Skip to content

[FEATURE] Add previews and toggles for file references of original re… #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bunnyfield wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[FEATURE] Add previews and toggles for file references of original re… #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ad0c3b
[BUGFIX] Check existing array keys before iterating with foreach
Bunnyfield Mar 24, 2024
dfabf89
[FEATURE] Add previews and toggles for file references of original re…
Bunnyfield Mar 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 68 additions & 4 deletions Classes/Domain/Repository/TransfusionRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use TYPO3\CMS\Core\Database\Query\Restriction\WorkspaceRestriction;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Resource\FileRepository;
use TYPO3\CMS\Core\Utility\GeneralUtility;

/**
Expand All @@ -34,9 +35,15 @@ class TransfusionRepository
*/
protected IconFactory $iconFactory;

/**
* @var FileRepository
*/
protected FileRepository $fileRepository;

public function __construct()
{
$this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
$this->fileRepository = GeneralUtility::makeInstance(FileRepository::class);
}

/**
Expand Down Expand Up @@ -105,7 +112,31 @@ protected function fetchDefaultLanguageRecordsAndConnectionsForTable(
)
->orderBy($transFusionFields['sorting'])
->executeQuery();
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('sys_file_reference');
$fileFields = $queryBuilder
->select(
'fieldname'
)
->from('sys_file_reference')
->where(
$queryBuilder->expr()->eq('pid', $queryBuilder->createNamedParameter($page, Connection::PARAM_INT)),
$queryBuilder->expr()->eq('tablenames', $queryBuilder->createNamedParameter($table)),
$queryBuilder->expr()->eq('l10n_parent', 0),
$queryBuilder->expr()->eq('sys_language_uid', 0),
)
->groupBy('fieldname')
->executeQuery()
->fetchAllAssociativeIndexed();
while ($record = $defaultLanguageQuery->fetchAssociative()) {
$files = [];
if (!empty($fileFields)) {
foreach (array_keys($fileFields) as $fieldName) {
$fileRecords = $this->fileRepository->findByRelation($table, $fieldName, $record['uid']);
if (!empty($fileRecords)) {
$files[$fieldName] = $fileRecords;
}
}
}
$preparedRecord = [
'uid' => $record['uid'],
'pid' => $record['pid'],
Expand All @@ -118,6 +149,9 @@ protected function fetchDefaultLanguageRecordsAndConnectionsForTable(
'icon' => $this->getIconForRecord($table, $record, $record[$transFusionFields['label']]),
'previewData' => $record
];
if (!empty($files)) {
$preparedRecord['relatedFiles'] = $files;
}
$preparedRecord['column'] = ($table === 'tt_content' ? $record[$transFusionFields['column']] : '');
$connectedRecords = $this->getConnectedTranslations(
$table,
Expand Down Expand Up @@ -179,6 +213,7 @@ protected function fetchDefaultLanguageRecordsAndConnectionsForTable(
!empty($dataMapRecord['brokenOrOrphaned'])
&& !isset($assigned[$dataMapRecord['uid']])
) {
$preparedRecord['brokenConnections'] = [];
foreach ($dataMapRecord['brokenOrOrphaned'] as $brokenOrOrphaned) {
if ($brokenOrOrphaned['uid'] === $preparedRecord['uid']) {
// These records are partly matching their translation parent but are not connected yet
Expand All @@ -201,7 +236,7 @@ protected function fetchDefaultLanguageRecordsAndConnectionsForTable(
foreach ($fullDataMap[$table] as $dataMapRecord) {
if (!empty($dataMapRecord['uid']) && empty($assigned[$dataMapRecord['uid']])) {
if (!empty($dataMapRecord['brokenOrOrphaned'])) {
$preparedRecord = ['brokenConnections' => []];
$preparedRecord = ['orphanedConnections' => []];
foreach ($dataMapRecord['brokenOrOrphaned'] as $brokenOrOrphaned) {
$preparedRecord['orphanedConnections'][] = [
'uid' => $brokenOrOrphaned['uid'],
Expand All @@ -213,9 +248,6 @@ protected function fetchDefaultLanguageRecordsAndConnectionsForTable(
];
}
}
if (!empty($preparedRecord)) {
$defaultLanguageRecords[$dataMapRecord['uid']] = $preparedRecord;
}
}
}
return $defaultLanguageRecords;
Expand Down Expand Up @@ -404,8 +436,37 @@ public function fetchDisconnectedRecordsAndPrepareDataMap(
$queryBuilder->expr()->eq($transFusionFields['language'], $language),
)
->executeQuery();

$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('sys_file_reference');
$queryBuilder
->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class))
->add(GeneralUtility::makeInstance(WorkspaceRestriction::class));
$fileFields = $queryBuilder
->select(
'fieldname'
)
->from('sys_file_reference')
->where(
$queryBuilder->expr()->eq('pid', $queryBuilder->createNamedParameter($page, Connection::PARAM_INT)),
$queryBuilder->expr()->eq('tablenames', $queryBuilder->createNamedParameter($table)),
$queryBuilder->expr()->eq('sys_language_uid', $language),
)
->groupBy('fieldname')
->executeQuery()
->fetchAllAssociativeIndexed();
while ($record = $disconnectedRecords->fetchAssociative()) {
$fetchPossibleParents = false;
$files = [];
if (!empty($fileFields)) {
foreach (array_keys($fileFields) as $fieldName) {
$fileRecords = $this->fileRepository->findByRelation($table, $fieldName, $record['uid']);
if (!empty($fileRecords)) {
$files[$fieldName] = $fileRecords;
}
}
}
$preparedRecord = [
'uid' => $record['uid'],
'type' => $record[$transFusionFields['type']],
Expand All @@ -415,6 +476,9 @@ public function fetchDisconnectedRecordsAndPrepareDataMap(
'original' => $record[$transFusionFields['original']],
'previewData' => $record
];
if (!empty($files)) {
$preparedRecord['relatedFiles'] = $files;
}
$preparedRecord['column'] = ($table === 'tt_content' ? $record[$transFusionFields['column']] : '');

$fetchFields = $transFusionFields['language'] . ',' . $transFusionFields['type'];
Expand Down
Loading