use BookStack\Facades\Activity;
use BookStack\References\ReferenceStore;
use Exception;
-use Illuminate\Database\Eloquent\Builder;
use Illuminate\Pagination\LengthAwarePaginator;
class PageRepo
{
protected BaseRepo $baseRepo;
+ protected RevisionRepo $revisionRepo;
protected ReferenceStore $references;
/**
* PageRepo constructor.
*/
- public function __construct(BaseRepo $baseRepo, ReferenceStore $references)
+ public function __construct(BaseRepo $baseRepo, RevisionRepo $revisionRepo, ReferenceStore $references)
{
$this->baseRepo = $baseRepo;
+ $this->revisionRepo = $revisionRepo;
$this->references = $references;
}
*/
public function getById(int $id, array $relations = ['book']): Page
{
+ /** @var Page $page */
$page = Page::visible()->with($relations)->find($id);
if (!$page) {
*/
public function getByOldSlug(string $bookSlug, string $pageSlug): ?Page
{
- /** @var ?PageRevision $revision */
- $revision = PageRevision::query()
- ->whereHas('page', function (Builder $query) {
- $query->scopes('visible');
- })
- ->where('slug', '=', $pageSlug)
- ->where('type', '=', 'version')
- ->where('book_slug', '=', $bookSlug)
- ->orderBy('created_at', 'desc')
- ->with('page')
- ->first();
+ $revision = $this->revisionRepo->getBySlugs($bookSlug, $pageSlug);
return $revision->page ?? null;
}
*/
public function getUserDraft(Page $page): ?PageRevision
{
- $revision = $this->getUserDraftQuery($page)->first();
-
- return $revision;
+ return $this->revisionRepo->getLatestDraftForCurrentUser($page);
}
/**
$draft->refreshSlug();
$draft->save();
- $this->savePageRevision($draft, trans('entities.pages_initial_revision'));
+ $this->revisionRepo->storeNewForPage($draft, trans('entities.pages_initial_revision'));
$draft->indexForSearch();
$this->references->updateForPage($draft);
$draft->refresh();
$page->save();
// Remove all update drafts for this user & page.
- $this->getUserDraftQuery($page)->delete();
+ $this->revisionRepo->deleteDraftsForCurrentUser($page);
// Save a revision after updating
$summary = trim($input['summary'] ?? '');
$nameChanged = isset($input['name']) && $input['name'] !== $oldName;
$markdownChanged = isset($input['markdown']) && $input['markdown'] !== $oldMarkdown;
if ($htmlChanged || $nameChanged || $markdownChanged || $summary) {
- $this->savePageRevision($page, $summary);
+ $this->revisionRepo->storeNewForPage($page, $summary);
}
Activity::add(ActivityType::PAGE_UPDATE, $page);
}
}
- /**
- * Saves a page revision into the system.
- */
- protected function savePageRevision(Page $page, string $summary = null): PageRevision
- {
- $revision = new PageRevision();
-
- $revision->name = $page->name;
- $revision->html = $page->html;
- $revision->markdown = $page->markdown;
- $revision->text = $page->text;
- $revision->page_id = $page->id;
- $revision->slug = $page->slug;
- $revision->book_slug = $page->book->slug;
- $revision->created_by = user()->id;
- $revision->created_at = $page->updated_at;
- $revision->type = 'version';
- $revision->summary = $summary;
- $revision->revision_number = $page->revision_count;
- $revision->save();
-
- $this->deleteOldRevisions($page);
-
- return $revision;
- }
-
/**
* Save a page update draft.
*/
}
// Otherwise, save the data to a revision
- $draft = $this->getPageRevisionToUpdate($page);
+ $draft = $this->revisionRepo->getNewDraftForCurrentUser($page);
$draft->fill($input);
if (!empty($input['markdown'])) {
$this->references->updateForPage($page);
$summary = trans('entities.pages_revision_restored_from', ['id' => strval($revisionId), 'summary' => $revision->summary]);
- $this->savePageRevision($page, $summary);
+ $this->revisionRepo->storeNewForPage($page, $summary);
Activity::add(ActivityType::PAGE_RESTORE, $page);
Activity::add(ActivityType::REVISION_RESTORE, $revision);
return $parentClass::visible()->where('id', '=', $entityId)->first();
}
- /**
- * Get a page revision to update for the given page.
- * Checks for an existing revisions before providing a fresh one.
- */
- protected function getPageRevisionToUpdate(Page $page): PageRevision
- {
- $drafts = $this->getUserDraftQuery($page)->get();
- if ($drafts->count() > 0) {
- return $drafts->first();
- }
-
- $draft = new PageRevision();
- $draft->page_id = $page->id;
- $draft->slug = $page->slug;
- $draft->book_slug = $page->book->slug;
- $draft->created_by = user()->id;
- $draft->type = 'update_draft';
-
- return $draft;
- }
-
- /**
- * Delete old revisions, for the given page, from the system.
- */
- protected function deleteOldRevisions(Page $page)
- {
- $revisionLimit = config('app.revision_limit');
- if ($revisionLimit === false) {
- return;
- }
-
- $revisionsToDelete = PageRevision::query()
- ->where('page_id', '=', $page->id)
- ->orderBy('created_at', 'desc')
- ->skip(intval($revisionLimit))
- ->take(10)
- ->get(['id']);
-
- if ($revisionsToDelete->count() > 0) {
- PageRevision::query()->whereIn('id', $revisionsToDelete->pluck('id'))->delete();
- }
- }
-
/**
* Get a new priority for a page.
*/
return (new BookContents($page->book))->getLastPriority() + 1;
}
-
- /**
- * Get the query to find the user's draft copies of the given page.
- */
- protected function getUserDraftQuery(Page $page)
- {
- return PageRevision::query()->where('created_by', '=', user()->id)
- ->where('type', 'update_draft')
- ->where('page_id', '=', $page->id)
- ->orderBy('created_at', 'desc');
- }
}
--- /dev/null
+<?php
+
+namespace BookStack\Entities\Repos;
+
+use BookStack\Entities\Models\Page;
+use BookStack\Entities\Models\PageRevision;
+use Illuminate\Database\Eloquent\Builder;
+
+class RevisionRepo
+{
+ /**
+ * Get a revision by its stored book and page slug values.
+ */
+ public function getBySlugs(string $bookSlug, string $pageSlug): ?PageRevision
+ {
+ /** @var ?PageRevision $revision */
+ $revision = PageRevision::query()
+ ->whereHas('page', function (Builder $query) {
+ $query->scopes('visible');
+ })
+ ->where('slug', '=', $pageSlug)
+ ->where('type', '=', 'version')
+ ->where('book_slug', '=', $bookSlug)
+ ->orderBy('created_at', 'desc')
+ ->with('page')
+ ->first();
+
+ return $revision;
+ }
+
+ /**
+ * Get the latest draft revision, for the given page, belonging to the current user.
+ */
+ public function getLatestDraftForCurrentUser(Page $page): ?PageRevision
+ {
+ /** @var ?PageRevision $revision */
+ $revision = $this->queryForCurrentUserDraft($page->id)->first();
+
+ return $revision;
+ }
+
+ /**
+ * Delete all drafts revisions, for the given page, belonging to the current user.
+ */
+ public function deleteDraftsForCurrentUser(Page $page): void
+ {
+ $this->queryForCurrentUserDraft($page->id)->delete();
+ }
+
+ /**
+ * Get a user update_draft page revision to update for the given page.
+ * Checks for an existing revisions before providing a fresh one.
+ */
+ public function getNewDraftForCurrentUser(Page $page): PageRevision
+ {
+ $draft = $this->getLatestDraftForCurrentUser($page);
+
+ if ($draft) {
+ return $draft;
+ }
+
+ $draft = new PageRevision();
+ $draft->page_id = $page->id;
+ $draft->slug = $page->slug;
+ $draft->book_slug = $page->book->slug;
+ $draft->created_by = user()->id;
+ $draft->type = 'update_draft';
+
+ return $draft;
+ }
+
+ /**
+ * Store a new revision in the system for the given page.
+ */
+ public function storeNewForPage(Page $page, string $summary = null): PageRevision
+ {
+ $revision = new PageRevision();
+
+ $revision->name = $page->name;
+ $revision->html = $page->html;
+ $revision->markdown = $page->markdown;
+ $revision->text = $page->text;
+ $revision->page_id = $page->id;
+ $revision->slug = $page->slug;
+ $revision->book_slug = $page->book->slug;
+ $revision->created_by = user()->id;
+ $revision->created_at = $page->updated_at;
+ $revision->type = 'version';
+ $revision->summary = $summary;
+ $revision->revision_number = $page->revision_count;
+ $revision->save();
+
+ $this->deleteOldRevisions($page);
+
+ return $revision;
+ }
+
+ /**
+ * Delete old revisions, for the given page, from the system.
+ */
+ protected function deleteOldRevisions(Page $page)
+ {
+ $revisionLimit = config('app.revision_limit');
+ if ($revisionLimit === false) {
+ return;
+ }
+
+ $revisionsToDelete = PageRevision::query()
+ ->where('page_id', '=', $page->id)
+ ->orderBy('created_at', 'desc')
+ ->skip(intval($revisionLimit))
+ ->take(10)
+ ->get(['id']);
+
+ if ($revisionsToDelete->count() > 0) {
+ PageRevision::query()->whereIn('id', $revisionsToDelete->pluck('id'))->delete();
+ }
+ }
+
+ /**
+ * Query update draft revisions for the current user.
+ */
+ protected function queryForCurrentUserDraft(int $pageId): Builder
+ {
+ return PageRevision::query()
+ ->where('created_by', '=', user()->id)
+ ->where('type', 'update_draft')
+ ->where('page_id', '=', $pageId)
+ ->orderBy('created_at', 'desc');
+ }
+}
\ No newline at end of file
--- /dev/null
+<?php
+
+namespace BookStack\References;
+
+use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Models\Page;
+use BookStack\Entities\Repos\RevisionRepo;
+
+class CrossLinkReplacer
+{
+ protected ReferenceFetcher $referenceFetcher;
+ protected RevisionRepo $revisionRepo;
+
+ public function __construct(ReferenceFetcher $referenceFetcher, RevisionRepo $revisionRepo)
+ {
+ $this->referenceFetcher = $referenceFetcher;
+ $this->revisionRepo = $revisionRepo;
+ }
+
+ public function updateEntityPageReferences(Entity $entity, string $oldLink)
+ {
+ $references = $this->referenceFetcher->getPageReferencesToEntity($entity);
+ $newLink = $entity->getUrl();
+
+ /** @var Reference $reference */
+ foreach ($references as $reference) {
+ /** @var Page $page */
+ $page = $reference->from;
+ $this->updateReferencesWithinPage($page, $oldLink, $newLink);
+ }
+ }
+
+ protected function updateReferencesWithinPage(Page $page, string $oldLink, string $newLink)
+ {
+ $page = (clone $page)->refresh();
+ $html = '';// TODO - Update HTML content
+ $markdown = '';// TODO - Update markdown content
+
+ $page->html = $html;
+ $page->markdown = $markdown;
+ $page->revision_count++;
+ $page->save();
+
+ $summary = ''; // TODO - Get default summary from translations
+ $this->revisionRepo->storeNewForPage($page, $summary);
+ }
+}
\ No newline at end of file
projects / bookstack / commitdiff