From 12290ae1aafcfed944ef3dc5c332ab35bc3d633c Mon Sep 17 00:00:00 2001 From: Brij Mandaliya Date: Thu, 24 Oct 2024 19:02:09 +0530 Subject: [PATCH 01/10] Buid: Cover image for pages and also add grid view for list of pages in chapter show page with test case and update create test case for page and add two test case one for update cover image for page and another for reset cover image for page --- app/App/helpers.php | 19 +++++ app/Config/setting-defaults.php | 1 + .../Controllers/ChapterController.php | 2 + app/Entities/Controllers/PageController.php | 6 ++ app/Entities/Models/Page.php | 29 ++++++- app/Entities/Queries/PageQueries.php | 9 ++- app/Entities/Repos/PageRepo.php | 8 ++ .../Controllers/UserPreferencesController.php | 2 +- ...0_24_074404_add_image_id_in_page_table.php | 28 +++++++ resources/sass/_colors.scss | 3 + resources/views/chapters/show.blade.php | 20 +++-- resources/views/entities/grid-item.blade.php | 2 +- resources/views/pages/edit.blade.php | 2 +- .../pages/parts/editor-toolbox.blade.php | 15 ++++ .../views/pages/parts/list-item.blade.php | 15 +++- tests/Entity/PageTest.php | 80 +++++++++++++++++++ 16 files changed, 226 insertions(+), 15 deletions(-) create mode 100755 database/migrations/2024_10_24_074404_add_image_id_in_page_table.php diff --git a/app/App/helpers.php b/app/App/helpers.php index af6dbcfc397..c42e0cb5e86 100644 --- a/app/App/helpers.php +++ b/app/App/helpers.php @@ -128,3 +128,22 @@ function sortUrl(string $path, array $data, array $overrideData = []): string return url($path . '?' . implode('&', $queryStringSections)); } + +function getCover($entity,$type) +{ + if(!in_array($type,['page','book','bookshelf'])) + { + return ''; + } + + if($type === 'page') + { + return $entity->getPageCover(); + } + + if($type === 'book' || $type === 'bookshelf') + { + return $entity->getBookCover(); + } + +} diff --git a/app/Config/setting-defaults.php b/app/Config/setting-defaults.php index 88c4612ca61..b72a05ecba4 100644 --- a/app/Config/setting-defaults.php +++ b/app/Config/setting-defaults.php @@ -41,6 +41,7 @@ 'bookshelves_view_type' => env('APP_VIEWS_BOOKSHELVES', 'grid'), 'bookshelf_view_type' => env('APP_VIEWS_BOOKSHELF', 'grid'), 'books_view_type' => env('APP_VIEWS_BOOKS', 'grid'), + 'pages_view_type' => env('APP_VIEWS_BOOKS', 'grid'), ], ]; diff --git a/app/Entities/Controllers/ChapterController.php b/app/Entities/Controllers/ChapterController.php index 4274589e260..52b989fa924 100644 --- a/app/Entities/Controllers/ChapterController.php +++ b/app/Entities/Controllers/ChapterController.php @@ -75,6 +75,7 @@ public function store(Request $request, string $bookSlug) */ public function show(string $bookSlug, string $chapterSlug) { + $view = setting()->getForCurrentUser(key: 'pages_view_type'); $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug); $this->checkOwnablePermission('chapter-view', $chapter); @@ -96,6 +97,7 @@ public function show(string $bookSlug, string $chapterSlug) 'next' => $nextPreviousLocator->getNext(), 'previous' => $nextPreviousLocator->getPrevious(), 'referenceCount' => $this->referenceFetcher->getReferenceCountToEntity($chapter), + 'view' => $view, ]); } diff --git a/app/Entities/Controllers/PageController.php b/app/Entities/Controllers/PageController.php index eab53bb2510..307ff43d3f2 100644 --- a/app/Entities/Controllers/PageController.php +++ b/app/Entities/Controllers/PageController.php @@ -222,6 +222,12 @@ public function update(Request $request, string $bookSlug, string $pageSlug) $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug); $this->checkOwnablePermission('page-update', $page); + if ($request->has('image_reset')) { + $request['image'] = null; + } elseif (array_key_exists('image', $request->all()) && is_null($request['image'])) { + unset($request['image']); + } + $this->pageRepo->update($page, $request->all()); return redirect($page->getUrl()); diff --git a/app/Entities/Models/Page.php b/app/Entities/Models/Page.php index 499ef4d7288..ceb428b5f2d 100644 --- a/app/Entities/Models/Page.php +++ b/app/Entities/Models/Page.php @@ -2,10 +2,12 @@ namespace BookStack\Entities\Models; +use BookStack\Uploads\Image; use BookStack\Entities\Tools\PageContent; use BookStack\Entities\Tools\PageEditorType; use BookStack\Permissions\PermissionApplicator; use BookStack\Uploads\Attachment; +use Exception; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Factories\HasFactory; @@ -24,12 +26,13 @@ * @property bool $draft * @property int $revision_count * @property string $editor + * @property Image|null $cover * @property Chapter $chapter * @property Collection $attachments * @property Collection $revisions * @property PageRevision $currentRevision */ -class Page extends BookChild +class Page extends BookChild implements HasCoverImage { use HasFactory; @@ -143,4 +146,28 @@ public function forJsonDisplay(): self return $refreshed; } + + public function getPageCover(int $width = 440, int $height = 250): string + { + $default = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='; + if (!$this->image_id || !$this->cover) { + return $default; + } + + try { + return $this->cover->getThumb($width, $height, false) ?? $default; + } catch (Exception $err) { + return $default; + } + } + + public function cover(): BelongsTo + { + return $this->belongsTo(Image::class, 'image_id'); + } + + public function coverImageTypeKey(): string + { + return 'cover_page'; + } } diff --git a/app/Entities/Queries/PageQueries.php b/app/Entities/Queries/PageQueries.php index 06298f470b9..209b7d97be1 100644 --- a/app/Entities/Queries/PageQueries.php +++ b/app/Entities/Queries/PageQueries.php @@ -15,7 +15,7 @@ class PageQueries implements ProvidesEntityQueries ]; protected static array $listAttributes = [ 'name', 'id', 'slug', 'book_id', 'chapter_id', 'draft', - 'template', 'text', 'created_at', 'updated_at', 'priority', 'owned_by', + 'template', 'text', 'created_at', 'updated_at', 'priority', 'owned_by','image_id', ]; public function start(): Builder @@ -75,7 +75,7 @@ public function visibleForList(): Builder public function visibleForChapterList(int $chapterId): Builder { - return $this->visibleForList() + return $this->visibleForListWithCover() ->where('chapter_id', '=', $chapterId) ->orderBy('draft', 'desc') ->orderBy('priority', 'asc'); @@ -109,4 +109,9 @@ protected function mergeBookSlugForSelect(array $columns): array ->whereColumn('books.id', '=', 'pages.book_id'); }]); } + + public function visibleForListWithCover(): Builder + { + return $this->visibleForList()->with('cover'); + } } diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php index 1bc15392cec..ea4a75cee1f 100644 --- a/app/Entities/Repos/PageRepo.php +++ b/app/Entities/Repos/PageRepo.php @@ -78,6 +78,10 @@ public function publishDraft(Page $draft, array $input): Page $this->updateTemplateStatusAndContentFromInput($draft, $input); $this->baseRepo->update($draft, $input); + if (array_key_exists('image', $input)) { + $this->baseRepo->updateCoverImage($draft, $input['image'], $input['image'] === null); + } + $summary = trim($input['summary'] ?? '') ?: trans('entities.pages_initial_revision'); $this->revisionRepo->storeNewForPage($draft, $summary); $draft->refresh(); @@ -116,6 +120,10 @@ public function update(Page $page, array $input): Page $this->revisionRepo->storeNewForPage($page, $summary); } + if (array_key_exists('image', $input)) { + $this->baseRepo->updateCoverImage($page, $input['image'], $input['image'] === null); + } + Activity::add(ActivityType::PAGE_UPDATE, $page); return $page; diff --git a/app/Users/Controllers/UserPreferencesController.php b/app/Users/Controllers/UserPreferencesController.php index 0bed2d22a43..ebbf35283ff 100644 --- a/app/Users/Controllers/UserPreferencesController.php +++ b/app/Users/Controllers/UserPreferencesController.php @@ -18,7 +18,7 @@ public function __construct( */ public function changeView(Request $request, string $type) { - $valueViewTypes = ['books', 'bookshelves', 'bookshelf']; + $valueViewTypes = ['books', 'bookshelves', 'bookshelf','pages']; if (!in_array($type, $valueViewTypes)) { return $this->redirectToRequest($request); } diff --git a/database/migrations/2024_10_24_074404_add_image_id_in_page_table.php b/database/migrations/2024_10_24_074404_add_image_id_in_page_table.php new file mode 100755 index 00000000000..8b252034ead --- /dev/null +++ b/database/migrations/2024_10_24_074404_add_image_id_in_page_table.php @@ -0,0 +1,28 @@ +integer('image_id')->after('priority')->nullable()->default(null); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('page', function (Blueprint $table) { + // + }); + } +}; diff --git a/resources/sass/_colors.scss b/resources/sass/_colors.scss index c77c1d8b388..6338e67a044 100644 --- a/resources/sass/_colors.scss +++ b/resources/sass/_colors.scss @@ -103,3 +103,6 @@ .bg-bookshelf { background-color: var(--color-bookshelf); } +.bg-page { + background-color: var(--color-page); +} diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php index 45e43ad96a9..a1a3dd841de 100644 --- a/resources/views/chapters/show.blade.php +++ b/resources/views/chapters/show.blade.php @@ -26,11 +26,19 @@
{!! $chapter->descriptionHtml() !!}
@if(count($pages) > 0) -
- @foreach($pages as $page) - @include('pages.parts.list-item', ['page' => $page]) - @endforeach -
+ @if($view === 'list') +
+ @foreach($pages as $page) + @include('pages.parts.list-item', ['page' => $page]) + @endforeach +
+ @else +
+ @foreach($pages as $page) + @include('entities.grid-item', ['entity' => $page]) + @endforeach +
+ @endif @else
@@ -107,6 +115,8 @@
{{ trans('common.actions') }}
+ @include('entities.view-toggle', ['view' => $view, 'type' => 'pages']) + @if(userCan('page-create', $chapter)) @icon('add') diff --git a/resources/views/entities/grid-item.blade.php b/resources/views/entities/grid-item.blade.php index ee31b53f2e9..5384bef3f97 100644 --- a/resources/views/entities/grid-item.blade.php +++ b/resources/views/entities/grid-item.blade.php @@ -1,7 +1,7 @@
-
cover) style="background-image: url('{{ $entity->getBookCover() }}')"@endif> +
cover) style="background-image: url('{{ getCover($entity,$entity->getType()) }}')"@endif>
@icon($entity->getType())
diff --git a/resources/views/pages/edit.blade.php b/resources/views/pages/edit.blade.php index 58fb5f355ea..94175286794 100644 --- a/resources/views/pages/edit.blade.php +++ b/resources/views/pages/edit.blade.php @@ -5,7 +5,7 @@ @section('content')
-
+ {{ csrf_field() }} @if(!$isDraft) {{ method_field('PUT') }} @endif diff --git a/resources/views/pages/parts/editor-toolbox.blade.php b/resources/views/pages/parts/editor-toolbox.blade.php index 4ecac26a589..3e805d4a15c 100644 --- a/resources/views/pages/parts/editor-toolbox.blade.php +++ b/resources/views/pages/parts/editor-toolbox.blade.php @@ -11,6 +11,7 @@ @if($comments->enabled()) @endif +
@@ -37,4 +38,18 @@ @include('pages.parts.toolbox-comments') @endif +
+

