Cleaned up dark mode styles inc. setting browser color scheme

[bookstack] / app / Http / Controllers / SearchController.php

diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index d12c23b5a2c4404cb665bec99c5160eeff4e700a..8df5cfafb805514ec9daf728c8832255129d42a7 100644 (file)
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -3,29 +3,25 @@
 namespace BookStack\Http\Controllers;
 
 use BookStack\Entities\Queries\Popular;
 namespace BookStack\Http\Controllers;
 
 use BookStack\Entities\Queries\Popular;

-use BookStack\Entities\Tools\SearchOptions;
-use BookStack\Entities\Tools\SearchRunner;
-use BookStack\Entities\Tools\ShelfContext;

 use BookStack\Entities\Tools\SiblingFetcher;
 use BookStack\Entities\Tools\SiblingFetcher;

+use BookStack\Search\SearchOptions;
+use BookStack\Search\SearchResultsFormatter;
+use BookStack\Search\SearchRunner;

 use Illuminate\Http\Request;
 
 class SearchController extends Controller
 {
 use Illuminate\Http\Request;
 
 class SearchController extends Controller
 {

-    protected $searchRunner;
-    protected $entityContextManager;
+    protected SearchRunner $searchRunner;

 
 

-    public function __construct(
-        SearchRunner $searchRunner,
-        ShelfContext $entityContextManager
-    ) {
+    public function __construct(SearchRunner $searchRunner)
+    {

         $this->searchRunner = $searchRunner;
         $this->searchRunner = $searchRunner;

-        $this->entityContextManager = $entityContextManager;

     }
 
     /**
      * Searches all entities.
      */
     }
 
     /**
      * Searches all entities.
      */

-    public function search(Request $request)
+    public function search(Request $request, SearchResultsFormatter $formatter)

     {
         $searchOpts = SearchOptions::fromRequest($request);
         $fullSearchString = $searchOpts->toString();
     {
         $searchOpts = SearchOptions::fromRequest($request);
         $fullSearchString = $searchOpts->toString();


@@ -35,6 +31,7 @@ class SearchController extends Controller
         $nextPageLink = url('/search?term=' . urlencode($fullSearchString) . '&page=' . ($page + 1));
 
         $results = $this->searchRunner->searchEntities($searchOpts, 'all', $page, 20);
         $nextPageLink = url('/search?term=' . urlencode($fullSearchString) . '&page=' . ($page + 1));
 
         $results = $this->searchRunner->searchEntities($searchOpts, 'all', $page, 20);

+        $formatter->format($results['results']->all(), $searchOpts);

 
         return view('search.all', [
             'entities'     => $results['results'],
 
         return view('search.all', [
             'entities'     => $results['results'],


@@ -72,7 +69,7 @@ class SearchController extends Controller
      * Search for a list of entities and return a partial HTML response of matching entities.
      * Returns the most popular entities if no search is provided.
      */
      * Search for a list of entities and return a partial HTML response of matching entities.
      * Returns the most popular entities if no search is provided.
      */

-    public function searchEntitiesAjax(Request $request)
+    public function searchForSelector(Request $request)

     {
         $entityTypes = $request->filled('types') ? explode(',', $request->get('types')) : ['page', 'chapter', 'book'];
         $searchTerm = $request->get('term', false);
     {
         $entityTypes = $request->filled('types') ? explode(',', $request->get('types')) : ['page', 'chapter', 'book'];
         $searchTerm = $request->get('term', false);


@@ -81,12 +78,30 @@ class SearchController extends Controller
         // Search for entities otherwise show most popular
         if ($searchTerm !== false) {
             $searchTerm .= ' {type:' . implode('|', $entityTypes) . '}';
         // Search for entities otherwise show most popular
         if ($searchTerm !== false) {
             $searchTerm .= ' {type:' . implode('|', $entityTypes) . '}';

-            $entities = $this->searchRunner->searchEntities(SearchOptions::fromString($searchTerm), 'all', 1, 20, $permission)['results'];
+            $entities = $this->searchRunner->searchEntities(SearchOptions::fromString($searchTerm), 'all', 1, 20)['results'];

         } else {
         } else {

-            $entities = (new Popular())->run(20, 0, $entityTypes, $permission);
+            $entities = (new Popular())->run(20, 0, $entityTypes);
+        }
+
+        return view('search.parts.entity-selector-list', ['entities' => $entities, 'permission' => $permission]);
+    }
+
+    /**
+     * Search for a list of entities and return a partial HTML response of matching entities
+     * to be used as a result preview suggestion list for global system searches.
+     */
+    public function searchSuggestions(Request $request)
+    {
+        $searchTerm = $request->get('term', '');
+        $entities = $this->searchRunner->searchEntities(SearchOptions::fromString($searchTerm), 'all', 1, 5)['results'];
+
+        foreach ($entities as $entity) {
+            $entity->setAttribute('preview_content', '');

         }
 
         }
 

-        return view('search.parts.entity-ajax-list', ['entities' => $entities]);
+        return view('search.parts.entity-suggestion-list', [
+            'entities' => $entities->slice(0, 5)
+        ]);

     }
 
     /**
     }
 
     /**