Fixes issue with having to click the delete icon for attachment twice.

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

diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index c9ca1f09fddd05bb3e20d46c66dd34e0731593b1..49f9885adb24c1bb438f5b95f6cd20fd0f7937a7 100644 (file)
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -1,32 +1,27 @@
-<?php
-
-namespace BookStack\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;

 
 

+use BookStack\Repos\EntityRepo;
+use BookStack\Services\SearchService;
+use BookStack\Services\ViewService;

 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;
-

 class SearchController extends Controller
 {
 class SearchController extends Controller
 {

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

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

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

      */
      */

-    public function __construct(PageRepo $pageRepo, BookRepo $bookRepo, ChapterRepo $chapterRepo)
+    public function __construct(EntityRepo $entityRepo, ViewService $viewService, SearchService $searchService)

     {
     {

-        $this->pageRepo = $pageRepo;
-        $this->bookRepo = $bookRepo;
-        $this->chapterRepo = $chapterRepo;
+        $this->entityRepo = $entityRepo;
+        $this->viewService = $viewService;
+        $this->searchService = $searchService;

         parent::__construct();
     }
 
         parent::__construct();
     }
 


@@ -36,19 +31,26 @@ class SearchController extends Controller
      * @return \Illuminate\View\View
      * @internal param string $searchTerm
      */
      * @return \Illuminate\View\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');
         $searchTerm = $request->get('term');

-        $pages = $this->pageRepo->getBySearch($searchTerm);
-        $books = $this->bookRepo->getBySearch($searchTerm);
-        $chapters = $this->chapterRepo->getBySearch($searchTerm);
-        $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 = baseUrl('/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
+        ]);

     }
 
     }
 

+

     /**
      * Searches all entities within a book.
      * @param Request $request
     /**
      * Searches all entities within a book.
      * @param Request $request


@@ -58,14 +60,48 @@ class SearchController extends Controller
      */
     public function searchBook(Request $request, $bookId)
     {
      */
     public function searchBook(Request $request, $bookId)
     {

-        if (!$request->has('term')) {
-            return redirect()->back();
-        }
-        $searchTerm = $request->get('term');
-        $whereTerm = [['book_id', '=', $bookId]];
-        $pages = $this->pageRepo->getBySearch($searchTerm, $whereTerm);
-        $chapters = $this->chapterRepo->getBySearch($searchTerm, $whereTerm);
-        return view('search/book', ['pages' => $pages, 'chapters' => $chapters, 'searchTerm' => $searchTerm]);
+        $term = $request->get('term', '');
+        $results = $this->searchService->searchBook($bookId, $term);
+        return view('partials/entity-list', ['entities' => $results]);

     }
 
     }
 

+    /**
+     * 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)
+    {
+        $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.
+     * @param Request $request
+     * @return mixed
+     */
+    public function searchEntitiesAjax(Request $request)
+    {
+        $entityTypes = $request->filled('types') ? collect(explode(',', $request->get('types'))) : collect(['page', 'chapter', 'book']);
+        $searchTerm =  $request->get('term', 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'];
+        } else {
+            $entityNames = $entityTypes->map(function ($type) {
+                return 'BookStack\\' . ucfirst($type);
+            })->toArray();
+            $entities = $this->viewService->getPopular(20, 0, $entityNames, $permission);
+        }
+
+        return view('search/entity-ajax-list', ['entities' => $entities]);
+    }

 }
 }