[FEATURE] Update of Analysis/Search/Detail view

in2code-de · Feb 26, 2024 · a6911e3 · a6911e3
1 parent 413418b
commit a6911e3
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/Classes/Controller/AnalysisController.php b/Classes/Controller/AnalysisController.php
@@ -414,11 +414,16 @@ public function detailLinkListenerAction(Linklistener $linkListener): ResponseIn
      */
     public function detailSearchAction(string $searchterm): ResponseInterface
     {
-        $filter = ObjectUtility::getFilterDto()->setSearchterm($searchterm);
+        $filter = BackendUtility::getFilterFromSession(
+            'search',
+            $this->getControllerName(),
+            ['searchterm' => $searchterm, 'limit' => 100]
+        );
         $this->view->assignMultiple([
+            'filter' => $filter,
             'searchterm' => $searchterm,
             'searchData' => GeneralUtility::makeInstance(SearchDataProvider::class, $filter),
-            'searches' => $this->searchRepository->findBySearchterm($filter),
+            'searches' => $this->searchRepository->findByFilter($filter),
         ]);
 
         $this->addDocumentHeaderForCurrentController();
@@ -524,8 +529,9 @@ public function detailSearchAjaxPage(ServerRequestInterface $request): ResponseI
             ['searchterm' => urldecode($request->getQueryParams()['searchterm']), 'limit' => 10]
         );
         $standaloneView->assignMultiple([
-            'searches' => $this->searchRepository->findBySearchterm($filter),
+            'searches' => $this->searchRepository->findByFilter($filter),
             'searchterm' => $request->getQueryParams()['searchterm'],
+            'searchData' => GeneralUtility::makeInstance(SearchDataProvider::class, $filter),
         ]);
         $response = GeneralUtility::makeInstance(JsonResponse::class);
         /** @var StreamInterface $stream */

diff --git a/Classes/Domain/Repository/SearchRepository.php b/Classes/Domain/Repository/SearchRepository.php
@@ -46,7 +46,7 @@ public function findCombinedBySearchIdentifier(FilterDto $filter): array
         return $connection->executeQuery($sql)->fetchAllAssociative();
     }
 
-    public function findBySearchterm(FilterDto $filter): QueryResultInterface
+    public function findByFilter(FilterDto $filter): QueryResultInterface
     {
         $sql = 'select s.* from ' . Search::TABLE_NAME . ' s'
             . ' left join ' . Pagevisit::TABLE_NAME . ' pv on s.pagevisit = pv.uid'

diff --git a/Resources/Private/Partials/Box/Miscellaneous/FilterInformation.html b/Resources/Private/Partials/Box/Miscellaneous/FilterInformation.html
@@ -102,3 +102,14 @@ <h3 class="panel-title">Filter</h3>
         </td>
     </tr>
 </f:section>
+
+<f:section name="search">
+    <tr>
+        <th>
+            <f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:tx_lux_domain_model_search.searchterm">Searchterm</f:translate>
+        </th>
+        <td>
+            {filter.searchterm}
+        </td>
+    </tr>
+</f:section>
diff --git a/Resources/Private/Templates/Analysis/DetailSearch.html b/Resources/Private/Templates/Analysis/DetailSearch.html
@@ -62,6 +62,9 @@ <h3 class="panel-title">
             </div>
         </div>
         <div class="col-md-4">
+            <f:alias map="{type:'search'}">
+                <f:render partial="Box/Miscellaneous/FilterInformation" arguments="{_all}"/>
+            </f:alias>
             <f:alias map="{headerPostfix:searchterm}">
                 <f:render partial="Box/Analysis/Search" arguments="{_all}"/>
             </f:alias>

diff --git a/Resources/Private/Templates/Analysis/SearchDetailPageAjax.html b/Resources/Private/Templates/Analysis/SearchDetailPageAjax.html
@@ -43,3 +43,7 @@ <h3 class="panel-title">
         </f:if>
     </div>
 </div>
+
+<f:alias map="{headerPostfix:searchterm}">
+    <f:render partial="Box/Analysis/Search" arguments="{_all}"/>
+</f:alias>