<?php namespace BookStack\Http\Controllers;
-use BookStack\Repos\EntityRepo;
-use BookStack\Services\ViewService;
+use BookStack\Actions\ViewService;
+use BookStack\Entities\EntityContextManager;
+use BookStack\Entities\Repos\EntityRepo;
+use BookStack\Entities\SearchService;
+use BookStack\Exceptions\NotFoundException;
+use Illuminate\Contracts\View\Factory;
use Illuminate\Http\Request;
+use Illuminate\View\View;
class SearchController extends Controller
{
protected $entityRepo;
protected $viewService;
+ protected $searchService;
+ protected $entityContextManager;
/**
* SearchController constructor.
* @param EntityRepo $entityRepo
* @param ViewService $viewService
+ * @param SearchService $searchService
+ * @param EntityContextManager $entityContextManager
*/
- public function __construct(EntityRepo $entityRepo, ViewService $viewService)
- {
+ public function __construct(
+ EntityRepo $entityRepo,
+ ViewService $viewService,
+ SearchService $searchService,
+ EntityContextManager $entityContextManager
+ ) {
$this->entityRepo = $entityRepo;
$this->viewService = $viewService;
+ $this->searchService = $searchService;
+ $this->entityContextManager = $entityContextManager;
parent::__construct();
}
/**
* Searches all entities.
* @param Request $request
- * @return \Illuminate\View\View
+ * @return View
* @internal param string $searchTerm
*/
- public function searchAll(Request $request)
+ public function search(Request $request)
{
- if (!$request->has('term')) {
- return redirect()->back();
- }
$searchTerm = $request->get('term');
- $paginationAppends = $request->only('term');
- $pages = $this->entityRepo->getBySearch('page', $searchTerm, [], 20, $paginationAppends);
- $books = $this->entityRepo->getBySearch('book', $searchTerm, [], 10, $paginationAppends);
- $chapters = $this->entityRepo->getBySearch('chapter', $searchTerm, [], 10, $paginationAppends);
$this->setPageTitle(trans('entities.search_for_term', ['term' => $searchTerm]));
- return view('search/all', [
- 'pages' => $pages,
- 'books' => $books,
- 'chapters' => $chapters,
- 'searchTerm' => $searchTerm
- ]);
- }
- /**
- * Search only the pages in the system.
- * @param Request $request
- * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
- */
- public function searchPages(Request $request)
- {
- if (!$request->has('term')) return redirect()->back();
+ $page = intval($request->get('page', '0')) ?: 1;
+ $nextPageLink = url('/search?term=' . urlencode($searchTerm) . '&page=' . ($page+1));
- $searchTerm = $request->get('term');
- $paginationAppends = $request->only('term');
- $pages = $this->entityRepo->getBySearch('page', $searchTerm, [], 20, $paginationAppends);
- $this->setPageTitle(trans('entities.search_page_for_term', ['term' => $searchTerm]));
- return view('search/entity-search-list', [
- 'entities' => $pages,
- 'title' => trans('entities.search_results_page'),
- 'searchTerm' => $searchTerm
- ]);
- }
+ $results = $this->searchService->searchEntities($searchTerm, 'all', $page, 20);
- /**
- * Search only the chapters in the system.
- * @param Request $request
- * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
- */
- public function searchChapters(Request $request)
- {
- if (!$request->has('term')) return redirect()->back();
-
- $searchTerm = $request->get('term');
- $paginationAppends = $request->only('term');
- $chapters = $this->entityRepo->getBySearch('chapter', $searchTerm, [], 20, $paginationAppends);
- $this->setPageTitle(trans('entities.search_chapter_for_term', ['term' => $searchTerm]));
- return view('search/entity-search-list', [
- 'entities' => $chapters,
- 'title' => trans('entities.search_results_chapter'),
- 'searchTerm' => $searchTerm
+ return view('search.all', [
+ 'entities' => $results['results'],
+ 'totalResults' => $results['total'],
+ 'searchTerm' => $searchTerm,
+ 'hasNextPage' => $results['has_more'],
+ 'nextPageLink' => $nextPageLink
]);
}
+
/**
- * Search only the books in the system.
+ * Searches all entities within a book.
* @param Request $request
- * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
+ * @param integer $bookId
+ * @return View
+ * @internal param string $searchTerm
*/
- public function searchBooks(Request $request)
+ public function searchBook(Request $request, $bookId)
{
- if (!$request->has('term')) return redirect()->back();
-
- $searchTerm = $request->get('term');
- $paginationAppends = $request->only('term');
- $books = $this->entityRepo->getBySearch('book', $searchTerm, [], 20, $paginationAppends);
- $this->setPageTitle(trans('entities.search_book_for_term', ['term' => $searchTerm]));
- return view('search/entity-search-list', [
- 'entities' => $books,
- 'title' => trans('entities.search_results_book'),
- 'searchTerm' => $searchTerm
- ]);
+ $term = $request->get('term', '');
+ $results = $this->searchService->searchBook($bookId, $term);
+ return view('partials.entity-list', ['entities' => $results]);
}
/**
- * Searches all entities within a book.
+ * Searches all entities within a chapter.
* @param Request $request
- * @param integer $bookId
- * @return \Illuminate\View\View
+ * @param integer $chapterId
+ * @return View
* @internal param string $searchTerm
*/
- public function searchBook(Request $request, $bookId)
+ public function searchChapter(Request $request, $chapterId)
{
- if (!$request->has('term')) {
- return redirect()->back();
- }
- $searchTerm = $request->get('term');
- $searchWhereTerms = [['book_id', '=', $bookId]];
- $pages = $this->entityRepo->getBySearch('page', $searchTerm, $searchWhereTerms);
- $chapters = $this->entityRepo->getBySearch('chapter', $searchTerm, $searchWhereTerms);
- return view('search/book', ['pages' => $pages, 'chapters' => $chapters, 'searchTerm' => $searchTerm]);
+ $term = $request->get('term', '');
+ $results = $this->searchService->searchChapter($chapterId, $term);
+ return view('partials.entity-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.
*/
public function searchEntitiesAjax(Request $request)
{
- $entities = collect();
- $entityTypes = $request->has('types') ? collect(explode(',', $request->get('types'))) : collect(['page', 'chapter', 'book']);
- $searchTerm = ($request->has('term') && trim($request->get('term')) !== '') ? $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) {
- foreach (['page', 'chapter', 'book'] as $entityType) {
- if ($entityTypes->contains($entityType)) {
- $entities = $entities->merge($this->entityRepo->getBySearch($entityType, $searchTerm)->items());
- }
- }
- $entities = $entities->sortByDesc('title_relevance');
+ $searchTerm .= ' {type:'. implode('|', $entityTypes) .'}';
+ $entities = $this->searchService->searchEntities($searchTerm, 'all', 1, 20, $permission)['results'];
} else {
- $entityNames = $entityTypes->map(function ($type) {
- return 'BookStack\\' . ucfirst($type);
- })->toArray();
- $entities = $this->viewService->getPopular(20, 0, $entityNames);
+ $entities = $this->viewService->getPopular(20, 0, $entityTypes, $permission);
}
- return view('search/entity-ajax-list', ['entities' => $entities]);
+ return view('search.entity-ajax-list', ['entities' => $entities]);
}
-}
+ /**
+ * Search siblings items in the system.
+ * @param Request $request
+ * @return Factory|View|mixed
+ */
+ 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
+ // Gets just the books in a shelf if shelf is in context
+ if ($entity->isA('book')) {
+ $contextShelf = $this->entityContextManager->getContextualShelfForBook($entity);
+ if ($contextShelf) {
+ $entities = $this->entityRepo->getBookshelfChildren($contextShelf);
+ } else {
+ $entities = $this->entityRepo->getAll('book');
+ }
+ }
+
+ // Shelve
+ if ($entity->isA('bookshelf')) {
+ $entities = $this->entityRepo->getAll('bookshelf');
+ }
+
+ return view('partials.entity-list-basic', ['entities' => $entities, 'style' => 'compact']);
+ }
+}
projects / bookstack / blobdiff