Updated npm dependancies

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

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index 7f743db41e4031b1abb182ea6a9fb5344b97ec72..bddfe3f6db005ceb8aa5857d4e44dcb399d57f17 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -1,264 +1,224 @@
 <?php namespace BookStack\Http\Controllers;
 
 use Activity;
 <?php namespace BookStack\Http\Controllers;
 
 use Activity;

-use BookStack\Repos\UserRepo;
+use BookStack\Entities\Managers\BookContents;
+use BookStack\Entities\Bookshelf;
+use BookStack\Entities\Managers\EntityContext;
+use BookStack\Entities\Repos\BookRepo;
+use BookStack\Exceptions\ImageUploadException;
+use BookStack\Exceptions\NotifyException;

 use Illuminate\Http\Request;
 use Illuminate\Http\Request;

-use Illuminate\Support\Facades\Auth;
-use BookStack\Http\Requests;
-use BookStack\Repos\BookRepo;
-use BookStack\Repos\ChapterRepo;
-use BookStack\Repos\PageRepo;
+use Illuminate\Validation\ValidationException;
+use Throwable;

 use Views;
 
 class BookController extends Controller
 {
 
     protected $bookRepo;
 use Views;
 
 class BookController extends Controller
 {
 
     protected $bookRepo;

-    protected $pageRepo;
-    protected $chapterRepo;
-    protected $userRepo;
+    protected $entityContextManager;

 
     /**
      * BookController constructor.
 
     /**
      * BookController constructor.

-     * @param BookRepo $bookRepo
-     * @param PageRepo $pageRepo
-     * @param ChapterRepo $chapterRepo
-     * @param UserRepo $userRepo

      */
      */

-    public function __construct(BookRepo $bookRepo, PageRepo $pageRepo, ChapterRepo $chapterRepo, UserRepo $userRepo)
+    public function __construct(EntityContext $entityContextManager, BookRepo $bookRepo)

     {
         $this->bookRepo = $bookRepo;
     {
         $this->bookRepo = $bookRepo;

-        $this->pageRepo = $pageRepo;
-        $this->chapterRepo = $chapterRepo;
-        $this->userRepo = $userRepo;
+        $this->entityContextManager = $entityContextManager;

         parent::__construct();
     }
 
     /**
      * Display a listing of the book.
         parent::__construct();
     }
 
     /**
      * Display a listing of the book.

-     * @return Response

      */
     public function index()
     {
      */
     public function index()
     {

-        $books = $this->bookRepo->getAllPaginated(10);
-        $recents = $this->signedIn ? $this->bookRepo->getRecentlyViewed(4, 0) : false;
-        $popular = $this->bookRepo->getPopular(4, 0);
-        $this->setPageTitle('Books');
-        return view('books/index', ['books' => $books, 'recents' => $recents, 'popular' => $popular]);
+        $view = setting()->getForCurrentUser('books_view_type', config('app.views.books'));
+        $sort = setting()->getForCurrentUser('books_sort', 'name');
+        $order = setting()->getForCurrentUser('books_sort_order', 'asc');
+
+        $books = $this->bookRepo->getAllPaginated(18, $sort, $order);
+        $recents = $this->isSignedIn() ? $this->bookRepo->getRecentlyViewed(4) : false;
+        $popular = $this->bookRepo->getPopular(4);
+        $new = $this->bookRepo->getRecentlyCreated(4);
+
+        $this->entityContextManager->clearShelfContext();
+
+        $this->setPageTitle(trans('entities.books'));
+        return view('books.index', [
+            'books' => $books,
+            'recents' => $recents,
+            'popular' => $popular,
+            'new' => $new,
+            'view' => $view,
+            'sort' => $sort,
+            'order' => $order,
+        ]);

     }
 
     /**
      * Show the form for creating a new book.
     }
 
     /**
      * Show the form for creating a new book.

-     * @return Response

      */
      */

-    public function create()
+    public function create(string $shelfSlug = null)

     {
         $this->checkPermission('book-create-all');
     {
         $this->checkPermission('book-create-all');

-        $this->setPageTitle('Create New Book');
-        return view('books/create');
+
+        $bookshelf = null;
+        if ($shelfSlug !== null) {
+            $bookshelf = Bookshelf::visible()->where('slug', '=', $shelfSlug)->firstOrFail();
+            $this->checkOwnablePermission('bookshelf-update', $bookshelf);
+        }
+
+        $this->setPageTitle(trans('entities.books_create'));
+        return view('books.create', [
+            'bookshelf' => $bookshelf
+        ]);

     }
 
     /**
      * Store a newly created book in storage.
     }
 
     /**
      * Store a newly created book in storage.

-     *
-     * @param  Request $request
-     * @return Response
+     * @throws ImageUploadException
+     * @throws ValidationException

      */
      */

-    public function store(Request $request)
+    public function store(Request $request, string $shelfSlug = null)

     {
         $this->checkPermission('book-create-all');
         $this->validate($request, [
             'name' => 'required|string|max:255',
     {
         $this->checkPermission('book-create-all');
         $this->validate($request, [
             'name' => 'required|string|max:255',

-            'description' => 'string|max:1000'
+            'description' => 'string|max:1000',
+            'image' => 'nullable|' . $this->getImageValidationRules(),

         ]);
         ]);

-        $book = $this->bookRepo->newFromInput($request->all());
-        $book->slug = $this->bookRepo->findSuitableSlug($book->name);
-        $book->created_by = Auth::user()->id;
-        $book->updated_by = Auth::user()->id;
-        $book->save();
+
+        $bookshelf = null;
+        if ($shelfSlug !== null) {
+            $bookshelf = Bookshelf::visible()->where('slug', '=', $shelfSlug)->firstOrFail();
+            $this->checkOwnablePermission('bookshelf-update', $bookshelf);
+        }
+
+        $book = $this->bookRepo->create($request->all());
+        $this->bookRepo->updateCoverImage($book, $request->file('image', null));

         Activity::add($book, 'book_create', $book->id);
         Activity::add($book, 'book_create', $book->id);

+
+        if ($bookshelf) {
+            $bookshelf->appendBook($book);
+            Activity::add($bookshelf, 'bookshelf_update');
+        }
+

         return redirect($book->getUrl());
     }
 
     /**
      * Display the specified book.
         return redirect($book->getUrl());
     }
 
     /**
      * Display the specified book.

-     * @param $slug
-     * @return Response

      */
      */

-    public function show($slug)
+    public function show(Request $request, string $slug)

     {
         $book = $this->bookRepo->getBySlug($slug);
     {
         $book = $this->bookRepo->getBySlug($slug);

-        $bookChildren = $this->bookRepo->getChildren($book);
+        $bookChildren = (new BookContents($book))->getTree(true);
+

         Views::add($book);
         Views::add($book);

+        if ($request->has('shelf')) {
+            $this->entityContextManager->setShelfContext(intval($request->get('shelf')));
+        }
+

         $this->setPageTitle($book->getShortName());
         $this->setPageTitle($book->getShortName());

-        return view('books/show', ['book' => $book, 'current' => $book, 'bookChildren' => $bookChildren]);
+        return view('books.show', [
+            'book' => $book,
+            'current' => $book,
+            'bookChildren' => $bookChildren,
+            'activity' => Activity::entityActivity($book, 20, 1)
+        ]);

     }
 
     /**
      * Show the form for editing the specified book.
     }
 
     /**
      * Show the form for editing the specified book.

-     * @param $slug
-     * @return Response

      */
      */

-    public function edit($slug)
+    public function edit(string $slug)

     {
         $book = $this->bookRepo->getBySlug($slug);
         $this->checkOwnablePermission('book-update', $book);
     {
         $book = $this->bookRepo->getBySlug($slug);
         $this->checkOwnablePermission('book-update', $book);

-        $this->setPageTitle('Edit Book ' . $book->getShortName());
-        return view('books/edit', ['book' => $book, 'current' => $book]);
+        $this->setPageTitle(trans('entities.books_edit_named', ['bookName'=>$book->getShortName()]));
+        return view('books.edit', ['book' => $book, 'current' => $book]);

     }
 
     /**
      * Update the specified book in storage.
     }
 
     /**
      * Update the specified book in storage.

-     * @param  Request $request
-     * @param          $slug
-     * @return Response
+     * @throws ImageUploadException
+     * @throws ValidationException
+     * @throws Throwable

      */
      */

-    public function update(Request $request, $slug)
+    public function update(Request $request, string $slug)

     {
         $book = $this->bookRepo->getBySlug($slug);
         $this->checkOwnablePermission('book-update', $book);
         $this->validate($request, [
             'name' => 'required|string|max:255',
     {
         $book = $this->bookRepo->getBySlug($slug);
         $this->checkOwnablePermission('book-update', $book);
         $this->validate($request, [
             'name' => 'required|string|max:255',

-            'description' => 'string|max:1000'
+            'description' => 'string|max:1000',
+            'image' => 'nullable|' . $this->getImageValidationRules(),

         ]);
         ]);

-        $book->fill($request->all());
-        $book->slug = $this->bookRepo->findSuitableSlug($book->name, $book->id);
-        $book->updated_by = Auth::user()->id;
-        $book->save();
+
+        $book = $this->bookRepo->update($book, $request->all());
+        $resetCover = $request->has('image_reset');
+        $this->bookRepo->updateCoverImage($book, $request->file('image', null), $resetCover);
+

         Activity::add($book, 'book_update', $book->id);
         Activity::add($book, 'book_update', $book->id);

+

         return redirect($book->getUrl());
     }
 
     /**
         return redirect($book->getUrl());
     }
 
     /**

-     * Shows the page to confirm deletion
-     * @param $bookSlug
-     * @return \Illuminate\View\View
+     * Shows the page to confirm deletion.

      */
      */

-    public function showDelete($bookSlug)
+    public function showDelete(string $bookSlug)

     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('book-delete', $book);
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('book-delete', $book);

-        $this->setPageTitle('Delete Book ' . $book->getShortName());
-        return view('books/delete', ['book' => $book, 'current' => $book]);
-    }
-
-    /**
-     * Shows the view which allows pages to be re-ordered and sorted.
-     * @param string $bookSlug
-     * @return \Illuminate\View\View
-     */
-    public function sort($bookSlug)
-    {
-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $this->checkOwnablePermission('book-update', $book);
-        $bookChildren = $this->bookRepo->getChildren($book);
-        $books = $this->bookRepo->getAll(false);
-        $this->setPageTitle('Sort Book ' . $book->getShortName());
-        return view('books/sort', ['book' => $book, 'current' => $book, 'books' => $books, 'bookChildren' => $bookChildren]);
-    }
-
-    /**
-     * Shows the sort box for a single book.
-     * Used via AJAX when loading in extra books to a sort.
-     * @param $bookSlug
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function getSortItem($bookSlug)
-    {
-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $bookChildren = $this->bookRepo->getChildren($book);
-        return view('books/sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);
+        $this->setPageTitle(trans('entities.books_delete_named', ['bookName' => $book->getShortName()]));
+        return view('books.delete', ['book' => $book, 'current' => $book]);

     }
 
     /**
     }
 
     /**

-     * Saves an array of sort mapping to pages and chapters.
-     * @param  string $bookSlug
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * Remove the specified book from the system.
+     * @throws Throwable
+     * @throws NotifyException

      */
      */

-    public function saveSort($bookSlug, Request $request)
+    public function destroy(string $bookSlug)

     {
         $book = $this->bookRepo->getBySlug($bookSlug);
     {
         $book = $this->bookRepo->getBySlug($bookSlug);

-        $this->checkOwnablePermission('book-update', $book);
-
-        // Return if no map sent
-        if (!$request->has('sort-tree')) {
-            return redirect($book->getUrl());
-        }
-
-        $sortedBooks = [];
-        // Sort pages and chapters
-        $sortMap = json_decode($request->get('sort-tree'));
-        $defaultBookId = $book->id;
-        foreach ($sortMap as $index => $bookChild) {
-            $id = $bookChild->id;
-            $isPage = $bookChild->type == 'page';
-            $bookId = $this->bookRepo->exists($bookChild->book) ? $bookChild->book : $defaultBookId;
-            $model = $isPage ? $this->pageRepo->getById($id) : $this->chapterRepo->getById($id);
-            $isPage ? $this->pageRepo->changeBook($bookId, $model) : $this->chapterRepo->changeBook($bookId, $model);
-            $model->priority = $index;
-            if ($isPage) {
-                $model->chapter_id = ($bookChild->parentChapter === false) ? 0 : $bookChild->parentChapter;
-            }
-            $model->save();
-            if (!in_array($bookId, $sortedBooks)) {
-                $sortedBooks[] = $bookId;
-            }
-        }
-
-        // Add activity for books
-        foreach ($sortedBooks as $bookId) {
-            $updatedBook = $this->bookRepo->getById($bookId);
-            Activity::add($updatedBook, 'book_sort', $updatedBook->id);
-        }
+        $this->checkOwnablePermission('book-delete', $book);

 
 

-        return redirect($book->getUrl());
-    }
+        Activity::addMessage('book_delete', $book->name);
+        $this->bookRepo->destroy($book);

 
 

-    /**
-     * Remove the specified book from storage.
-     * @param $bookSlug
-     * @return Response
-     */
-    public function destroy($bookSlug)
-    {
-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $this->checkOwnablePermission('book-delete', $book);
-        Activity::addMessage('book_delete', 0, $book->name);
-        Activity::removeEntity($book);
-        $this->bookRepo->destroyBySlug($bookSlug);

         return redirect('/books');
     }
 
     /**
         return redirect('/books');
     }
 
     /**

-     * Show the Restrictions view.
-     * @param $bookSlug
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * Show the permissions view.

      */
      */

-    public function showRestrict($bookSlug)
+    public function showPermissions(string $bookSlug)

     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('restrictions-manage', $book);
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('restrictions-manage', $book);

-        $roles = $this->userRepo->getRestrictableRoles();
-        return view('books/restrictions', [
+
+        return view('books.permissions', [

             'book' => $book,
             'book' => $book,

-            'roles' => $roles

         ]);
     }
 
     /**
      * Set the restrictions for this book.
         ]);
     }
 
     /**
      * Set the restrictions for this book.

-     * @param $bookSlug
-     * @param $bookSlug
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @throws Throwable

      */
      */

-    public function restrict($bookSlug, Request $request)
+    public function permissions(Request $request, string $bookSlug)

     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('restrictions-manage', $book);
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('restrictions-manage', $book);

-        $this->bookRepo->updateRestrictionsFromRequest($request, $book);
-        session()->flash('success', 'Book Restrictions Updated');
+
+        $restricted = $request->get('restricted') === 'true';
+        $permissions = $request->filled('restrictions') ? collect($request->get('restrictions')) : null;
+        $this->bookRepo->updatePermissions($book, $restricted, $permissions);
+
+        $this->showSuccessNotification(trans('entities.books_permissions_updated'));

         return redirect($book->getUrl());
     }
 }
         return redirect($book->getUrl());
     }
 }