IBX-9289: NodeFactory optimization (#1405)

* IBX-9289: Move translations resolved in `NodeFactory` to node's extended info * IBX-9289: Remove dependency on Content * IBX-9289: Update integration tests
ibexa · Dec 12, 2024 · 06d1b32 · 06d1b32
1 parent 8defa25
commit 06d1b32
Show file tree

Hide file tree

Showing 19 changed files with 68 additions and 68 deletions.
diff --git a/src/bundle/Controller/Content/ContentTreeController.php b/src/bundle/Controller/Content/ContentTreeController.php
@@ -194,7 +194,7 @@ public function loadNodeExtendedInfoAction(Location $location): NodeExtendedInfo
             fn (string $languageCode): bool => $this->isPreviewable($location, $content, $languageCode)
         );
 
-        return new NodeExtendedInfo($locationPermissionRestrictions, $previewableTranslations);
+        return new NodeExtendedInfo($locationPermissionRestrictions, $previewableTranslations, $translations);
     }
 
     /**

diff --git a/src/lib/REST/Output/ValueObjectVisitor/ContentTree/Node.php b/src/lib/REST/Output/ValueObjectVisitor/ContentTree/Node.php
@@ -39,8 +39,6 @@ public function visit(Visitor $visitor, Generator $generator, $data)
 
         $generator->valueElement('versionNo', $data->versionNo);
 
-        $generator->valueElement('translations', implode(',', $data->translations));
-
         $generator->valueElement('mainLanguageCode', $data->mainLanguageCode);
 
         $generator->startValueElement('name', $data->name);

diff --git a/src/lib/REST/Output/ValueObjectVisitor/ContentTree/NodeExtendedInfoVisitor.php b/src/lib/REST/Output/ValueObjectVisitor/ContentTree/NodeExtendedInfoVisitor.php
@@ -31,6 +31,7 @@ public function visit(Visitor $visitor, Generator $generator, $data): void
 
         $this->buildPermissionNode($data->getPermissionRestrictions(), $generator);
         $this->buildPreviewableTranslationsNode($data->getPreviewableTranslations(), $generator);
+        $this->buildTranslationsNode($data->getTranslations(), $generator);
 
         $generator->endObjectElement(self::MAIN_ELEMENT);
     }
@@ -51,6 +52,22 @@ protected function buildPreviewableTranslationsNode(
         $generator->endHashElement('previewableTranslations');
     }
 
+    /**
+     * @param array<int, string> $translations
+     */
+    protected function buildTranslationsNode(
+        array $translations,
+        Generator $generator
+    ): void {
+        $generator->startHashElement('translations');
+        $generator->startList('values');
+        foreach ($translations as $value) {
+            $generator->valueElement('value', $value);
+        }
+        $generator->endList('values');
+        $generator->endHashElement('translations');
+    }
+
     /**
      * @phpstan-param TPermissionRestrictions $permissionRestrictions
      */

diff --git a/src/lib/REST/Value/ContentTree/Node.php b/src/lib/REST/Value/ContentTree/Node.php
@@ -23,9 +23,6 @@ class Node extends RestValue
 
     public int $versionNo;
 
-    /** @var string[] */
-    public array $translations;
-
     /** @var string */
     public $name;
 
@@ -56,24 +53,13 @@ class Node extends RestValue
     public string $mainLanguageCode;
 
     /**
-     * @param int $depth
-     * @param int $locationId
-     * @param int $contentId
-     * @param string[] $translations
-     * @param string $name
-     * @param string $contentTypeIdentifier
-     * @param bool $isContainer
-     * @param bool $isInvisible
-     * @param int $displayLimit
-     * @param int $totalChildrenCount
-     * @param \Ibexa\AdminUi\REST\Value\ContentTree\Node[] $children
+     * @param array<\Ibexa\AdminUi\REST\Value\ContentTree\Node> $children
      */
     public function __construct(
         int $depth,
         int $locationId,
         int $contentId,
         int $versionNo,
-        array $translations,
         string $name,
         string $contentTypeIdentifier,
         bool $isContainer,
@@ -90,7 +76,6 @@ public function __construct(
         $this->locationId = $locationId;
         $this->contentId = $contentId;
         $this->versionNo = $versionNo;
-        $this->translations = $translations;
         $this->name = $name;
         $this->isInvisible = $isInvisible;
         $this->contentTypeIdentifier = $contentTypeIdentifier;

diff --git a/src/lib/REST/Value/ContentTree/NodeExtendedInfo.php b/src/lib/REST/Value/ContentTree/NodeExtendedInfo.php
@@ -28,20 +28,26 @@ final class NodeExtendedInfo extends RestValue
     /** @phpstan-var TPermissionRestrictions|null */
     private ?array $permissions;
 
-    /** @var string[] */
+    /** @var array<int, string> */
     private array $previewableTranslations;
 
+    /** @var array<int, string> */
+    private array $translations;
+
     /**
      * @phpstan-param TPermissionRestrictions|null $permissions
      *
-     * @param string[] $previewableTranslation
+     * @param array<int, string> $previewableTranslation
+     * @param array<int, string> $translations
      */
     public function __construct(
         ?array $permissions = null,
-        array $previewableTranslation = []
+        array $previewableTranslation = [],
+        array $translations = []
     ) {
         $this->permissions = $permissions;
         $this->previewableTranslations = $previewableTranslation;
+        $this->translations = $translations;
     }
 
     /**
@@ -53,10 +59,18 @@ public function getPermissionRestrictions(): ?array
     }
 
     /**
-     * @return string[]
+     * @return array<int, string>
      */
     public function getPreviewableTranslations(): array
     {
         return $this->previewableTranslations;
     }
+
+    /**
+     * @return array<int, string>
+     */
+    public function getTranslations(): array
+    {
+        return $this->translations;
+    }
 }
diff --git a/src/lib/UI/Module/ContentTree/NodeFactory.php b/src/lib/UI/Module/ContentTree/NodeFactory.php
@@ -356,9 +356,6 @@ private function buildNode(
             $containerLocations[] = $location;
         }
 
-        $content = $location->getContent();
-        $versionInfo = $content->getVersionInfo();
-
         $limit = $this->resolveLoadLimit($loadSubtreeRequestNode);
         $offset = null !== $loadSubtreeRequestNode
             ? $loadSubtreeRequestNode->offset
@@ -391,15 +388,11 @@ private function buildNode(
             }
         }
 
