fix(website-builder): leave a deleted revision and order revisions by version (#6006)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Author: adrians5j

packages/app-website-builder/src/presentation/pages/PageEditor/Revisions/RevisionListItem.tsx

@@ -71,13 +71,15 @@ const getIcon = (revision: PageRevision) => {
 
 interface RevisionListItemProps {
     item: RevisionListPresenter.ItemViewModel;
+    onDeleted?: (revision: PageRevision) => void;
 }
 
-const RevisionListItem = ({ item }: RevisionListItemProps) => {
+const RevisionListItem = ({ item, onDeleted }: RevisionListItemProps) => {
     const { revision } = item;
     const { createRevision, editRevision, deleteRevision, unpublishRevision, publishRevision } =
         useRevision({
-            revision
+            revision,
+            onDeleted
         });
 
     const { icon, text: tooltipText } = getIcon(revision);

packages/app-website-builder/src/presentation/pages/PageEditor/Revisions/RevisionsList.tsx

@@ -1,8 +1,12 @@
-import React from "react";
+import React, { useCallback } from "react";
 import { List, OverlayLoader } from "@webiny/admin-ui";
+import { useRouter } from "@webiny/app";
 import RevisionListItem from "./RevisionListItem.js";
 import type { Page } from "~/domain/Page/index.js";
+import type { PageRevision } from "~/domain/PageRevision/index.js";
+import { Routes } from "~/routes.js";
 import { useRevisionList } from "./useRevisionList.js";
+import { usePageEditorDrawer } from "./usePageEditorDrawer.js";
 
 interface IRevisionsListProps {
     page: Pick<Page, "id">;
@@ -11,14 +15,45 @@ interface IRevisionsListProps {
 export const RevisionsList = (props: IRevisionsListProps) => {
     const { page } = props;
     const { vm } = useRevisionList(page.id);
+    const { goToRoute } = useRouter();
+    const { openRevisionList } = usePageEditorDrawer();
+
+    /**
+     * Deleting the revision that is open in the editor would leave the editor on a revision that
+     * no longer exists, so we move to the newest remaining one, or back to the list if none is left.
+     */
+    const onDeleted = useCallback(
+        (revision: PageRevision) => {
+            if (revision.id !== page.id) {
+                return;
+            }
+
+            openRevisionList(false);
+
+            const next = vm.revisions.find(item => item.revision.id !== revision.id);
+            if (!next) {
+                goToRoute(Routes.Pages.List);
+                return;
+            }
+
+            goToRoute(Routes.Pages.Editor, {
+                id: next.revision.id
+            });
+        },
+        [page.id, vm.revisions, openRevisionList]
+    );
 
     return (
         <div className={"relative"}>
             {(vm.isLoading || vm.isMutating) && <OverlayLoader />}
             {vm.revisions.length ? (
                 <List data-testid={"cms.content-form.revisions"}>
                     {vm.revisions.map(item => (
-                        <RevisionListItem item={item} key={item.revision.id} />
+                        <RevisionListItem
+                            item={item}
+                            key={item.revision.id}
+                            onDeleted={onDeleted}
+                        />
                     ))}
                 </List>
             ) : (

packages/app-website-builder/src/presentation/pages/PageEditor/Revisions/useRevision.tsx

@@ -18,10 +18,15 @@ import { usePageEditorDrawer } from "./usePageEditorDrawer.js";
 
 export interface UseRevisionProps {
     revision: PageRevision;
+    /**
+     * Called once the revision is deleted, so the list can move the editor away from a revision
+     * that no longer exists.
+     */
+    onDeleted?: (revision: PageRevision) => void;
 }
 
 export const useRevision = (props: UseRevisionProps) => {
-    const { revision } = props;
+    const { revision, onDeleted } = props;
 
     const { goToRoute } = useRouter();
     const { openRevisionList } = usePageEditorDrawer();
@@ -59,6 +64,8 @@ export const useRevision = (props: UseRevisionProps) => {
                     showSuccessToast({
                         title: `Revision #${revision.version} was deleted successfully!`
                     });
+
+                    onDeleted?.(revision);
                 } catch (ex) {
                     showWarningToast({
                         title: "Could not delete the revision.",
@@ -67,7 +74,7 @@ export const useRevision = (props: UseRevisionProps) => {
                 }
             }
         });
-    }, [revision.id, revision.version]);
+    }, [revision.id, revision.version, onDeleted]);
 
     const publishRevision = useCallback(() => {
         showDialog({

packages/app-website-builder/src/presentation/pages/RevisionList/RevisionListPresenter.test.ts

@@ -121,6 +121,25 @@ describe("RevisionListPresenter", () => {
         expect(presenter.vm.isEmpty).toBeFalse();
     });
 
+    it("should order the revisions by version, even when an older one was saved later", () => {
+        const presenter = createPresenter();
+
+        // Publishing or editing an older revision moves its savedOn past the newer ones.
+        revisionsCache.addItems([
+            createRevision("page-1#0002", "page-1", 2, "2026-09-21T00:00:00.000Z"),
+            createRevision("page-1#0001", "page-1", 1, "2026-09-23T00:00:00.000Z"),
+            createRevision("page-1#0003", "page-1", 3, "2026-09-22T00:00:00.000Z")
+        ]);
+
+        presenter.init({ entryId: "page-1" });
+
+        expect(presenter.vm.revisions.map(item => item.revision.id)).toEqual([
+            "page-1#0003",
+            "page-1#0002",
+            "page-1#0001"
+        ]);
+    });
+
     it("should not report an empty list while loading", () => {
         loadingRepository.isLoading.mockReturnValue(true);
         const presenter = createPresenter();

packages/app-website-builder/src/presentation/pages/RevisionList/RevisionListPresenter.ts

@@ -61,7 +61,9 @@ class RevisionListPresenterImpl implements PresenterAbstraction.Interface {
             .getItems()
             .filter(revision => revision.entryId === this.entryId);
 
-        return orderBy(revisions, ["savedOn"], ["desc"]).map(revision => this.getItemVm(revision));
+        // Ordered by version rather than savedOn: publishing or editing an older revision moves its
+        // savedOn past the newer ones, which would shuffle the list.
+        return orderBy(revisions, ["version"], ["desc"]).map(revision => this.getItemVm(revision));
     };
 
     private getItemVm = (revision: PageRevision): PresenterAbstraction.ItemViewModel => {