[RELEASE] Version 12.6.0 with new UI

Related: https://projekte.in2code.de/issues/72637

Author: tinzog

.github/workflows/tests.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   testsuite:
     name: all tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 #    strategy:
 #      matrix:
 #        php: [ '7.4', '8.0' ]

.gitignore

@@ -24,3 +24,4 @@ Build/.phpunit.result.cache
 .php-cs-fixer.cache
 composer.lock
 docker-compose.yaml
+node_modules/

CHANGELOG.md

@@ -1,5 +1,52 @@
 # In2publish Core Change Log
 
+12.6.0:
+- [DOCS] Update Changelog.md
+- [META] Set the EM conf version number to 12.6.0
+- [DOC] Add upgrade documentation
+- [BUGFIX] Fix wrong characters in PageRow.html condition
+- [BUGFIX] Remove usage of ConditionViewHelper from EXT:in2publish
+- [BUGFIX] Show status for deleted pages in OverviewModule
+- [BUGFIX] Fix PublishButtonWithWarning displayed when record is publishable ignoring dependencies
+- [BUGFIX] Eliminate not publishable warning for unchanged elements
+- [BUGFIX] Show publishing action only if user is allowed to publish
+- [DOC] Adjust documentation and change screenshots
+- [BUGFIX] Show language flag also for default language
+- [BUGFIX] Fix layout of topmost "table" page header
+- [TASK] Add header to OverviewModule
+- [TEST] Fix PublishChangedNewsTest
+- [TEST] Fix UidClashTest
+- [TEST] Fix RecordTreeDisplayTest
+- [TEST] Fix PublishTranslationTest
+- [TEST] Fix PublishChangedPagePropertiesTest
+- [TEST] Fix PublishChangedContentTest
+- [TEST] Fix PublishingRecordWithDependencyTest
+- [TEST] Add make task for execution of single tests
+- [BUGFIX] Fix getChildPagesWithoutTranslations in AbstractRecord
+- [TASK] Improve layout for translated page records in Publish Overview
+- [TASK] Provide method getChildPagesWithoutTranslations in RecordTree, Node and AbstractRecord in order to fix display of records in OverviewModule
+- [GIT] update github workflow testsuite image
+- [BUGFIX] fix request access check
+- [TASK] Fix spacing of elements in publish overview page rows
+- [TASK] Add language filtering to publish overview
+- [COMMENT] Add comment to LanguageAugmentation
+- [TASK] Display reasons why record is not publishable in OverviewModule using a new InformationModal without publish buttons
+- [BUGFIX] Display ReasonsWhyRecordIsNotPublishable in WorkflowModule
+- [BUGFIX] Replace in2publish ContentLanguage with SiteLanguage in SiteLanguageService
+- [WIP] Add language filter to OverviewModule
+- [TASK] Assign available languages to PublishOverviewModule
+- [REFACTOR] Move SiteLanguageServie from EXT:in2publish to EXT:in2publish_core
+- [TASK] Provide event to decide if translations should be included in publishing
+- [FEATURE] Add event listener language augmentation limiting the publishing to the selected languages
+- [BUGFIX] Make searches case-insensitive
+- [BUGFIX] Fix spacing of in2publish-page entries to prevent whitespace in searches
+- [TASK] Don't render function bar in publish overview
+- [TASK] Rebuild frontend assets
+- [TASK] Move SCSS files into new build location
+- [TASK] Add updated tooling to build SCSS
+- [FEATURE] Implement new publish overview
+- [DEV] Add some make tasks for local development
+
 12.5.9:
 - [META] Set the EM conf version number to 12.5.9
 - [BUGFIX] Avoid trailing AND when additionalWhere is empty
@@ -929,7 +976,7 @@
 - [GIT] Ignore build and qa files when creating a production dist
 - [GIT] Ignore the .github folder when creating a production dist
 
-1.0.9:
+11.0.9:
 - [META] Set the EM conf version number to 11.0.9
 - [BUGFIX] Search for file links only in href attributes
 - [BUGFIX] Do not enhance records with sys_redirects if they are excluded from publishing

Classes/Component/Core/Demand/Augmentation/LanguageAugmentation.php

