IBX-9313: Add languageCodes param to VewsInput

ibexa · Dec 17, 2024 · 06b78cc · 06b78cc
1 parent fd2cbf5
commit 06b78cc
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/src/lib/Server/Controller/Views.php b/src/lib/Server/Controller/Views.php
@@ -51,8 +51,18 @@ public function createView(Request $request)
             $method = [$this->searchService, 'findContent'];
         }
 
+        $languages = [];
+        if ($viewInput->languageCodes !== null) {
+            $languages = $viewInput->languageCodes;
+        }
+
+        if ($viewInput->languageCode !== null) {
+            $languages[] = $viewInput->languageCode;
+            $languages = array_unique($languages);
+        }
+
         $languageFilter = [
-            'languages' => null !== $viewInput->languageCode ? [$viewInput->languageCode] : Language::ALL,
+            'languages' => empty($languages) ? Language::ALL : $languages,
             'useAlwaysAvailable' => $viewInput->useAlwaysAvailable ?? true,
         ];
         $query = $viewInput->query->query;

diff --git a/src/lib/Server/Input/Parser/ViewInput.php b/src/lib/Server/Input/Parser/ViewInput.php
@@ -38,6 +38,9 @@ public function parse(array $data, ParsingDispatcher $parsingDispatcher)
 
         // language params
         $restViewInput->languageCode = $data['languageCode'] ?? null;
+        $restViewInput->languageCodes =
+            array_key_exists('languageCodes', $data) && is_array($data['languageCodes'])
+                ? $data['languageCodes'] : null;
         $restViewInput->useAlwaysAvailable = $data['useAlwaysAvailable'] ?? null;
 
         // query

diff --git a/src/lib/Server/Input/Parser/ViewInputOneDotOne.php b/src/lib/Server/Input/Parser/ViewInputOneDotOne.php
@@ -38,6 +38,9 @@ public function parse(array $data, ParsingDispatcher $parsingDispatcher)
 
         // language params
         $restViewInput->languageCode = $data['languageCode'] ?? null;
+        $restViewInput->languageCodes =
+            array_key_exists('languageCodes', $data) && is_array($data['languageCodes'])
+            ? $data['languageCodes'] : null;
         $restViewInput->useAlwaysAvailable = $data['useAlwaysAvailable'] ?? null;
 
         // query

diff --git a/src/lib/Server/Values/RestViewInput.php b/src/lib/Server/Values/RestViewInput.php
@@ -32,6 +32,11 @@ class RestViewInput extends RestValue
      */
     public $languageCode;
 
+    /**
+     * @var [string]|null
+     */
+    public $languageCodes;
+
     /**
      * @var bool|null
      */