{{ trans('common.cover_image') }}

+
+

{{ trans('common.cover_image_description') }}

+ + @include('form.image-picker', [ + 'defaultImage' => url('/book_default_cover.png'), + 'currentImage' => (isset($page) && $page->cover) ? $page->getPageCover() : url('/book_default_cover.png') , + 'name' => 'image', + 'imageClass' => 'cover' + ]) +
+
+
diff --git a/resources/views/pages/parts/list-item.blade.php b/resources/views/pages/parts/list-item.blade.php index 5707a9c6619..5a925da2b0d 100644 --- a/resources/views/pages/parts/list-item.blade.php +++ b/resources/views/pages/parts/list-item.blade.php @@ -1,5 +1,12 @@ -@component('entities.list-item-basic', ['entity' => $page]) -
-

{{ $page->getExcerpt() }}

+ + @icon('page') +
+ @icon('page')
-@endcomponent \ No newline at end of file +
+

{{ $page->name }}

+
+

{{ $page->getExcerpt() }}

+
+
+ \ No newline at end of file diff --git a/tests/Entity/PageTest.php b/tests/Entity/PageTest.php index b96d455eb25..27f2a2ee88a 100644 --- a/tests/Entity/PageTest.php +++ b/tests/Entity/PageTest.php @@ -4,6 +4,7 @@ use BookStack\Entities\Models\Book; use BookStack\Entities\Models\Page; +use BookStack\Entities\Repos\BaseRepo; use Carbon\Carbon; use Tests\TestCase; @@ -27,6 +28,15 @@ public function test_create() ->first(); $resp->assertRedirect($draftPage->getUrl()); + $baseRepo = $this->app->make(BaseRepo::class); + + $coverImageFile = $this->files->uploadedImage('page_cover.png'); + + $baseRepo->updateCoverImage($draftPage, $coverImageFile); + + $this->assertNotNull($draftPage->cover); + $this->assertEquals('page_cover.png', $draftPage->cover->name); + $resp = $this->get($draftPage->getUrl()); $this->withHtml($resp)->assertElementContains('form[action="' . $draftPage->getUrl() . '"][method="POST"]', 'Save Page'); @@ -356,4 +366,74 @@ public function test_recently_updated_pages_on_home() $resp = $this->get('/'); $this->withHtml($resp)->assertElementContains('#recently-updated-pages', $page->name); } + + public function test_page_cover_image_reset() + { + $page = $this->entities->page(); + + $baseRepo = $this->app->make(BaseRepo::class); + + $coverImageFile = $this->files->uploadedImage('page_cover.png'); + + $baseRepo->updateCoverImage($page, $coverImageFile); + + $this->assertNotNull($page->cover); + $this->assertEquals('page_cover.png', $page->cover->name); + + $page = Page::findOrFail($page->id); + + // Third argument specify for reset image is true or false + $baseRepo->updateCoverImage($page, null,true); + + $this->assertNull($page->cover); + } + + public function test_page_cover_image_update() + { + $page = $this->entities->page(); + + $baseRepo = $this->app->make(BaseRepo::class); + + $coverImageFile = $this->files->uploadedImage('page_cover.png'); + + $baseRepo->updateCoverImage($page, $coverImageFile); + + $this->assertNotNull($page->cover); + $this->assertEquals('page_cover.png', $page->cover->name); + + $coverImageFile = $this->files->uploadedImage('updated_page_cover.png'); + + $baseRepo->updateCoverImage($page, $coverImageFile); + + $this->assertNotNull($page->cover); + $this->assertEquals('updated_page_cover.png', $page->cover->name); + } + + public function test_pages_in_chapter_view_shows_view_toggle_option() + { + $editor = $this->users->editor(); + setting()->putUser($editor, 'pages_view_type', 'list'); + + + $book = $this->entities->book(); + + $chapter = $this->entities->chapter()->where('book_id',$book->id)->get(); + + $resp = $this->actingAs($editor)->get("/books/{$book->slug}/chapter/{$chapter->first()->slug}"); + + $this->withHtml($resp)->assertElementContains('form[action$="/preferences/change-view/pages"]', 'Grid View'); + $this->withHtml($resp)->assertElementExists('button[name="view"][value="grid"]'); + + $resp = $this->patch("/preferences/change-view/pages", ['view' => 'grid']); + $resp->assertRedirect(); + $this->assertEquals('grid', setting()->getUser($editor, 'pages_view_type')); + + $resp = $this->actingAs($editor)->get("/books/{$book->slug}/chapter/{$chapter->first()->slug}"); + $this->withHtml($resp)->assertElementContains('form[action$="/preferences/change-view/pages"]', 'List View'); + $this->withHtml($resp)->assertElementExists('button[name="view"][value="list"]'); + + $resp = $this->patch("/preferences/change-view/pages", ['view_type' => 'list']); + $resp->assertRedirect(); + $this->assertEquals('list', setting()->getUser($editor, 'pages_view_type')); + } } From abd98e114d54cc50fcff68fbd4f69e79bf533ba9 Mon Sep 17 00:00:00 2001 From: Brij Mandaliya Date: Thu, 24 Oct 2024 19:16:59 +0530 Subject: [PATCH 02/10] fix: lint php --- app/App/helpers.php | 14 +++++--------- tests/Entity/PageTest.php | 6 +++--- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/app/App/helpers.php b/app/App/helpers.php index c42e0cb5e86..617cc49eba0 100644 --- a/app/App/helpers.php +++ b/app/App/helpers.php @@ -129,21 +129,17 @@ function sortUrl(string $path, array $data, array $overrideData = []): string return url($path . '?' . implode('&', $queryStringSections)); } -function getCover($entity,$type) +function getCover($entity, $type) { - if(!in_array($type,['page','book','bookshelf'])) - { + if (!in_array($type, ['page', 'book', 'bookshelf'])) { return ''; } - - if($type === 'page') - { + + if ($type === 'page') { return $entity->getPageCover(); } - if($type === 'book' || $type === 'bookshelf') - { + if ($type === 'book' || $type === 'bookshelf') { return $entity->getBookCover(); } - } diff --git a/tests/Entity/PageTest.php b/tests/Entity/PageTest.php index 27f2a2ee88a..a1fe8c2be5b 100644 --- a/tests/Entity/PageTest.php +++ b/tests/Entity/PageTest.php @@ -383,7 +383,7 @@ public function test_page_cover_image_reset() $page = Page::findOrFail($page->id); // Third argument specify for reset image is true or false - $baseRepo->updateCoverImage($page, null,true); + $baseRepo->updateCoverImage($page, null, true); $this->assertNull($page->cover); } @@ -417,8 +417,8 @@ public function test_pages_in_chapter_view_shows_view_toggle_option() $book = $this->entities->book(); - $chapter = $this->entities->chapter()->where('book_id',$book->id)->get(); - + $chapter = $this->entities->chapter()->where('book_id', $book->id)->get(); + $resp = $this->actingAs($editor)->get("/books/{$book->slug}/chapter/{$chapter->first()->slug}"); $this->withHtml($resp)->assertElementContains('form[action$="/preferences/change-view/pages"]', 'Grid View'); From ac9945fc4d8b0416046a9dc6be3a0d05cc50d05f Mon Sep 17 00:00:00 2001 From: Brij Mandaliya Date: Tue, 29 Oct 2024 17:49:11 +0530 Subject: [PATCH 03/10] set to get default page cover image from env --- app/Config/setting-defaults.php | 1 + app/Entities/Models/Page.php | 2 +- app/Settings/SettingService.php | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Config/setting-defaults.php b/app/Config/setting-defaults.php index b72a05ecba4..d95b99f935e 100644 --- a/app/Config/setting-defaults.php +++ b/app/Config/setting-defaults.php @@ -32,6 +32,7 @@ 'page-draft-color-dark' => '#a66ce8', 'app-custom-head' => false, 'registration-enabled' => false, + 'default_page_cover_image' => ENV('DEFAULT_PAGE_COVER_IMAGE','data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='), // User-level default settings 'user' => [ diff --git a/app/Entities/Models/Page.php b/app/Entities/Models/Page.php index ceb428b5f2d..40420016705 100644 --- a/app/Entities/Models/Page.php +++ b/app/Entities/Models/Page.php @@ -149,7 +149,7 @@ public function forJsonDisplay(): self public function getPageCover(int $width = 440, int $height = 250): string { - $default = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='; + $default = setting()->getDefaultPageCoverImage(); if (!$this->image_id || !$this->cover) { return $default; } diff --git a/app/Settings/SettingService.php b/app/Settings/SettingService.php index 31debdaea85..36a2c5749b8 100644 --- a/app/Settings/SettingService.php +++ b/app/Settings/SettingService.php @@ -276,4 +276,9 @@ public function flushCache(): void { $this->localCache = []; } + + public function getDefaultPageCoverImage() + { + return config('setting-defaults.default_page_cover_image'); + } } From cdbc26920d170f339f5d313ec931bdf54ef8b9af Mon Sep 17 00:00:00 2001 From: Brij Mandaliya Date: Tue, 29 Oct 2024 17:50:37 +0530 Subject: [PATCH 04/10] fix: lint php --- app/Config/setting-defaults.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Config/setting-defaults.php b/app/Config/setting-defaults.php index d95b99f935e..d6ffbbabce2 100644 --- a/app/Config/setting-defaults.php +++ b/app/Config/setting-defaults.php @@ -32,7 +32,7 @@ 'page-draft-color-dark' => '#a66ce8', 'app-custom-head' => false, 'registration-enabled' => false, - 'default_page_cover_image' => ENV('DEFAULT_PAGE_COVER_IMAGE','data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='), + 'default_page_cover_image' => ENV('DEFAULT_PAGE_COVER_IMAGE', 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='), // User-level default settings 'user' => [ From 802e57972a2b21d5584ffaea9ae487984a2cfe63 Mon Sep 17 00:00:00 2001 From: brijm-improwised Date: Tue, 14 Apr 2026 22:24:21 +0530 Subject: [PATCH 05/10] feat(pages): add image_id support and update cover handling. - Added `image_id` field to `entity_page_data` model and migration - Updated `PageQueries` to select `image_id` and reference entity_page_data columns explicitly - Modified `PageRepo` to handle cover image updates consistently for drafts and revisions - Extended `EntityCover` and `EntityHtmlDescription` to support `Page` entities - Adjusted `BookContents` queries to use entity_page_data.draft - Updated Blade views to use `coverInfo()->getUrl()` for page list items - Introduced sidebar view-toggle for pages in chapter actions - Removed `ContainerTrait` from `Page` and replaced defaultTemplate with descriptionInfo --- app/Entities/Models/EntityPageData.php | 1 + app/Entities/Models/Page.php | 10 +++-- app/Entities/Queries/PageQueries.php | 41 +++++++++++++------ app/Entities/Repos/PageRepo.php | 16 ++++---- app/Entities/Tools/BookContents.php | 2 +- app/Entities/Tools/EntityCover.php | 4 +- app/Entities/Tools/EntityHtmlDescription.php | 3 +- ...20254_add_image_id_to_entity_page_data.php | 30 ++++++++++++++ .../show-sidebar-section-actions.blade.php | 1 + .../views/pages/parts/list-item.blade.php | 2 +- 10 files changed, 81 insertions(+), 29 deletions(-) create mode 100755 database/migrations/2026_04_11_220254_add_image_id_to_entity_page_data.php diff --git a/app/Entities/Models/EntityPageData.php b/app/Entities/Models/EntityPageData.php index a98b1a9823c..0d3c62f79ce 100644 --- a/app/Entities/Models/EntityPageData.php +++ b/app/Entities/Models/EntityPageData.php @@ -21,5 +21,6 @@ class EntityPageData extends Model 'html', 'text', 'markdown', + 'image_id' ]; } diff --git a/app/Entities/Models/Page.php b/app/Entities/Models/Page.php index fdedbfe3717..d083b60e30b 100644 --- a/app/Entities/Models/Page.php +++ b/app/Entities/Models/Page.php @@ -4,6 +4,7 @@ use BookStack\Entities\Tools\EntityCover; use BookStack\Entities\Tools\EntityDefaultTemplate; +use BookStack\Entities\Tools\EntityHtmlDescription; use BookStack\Uploads\Image; use BookStack\Entities\Tools\PageContent; use BookStack\Permissions\PermissionApplicator; @@ -33,10 +34,10 @@ * @property Collection $revisions * @property PageRevision $currentRevision */ -class Page extends BookChild implements HasDescriptionInterface, HasCoverInterface, HasDefaultTemplateInterface +class Page extends BookChild implements HasDescriptionInterface, HasCoverInterface { use HasFactory; - use ContainerTrait; + // use ContainerTrait; public string $textField = 'text'; public string $htmlField = 'html'; @@ -165,10 +166,11 @@ public function getPageCover(int $width = 440, int $height = 250): string } } - public function defaultTemplate(): EntityDefaultTemplate + public function descriptionInfo(): EntityHtmlDescription { - return new EntityDefaultTemplate($this); + return new EntityHtmlDescription($this); } + public function cover(): BelongsTo { diff --git a/app/Entities/Queries/PageQueries.php b/app/Entities/Queries/PageQueries.php index 0d62bdb9d0d..7acc1b4e668 100644 --- a/app/Entities/Queries/PageQueries.php +++ b/app/Entities/Queries/PageQueries.php @@ -12,13 +12,18 @@ class PageQueries implements ProvidesEntityQueries { protected static array $contentAttributes = [ - 'name', 'id', 'slug', 'book_id', 'chapter_id', 'draft', - 'template', 'html', 'markdown', 'text', 'created_at', 'updated_at', 'priority', - 'created_by', 'updated_by', 'owned_by', + 'entities.name as name', 'entities.id as id', 'entities.slug as slug', 'entities.book_id as book_id', + 'entities.chapter_id as chapter_id', 'entity_page_data.draft as draft', + 'entity_page_data.template as template', 'entity_page_data.html as html', 'entity_page_data.markdown as markdown', + 'entity_page_data.text as text', 'entities.created_at as created_at', 'entities.updated_at as updated_at', + 'entities.priority as priority', 'entities.created_by as created_by', 'entities.updated_by as updated_by', + 'entities.owned_by as owned_by', ]; protected static array $listAttributes = [ - 'name', 'id', 'slug', 'book_id', 'chapter_id', 'draft', - 'template', 'text', 'created_at', 'updated_at', 'priority', 'owned_by','image_id', + 'entities.name as name', 'entities.id as id', 'entities.slug as slug', 'entities.book_id as book_id', + 'entities.chapter_id as chapter_id', 'entity_page_data.draft as draft', + 'entity_page_data.template as template', 'entity_page_data.text as text', 'entities.created_at as created_at', + 'entities.updated_at as updated_at', 'entities.priority as priority', 'entities.owned_by as owned_by', ]; /** @@ -79,7 +84,12 @@ public function visibleForList(): Builder { return $this->start() ->scopes('visible') - ->select($this->mergeBookSlugForSelect(static::$listAttributes)); + ->select(array_merge( + $this->mergeBookSlugForSelect(static::$listAttributes), + [ + 'entity_page_data.image_id', + ] + )); } /** @@ -93,29 +103,34 @@ public function visibleForContent(): Builder public function visibleForChapterList(int $chapterId): Builder { return $this->visibleForListWithCover() - ->where('chapter_id', '=', $chapterId) - ->orderBy('draft', 'desc') - ->orderBy('priority', 'asc'); + ->where('entities.chapter_id', '=', $chapterId) + ->orderBy('entity_page_data.draft', 'desc') + ->orderBy('entities.priority', 'asc'); } public function visibleWithContents(): Builder { return $this->start() ->scopes('visible') - ->select($this->mergeBookSlugForSelect(static::$contentAttributes)); + ->select(array_merge( + $this->mergeBookSlugForSelect(static::$contentAttributes), + [ + 'entity_page_data.image_id', + ] + )); } public function currentUserDraftsForList(): Builder { return $this->visibleForList() - ->where('draft', '=', true) - ->where('created_by', '=', user()->id); + ->where('entity_page_data.draft', '=', true) + ->where('entities.created_by', '=', user()->id); } public function visibleTemplates(bool $includeContents = false): Builder { $base = $includeContents ? $this->visibleWithContents() : $this->visibleForList(); - return $base->where('template', '=', true); + return $base->where('entity_page_data.template', '=', true); } protected function mergeBookSlugForSelect(array $columns): array diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php index 73e81cf06d8..bda8b521959 100644 --- a/app/Entities/Repos/PageRepo.php +++ b/app/Entities/Repos/PageRepo.php @@ -88,9 +88,9 @@ public function publishDraft(Page $draft, array $input): Page $draft->priority = $this->getNewPriority($draft); $this->updateTemplateStatusAndContentFromInput($draft, $input); - if (array_key_exists('image', $input)) { - $this->baseRepo->updateCoverImage($draft, $input['image'], $input['image'] === null); - } + if (array_key_exists('image', $input)) { + $this->baseRepo->updateCoverImage($draft, $input['image'], $input['image'] === null); + } $draft = $this->baseRepo->update($draft, $input); $draft->rebuildPermissions(); @@ -126,17 +126,17 @@ public function update(Page $page, array $input): Page $oldName = $page->name; $oldHtml = $page->html; $oldMarkdown = $page->markdown; - + $this->updateTemplateStatusAndContentFromInput($page, $input); $page = $this->baseRepo->update($page, $input); - + // Update with new details $page->revision_count++; $page->save(); - + // Remove all update drafts for this user and page. $this->revisionRepo->deleteDraftsForCurrentUser($page); - + // Save a revision after updating $summary = trim($input['summary'] ?? ''); $htmlChanged = isset($input['html']) && $input['html'] !== $oldHtml; @@ -145,7 +145,7 @@ public function update(Page $page, array $input): Page if ($htmlChanged || $nameChanged || $markdownChanged || $summary) { $this->revisionRepo->storeNewForPage($page, $summary); } - + if (array_key_exists('image', $input)) { $this->baseRepo->updateCoverImage($page, $input['image'], $input['image'] === null); } diff --git a/app/Entities/Tools/BookContents.php b/app/Entities/Tools/BookContents.php index 4bbab626520..a976a8a7a67 100644 --- a/app/Entities/Tools/BookContents.php +++ b/app/Entities/Tools/BookContents.php @@ -97,7 +97,7 @@ protected function getPages(bool $showDrafts = false, bool $getPageContent = fal } if (!$showDrafts) { - $query->where('draft', '=', false); + $query->where('entity_page_data.draft', '=', false); } return $query->where('book_id', '=', $this->book->id)->get(); diff --git a/app/Entities/Tools/EntityCover.php b/app/Entities/Tools/EntityCover.php index 1e8fce201dd..f52c3621e8d 100644 --- a/app/Entities/Tools/EntityCover.php +++ b/app/Entities/Tools/EntityCover.php @@ -4,6 +4,7 @@ use BookStack\Entities\Models\Book; use BookStack\Entities\Models\Bookshelf; +use BookStack\Entities\Models\Page; use BookStack\Uploads\Image; use Exception; use Illuminate\Database\Eloquent\Builder; @@ -11,7 +12,7 @@ class EntityCover { public function __construct( - protected Book|Bookshelf $entity, + protected Book|Bookshelf|Page $entity, ) { } @@ -33,6 +34,7 @@ public function exists(): bool */ public function getImage(): Image|null { + if ($this->entity->image_id === null) { return null; } diff --git a/app/Entities/Tools/EntityHtmlDescription.php b/app/Entities/Tools/EntityHtmlDescription.php index b14deb257a7..b48397bf4a4 100644 --- a/app/Entities/Tools/EntityHtmlDescription.php +++ b/app/Entities/Tools/EntityHtmlDescription.php @@ -5,6 +5,7 @@ use BookStack\Entities\Models\Book; use BookStack\Entities\Models\Bookshelf; use BookStack\Entities\Models\Chapter; +use BookStack\Entities\Models\Page; use BookStack\Util\HtmlContentFilter; class EntityHtmlDescription @@ -13,7 +14,7 @@ class EntityHtmlDescription protected string $plain = ''; public function __construct( - protected Book|Chapter|Bookshelf $entity, + protected Book|Chapter|Bookshelf|Page $entity, ) { $this->html = $this->entity->description_html ?? ''; $this->plain = $this->entity->description ?? ''; diff --git a/database/migrations/2026_04_11_220254_add_image_id_to_entity_page_data.php b/database/migrations/2026_04_11_220254_add_image_id_to_entity_page_data.php new file mode 100755 index 00000000000..806f89ceed4 --- /dev/null +++ b/database/migrations/2026_04_11_220254_add_image_id_to_entity_page_data.php @@ -0,0 +1,30 @@ +unsignedInteger('image_id')->nullable(); + $table->foreign('image_id')->references('id')->on('images')->onDelete('cascade'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('entity_page_data', function (Blueprint $table) { + $table->dropForeign(['image_id']); + $table->dropColumn('image_id'); + }); + } +}; diff --git a/resources/views/chapters/parts/show-sidebar-section-actions.blade.php b/resources/views/chapters/parts/show-sidebar-section-actions.blade.php index 55df999a22c..06d52e113fe 100644 --- a/resources/views/chapters/parts/show-sidebar-section-actions.blade.php +++ b/resources/views/chapters/parts/show-sidebar-section-actions.blade.php @@ -2,6 +2,7 @@
{{ trans('common.actions') }}
+ @include('entities.view-toggle', ['view' => $view, 'type' => 'pages']) @if(userCan(\BookStack\Permissions\Permission::PageCreate, $chapter)) @icon('add') diff --git a/resources/views/pages/parts/list-item.blade.php b/resources/views/pages/parts/list-item.blade.php index 5a925da2b0d..ecaff643c9b 100644 --- a/resources/views/pages/parts/list-item.blade.php +++ b/resources/views/pages/parts/list-item.blade.php @@ -1,6 +1,6 @@ @icon('page') -
+
@icon('page')
From 9d4866e9956566dd2078f22aaccfa5f39002af61 Mon Sep 17 00:00:00 2001 From: brij-mandaliya Date: Wed, 15 Apr 2026 13:20:27 +0530 Subject: [PATCH 06/10] fix the link. --- app/Entities/Models/Page.php | 19 +++---------------- app/Entities/Tools/EntityCover.php | 2 +- tests/Entity/PageTest.php | 1 + 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/app/Entities/Models/Page.php b/app/Entities/Models/Page.php index d083b60e30b..4220b1d0378 100644 --- a/app/Entities/Models/Page.php +++ b/app/Entities/Models/Page.php @@ -36,16 +36,17 @@ */ class Page extends BookChild implements HasDescriptionInterface, HasCoverInterface { + use HasFactory; // use ContainerTrait; public string $textField = 'text'; public string $htmlField = 'html'; - protected $hidden = ['html', 'markdown', 'text', 'pivot', 'deleted_at', 'entity_id', 'entity_type']; + protected $hidden = ['html', 'markdown', 'text', 'pivot', 'deleted_at', 'entity_id', 'entity_type']; protected $fillable = ['name', 'priority']; protected $casts = [ - 'draft' => 'boolean', + 'draft' => 'boolean', 'template' => 'boolean', ]; @@ -152,26 +153,12 @@ public function forJsonDisplay(): self return $refreshed; } - public function getPageCover(int $width = 440, int $height = 250): string - { - $default = setting()->getDefaultPageCoverImage(); - if (!$this->image_id || !$this->cover) { - return $default; - } - - try { - return $this->cover->getThumb($width, $height, false) ?? $default; - } catch (Exception $err) { - return $default; - } - } public function descriptionInfo(): EntityHtmlDescription { return new EntityHtmlDescription($this); } - public function cover(): BelongsTo { return $this->belongsTo(Image::class, 'image_id'); diff --git a/app/Entities/Tools/EntityCover.php b/app/Entities/Tools/EntityCover.php index f52c3621e8d..878c673ac74 100644 --- a/app/Entities/Tools/EntityCover.php +++ b/app/Entities/Tools/EntityCover.php @@ -34,7 +34,7 @@ public function exists(): bool */ public function getImage(): Image|null { - + if ($this->entity->image_id === null) { return null; } diff --git a/tests/Entity/PageTest.php b/tests/Entity/PageTest.php index 89031e7c1fe..a41df493b51 100644 --- a/tests/Entity/PageTest.php +++ b/tests/Entity/PageTest.php @@ -4,6 +4,7 @@ use BookStack\Entities\Models\Book; use BookStack\Entities\Models\Page; +use BookStack\Entities\Repos\BaseRepo; use BookStack\Uploads\Image; use Carbon\Carbon; use Tests\TestCase; From e20a4922dcc66c0130723eb0cc911d2fb94956e3 Mon Sep 17 00:00:00 2001 From: brij-mandaliya Date: Wed, 15 Apr 2026 13:31:40 +0530 Subject: [PATCH 07/10] fix link --- app/Entities/Models/Page.php | 2 +- app/Entities/Repos/PageRepo.php | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Entities/Models/Page.php b/app/Entities/Models/Page.php index 4220b1d0378..d4d6d32df7e 100644 --- a/app/Entities/Models/Page.php +++ b/app/Entities/Models/Page.php @@ -36,8 +36,8 @@ */ class Page extends BookChild implements HasDescriptionInterface, HasCoverInterface { - use HasFactory; + // use ContainerTrait; public string $textField = 'text'; diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php index bda8b521959..23c408e5397 100644 --- a/app/Entities/Repos/PageRepo.php +++ b/app/Entities/Repos/PageRepo.php @@ -126,17 +126,17 @@ public function update(Page $page, array $input): Page $oldName = $page->name; $oldHtml = $page->html; $oldMarkdown = $page->markdown; - + $this->updateTemplateStatusAndContentFromInput($page, $input); $page = $this->baseRepo->update($page, $input); - + // Update with new details $page->revision_count++; $page->save(); - + // Remove all update drafts for this user and page. $this->revisionRepo->deleteDraftsForCurrentUser($page); - + // Save a revision after updating $summary = trim($input['summary'] ?? ''); $htmlChanged = isset($input['html']) && $input['html'] !== $oldHtml; @@ -145,7 +145,7 @@ public function update(Page $page, array $input): Page if ($htmlChanged || $nameChanged || $markdownChanged || $summary) { $this->revisionRepo->storeNewForPage($page, $summary); } - + if (array_key_exists('image', $input)) { $this->baseRepo->updateCoverImage($page, $input['image'], $input['image'] === null); } From 911417ce4b5e393750084da5ba752027b6bc2b99 Mon Sep 17 00:00:00 2001 From: brij-mandaliya Date: Tue, 21 Apr 2026 16:38:19 +0530 Subject: [PATCH 08/10] refactor(entities): migrate draft and cover image handling to entity_container_data table - Move draft status from entities table to entity_container_data table - Add fillable fields to EntityContainerData for image_id, sort_rule_id, and description fields - Update all draft queries to use entity_page_data.draft join condition - Enhance ReferenceChangeContext to track URL and permalink mappings during cloning - Update ReferenceUpdater to process reference changes in descriptions and page content - Modify cover image access to use coverInfo() method instead of cover property - Fix entity-list-item class naming from chapter to page - Update copy tests to verify reference updating during entity cloning BREAKING CHANGE: Draft status is now stored in entity_container_data table instead of entities table --- app/App/HomeController.php | 6 +- app/Entities/Models/EntityContainerData.php | 9 +++ app/Entities/Tools/BookContents.php | 2 +- app/Entities/Tools/Cloner.php | 3 +- app/Permissions/PermissionApplicator.php | 6 +- app/References/ReferenceChangeContext.php | 18 ++++++ app/References/ReferenceUpdater.php | 57 +++++++++++++++++-- app/Search/SearchController.php | 2 +- .../Queries/UserRecentlyCreatedContent.php | 2 +- .../pages/parts/editor-toolbox.blade.php | 2 +- .../views/pages/parts/list-item.blade.php | 2 +- tests/Entity/CopyTest.php | 23 +++++--- 12 files changed, 106 insertions(+), 26 deletions(-) diff --git a/app/App/HomeController.php b/app/App/HomeController.php index 00e2db3df43..ac3bd765661 100644 --- a/app/App/HomeController.php +++ b/app/App/HomeController.php @@ -45,7 +45,7 @@ public function index( : $this->queries->books->visibleForList()->orderBy('created_at', 'desc')->take(12 * $recentFactor)->get(); $favourites = $topFavourites->run(6); $recentlyUpdatedPages = $this->queries->pages->visibleForList() - ->where('draft', false) + ->where('entity_page_data.draft', false) ->orderBy('updated_at', 'desc') ->take($favourites->count() > 0 ? 5 : 10) ->get(); @@ -102,7 +102,9 @@ public function index( $homepageSetting = setting('app-homepage', '0:'); $id = intval(explode(':', $homepageSetting)[0]); /** @var Page $customHomepage */ - $customHomepage = $this->queries->pages->start()->where('draft', '=', false)->findOrFail($id); + $customHomepage = $this->queries->pages->start() + ->where('entity_page_data.draft', '=', false) + ->findOrFail($id); $pageContent = new PageContent($customHomepage); $customHomepage->html = $pageContent->render(false); diff --git a/app/Entities/Models/EntityContainerData.php b/app/Entities/Models/EntityContainerData.php index 21bace7513f..6b4c54f7f17 100644 --- a/app/Entities/Models/EntityContainerData.php +++ b/app/Entities/Models/EntityContainerData.php @@ -19,6 +19,15 @@ class EntityContainerData extends Model public $timestamps = false; protected $primaryKey = 'entity_id'; public $incrementing = false; + protected $fillable = [ + 'entity_id', + 'entity_type', + 'description', + 'description_html', + 'default_template_id', + 'image_id', + 'sort_rule_id', + ]; public static array $fields = [ 'description', diff --git a/app/Entities/Tools/BookContents.php b/app/Entities/Tools/BookContents.php index a976a8a7a67..c71e9e069a2 100644 --- a/app/Entities/Tools/BookContents.php +++ b/app/Entities/Tools/BookContents.php @@ -25,7 +25,7 @@ public function __construct( public function getLastPriority(): int { $maxPage = $this->book->pages() - ->where('draft', '=', false) + ->where('entity_page_data.draft', '=', false) ->whereDoesntHave('chapter') ->max('priority'); diff --git a/app/Entities/Tools/Cloner.php b/app/Entities/Tools/Cloner.php index 64c48c351ae..468eaa1da3c 100644 --- a/app/Entities/Tools/Cloner.php +++ b/app/Entities/Tools/Cloner.php @@ -106,6 +106,7 @@ protected function createBookClone(Book $original, string $newName): Book // Clone book $copyBook = $this->bookRepo->create($bookDetails); + $this->referenceChangeContext->add($original, $copyBook); // Clone contents $directChildren = $original->getDirectVisibleChildren(); @@ -127,8 +128,6 @@ protected function createBookClone(Book $original, string $newName): Book } } - $this->referenceChangeContext->add($original, $copyBook); - return $copyBook; } diff --git a/app/Permissions/PermissionApplicator.php b/app/Permissions/PermissionApplicator.php index c44a18a4d53..a2a258902f0 100644 --- a/app/Permissions/PermissionApplicator.php +++ b/app/Permissions/PermissionApplicator.php @@ -117,10 +117,10 @@ public function restrictEntityQuery(Builder $query): Builder public function restrictDraftsOnPageQuery(Builder $query): Builder { return $query->where(function (Builder $query) { - $query->where('draft', '=', false) + $query->where('entity_page_data.draft', '=', false) ->orWhere(function (Builder $query) { - $query->where('draft', '=', true) - ->where('owned_by', '=', $this->currentUser()->id); + $query->where('entity_page_data.draft', '=', true) + ->where('entities.owned_by', '=', $this->currentUser()->id); }); }); } diff --git a/app/References/ReferenceChangeContext.php b/app/References/ReferenceChangeContext.php index 27de0e2d24c..d10321c9f1e 100644 --- a/app/References/ReferenceChangeContext.php +++ b/app/References/ReferenceChangeContext.php @@ -11,10 +11,18 @@ class ReferenceChangeContext * @var array */ protected array $changes = []; + + protected array $urlMap = []; + protected array $permalinkMap = []; public function add(Entity $oldEntity, Entity $newEntity): void { $this->changes[] = [$oldEntity, $newEntity]; + $this->urlMap[$oldEntity->getUrl()] = $newEntity->getUrl(); + + if (method_exists($oldEntity, 'getPermalink') && method_exists($newEntity, 'getPermalink')) { + $this->permalinkMap[$oldEntity->getPermalink()] = $newEntity->getPermalink(); + } } /** @@ -42,4 +50,14 @@ public function getNewForOld(Entity $oldEntity): ?Entity } return null; } + + public function getUrlMap(): array + { + return $this->urlMap; + } + + public function getPermalinkMap(): array + { + return $this->permalinkMap; + } } diff --git a/app/References/ReferenceUpdater.php b/app/References/ReferenceUpdater.php index 42de72fde04..d19723ef095 100644 --- a/app/References/ReferenceUpdater.php +++ b/app/References/ReferenceUpdater.php @@ -3,9 +3,12 @@ namespace BookStack\References; use BookStack\Entities\Models\Book; +use BookStack\Entities\Models\Bookshelf; +use BookStack\Entities\Models\Chapter; use BookStack\Entities\Models\HasDescriptionInterface; use BookStack\Entities\Models\Entity; use BookStack\Entities\Models\Page; +use Illuminate\Support\Facades\DB; use BookStack\Entities\Repos\RevisionRepo; use BookStack\Util\HtmlDocument; @@ -67,6 +70,17 @@ public function changeReferencesUsingContext(ReferenceChangeContext $context): v $reference->to_type = $newToEntity->getMorphClass(); $reference->save(); } + + // Handle embedded HTML links within content fields + foreach ($context->getUrlMap() as $oldUrl => $newUrl) { + if ($new instanceof Page) { + $this->updateReferencesWithinPage($new, $oldUrl, $newUrl); + } + // Only for Chapter, Book, or Bookshelf - entities with descriptions + if (($new instanceof Chapter) || ($new instanceof Book) || ($new instanceof Bookshelf)) { + $this->updateReferencesWithinDescription($new, $oldUrl, $newUrl); + } + } } } @@ -104,7 +118,7 @@ protected function updateReferencesWithinEntity(Entity $entity, string $oldLink, $this->updateReferencesWithinPage($entity, $oldLink, $newLink); } - if ($entity instanceof HasDescriptionInterface) { + if (($entity instanceof Chapter) || ($entity instanceof Book) || ($entity instanceof Bookshelf)) { $this->updateReferencesWithinDescription($entity, $oldLink, $newLink); } } @@ -112,9 +126,35 @@ protected function updateReferencesWithinEntity(Entity $entity, string $oldLink, protected function updateReferencesWithinDescription(Entity&HasDescriptionInterface $entity, string $oldLink, string $newLink): void { $description = $entity->descriptionInfo(); - $html = $this->updateLinksInHtml($description->getHtml(true) ?: '', $oldLink, $newLink); + $originalHtml = $description->getHtml(true) ?: ''; + $html = $this->updateLinksInHtml($originalHtml, $oldLink, $newLink); $description->set($html); - $entity->save(); + + $plainText = $description->getPlain(); + $entity->description_html = $html; + $entity->description = $plainText; + + $existing = DB::table('entity_container_data') + ->where('entity_id', $entity->id) + ->where('entity_type', $entity->getMorphClass()) + ->first(); + + if ($existing) { + DB::table('entity_container_data') + ->where('entity_id', $entity->id) + ->where('entity_type', $entity->getMorphClass()) + ->update([ + 'description_html' => $html, + 'description' => $plainText, + ]); + } else { + DB::table('entity_container_data')->insert([ + 'entity_id' => $entity->id, + 'entity_type' => $entity->getMorphClass(), + 'description_html' => $html, + 'description' => $plainText, + ]); + } } protected function updateReferencesWithinPage(Page $page, string $oldLink, string $newLink): void @@ -159,10 +199,15 @@ protected function updateLinksInHtml(string $html, string $oldLink, string $newL /** @var \DOMElement $anchor */ foreach ($anchors as $anchor) { $link = $anchor->getAttribute('href'); - $updated = str_ireplace($oldLink, $newLink, $link); - $anchor->setAttribute('href', $updated); + $isExactMatch = strcasecmp($link, $oldLink) === 0; + $isPrefixMatch = strcasecmp(substr($link, 0, strlen($oldLink)), $oldLink) === 0 && strlen($link) > strlen($oldLink) && $link[strlen($oldLink)] === '/'; + if (!$isExactMatch && !$isPrefixMatch) { + continue; + } + $anchor->setAttribute('href', $newLink . ($isPrefixMatch ? substr($link, strlen($oldLink)) : '')); } - return $doc->getBodyInnerHtml(); + $result = $doc->getBodyInnerHtml(); + return $result; } } diff --git a/app/Search/SearchController.php b/app/Search/SearchController.php index 348d44a427f..f7b7be61d01 100644 --- a/app/Search/SearchController.php +++ b/app/Search/SearchController.php @@ -101,7 +101,7 @@ public function templatesForSelector(Request $request) $entities = $this->searchRunner->searchEntities($searchOptions, 'page', 1, 20)['results']; } else { $entities = $this->pageQueries->visibleTemplates() - ->where('draft', '=', false) + ->where('entity_page_data.draft', '=', false) ->orderBy('updated_at', 'desc') ->take(20) ->get(); diff --git a/app/Users/Queries/UserRecentlyCreatedContent.php b/app/Users/Queries/UserRecentlyCreatedContent.php index 23850e07201..55d0ce57ccb 100644 --- a/app/Users/Queries/UserRecentlyCreatedContent.php +++ b/app/Users/Queries/UserRecentlyCreatedContent.php @@ -30,7 +30,7 @@ public function run(User $user, int $count): array }; return [ - 'pages' => $query($this->queries->pages->visibleForList()->where('draft', '=', false)), + 'pages' => $query($this->queries->pages->visibleForList()->where('entity_page_data.draft', '=', false)), 'chapters' => $query($this->queries->chapters->visibleForList()), 'books' => $query($this->queries->books->visibleForList()), 'shelves' => $query($this->queries->shelves->visibleForList()), diff --git a/resources/views/pages/parts/editor-toolbox.blade.php b/resources/views/pages/parts/editor-toolbox.blade.php index 4dc7af794ba..27f6d74e806 100644 --- a/resources/views/pages/parts/editor-toolbox.blade.php +++ b/resources/views/pages/parts/editor-toolbox.blade.php @@ -45,7 +45,7 @@ @include('form.image-picker', [ 'defaultImage' => url('/book_default_cover.png'), - 'currentImage' => (isset($page) && $page->cover) ? $page->getPageCover() : url('/book_default_cover.png') , + 'currentImage' => (isset($page) && $page->cover) ? $page->coverInfo()->getUrl() : url('/book_default_cover.png') , 'name' => 'image', 'imageClass' => 'cover' ]) diff --git a/resources/views/pages/parts/list-item.blade.php b/resources/views/pages/parts/list-item.blade.php index ecaff643c9b..6a7a5fb8df1 100644 --- a/resources/views/pages/parts/list-item.blade.php +++ b/resources/views/pages/parts/list-item.blade.php @@ -1,4 +1,4 @@ - + @icon('page')
@icon('page') diff --git a/tests/Entity/CopyTest.php b/tests/Entity/CopyTest.php index d4b6d54cf88..1034a5ddd88 100644 --- a/tests/Entity/CopyTest.php +++ b/tests/Entity/CopyTest.php @@ -143,7 +143,7 @@ public function test_chapter_copy() $otherBook = Book::query()->where('id', '!=', $chapter->book_id)->first(); $resp = $this->asEditor()->post($chapter->getUrl('/copy'), [ - 'name' => 'My copied chapter', + 'name' => 'My copied chapter', 'entity_selection' => 'book:' . $otherBook->id, ]); @@ -253,9 +253,16 @@ public function test_chapter_copy_updates_internal_references() $html = '

This is a test page link

'; $this->put($chapter->getUrl(), ['name' => 'Internal ref test', 'description_html' => $html]); - $this->post($chapter->getUrl('/copy'), ['name' => 'My copied chapter']); + $response = $this->post($chapter->getUrl('/copy'), ['name' => 'My copied chapter']); + $response->assertStatus(302); // Expect a redirect + $redirectUrl = $response->headers->get('Location'); - $newChapter = Chapter::query()->where('name', '=', 'My copied chapter')->first(); + // Extract the chapter slug from the redirect URL + // URL format: /books/{bookSlug}/chapter/{chapterSlug} + $urlParts = explode('/', $redirectUrl); + $newChapterSlug = end($urlParts); + + $newChapter = Chapter::query()->where('slug', '=', $newChapterSlug)->first(); $newPage = $newChapter->pages()->where('name', '=', 'reference test page')->first(); $this->assertStringContainsString($newChapter->getUrl() . '"', $newPage->html); @@ -320,7 +327,7 @@ public function test_page_copy() $movePageResp = $this->post($page->getUrl('/copy'), [ 'entity_selection' => 'book:' . $newBook->id, - 'name' => 'My copied test page', + 'name' => 'My copied test page', ]); $pageCopy = Page::where('name', '=', 'My copied test page')->first(); @@ -339,7 +346,7 @@ public function test_page_copy_with_markdown_has_both_html_and_markdown() $this->asEditor()->post($page->getUrl('/copy'), [ 'entity_selection' => 'book:' . $newBook->id, - 'name' => 'My copied test page', + 'name' => 'My copied test page', ]); $pageCopy = Page::where('name', '=', 'My copied test page')->first(); @@ -386,14 +393,14 @@ public function test_page_can_be_copied_without_edit_permission() $movePageResp = $this->post($page->getUrl('/copy'), [ 'entity_selection' => 'book:' . $newBook->id, - 'name' => 'My copied test page', + 'name' => 'My copied test page', ]); $movePageResp->assertRedirect(); $this->assertDatabaseHasEntityData('page', [ - 'name' => 'My copied test page', + 'name' => 'My copied test page', 'created_by' => $viewer->id, - 'book_id' => $newBook->id, + 'book_id' => $newBook->id, ]); } } From c7f4dcec7e2fa022992183a1bbe25a94cfde1e0f Mon Sep 17 00:00:00 2001 From: brij-mandaliya Date: Tue, 21 Apr 2026 16:39:51 +0530 Subject: [PATCH 09/10] fix lint --- app/References/ReferenceChangeContext.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/References/ReferenceChangeContext.php b/app/References/ReferenceChangeContext.php index d10321c9f1e..21853eb94b1 100644 --- a/app/References/ReferenceChangeContext.php +++ b/app/References/ReferenceChangeContext.php @@ -11,7 +11,7 @@ class ReferenceChangeContext * @var array */ protected array $changes = []; - + protected array $urlMap = []; protected array $permalinkMap = []; @@ -19,7 +19,7 @@ public function add(Entity $oldEntity, Entity $newEntity): void { $this->changes[] = [$oldEntity, $newEntity]; $this->urlMap[$oldEntity->getUrl()] = $newEntity->getUrl(); - + if (method_exists($oldEntity, 'getPermalink') && method_exists($newEntity, 'getPermalink')) { $this->permalinkMap[$oldEntity->getPermalink()] = $newEntity->getPermalink(); } @@ -50,12 +50,12 @@ public function getNewForOld(Entity $oldEntity): ?Entity } return null; } - + public function getUrlMap(): array { return $this->urlMap; } - + public function getPermalinkMap(): array { return $this->permalinkMap; From 846e6efc9fc23ba9e8ab9ad03e71f63f23b82f23 Mon Sep 17 00:00:00 2001 From: brij-mandaliya Date: Thu, 23 Apr 2026 10:23:29 +0530 Subject: [PATCH 10/10] fix analysis --- app/Entities/Models/Entity.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Entities/Models/Entity.php b/app/Entities/Models/Entity.php index 47e13462691..e3c2839c8c0 100644 --- a/app/Entities/Models/Entity.php +++ b/app/Entities/Models/Entity.php @@ -47,6 +47,8 @@ * @property int|null $updated_by * @property int|null $owned_by * @property Collection $tags + * @property string $description + * @property string $description_html * * @method static Entity|Builder visible() * @method static Builder withLastView()