X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/c7a2d568bf693add30c8402d68d1f46f09a44c5b..refs/pull/2890/head:/app/Http/Controllers/SearchController.php diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 3a7ca62ba..d4431e166 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -1,30 +1,24 @@ -viewService = $viewService; - $this->searchService = $searchService; + $this->searchRunner = $searchRunner; $this->entityContextManager = $entityContextManager; } @@ -38,28 +32,28 @@ class SearchController extends Controller $this->setPageTitle(trans('entities.search_for_term', ['term' => $fullSearchString])); $page = intval($request->get('page', '0')) ?: 1; - $nextPageLink = url('/https/source.bookstackapp.com/search?term=' . urlencode($fullSearchString) . '&page=' . ($page+1)); + $nextPageLink = url('/https/source.bookstackapp.com/search?term=' . urlencode($fullSearchString) . '&page=' . ($page + 1)); - $results = $this->searchService->searchEntities($searchOpts, 'all', $page, 20); + $results = $this->searchRunner->searchEntities($searchOpts, 'all', $page, 20); return view('search.all', [ - 'entities' => $results['results'], + 'entities' => $results['results'], 'totalResults' => $results['total'], - 'searchTerm' => $fullSearchString, - 'hasNextPage' => $results['has_more'], + 'searchTerm' => $fullSearchString, + 'hasNextPage' => $results['has_more'], 'nextPageLink' => $nextPageLink, - 'options' => $searchOpts, + 'options' => $searchOpts, ]); } - /** * Searches all entities within a book. */ public function searchBook(Request $request, int $bookId) { $term = $request->get('term', ''); - $results = $this->searchService->searchBook($bookId, $term); + $results = $this->searchRunner->searchBook($bookId, $term); + return view('partials.entity-list', ['entities' => $results]); } @@ -69,7 +63,8 @@ class SearchController extends Controller public function searchChapter(Request $request, int $chapterId) { $term = $request->get('term', ''); - $results = $this->searchService->searchChapter($chapterId, $term); + $results = $this->searchRunner->searchChapter($chapterId, $term); + return view('partials.entity-list', ['entities' => $results]); } @@ -80,15 +75,15 @@ class SearchController extends Controller public function searchEntitiesAjax(Request $request) { $entityTypes = $request->filled('types') ? explode(',', $request->get('types')) : ['page', 'chapter', 'book']; - $searchTerm = $request->get('term', false); + $searchTerm = $request->get('term', false); $permission = $request->get('permission', 'view'); // Search for entities otherwise show most popular if ($searchTerm !== false) { - $searchTerm .= ' {type:'. implode('|', $entityTypes) .'}'; - $entities = $this->searchService->searchEntities(SearchOptions::fromString($searchTerm), 'all', 1, 20, $permission)['results']; + $searchTerm .= ' {type:' . implode('|', $entityTypes) . '}'; + $entities = $this->searchRunner->searchEntities(SearchOptions::fromString($searchTerm), 'all', 1, 20, $permission)['results']; } else { - $entities = $this->viewService->getPopular(20, 0, $entityTypes, $permission); + $entities = (new Popular())->run(20, 0, $entityTypes, $permission); } return view('search.entity-ajax-list', ['entities' => $entities]); @@ -102,38 +97,7 @@ class SearchController extends Controller $type = $request->get('entity_type', null); $id = $request->get('entity_id', null); - $entity = Entity::getEntityInstance($type)->newQuery()->visible()->find($id); - if (!$entity) { - return $this->jsonError(trans('errors.entity_not_found'), 404); - } - - $entities = []; - - // Page in chapter - if ($entity->isA('page') && $entity->chapter) { - $entities = $entity->chapter->getVisiblePages(); - } - - // Page in book or chapter - if (($entity->isA('page') && !$entity->chapter) || $entity->isA('chapter')) { - $entities = $entity->book->getDirectChildren(); - } - - // Book - // Gets just the books in a shelf if shelf is in context - if ($entity->isA('book')) { - $contextShelf = $this->entityContextManager->getContextualShelfForBook($entity); - if ($contextShelf) { - $entities = $contextShelf->visibleBooks()->get(); - } else { - $entities = Book::visible()->get(); - } - } - - // Shelve - if ($entity->isA('bookshelf')) { - $entities = Bookshelf::visible()->get(); - } + $entities = (new SiblingFetcher())->fetch($type, $id); return view('partials.entity-list-basic', ['entities' => $entities, 'style' => 'compact']); }