Added "page_include_parse" theme event

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

diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index 1f4224c792751eef905feed1aae1b23e57c6454a..699733e377008f508634d9dbbda6755e103c6394 100644 (file)
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -1,149 +1,101 @@
-<?php namespace BookStack\Http\Controllers;
+<?php

 
 

-use BookStack\Actions\ViewService;
-use BookStack\Entities\Repos\EntityRepo;
-use BookStack\Entities\SearchService;
-use BookStack\Exceptions\NotFoundException;
+namespace BookStack\Http\Controllers;
+
+use BookStack\Entities\Queries\Popular;
+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 $entityRepo;
-    protected $viewService;
-    protected $searchService;
+    protected $searchRunner;

 
 

-    /**
-     * SearchController constructor.
-     * @param \BookStack\Entities\Repos\EntityRepo $entityRepo
-     * @param ViewService $viewService
-     * @param SearchService $searchService
-     */
-    public function __construct(EntityRepo $entityRepo, ViewService $viewService, SearchService $searchService)
+    public function __construct(SearchRunner $searchRunner)

     {
     {

-        $this->entityRepo = $entityRepo;
-        $this->viewService = $viewService;
-        $this->searchService = $searchService;
-        parent::__construct();
+        $this->searchRunner = $searchRunner;

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

-     * @param Request $request
-     * @return \Illuminate\View\View
-     * @internal param string $searchTerm

      */
      */

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

     {
     {

-        $searchTerm = $request->get('term');
-        $this->setPageTitle(trans('entities.search_for_term', ['term' => $searchTerm]));
+        $searchOpts = SearchOptions::fromRequest($request);
+        $fullSearchString = $searchOpts->toString();
+        $this->setPageTitle(trans('entities.search_for_term', ['term' => $fullSearchString]));

 
         $page = intval($request->get('page', '0')) ?: 1;
 
         $page = intval($request->get('page', '0')) ?: 1;

-        $nextPageLink = baseUrl('/search?term=' . urlencode($searchTerm) . '&page=' . ($page+1));
+        $nextPageLink = url('/search?term=' . urlencode($fullSearchString) . '&page=' . ($page + 1));

 
 

-        $results = $this->searchService->searchEntities($searchTerm, 'all', $page, 20);
+        $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'],

             'totalResults' => $results['total'],
             'totalResults' => $results['total'],

-            'searchTerm' => $searchTerm,
-            'hasNextPage' => $results['has_more'],
-            'nextPageLink' => $nextPageLink
+            'searchTerm'   => $fullSearchString,
+            'hasNextPage'  => $results['has_more'],
+            'nextPageLink' => $nextPageLink,
+            'options'      => $searchOpts,

         ]);
     }
 
         ]);
     }
 

-

     /**
      * Searches all entities within a book.
     /**
      * Searches all entities within a book.

-     * @param Request $request
-     * @param integer $bookId
-     * @return \Illuminate\View\View
-     * @internal param string $searchTerm

      */
      */

-    public function searchBook(Request $request, $bookId)
+    public function searchBook(Request $request, int $bookId)

     {
         $term = $request->get('term', '');
     {
         $term = $request->get('term', '');

-        $results = $this->searchService->searchBook($bookId, $term);
-        return view('partials/entity-list', ['entities' => $results]);
+        $results = $this->searchRunner->searchBook($bookId, $term);
+
+        return view('entities.list', ['entities' => $results]);

     }
 
     /**
      * Searches all entities within a chapter.
     }
 
     /**
      * Searches all entities within a chapter.

-     * @param Request $request
-     * @param integer $chapterId
-     * @return \Illuminate\View\View
-     * @internal param string $searchTerm

      */
      */

-    public function searchChapter(Request $request, $chapterId)
+    public function searchChapter(Request $request, int $chapterId)

     {
         $term = $request->get('term', '');
     {
         $term = $request->get('term', '');

-        $results = $this->searchService->searchChapter($chapterId, $term);
-        return view('partials/entity-list', ['entities' => $results]);
+        $results = $this->searchRunner->searchChapter($chapterId, $term);
+
+        return view('entities.list', ['entities' => $results]);

     }
 
     /**
      * 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.

-     * @param Request $request
-     * @return mixed

      */
     public function searchEntitiesAjax(Request $request)
     {
      */
     public function searchEntitiesAjax(Request $request)
     {

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

         $permission = $request->get('permission', 'view');
 
         // Search for entities otherwise show most popular
         if ($searchTerm !== false) {
         $permission = $request->get('permission', 'view');
 
         // Search for entities otherwise show most popular
         if ($searchTerm !== false) {

-            $searchTerm .= ' {type:'. implode('|', $entityTypes->toArray()) .'}';
-            $entities = $this->searchService->searchEntities($searchTerm, 'all', 1, 20, $permission)['results'];
+            $searchTerm .= ' {type:' . implode('|', $entityTypes) . '}';
+            $entities = $this->searchRunner->searchEntities(SearchOptions::fromString($searchTerm), 'all', 1, 20)['results'];

         } else {
         } else {

-            $entityNames = $entityTypes->map(function ($type) {
-                return 'BookStack\\' . ucfirst($type); // TODO - Extract this elsewhere, too specific and stringy
-            })->toArray();
-            $entities = $this->viewService->getPopular(20, 0, $entityNames, $permission);
+            $entities = (new Popular())->run(20, 0, $entityTypes);

         }
 
         }
 

-        return view('search/entity-ajax-list', ['entities' => $entities]);
+        return view('search.parts.entity-ajax-list', ['entities' => $entities, 'permission' => $permission]);

     }
 
     /**
      * Search siblings items in the system.
     }
 
     /**
      * Search siblings items in the system.

-     * @param Request $request
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View|mixed

      */
     public function searchSiblings(Request $request)
     {
         $type = $request->get('entity_type', null);
         $id = $request->get('entity_id', null);
 
      */
     public function searchSiblings(Request $request)
     {
         $type = $request->get('entity_type', null);
         $id = $request->get('entity_id', null);
 

-        $entity = $this->entityRepo->getById($type, $id);
-        if (!$entity) {
-            return $this->jsonError(trans('errors.entity_not_found'), 404);
-        }
-
-        $entities = [];
-
-        // Page in chapter
-        if ($entity->isA('page') && $entity->chapter) {
-            $entities = $this->entityRepo->getChapterChildren($entity->chapter);
-        }
-
-        // Page in book or chapter
-        if (($entity->isA('page') && !$entity->chapter) || $entity->isA('chapter')) {
-            $entities = $this->entityRepo->getBookDirectChildren($entity->book);
-        }
-
-        // Book in shelf
-        // TODO - When shelve tracking added, Update below if criteria
-
-        // Book
-        if ($entity->isA('book')) {
-            $entities = $this->entityRepo->getAll('book');
-        }
-
-        // Shelve
-        // TODO - When shelve tracking added
+        $entities = (new SiblingFetcher())->fetch($type, $id);

 
 

-        return view('partials.entity-list-basic', ['entities' => $entities, 'style' => 'compact']);
+        return view('entities.list-basic', ['entities' => $entities, 'style' => 'compact']);

     }
 }
     }
 }