@@ -0,0 +1,79 @@
+<?php
+
+declare(strict_types=1);
+
+namespace In2code\In2publishCore\Component\Core\Demand\Augmentation;
+
+use In2code\In2publishCore\Component\Core\Demand\Type\JoinDemand;
+use In2code\In2publishCore\Component\Core\Demand\Type\SelectDemand;
+use In2code\In2publishCore\Component\Core\Demand\Type\SysRedirectDemand;
+use In2code\In2publishCore\Component\Core\RecordTree\RecordTreeBuildRequest;
+use In2code\In2publishCore\Event\DemandsWereCollected;
+use TYPO3\CMS\Core\SingletonInterface;
+
+use function array_map;
+use function array_merge;
+use function array_unique;
+use function implode;
+use function trim;
+
+/**
+ * This event listener listens to the event DemandsWereCollected and checks if there are languages in the request.
+ * If there are, it adds a language condition to the demands.
+ */
+class LanguageAugmentation implements SingletonInterface
+{
+    public ?RecordTreeBuildRequest $request = null;
+
+    public function __invoke(DemandsWereCollected $event): void
+    {
+        if (null === $this->request || empty($this->request->getLanguages())) {
+            return;
+        }
+
+        $languages = $this->request->getLanguages();
+        $demands = $event->getDemands();
+        $allDemands = $demands->getAll();
+
+        $languages = array_map('intval', array_unique(array_merge([-1, 0], $languages)));
+
+        $languageArray = implode(',', $languages);
+
+        foreach ($allDemands as $type => $tables) {
+            switch ($type) {
+                case SysRedirectDemand::class:
+                case SelectDemand::class:
+                    foreach ($tables as $table => $wheres) {
+                        $languageField = $GLOBALS['TCA'][$table]['ctrl']['languageField'] ?? null;
+                        if ($languageField) {
+                            foreach ($wheres as $where => $value) {
+                                if (trim($where) !== '') {
+                                    $where .= ' AND ';
+                                }
+                                $where .= $table . '.' . $languageField . ' IN(' . $languageArray .')';
+                                $allDemands[$type][$table][$where] = $value;
+                            }
+                        }
+                    }
+                    break;
+                case JoinDemand::class:
+                    foreach ($tables as $table => $joinTables) {
+                        $languageField = $GLOBALS['TCA'][$table]['ctrl']['languageField'] ?? null;
+                        if ($languageField) {
+                            foreach ($joinTables as $joinTable => $wheres) {
+                                foreach ($wheres as $where => $value) {
+                                    if (trim($where) !== '') {
+                                        $where .= ' AND ';
+                                    }
+                                    $where .= $table . '.' . $languageField . ' IN(' . $languageArray;
+                                    $allDemands[$type][$table][$joinTable][$where] = $value;
+                                }
+                            }
+                        }
+                    }
+                    break;
+            }
+        }
+        $demands->setAll($allDemands);
+    }
+}

Classes/Component/Core/Demand/Demands.php

@@ -12,4 +12,8 @@ public function addDemand(Demand $demand): void;
     public function unsetDemand(DemandRemover $demandRemover): void;
 
     public function getDemandsByType(string $type): array;
+
+    public function getAll(): array;
+
+    public function setAll(array $demands): void;
 }

Classes/Component/Core/Demand/DemandsCollection.php

@@ -35,4 +35,14 @@ public function getDemandsByType(string $type): array
     {
         return $this->demands[$type] ?? [];
     }
+
+    public function getAll(): array
+    {
+        return $this->demands;
+    }
+
+    public function setAll(array $demands): void
+    {
+        $this->demands = $demands;
+    }
 }

Classes/Component/Core/Publisher/PublisherService.php

@@ -8,6 +8,7 @@
 use In2code\In2publishCore\Component\Core\Record\Model\Record;
 use In2code\In2publishCore\Component\Core\RecordTree\RecordTree;
 use In2code\In2publishCore\Component\PostPublishTaskExecution\Service\TaskExecutionServiceInjection;
+use In2code\In2publishCore\Event\BeforePublishingTranslationsEvent;
 use In2code\In2publishCore\Event\PublishingOfOneRecordBegan;
 use In2code\In2publishCore\Event\PublishingOfOneRecordEnded;
 use In2code\In2publishCore\Event\RecordWasPublished;
@@ -127,9 +128,14 @@ protected function publishRecord(Record $record, bool $includeChildPages = false
             $this->eventDispatcher->dispatch(new RecordWasPublished($record));
         }
 
-        foreach ($record->getTranslations() as $translatedRecords) {
-            foreach ($translatedRecords as $translatedRecord) {
-                $this->publishRecord($translatedRecord, $includeChildPages);
+        $translationEvent = new BeforePublishingTranslationsEvent($record, $includeChildPages);
+        $this->eventDispatcher->dispatch($translationEvent);
+
+        if ($translationEvent->shouldProcessTranslations()) {
+            foreach ($record->getTranslations() as $translatedRecords) {
+                foreach ($translatedRecords as $translatedRecord) {
+                    $this->publishRecord($translatedRecord, $includeChildPages);
+                }
             }
         }
 

Classes/Component/Core/Record/Model/AbstractRecord.php

@@ -47,7 +47,7 @@ abstract class AbstractRecord implements Record
      */
     protected array $parents = [];
     /**
-     * @var array<Record>
+     * @var array<int, array<int, Record>>
      */
     protected array $translations = [];
     protected ?Record $translationParent = null;
@@ -121,6 +121,17 @@ public function getChildren(): array
         return $this->children;
     }
 
+    public function getChildPagesWithoutTranslations(): array
+    {
+        $childPages = $this->children['pages'] ?? [];
+        foreach ($childPages as $id => $record) {
+            if ($record->getTranslationParent() !== null) {
+                unset($childPages[$id]);
+            }
+        }
+        return $childPages;
+    }
+
     public function addParent(Record $parentRecord): void
     {
         $this->parents[] = $parentRecord;

Classes/Component/Core/Record/Model/Node.php

@@ -19,4 +19,6 @@ public function addChild(Record $record): void;
      * @return array<string, array<int|string, Record>>
      */
     public function getChildren(): array;
+
+    public function getChildPagesWithoutTranslations(): array;
 }

Classes/Component/Core/RecordTree/RecordTree.php

@@ -74,4 +74,15 @@ public function getCurrentPage(): ?Record
 
         return null;
     }
+
+    public function getChildPagesWithoutTranslations(): array
+    {
+        $childPages = $this->children['pages'] ?? [];
+        foreach ($childPages as $id => $record) {
+            if ($record->getTranslationParent() !== null) {
+                unset($childPages[$id]);
+            }
+        }
+        return $childPages;
+    }
 }