feat: include global search output in initialData

remindgmbh · Feb 13, 2024 · 0737424 · 0737424
1 parent 37e0220
commit 0737424
Show file tree

Hide file tree

Showing 10 changed files with 647 additions and 613 deletions.
diff --git a/.build/phpcs.xml b/.build/phpcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="PHP_CodeSniffer">
-    <config name="installed_paths" value="../../slevomat/coding-standard"/>
+    <config name="installed_paths" value="../../slevomat/coding-standard" />
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">
         <type>error</type>
     </rule>

diff --git a/Classes/Controller/SearchController.php b/Classes/Controller/SearchController.php
@@ -14,6 +14,7 @@
 use FriendsOfTYPO3\Headless\Utility\FileUtility;
 use Psr\Http\Message\ResponseInterface;
 use Remind\Headless\Service\JsonService;
+use Remind\Headless\Utility\ConfigUtility;
 use Remind\HeadlessSolr\Event\ModifySearchDocumentEvent;
 use TYPO3\CMS\Extbase\Service\ImageService;
 
@@ -42,9 +43,15 @@ public function formAction(): ResponseInterface
     {
         parent::formAction();
 
-        $config = Util::getSolrConfiguration();
-        $targetPageUid = $config->getSearchTargetPage();
-        $getParameter = $config->getValueByPathOrDefaultValue('plugin.tx_solr.search.query.getParameter', 'q');
+        $pageConfig = ConfigUtility::getConfig();
+
+        $solrConfig = Util::getSolrConfiguration();
+
+        $targetPageUid = isset($this->settings['global'])
+            ? ((int) ($pageConfig['solr']['searchPage'] ?? 0))
+            : $solrConfig->getSearchTargetPage();
+
+        $getParameter = $solrConfig->getValueByPathOrDefaultValue('plugin.tx_solr.search.query.getParameter', 'q');
 
         $arguments = $this->request->getArguments();
 

diff --git a/Configuration/FlexForms/Config.xml b/Configuration/FlexForms/Config.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<T3DataStructure>
+    <sheets>
+        <solr>
+            <ROOT>
+                <sheetTitle>LLL:EXT:rmnd_headless_solr/Resources/Private/Language/locallang.xlf:flexform.config.sheet_title</sheetTitle>
+                <type>array</type>
+                <el>
+                    <solr.searchPage>
+                        <label>LLL:EXT:rmnd_headless_solr/Resources/Private/Language/locallang.xlf:flexform.config.search_page</label>
+                        <config>
+                            <type>group</type>
+                            <allowed>pages</allowed>
+                            <maxitems>1</maxitems>
+                            <size>1</size>
+                        </config>
+                    </solr.searchPage>
+                </el>
+            </ROOT>
+        </solr>
+    </sheets>
+</T3DataStructure>
diff --git a/Configuration/TCA/Overrides/pages.php b/Configuration/TCA/Overrides/pages.php
@@ -2,6 +2,7 @@
 
 defined('TYPO3') || die;
 
+use Remind\Headless\Utility\ConfigUtility;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 
 ExtensionManagementUtility::addTCAcolumns(
@@ -15,10 +16,13 @@
                 'maxitems' => 1,
             ],
         ],
-    ]
+     ]
 );
 
-// Replace no_search and no_search_sub_entries fields with empty palette to remove, they will be added to a new palette below
+/**
+ * Replace no_search and no_search_sub_entries fields with empty palette to remove,
+ * they will be added to a new palette below
+ */
 foreach (['no_search', 'no_search_sub_entries'] as $field) {
     ExtensionManagementUtility::addToAllTCAtypes(
         'pages',
@@ -36,5 +40,7 @@
 
 ExtensionManagementUtility::addToAllTCAtypes(
     'pages',
-    '--palette--;Search;search',
+    '--palette--;LLL:EXT:rmnd_headless_solr/Resources/Private/Language/locallang.xlf:pages.palettes.search;search',
 );
+
+ConfigUtility::addFlexForm('FILE:EXT:rmnd_headless_solr/Configuration/FlexForms/Config.xml');
diff --git a/Configuration/TypoScript/constants.typoscript b/Configuration/TypoScript/constants.typoscript
@@ -1,9 +1,6 @@
 @import 'EXT:solr/Configuration/TypoScript/Solr/constants.typoscript'
 
 plugin.tx_solr {
-    search {
-        typeNum = 7385
-    }
     suggest {
         typeNum = 7384
     }

diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript
@@ -45,32 +45,23 @@ tt_content.list {
     }
 }
 
-tx_solr_search = PAGE
-tx_solr_search {
-    typeNum = {$plugin.tx_solr.search.typeNum}
-    config {
-        disableAllHeaderCode = 1
-        xhtml_cleaning = 0
-        admPanel = 0
-        additionalHeaders.10.header = Content-type: application/json
-        no_cache = 0
-        debug = 0
+initialData {
+    10 {
+        fields {
+            solr = CONTENT
+            solr < lib.search
+            solr {
+                settings {
+                    global = 1
+                }
+            }
+        }
     }
-
-    10 < lib.search
 }
 
-tx_solr_suggest = PAGE
+tx_solr_suggest < lib.headlessPage
 tx_solr_suggest {
     typeNum = {$plugin.tx_solr.suggest.typeNum}
-    config {
-        disableAllHeaderCode = 1
-        xhtml_cleaning = 0
-        admPanel = 0
-        additionalHeaders.10.header = Content-type: application/json
-        no_cache = 0
-        debug = 0
-    }
 
     10 = USER
     10 {

diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf
@@ -3,6 +3,15 @@
     <file source-language="en" datatype="plaintext" product-name="headless_solr">
         <header/>
         <body>
+            <trans-unit id="flexform.config.sheet_title">
+                <target>Solr</target>
+            </trans-unit>
+            <trans-unit id="flexform.config.search_page">
+                <target>Suchseite</target>
+            </trans-unit>
+            <trans-unit id="pages.palettes.search">
+                <target>Suche</target>
+            </trans-unit>
             <trans-unit id="pages.tx_headless_solr_image">
                 <target>Suchergebnis Bild</target>
             </trans-unit>

diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
@@ -3,6 +3,15 @@
     <file source-language="en" datatype="plaintext" product-name="headless_solr">
         <header/>
         <body>
+            <trans-unit id="flexform.config.sheet_title">
+                <source>Solr</source>
+            </trans-unit>
+            <trans-unit id="flexform.config.search_page">
+                <source>Search Page</source>
+            </trans-unit>
+            <trans-unit id="pages.palettes.search">
+                <source>Search</source>
+            </trans-unit>
             <trans-unit id="pages.tx_headless_solr_image">
                 <source>Search Result Image</source>
             </trans-unit>

diff --git a/composer.json b/composer.json
@@ -46,7 +46,7 @@
     "require": {
         "apache-solr-for-typo3/solr": "^12",
         "php": "^8.2",
-        "remind/headless": "^3.1 | dev-develop",
+        "remind/headless": "^3.2 | dev-develop",
         "typo3/cms-core": "^12.4"
     },
     "require-dev": {