Add error messages, fix LDAP error

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

diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index e198dc767913b9ac2f3ae5ffb7b8bdae00b5056f..1691ee9b0bf937f338436305baa8b9beea3bb24f 100644 (file)
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -1,137 +1,161 @@
-<?php
-
-namespace BookStack\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;

 
 

+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\Http\Request;

-
-use BookStack\Http\Requests;
-use BookStack\Http\Controllers\Controller;
-use BookStack\Repos\BookRepo;
-use BookStack\Repos\ChapterRepo;
-use BookStack\Repos\PageRepo;
+use Illuminate\View\View;

 
 class SearchController extends Controller
 {
 
 class SearchController extends Controller
 {

-    protected $pageRepo;
-    protected $bookRepo;
-    protected $chapterRepo;
+    protected $entityRepo;
+    protected $viewService;
+    protected $searchService;
+    protected $entityContextManager;

 
     /**
      * SearchController constructor.
 
     /**
      * SearchController constructor.

-     * @param $pageRepo
-     * @param $bookRepo
-     * @param $chapterRepo
+     * @param EntityRepo $entityRepo
+     * @param ViewService $viewService
+     * @param SearchService $searchService
+     * @param EntityContextManager $entityContextManager

      */
      */

-    public function __construct(PageRepo $pageRepo, BookRepo $bookRepo, ChapterRepo $chapterRepo)
-    {
-        $this->pageRepo = $pageRepo;
-        $this->bookRepo = $bookRepo;
-        $this->chapterRepo = $chapterRepo;
+    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
         parent::__construct();
     }
 
     /**
      * Searches all entities.
      * @param Request $request

-     * @return \Illuminate\View\View
+     * @return View

      * @internal param string $searchTerm
      */
      * @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');
         $searchTerm = $request->get('term');

-        $paginationAppends = $request->only('term');
-        $pages = $this->pageRepo->getBySearch($searchTerm, [], 20, $paginationAppends);
-        $books = $this->bookRepo->getBySearch($searchTerm, 10, $paginationAppends);
-        $chapters = $this->chapterRepo->getBySearch($searchTerm, [], 10, $paginationAppends);
-        $this->setPageTitle('Search For ' . $searchTerm);
-        return view('search/all', [
-            'pages' => $pages,
-            'books' => $books,
-            'chapters' => $chapters,
-            'searchTerm' => $searchTerm
+        $this->setPageTitle(trans('entities.search_for_term', ['term' => $searchTerm]));
+
+        $page = intval($request->get('page', '0')) ?: 1;
+        $nextPageLink = url('/search?term=' . urlencode($searchTerm) . '&page=' . ($page+1));
+
+        $results = $this->searchService->searchEntities($searchTerm, 'all', $page, 20);
+
+        return view('search.all', [
+            'entities'   => $results['results'],
+            'totalResults' => $results['total'],
+            'searchTerm' => $searchTerm,
+            'hasNextPage' => $results['has_more'],
+            'nextPageLink' => $nextPageLink

         ]);
     }
 
         ]);
     }
 

+

     /**
     /**

-     * Search only the pages in the system.
+     * Searches all entities within a book.

      * @param Request $request
      * @param Request $request

-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
+     * @param integer $bookId
+     * @return View
+     * @internal param string $searchTerm

      */
      */

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

     {
     {

-        if (!$request->has('term')) return redirect()->back();
-
-        $searchTerm = $request->get('term');
-        $paginationAppends = $request->only('term');
-        $pages = $this->pageRepo->getBySearch($searchTerm, [], 20, $paginationAppends);
-        $this->setPageTitle('Page Search For ' . $searchTerm);
-        return view('search/entity-search-list', [
-            'entities' => $pages,
-            'title' => 'Page Search Results',
-            'searchTerm' => $searchTerm
-        ]);
+        $term = $request->get('term', '');
+        $results = $this->searchService->searchBook($bookId, $term);
+        return view('partials.entity-list', ['entities' => $results]);

     }
 
     /**
     }
 
     /**

-     * Search only the chapters in the system.
+     * Searches all entities within a chapter.

      * @param Request $request
      * @param Request $request

-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
+     * @param integer $chapterId
+     * @return View
+     * @internal param string $searchTerm

      */
      */

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

     {
     {

-        if (!$request->has('term')) return redirect()->back();
-
-        $searchTerm = $request->get('term');
-        $paginationAppends = $request->only('term');
-        $chapters = $this->chapterRepo->getBySearch($searchTerm, [], 20, $paginationAppends);
-        $this->setPageTitle('Chapter Search For ' . $searchTerm);
-        return view('search/entity-search-list', [
-            'entities' => $chapters,
-            'title' => 'Chapter Search Results',
-            'searchTerm' => $searchTerm
-        ]);
+        $term = $request->get('term', '');
+        $results = $this->searchService->searchChapter($chapterId, $term);
+        return view('partials.entity-list', ['entities' => $results]);

     }
 
     /**
     }
 
     /**

-     * Search only the books in the system.
+     * 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
      * @param Request $request

-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
+     * @return mixed

      */
      */

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

     {
     {

-        if (!$request->has('term')) return redirect()->back();
+        $entityTypes = $request->filled('types') ? explode(',', $request->get('types')) : ['page', 'chapter', 'book'];
+        $searchTerm =  $request->get('term', false);
+        $permission = $request->get('permission', 'view');

 
 

-        $searchTerm = $request->get('term');
-        $paginationAppends = $request->only('term');
-        $books = $this->bookRepo->getBySearch($searchTerm, 20, $paginationAppends);
-        $this->setPageTitle('Book Search For ' . $searchTerm);
-        return view('search/entity-search-list', [
-            'entities' => $books,
-            'title' => 'Book Search Results',
-            'searchTerm' => $searchTerm
-        ]);
+        // Search for entities otherwise show most popular
+        if ($searchTerm !== false) {
+            $searchTerm .= ' {type:'. implode('|', $entityTypes) .'}';
+            $entities = $this->searchService->searchEntities($searchTerm, 'all', 1, 20, $permission)['results'];
+        } else {
+            $entities = $this->viewService->getPopular(20, 0, $entityTypes, $permission);
+        }
+
+        return view('search.entity-ajax-list', ['entities' => $entities]);

     }
 
     /**
     }
 
     /**

-     * Searches all entities within a book.
+     * Search siblings items in the system.

      * @param Request $request
      * @param Request $request

-     * @param integer $bookId
-     * @return \Illuminate\View\View
-     * @internal param string $searchTerm
+     * @return Factory|View|mixed

      */
      */

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

     {
     {

-        if (!$request->has('term')) {
-            return redirect()->back();
+        $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);

         }
         }

-        $searchTerm = $request->get('term');
-        $searchWhereTerms = [['book_id', '=', $bookId]];
-        $pages = $this->pageRepo->getBySearch($searchTerm, $searchWhereTerms);
-        $chapters = $this->chapterRepo->getBySearch($searchTerm, $searchWhereTerms);
-        return view('search/book', ['pages' => $pages, 'chapters' => $chapters, 'searchTerm' => $searchTerm]);
-    }

 
 

+        $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']);
+    }

 }
 }