Skip to content

In MenuProcessor allow to specify data fields to include as… … list field1,field2,... #805

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
oliverkroener wants to merge 12 commits into
base: master
Choose a base branch
from
Open

In MenuProcessor allow to specify data fields to include as… … list field1,field2,... #805

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
66767fa
[FEATURE] In MenuProcessor allow to specify data fields to include as…
oliverkroener Jan 27, 2025
46499da
Merge branch 'master' of github.com:oliverkroener/headless into dev
oliverkroener Feb 7, 2025
506165a
Merge branch 'master' into dev
oliverkroener Feb 7, 2025
9f64a5b
[TASK] Fixed code
oliverkroener Feb 8, 2025
9bf4ae3
Merge branch 'master' of https://github.com/TYPO3-Headless/headless i…
oliverkroener Feb 8, 2025
2b0653f
Merge branch 'dev' of github.com:oliverkroener/headless into dev
oliverkroener Feb 8, 2025
00b2b55
[BUGFIX] Don't render double slashes in file URLs (#796)
kitzberger Nov 28, 2024
086d981
[FEATURE] Add links for backend editor on the frontend (#800)
twoldanski Jan 13, 2025
46daed0
[FEATURE] Add support for `config.htmlTag` & `page.bodyTagAdd` (#802)
twoldanski Jan 23, 2025
6b52c90
[TASK] Fixed code
oliverkroener Feb 8, 2025
4663311
[BUGFIX] Generate proper hash for v13 in LoginFormViewHelper (#804)
twoldanski Jan 28, 2025
fe59047
Merge branch 'dev' of github.com:oliverkroener/headless into dev
oliverkroener Feb 20, 2025
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
39 changes: 30 additions & 9 deletions Classes/DataProcessing/DataProcessingTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,33 @@ trait DataProcessingTrait
*/
protected function removeDataIfnotAppendInConfiguration(array $processorConfiguration, array $processedData): array
{
if (!isset($processorConfiguration['appendData']) ||
(int)$processorConfiguration['appendData'] === 0) {
unset($processedData['data']);
if (isset($processorConfiguration['as'], $processedData[$processorConfiguration['as']])
&& is_array($processedData[$processorConfiguration['as']])) {
if (
!isset($processorConfiguration['appendData']) ||
(int)$processorConfiguration['appendData'] !== 1
) {
// Items to keep
$removeAll = !isset($processorConfiguration['appendData']) || $processorConfiguration['appendData'] == 0;
$keepItems = $removeAll ? [] : array_flip(array_map('trim', explode(',', $processorConfiguration['appendData'])));
Copy link
Collaborator

@twoldanski twoldanski Feb 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should add new option like keep(Items|fields) or passFields to keep clear what is happening also do not change behavior of flag appendData to keep BC, also you can use GeneralUtility:trimExplode

if ($removeAll) {
unset($processedData['data']);
} else {
$processedData['data'] = array_intersect_key($processedData['data'], $keepItems);
}
if (
isset($processorConfiguration['as'], $processedData[$processorConfiguration['as']])
&& is_array($processedData[$processorConfiguration['as']])
) {
foreach ($processedData[$processorConfiguration['as']] as &$item) {
if (is_array($item) && isset($item['data'])) {
unset($item['data']);
if ($removeAll) {
unset($item['data']);
} else {
$item['data'] = array_intersect_key($item['data'], $keepItems);
}
}

if ($this->isMenuProcessor() && isset($item['children']) && is_array($item['children'])) {
$this->removeDataInChildrenNodes($item['children']);
$this->removeDataInChildrenNodes($item['children'], $removeAll, $keepItems);
}
}
}
Expand All @@ -49,12 +64,18 @@ protected function isMenuProcessor(): bool
* Removes recursively "data" in children nodes
*
* @param array $children
* @param bool $removeAll
* @param array $keepItems
* @param string $nodeName
*/
private function removeDataInChildrenNodes(array &$children, string $nodeName = 'children'): void
private function removeDataInChildrenNodes(array &$children, bool $removeAll, array $keepItems, string $nodeName = 'children'): void
{
foreach ($children as &$childrenItem) {
unset($childrenItem['data']);
if ($removeAll) {
unset($childrenItem['data']);
} else {
$childrenItem['data'] = array_intersect_key($childrenItem['data'], $keepItems);
}
if (isset($childrenItem[$nodeName]) && is_array($childrenItem[$nodeName])) {
$this->removeDataInChildrenNodes($childrenItem[$nodeName], $nodeName);
}
Expand Down