-        $translations = $versionInfo->getLanguageCodes();
-        $mainLanguageCode = $versionInfo->getContentInfo()->getMainLanguageCode();
-
         return new Node(
             $depth,
             $location->getId(),
             $location->getContentId(),
-            $versionInfo->getVersionNo(),
-            $translations,
+            $contentInfo->currentVersionNo,
             '', // node name will be provided later by `supplyTranslatedContentName` method
             null !== $contentType ? $contentType->getIdentifier() : '',
             null === $contentType || $contentType->isContainer(),
@@ -408,7 +401,7 @@ private function buildNode(
             $totalChildrenCount,
             $this->getReverseRelationsCount($contentInfo),
             isset($bookmarkLocations[$location->getId()]),
-            $mainLanguageCode,
+            $contentInfo->getMainLanguageCode(),
             $children,
             $location->getPathString()
         );

diff --git a/tests/integration/Resources/REST/Schemas/ContentTreeNode.json b/tests/integration/Resources/REST/Schemas/ContentTreeNode.json
@@ -88,7 +88,6 @@
                 "pathString",
                 "contentId",
                 "versionNo",
-                "translations",
                 "name",
                 "contentTypeIdentifier",
                 "isContainer",
@@ -109,7 +108,6 @@
         "pathString",
         "contentId",
         "versionNo",
-        "translations",
         "name",
         "contentTypeIdentifier",
         "isContainer",

diff --git a/tests/integration/Resources/REST/Schemas/ContentTreeNode.xsd b/tests/integration/Resources/REST/Schemas/ContentTreeNode.xsd
@@ -7,7 +7,6 @@
                 <xs:element type="xs:string" name="pathString"/>
                 <xs:element type="xs:integer" name="contentId"/>
                 <xs:element type="xs:integer" name="versionNo"/>
-                <xs:element type="xs:string" name="translations"/>
                 <xs:element type="xs:string" name="mainLanguageCode"/>
                 <xs:element type="xs:string" name="name"/>
                 <xs:element type="xs:string" name="contentTypeIdentifier"/>
@@ -24,7 +23,6 @@
                             <xs:element type="xs:string" name="pathString"/>
                             <xs:element type="xs:integer" name="contentId"/>
                             <xs:element type="xs:integer" name="versionNo"/>
-                            <xs:element type="xs:string" name="translations"/>
                             <xs:element type="xs:string" name="mainLanguageCode"/>
                             <xs:element type="xs:string" name="name"/>
                             <xs:element type="xs:string" name="contentTypeIdentifier"/>

diff --git a/tests/integration/Resources/REST/Schemas/ContentTreeNodeExtendedInfo.json b/tests/integration/Resources/REST/Schemas/ContentTreeNodeExtendedInfo.json
@@ -66,12 +66,26 @@
                         ]
                       }
                     }
-                  }
+                  },
+                "translations": {
+                    "type": "object",
+                    "properties": {
+                        "values": {
+                            "type": "array",
+                            "items": [
+                                {
+                                    "type": "string"
+                                }
+                            ]
+                        }
+                    }
+                }
             },
             "required": [
                 "_media-type",
                 "permissions",
-                "previewableTranslations"
+                "previewableTranslations",
+                "translations"
             ]
         }
     },

diff --git a/tests/integration/Resources/REST/Schemas/ContentTreeNodeExtendedInfo.xsd b/tests/integration/Resources/REST/Schemas/ContentTreeNodeExtendedInfo.xsd
@@ -33,6 +33,13 @@
                         </xs:sequence>
                     </xs:complexType>
                 </xs:element>
