Fixed failing test after drawio default url change

[bookstack] / app / Entities / Models / Page.php

diff --git a/app/Entities/Models/Page.php b/app/Entities/Models/Page.php
index 739927aff6dad8561672a5687d504d18848079ee..c8217af576d84af0e1aa4aa4d98526d222c471ac 100644 (file)
--- a/app/Entities/Models/Page.php
+++ b/app/Entities/Models/Page.php
@@ -1,37 +1,47 @@
-<?php namespace BookStack\Entities\Models;
+<?php
+
+namespace BookStack\Entities\Models;

 
 use BookStack\Entities\Tools\PageContent;
 
 use BookStack\Entities\Tools\PageContent;

+use BookStack\Facades\Permissions;

 use BookStack\Uploads\Attachment;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use BookStack\Uploads\Attachment;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;

+use Illuminate\Database\Eloquent\Factories\HasFactory;

 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;

-use Permissions;
+use Illuminate\Database\Eloquent\Relations\HasOne;

 
 /**
 
 /**

- * Class Page
- * @property int $chapter_id
- * @property string $html
- * @property string $markdown
- * @property string $text
- * @property bool $template
- * @property bool $draft
- * @property int $revision_count
- * @property Chapter $chapter
- * @property Collection $attachments
+ * Class Page.
+ *
+ * @property int          $chapter_id
+ * @property string       $html
+ * @property string       $markdown
+ * @property string       $text
+ * @property bool         $template
+ * @property bool         $draft
+ * @property int          $revision_count
+ * @property Chapter      $chapter
+ * @property Collection   $attachments
+ * @property Collection   $revisions
+ * @property PageRevision $currentRevision

  */
 class Page extends BookChild
 {
  */
 class Page extends BookChild
 {

-    protected $fillable = ['name', 'priority', 'markdown'];
+    use HasFactory;
+
+    public static $listAttributes = ['name', 'id', 'slug', 'book_id', 'chapter_id', 'draft', 'template', 'text', 'created_at', 'updated_at', 'priority'];
+    public static $contentAttributes = ['name', 'id', 'slug', 'book_id', 'chapter_id', 'draft', 'template', 'html', 'text', 'created_at', 'updated_at', 'priority'];

 
 

-    protected $simpleAttributes = ['name', 'id', 'slug'];
+    protected $fillable = ['name', 'priority'];

 
     public $textField = 'text';
 
     protected $hidden = ['html', 'markdown', 'text', 'restricted', 'pivot', 'deleted_at'];
 
     protected $casts = [
 
     public $textField = 'text';
 
     protected $hidden = ['html', 'markdown', 'text', 'restricted', 'pivot', 'deleted_at'];
 
     protected $casts = [

-        'draft' => 'boolean',
+        'draft'    => 'boolean',

         'template' => 'boolean',
     ];
 
         'template' => 'boolean',
     ];
 


@@ -40,23 +50,14 @@ class Page extends BookChild
      */
     public function scopeVisible(Builder $query): Builder
     {
      */
     public function scopeVisible(Builder $query): Builder
     {

-        $query = Permissions::enforceDraftVisiblityOnQuery($query);
-        return parent::scopeVisible($query);
-    }
+        $query = Permissions::enforceDraftVisibilityOnQuery($query);

 
 

-    /**
-     * Converts this page into a simplified array.
-     * @return mixed
-     */
-    public function toSimpleArray()
-    {
-        $array = array_intersect_key($this->toArray(), array_flip($this->simpleAttributes));
-        $array['url'] = $this->getUrl();
-        return $array;
+        return parent::scopeVisible($query);

     }
 
     /**
      * Get the chapter that this page is in, If applicable.
     }
 
     /**
      * Get the chapter that this page is in, If applicable.

+     *

      * @return BelongsTo
      */
     public function chapter()
      * @return BelongsTo
      */
     public function chapter()


@@ -66,24 +67,49 @@ class Page extends BookChild
 
     /**
      * Check if this page has a chapter.
 
     /**
      * Check if this page has a chapter.

-     * @return bool

      */
      */

-    public function hasChapter()
+    public function hasChapter(): bool

     {
         return $this->chapter()->count() > 0;
     }
 
     /**
      * Get the associated page revisions, ordered by created date.
     {
         return $this->chapter()->count() > 0;
     }
 
     /**
      * Get the associated page revisions, ordered by created date.

-     * @return mixed
+     * Only provides actual saved page revision instances, Not drafts.
+     */
+    public function revisions(): HasMany
+    {
+        return $this->allRevisions()
+            ->where('type', '=', 'version')
+            ->orderBy('created_at', 'desc')
+            ->orderBy('id', 'desc');
+    }
+
+    /**
+     * Get the current revision for the page if existing.
+     *
+     * @return PageRevision|null

      */
      */

-    public function revisions()
+    public function currentRevision(): HasOne

     {
     {

-        return $this->hasMany(PageRevision::class)->where('type', '=', 'version')->orderBy('created_at', 'desc')->orderBy('id', 'desc');
+        return $this->hasOne(PageRevision::class)
+            ->where('type', '=', 'version')
+            ->orderBy('created_at', 'desc')
+            ->orderBy('id', 'desc');
+    }
+
+    /**
+     * Get all revision instances assigned to this page.
+     * Includes all types of revisions.
+     */
+    public function allRevisions(): HasMany
+    {
+        return $this->hasMany(PageRevision::class);

     }
 
     /**
      * Get the attachments assigned to this page.
     }
 
     /**
      * Get the attachments assigned to this page.

+     *

      * @return HasMany
      */
     public function attachments()
      * @return HasMany
      */
     public function attachments()


@@ -94,11 +120,11 @@ class Page extends BookChild
     /**
      * Get the url of this page.
      */
     /**
      * Get the url of this page.
      */

-    public function getUrl($path = ''): string
+    public function getUrl(string $path = ''): string

     {
         $parts = [
             'books',
     {
         $parts = [
             'books',

-            urlencode($this->getAttribute('bookSlug') ?? $this->book->slug),
+            urlencode($this->book_slug ?? $this->book->slug),

             $this->draft ? 'draft' : 'page',
             $this->draft ? $this->id : urlencode($this->slug),
             trim($path, '/'),
             $this->draft ? 'draft' : 'page',
             $this->draft ? $this->id : urlencode($this->slug),
             trim($path, '/'),


@@ -107,23 +133,15 @@ class Page extends BookChild
         return url('/' . implode('/', $parts));
     }
 
         return url('/' . implode('/', $parts));
     }
 

-    /**
-     * Get the current revision for the page if existing
-     * @return PageRevision|null
-     */
-    public function getCurrentRevision()
-    {
-        return $this->revisions()->first();
-    }
-

     /**
      * Get this page for JSON display.
      */
     /**
      * Get this page for JSON display.
      */

-    public function forJsonDisplay(): Page
+    public function forJsonDisplay(): self

     {
         $refreshed = $this->refresh()->unsetRelations()->load(['tags', 'createdBy', 'updatedBy', 'ownedBy']);
         $refreshed->setHidden(array_diff($refreshed->getHidden(), ['html', 'markdown']));
         $refreshed->html = (new PageContent($refreshed))->render();
     {
         $refreshed = $this->refresh()->unsetRelations()->load(['tags', 'createdBy', 'updatedBy', 'ownedBy']);
         $refreshed->setHidden(array_diff($refreshed->getHidden(), ['html', 'markdown']));
         $refreshed->html = (new PageContent($refreshed))->render();

+

         return $refreshed;
     }
 }
         return $refreshed;
     }
 }