+                <xs:element name="translations">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="0" name="value" type="xs:string" />
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
             </xs:sequence>
             <xs:attribute name="media-type" type="xs:string" use="required" />
         </xs:complexType>

diff --git a/...ontentTreeNode/filter/json/filter-by-content-type-identifier-folder-and-landing-page.json b/...ontentTreeNode/filter/json/filter-by-content-type-identifier-folder-and-landing-page.json
@@ -17,7 +17,6 @@
                 "pathString": "/1/2/",
                 "reverseRelationsCount": 0,
                 "totalChildrenCount": 0,
-                "translations": "eng-GB",
                 "versionNo": 1
             },
             {
@@ -35,7 +34,6 @@
                 "pathString": "/1/43/",
                 "reverseRelationsCount": 0,
                 "totalChildrenCount": 3,
-                "translations": "eng-US",
                 "versionNo": 1
             },
             {
@@ -53,7 +51,6 @@
                 "pathString": "/1/48/",
                 "reverseRelationsCount": 0,
                 "totalChildrenCount": 0,
-                "translations": "eng-US",
                 "versionNo": 1
             },
             {
@@ -71,7 +68,6 @@
                 "pathString": "/1/58/",
                 "reverseRelationsCount": 0,
                 "totalChildrenCount": 0,
-                "translations": "eng-US",
                 "versionNo": 1
             }
         ],
@@ -87,7 +83,6 @@
         "pathString": "/1/",
         "reverseRelationsCount": 0,
         "totalChildrenCount": 4,
-        "translations": "",
         "versionNo": 1
     }
 }
diff --git a/...tTreeNode/filter/json/filter-by-content-type-identifier-folder-and-media-location-id.json b/...tTreeNode/filter/json/filter-by-content-type-identifier-folder-and-media-location-id.json
@@ -17,7 +17,6 @@
                 "pathString": "/1/43/",
                 "reverseRelationsCount": 0,
                 "totalChildrenCount": 0,
-                "translations": "eng-US",
                 "versionNo": 1
             }
         ],
@@ -33,7 +32,6 @@
         "pathString": "/1/",
         "reverseRelationsCount": 0,
         "totalChildrenCount": 1,
-        "translations": "",
         "versionNo": 1
     }
 }
diff --git a/...hots/ContentTreeNode/filter/json/filter-by-content-type-identifier-folder-or-subtree.json b/...hots/ContentTreeNode/filter/json/filter-by-content-type-identifier-folder-or-subtree.json
@@ -17,7 +17,6 @@
                 "pathString": "/1/43/",
                 "reverseRelationsCount": 0,
                 "totalChildrenCount": 3,
-                "translations": "eng-US",
                 "versionNo": 1
             },
             {
@@ -35,7 +34,6 @@
                 "pathString": "/1/48/",
                 "reverseRelationsCount": 0,
                 "totalChildrenCount": 0,
-                "translations": "eng-US",
                 "versionNo": 1
             },
             {
@@ -53,7 +51,6 @@
                 "pathString": "/1/5/",
                 "reverseRelationsCount": 0,
                 "totalChildrenCount": 5,
-                "translations": "eng-US",
                 "versionNo": 1
             },
             {
@@ -71,7 +68,6 @@
                 "pathString": "/1/58/",
                 "reverseRelationsCount": 0,
                 "totalChildrenCount": 0,
-                "translations": "eng-US",
                 "versionNo": 1
             }
         ],
@@ -87,7 +83,6 @@
         "pathString": "/1/",
         "reverseRelationsCount": 0,
         "totalChildrenCount": 4,
-        "translations": "",
         "versionNo": 1
     }
 }
diff --git a/.../REST/Snapshots/ContentTreeNode/filter/json/filter-by-content-type-identifier-folder.json b/.../REST/Snapshots/ContentTreeNode/filter/json/filter-by-content-type-identifier-folder.json
@@ -17,7 +17,6 @@
                 "pathString": "/1/43/",
                 "reverseRelationsCount": 0,
                 "totalChildrenCount": 3,
-                "translations": "eng-US",
                 "versionNo": 1
             },
             {
@@ -35,7 +34,6 @@
                 "pathString": "/1/48/",
                 "reverseRelationsCount": 0,
                 "totalChildrenCount": 0,
-                "translations": "eng-US",
                 "versionNo": 1
             },
             {
@@ -53,7 +51,6 @@
                 "pathString": "/1/58/",
                 "reverseRelationsCount": 0,
                 "totalChildrenCount": 0,
-                "translations": "eng-US",
                 "versionNo": 1
             }
         ],
@@ -69,7 +66,6 @@
         "pathString": "/1/",
         "reverseRelationsCount": 0,
         "totalChildrenCount": 3,
-        "translations": "",
         "versionNo": 1
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                 fn (string $languageCode): bool => $this->isPreviewable($location, $content, $languageCode)
             );
-            return new NodeExtendedInfo($locationPermissionRestrictions, $previewableTranslations);
+            return new NodeExtendedInfo($locationPermissionRestrictions, $previewableTranslations, $translations);
         }
         /**
@@ Expand Down @@