@byline/host-tanstack-start 4.16.0 → 4.18.0

package/dist/admin-shell/collections/history.js

@@ -1,27 +1,22 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import { Fragment as external_react_Fragment, Suspense, lazy, useState } from "react";
-import { useParams, useRouterState } from "@tanstack/react-router";
+import { useParams, useRouter, useRouterState } from "@tanstack/react-router";
 import { AdminTabs, StatusBadge, renderFormatted } from "@byline/admin/react";
 import { useBylineAdminServices } from "@byline/admin/services";
 import { useTranslation } from "@byline/i18n/react";
-import { Button, CloseIcon, Container, IconButton, Modal, Section, Select, Table } from "@byline/ui/react";
+import { Button, Container, Section, Table } from "@byline/ui/react";
 import clsx from "clsx";
 import { getAdminRouteId, getAdminRoutePath } from "../../routes/admin-path.js";
+import { restoreDocumentVersion } from "../../server-fns/collections/index.js";
 import { Link, useNavigate } from "../chrome/loose-router.js";
-import { RouterPager } from "../chrome/router-pager.js";
 import { TableHeadingCellSortable } from "../chrome/th-sortable.js";
-import { formatNumber } from "../chrome/utils.js";
 import { DocumentHistoryView } from "./document-history.js";
 import history_module from "./history.module.js";
-import { RestoreVersionModal } from "./restore-version-modal.js";
+import { HistoryStats, VersionHistoryCore } from "./version-history.js";
 import { ViewMenu } from "./view-menu.js";
 function getColumnValue(document, fieldName) {
-    if (document.fields && fieldName in document.fields) return document.fields[fieldName];
+    if (document.fields && 'object' == typeof document.fields && fieldName in document.fields) return document.fields[fieldName];
     return document[fieldName];
 }
-const DiffModal = /*#__PURE__*/ lazy(()=>import("@byline/admin/react").then((m)=>({
-            default: m.DiffModal
-        })));
 function resolveDisplayValue(value, locale, defaultContentLocale) {
     if (null == value) return '';
     if ('object' == typeof value && !Array.isArray(value)) {
@@ -31,45 +26,23 @@ function resolveDisplayValue(value, locale, defaultContentLocale) {
     }
     return String(value);
 }
-function Stats({ total }) {
-    return /*#__PURE__*/ jsx("span", {
-        className: clsx('byline-coll-history-stats', history_module.stats),
-        children: formatNumber(total, 0)
-    });
-}
-function padRows(value) {
-    return Array.from({
-        length: value
-    }).map((_, index)=>/*#__PURE__*/ jsx("div", {
-            className: clsx('byline-coll-history-pad-row', history_module.padRow),
-            children: "\xa0"
-        }, `empty-row-${index}`));
-}
-const AUDIT_ACTION_KEYS = {
-    create: 'collections.history.audit.actionCreate',
-    update: 'collections.history.audit.actionUpdate',
-    restore: 'collections.history.audit.actionRestore',
-    copy_to_locale: 'collections.history.audit.actionCopyToLocale',
-    delete_locale: 'collections.history.audit.actionDeleteLocale'
-};
 const HistoryView = ({ collectionDefinition, adminConfig, data, auditLog, workflowStatuses, currentDocument, contentLocales, defaultContentLocale })=>{
     const { id, collection } = useParams({
         from: getAdminRouteId('collections', '$collection', '$id', 'history')
     });
     const navigate = useNavigate();
+    const router = useRouter();
     const { getCollectionDocumentVersion } = useBylineAdminServices();
     const { t } = useTranslation('byline-admin');
     const columns = adminConfig?.columns || [];
     const { labels } = collectionDefinition;
     const titleFieldName = collectionDefinition.useAsTitle;
+    const hasRestoreColumn = null != titleFieldName && columns.some((column)=>column.fieldName === titleFieldName);
     const location = useRouterState({
-        select: (s)=>s.location
+        select: (state)=>state.location
     });
     const locale = location.search.locale;
     const activeTab = 'document' === location.search.tab ? 'document' : 'versions';
-    const [selectedVersion, setSelectedVersion] = useState(null);
-    const [restoreTarget, setRestoreTarget] = useState(null);
-    const currentVersionId = currentDocument && 'string' == typeof currentDocument.versionId ? currentDocument.versionId : null;
     function handleTabChange(name) {
         const params = structuredClone(location.search);
         delete params.page;
@@ -84,11 +57,10 @@ const HistoryView = ({ collectionDefinition, adminConfig, data, auditLog, workfl
             search: params
         });
     }
-    function handleOnPageSizeChange(value) {
-        if ('string' != typeof value || 0 === value.length) return;
+    function handlePageSizeChange(pageSize) {
         const params = structuredClone(location.search);
         delete params.page;
-        params.page_size = Number.parseInt(value, 10);
+        params.page_size = pageSize;
         navigate({
             to: getAdminRoutePath('collections', '$collection', '$id', 'history'),
             params: {
@@ -98,6 +70,75 @@ const HistoryView = ({ collectionDefinition, adminConfig, data, auditLog, workfl
             search: params
         });
     }
+    const rowPresentation = {
+        headers: columns.flatMap((column)=>{
+            const cell = /*#__PURE__*/ jsx(TableHeadingCellSortable, {
+                fieldName: String(column.fieldName),
+                label: column.label,
+                sortable: column.sortable,
+                scope: "col",
+                align: column.align,
+                className: column.className
+            }, String(column.fieldName));
+            return null != titleFieldName && column.fieldName === titleFieldName ? [
+                cell,
+                /*#__PURE__*/ jsx("th", {
+                    scope: "col",
+                    className: clsx('byline-coll-history-col-restore', history_module.colRestore)
+                }, "__restore")
+            ] : [
+                cell
+            ];
+        }),
+        auditColSpan: columns.length + (hasRestoreColumn ? 1 : 0),
+        renderCells: ({ document, versionId, versionNumber, currentVersionId, restoreStatusLabel, openCompare, openRestore })=>columns.flatMap((column)=>{
+                const value = getColumnValue(document, String(column.fieldName));
+                const dataCell = /*#__PURE__*/ jsx(Table.Cell, {
+                    className: clsx({
+                        'byline-coll-history-cell-right': 'right' === column.align,
+                        [history_module.cellRight]: 'right' === column.align,
+                        'byline-coll-history-cell-center': 'center' === column.align,
+                        [history_module.cellCenter]: 'center' === column.align
+                    }),
+                    children: null != titleFieldName && column.fieldName === titleFieldName ? versionId && currentDocument ? /*#__PURE__*/ jsx("button", {
+                        type: "button",
+                        className: clsx('byline-coll-history-title-button', history_module.titleButton),
+                        onClick: openCompare,
+                        children: column.formatter ? renderFormatted(value, document, column.formatter) : resolveDisplayValue(value, locale, defaultContentLocale) || '------'
+                    }) : /*#__PURE__*/ jsx(Link, {
+                        to: getAdminRoutePath('collections', '$collection', '$id'),
+                        params: {
+                            collection,
+                            id: document.id
+                        },
+                        children: column.formatter ? renderFormatted(value, document, column.formatter) : resolveDisplayValue(value, locale, defaultContentLocale) || '------'
+                    }) : column.formatter ? renderFormatted(value, document, column.formatter) : 'status' === column.fieldName && workflowStatuses ? /*#__PURE__*/ jsx(StatusBadge, {
+                        status: document.status,
+                        workflowStatuses: workflowStatuses
+                    }) : resolveDisplayValue(value, locale, defaultContentLocale) || ''
+                }, String(column.fieldName));
+                return null != titleFieldName && column.fieldName === titleFieldName ? [
+                    dataCell,
+                    /*#__PURE__*/ jsx(Table.Cell, {
+                        className: clsx('byline-coll-history-restore-cell', history_module.restoreCell),
+                        children: versionId && versionId !== currentVersionId ? /*#__PURE__*/ jsx(Button, {
+                            type: "button",
+                            variant: "outlined",
+                            size: "xs",
+                            intent: "noeffect",
+                            onClick: openRestore,
+                            className: clsx('byline-coll-history-restore-button', history_module.restoreButton),
+                            title: t('collections.history.restoreButtonTitle', {
+                                status: restoreStatusLabel
+                            }),
+                            children: t('collections.history.restoreButton')
+                        }) : null
+                    }, "__restore")
+                ] : [
+                    dataCell
+                ];
+            })
+    };
     return /*#__PURE__*/ jsxs(Fragment, {
         children: [
             /*#__PURE__*/ jsx(Section, {
@@ -113,8 +154,8 @@ const HistoryView = ({ collectionDefinition, adminConfig, data, auditLog, workfl
                                             label: labels.singular
                                         }),
                                         ' ',
-                                        /*#__PURE__*/ jsx(Stats, {
-                                            total: 'document' === activeTab ? auditLog?.meta.total ?? 0 : data?.meta.total
+                                        /*#__PURE__*/ jsx(HistoryStats, {
+                                            total: 'document' === activeTab ? auditLog?.meta.total ?? 0 : data.meta.total
                                         })
                                     ]
                                 }),
@@ -146,7 +187,7 @@ const HistoryView = ({ collectionDefinition, adminConfig, data, auditLog, workfl
                     ]
                 })
             }),
-            'document' === activeTab && /*#__PURE__*/ jsx(DocumentHistoryView, {
+            'document' === activeTab ? /*#__PURE__*/ jsx(DocumentHistoryView, {
                 data: auditLog ?? {
                     entries: [],
                     meta: {
@@ -156,268 +197,36 @@ const HistoryView = ({ collectionDefinition, adminConfig, data, auditLog, workfl
                         totalPages: 0
                     }
                 }
-            }),
-            'document' !== activeTab && /*#__PURE__*/ jsx(Section, {
-                children: /*#__PURE__*/ jsxs(Container, {
-                    children: [
-                        /*#__PURE__*/ jsx("div", {
-                            className: clsx('byline-coll-history-options', history_module.options),
-                            children: /*#__PURE__*/ jsx(RouterPager, {
-                                page: data?.meta.page,
-                                count: data?.meta.totalPages,
-                                showFirstButton: true,
-                                showLastButton: true,
-                                componentName: "pagerTop",
-                                "aria-label": t('collections.list.pagerTopAriaLabel')
-                            })
-                        }),
-                        /*#__PURE__*/ jsxs(Table.Container, {
-                            className: clsx('byline-coll-history-table-wrap', history_module.tableWrap),
-                            children: [
-                                /*#__PURE__*/ jsxs(Table, {
-                                    children: [
-                                        /*#__PURE__*/ jsx(Table.Header, {
-                                            children: /*#__PURE__*/ jsxs(Table.Row, {
-                                                children: [
-                                                    /*#__PURE__*/ jsx("th", {
-                                                        scope: "col",
-                                                        className: clsx('byline-coll-history-col-version', history_module.colVersion)
-                                                    }),
-                                                    columns.flatMap((column)=>{
-                                                        const cell = /*#__PURE__*/ jsx(TableHeadingCellSortable, {
-                                                            fieldName: String(column.fieldName),
-                                                            label: column.label,
-                                                            sortable: column.sortable,
-                                                            scope: "col",
-                                                            align: column.align,
-                                                            className: column.className
-                                                        }, String(column.fieldName));
-                                                        if (null != titleFieldName && column.fieldName === titleFieldName) return [
-                                                            cell,
-                                                            /*#__PURE__*/ jsx("th", {
-                                                                scope: "col",
-                                                                className: clsx('byline-coll-history-col-restore', history_module.colRestore)
-                                                            }, "__restore")
-                                                        ];
-                                                        return [
-                                                            cell
-                                                        ];
-                                                    })
-                                                ]
-                                            })
-                                        }),
-                                        /*#__PURE__*/ jsx(Table.Body, {
-                                            children: data?.docs?.map((document, rowIndex)=>{
-                                                const versionId = document.versionId;
-                                                const { total, page, pageSize, desc } = data.meta;
-                                                const versionNumber = desc ? total - (page - 1) * pageSize - rowIndex : (page - 1) * pageSize + rowIndex + 1;
-                                                const actorLabel = document.createdBy ? data.actors?.[document.createdBy]?.label ?? t('collections.history.audit.formerUser') : t('collections.history.audit.unknown');
-                                                const actionKey = document.eventType ? AUDIT_ACTION_KEYS[document.eventType] : void 0;
-                                                const actionLabel = actionKey ? t(actionKey) : document.eventType ?? '';
-                                                const auditColSpan = columns.length + (null != titleFieldName && columns.some((c)=>c.fieldName === titleFieldName) ? 1 : 0);
-                                                return /*#__PURE__*/ jsxs(external_react_Fragment, {
-                                                    children: [
-                                                        /*#__PURE__*/ jsxs(Table.Row, {
-                                                            className: clsx('byline-coll-history-row', history_module.historyRow),
-                                                            children: [
-                                                                /*#__PURE__*/ jsx(Table.Cell, {
-                                                                    className: clsx('byline-coll-history-version-cell', history_module.versionCell),
-                                                                    children: versionId && currentDocument ? /*#__PURE__*/ jsx(IconButton, {
-                                                                        size: "xs",
-                                                                        variant: "outlined",
-                                                                        intent: "noeffect",
-                                                                        "aria-label": t('collections.history.compareAriaLabel'),
-                                                                        title: t('collections.history.compareTitle'),
-                                                                        className: clsx('byline-coll-history-version-button', history_module.versionButton),
-                                                                        onClick: ()=>setSelectedVersion({
-                                                                                versionId,
-                                                                                label: new Date(document.createdAt).toLocaleString()
-                                                                            }),
-                                                                        children: versionNumber
-                                                                    }) : null
-                                                                }),
-                                                                columns.flatMap((column)=>{
-                                                                    const dataCell = /*#__PURE__*/ jsx(Table.Cell, {
-                                                                        className: clsx({
-                                                                            'byline-coll-history-cell-right': 'right' === column.align,
-                                                                            [history_module.cellRight]: 'right' === column.align,
-                                                                            'byline-coll-history-cell-center': 'center' === column.align,
-                                                                            [history_module.cellCenter]: 'center' === column.align
-                                                                        }),
-                                                                        children: null != titleFieldName && column.fieldName === titleFieldName ? versionId && currentDocument ? /*#__PURE__*/ jsx("button", {
-                                                                            type: "button",
-                                                                            className: clsx('byline-coll-history-title-button', history_module.titleButton),
-                                                                            onClick: ()=>setSelectedVersion({
-                                                                                    versionId,
-                                                                                    label: new Date(document.createdAt).toLocaleString()
-                                                                                }),
-                                                                            children: column.formatter ? renderFormatted(getColumnValue(document, column.fieldName), document, column.formatter) : resolveDisplayValue(getColumnValue(document, column.fieldName), locale, defaultContentLocale) || '------'
-                                                                        }) : /*#__PURE__*/ jsx(Link, {
-                                                                            to: getAdminRoutePath('collections', '$collection', '$id'),
-                                                                            params: {
-                                                                                collection,
-                                                                                id: document.id
-                                                                            },
-                                                                            children: column.formatter ? renderFormatted(getColumnValue(document, column.fieldName), document, column.formatter) : resolveDisplayValue(getColumnValue(document, column.fieldName), locale, defaultContentLocale) || '------'
-                                                                        }) : column.formatter ? renderFormatted(getColumnValue(document, column.fieldName), document, column.formatter) : 'status' === column.fieldName && workflowStatuses ? /*#__PURE__*/ jsx(StatusBadge, {
-                                                                            status: document.status,
-                                                                            workflowStatuses: workflowStatuses
-                                                                        }) : resolveDisplayValue(getColumnValue(document, column.fieldName), locale, defaultContentLocale) || ''
-                                                                    }, String(column.fieldName));
-                                                                    if (null != titleFieldName && column.fieldName === titleFieldName) return [
-                                                                        dataCell,
-                                                                        /*#__PURE__*/ jsx(Table.Cell, {
-                                                                            className: clsx('byline-coll-history-restore-cell', history_module.restoreCell),
-                                                                            children: versionId && versionId !== currentVersionId ? /*#__PURE__*/ jsx(Button, {
-                                                                                type: "button",
-                                                                                variant: "outlined",
-                                                                                size: "xs",
-                                                                                intent: "noeffect",
-                                                                                onClick: ()=>setRestoreTarget({
-                                                                                        versionId,
-                                                                                        label: new Date(document.createdAt).toLocaleString(),
-                                                                                        versionNumber
-                                                                                    }),
-                                                                                className: clsx('byline-coll-history-restore-button', history_module.restoreButton),
-                                                                                title: t('collections.history.restoreButtonTitle'),
-                                                                                children: t('collections.history.restoreButton')
-                                                                            }) : null
-                                                                        }, "__restore")
-                                                                    ];
-                                                                    return [
-                                                                        dataCell
-                                                                    ];
-                                                                })
-                                                            ]
-                                                        }),
-                                                        /*#__PURE__*/ jsxs(Table.Row, {
-                                                            className: clsx('byline-coll-history-audit-row', history_module.auditRow),
-                                                            "aria-label": t('collections.history.audit.createdBy', {
-                                                                label: actorLabel
-                                                            }),
-                                                            children: [
-                                                                /*#__PURE__*/ jsx(Table.Cell, {
-                                                                    className: clsx('byline-coll-history-audit-spacer-cell', history_module.auditSpacerCell)
-                                                                }),
-                                                                /*#__PURE__*/ jsx(Table.Cell, {
-                                                                    colSpan: auditColSpan,
-                                                                    className: clsx('byline-coll-history-audit-cell', history_module.auditCell),
-                                                                    children: /*#__PURE__*/ jsxs("span", {
-                                                                        className: clsx('byline-coll-history-audit', history_module.audit),
-                                                                        children: [
-                                                                            actionLabel,
-                                                                            ' · ',
-                                                                            t('collections.history.audit.createdBy', {
-                                                                                label: actorLabel
-                                                                            }),
-                                                                            ' · ',
-                                                                            new Date(document.createdAt).toLocaleString()
-                                                                        ]
-                                                                    })
-                                                                })
-                                                            ]
-                                                        })
-                                                    ]
-                                                }, versionId ?? document.id);
-                                            })
-                                        })
-                                    ]
-                                }),
-                                padRows(6 - (data?.docs?.length ?? 0))
-                            ]
-                        }),
-                        /*#__PURE__*/ jsxs("div", {
-                            className: clsx('byline-coll-history-options byline-coll-history-options-bottom', history_module.options, history_module.optionsBottom),
-                            children: [
-                                /*#__PURE__*/ jsx(Select, {
-                                    containerClassName: clsx('byline-coll-history-page-size', history_module.pageSize),
-                                    id: "page_size",
-                                    name: "page_size",
-                                    size: "sm",
-                                    defaultValue: "15",
-                                    items: [
-                                        {
-                                            value: '15',
-                                            label: '15'
-                                        },
-                                        {
-                                            value: '30',
-                                            label: '30'
-                                        },
-                                        {
-                                            value: '50',
-                                            label: '50'
-                                        },
-                                        {
-                                            value: '100',
-                                            label: '100'
-                                        }
-                                    ],
-                                    onValueChange: handleOnPageSizeChange
-                                }),
-                                /*#__PURE__*/ jsx(RouterPager, {
-                                    smoothScrollToTop: true,
-                                    page: data?.meta.page,
-                                    count: data?.meta.totalPages,
-                                    showFirstButton: true,
-                                    showLastButton: true,
-                                    componentName: "pagerBottom",
-                                    "aria-label": t('collections.list.pagerBottomAriaLabel')
-                                })
-                            ]
-                        })
-                    ]
-                })
-            }),
-            selectedVersion && currentDocument && /*#__PURE__*/ jsx(Suspense, {
-                fallback: null,
-                children: /*#__PURE__*/ jsx(DiffModal, {
-                    isOpen: true,
-                    onDismiss: ()=>setSelectedVersion(null),
-                    collection: collection,
-                    documentId: id,
-                    versionId: selectedVersion.versionId,
-                    versionLabel: selectedVersion.label,
-                    currentDocument: currentDocument,
-                    locale: locale,
-                    loadHistoricalVersion: getCollectionDocumentVersion
-                })
-            }),
-            /*#__PURE__*/ jsx(Modal, {
-                isOpen: null != restoreTarget,
-                onDismiss: ()=>setRestoreTarget(null),
-                closeOnOverlayClick: false,
-                children: /*#__PURE__*/ jsxs(Modal.Container, {
-                    className: clsx('byline-coll-history-restore-modal', history_module.restoreModal),
-                    children: [
-                        /*#__PURE__*/ jsxs(Modal.Header, {
-                            className: clsx('byline-coll-history-restore-modal-head', history_module.restoreModalHead),
-                            children: [
-                                /*#__PURE__*/ jsx("h3", {
-                                    className: "m-0",
-                                    children: t('collections.history.restoreModalTitle')
-                                }),
-                                /*#__PURE__*/ jsx(IconButton, {
-                                    "aria-label": t('common.actions.close'),
-                                    size: "xs",
-                                    onClick: ()=>setRestoreTarget(null),
-                                    children: /*#__PURE__*/ jsx(CloseIcon, {
-                                        width: "14px",
-                                        height: "14px",
-                                        svgClassName: "white-icon"
-                                    })
-                                })
-                            ]
-                        }),
-                        restoreTarget ? /*#__PURE__*/ jsx(RestoreVersionModal, {
-                            collection: collection,
-                            documentId: id,
-                            versionId: restoreTarget.versionId,
-                            versionLabel: restoreTarget.label,
-                            versionNumber: restoreTarget.versionNumber,
-                            onClose: ()=>setRestoreTarget(null)
-                        }) : null
-                    ]
+            }) : /*#__PURE__*/ jsx(Section, {
+                children: /*#__PURE__*/ jsx(Container, {
+                    children: /*#__PURE__*/ jsx(VersionHistoryCore, {
+                        data: data,
+                        resourceDefinition: collectionDefinition,
+                        resourcePath: collection,
+                        documentId: id,
+                        currentDocument: currentDocument,
+                        locale: locale,
+                        rowPresentation: rowPresentation,
+                        loadHistoricalVersion: getCollectionDocumentVersion,
+                        onPageSizeChange: handlePageSizeChange,
+                        restoreVersion: (versionId)=>restoreDocumentVersion({
+                                data: {
+                                    collection,
+                                    id,
+                                    versionId
+                                }
+                            }),
+                        onRestoreComplete: async ()=>{
+                            await router.invalidate();
+                            navigate({
+                                to: getAdminRoutePath('collections', '$collection', '$id'),
+                                params: {
+                                    collection,
+                                    id
+                                }
+                            });
+                        }
+                    })
                 })
             })
         ]

package/dist/admin-shell/collections/reindex-button.d.ts

@@ -21,5 +21,5 @@
  * backgrounded job (see docs/06-search/02-indexing-and-reindexing.md).
  */
 import type React from 'react';
-import type { ListActionComponentProps } from '@byline/core';
+import { type ListActionComponentProps } from '@byline/core';
 export declare function ReindexButton({ collectionPath, }: ListActionComponentProps): React.JSX.Element | null;

package/dist/admin-shell/collections/reindex-button.js

@@ -1,5 +1,6 @@
 import { jsx } from "react/jsx-runtime";
 import { useState } from "react";
+import { documentAbilityKey } from "@byline/core";
 import { useTranslation } from "@byline/i18n/react";
 import { Button, useToastManager } from "@byline/ui/react";
 import { useAbility } from "../../integrations/abilities.js";
@@ -7,7 +8,10 @@ import { reindexCollection } from "../../server-fns/collections/reindex.js";
 function ReindexButton({ collectionPath }) {
     const { t } = useTranslation('byline-admin');
     const toastManager = useToastManager();
-    const canReindex = useAbility(`collections.${collectionPath}.reindex`);
+    const canReindex = useAbility(documentAbilityKey({
+        kind: 'collection',
+        path: collectionPath
+    }, 'reindex'));
     const [pending, setPending] = useState(false);
     if (!canReindex) return null;
     const onClick = async ()=>{

package/dist/admin-shell/collections/restore-version-modal.d.ts

@@ -1,10 +1,10 @@
 interface RestoreVersionModalProps {
-    collection: string;
-    documentId: string;
-    versionId: string;
     versionLabel: string;
     versionNumber: number;
+    restoreStatusLabel: string;
     onClose: () => void;
+    restoreVersion: () => Promise<unknown>;
+    onRestoreComplete: () => void | Promise<void>;
 }
-export declare function RestoreVersionModal({ collection, documentId, versionId, versionLabel, versionNumber, onClose, }: RestoreVersionModalProps): import("react").JSX.Element;
+export declare function RestoreVersionModal({ versionLabel, versionNumber, restoreStatusLabel, onClose, restoreVersion, onRestoreComplete, }: RestoreVersionModalProps): import("react").JSX.Element;
 export {};

package/dist/admin-shell/collections/restore-version-modal.js

@@ -1,17 +1,11 @@
 "use client";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useState } from "react";
-import { useRouter } from "@tanstack/react-router";
 import { useTranslation } from "@byline/i18n/react";
 import { Alert, Button, LoaderEllipsis, Modal } from "@byline/ui/react";
 import clsx from "clsx";
-import { getAdminRoutePath } from "../../routes/admin-path.js";
-import { restoreDocumentVersion } from "../../server-fns/collections/index.js";
-import { useNavigate } from "../chrome/loose-router.js";
 import restore_version_modal_module from "./restore-version-modal.module.js";
-function RestoreVersionModal({ collection, documentId, versionId, versionLabel, versionNumber, onClose }) {
-    const navigate = useNavigate();
-    const router = useRouter();
+function RestoreVersionModal({ versionLabel, versionNumber, restoreStatusLabel, onClose, restoreVersion, onRestoreComplete }) {
     const { t } = useTranslation('byline-admin');
     const [error, setError] = useState(null);
     const [pending, setPending] = useState(false);
@@ -20,22 +14,9 @@ function RestoreVersionModal({ collection, documentId, versionId, versionLabel,
         setPending(true);
         setError(null);
         try {
-            await restoreDocumentVersion({
-                data: {
-                    collection,
-                    id: documentId,
-                    versionId
-                }
-            });
+            await restoreVersion();
             onClose();
-            await router.invalidate();
-            navigate({
-                to: getAdminRoutePath('collections', '$collection', '$id'),
-                params: {
-                    collection,
-                    id: documentId
-                }
-            });
+            await onRestoreComplete();
         } catch (err) {
             const code = getErrorCode(err);
             if ('ERR_INVALID_TRANSITION' === code) setError(t('collections.restore.errors.alreadyCurrent'));
@@ -80,7 +61,8 @@ function RestoreVersionModal({ collection, documentId, versionId, versionLabel,
                     /*#__PURE__*/ jsx("p", {
                         className: clsx('byline-coll-restore-warning', restore_version_modal_module.warning),
                         children: t('collections.restore.warning', {
-                            version: versionNumber
+                            version: versionNumber,
+                            status: restoreStatusLabel
                         })
                     })
                 ]
@@ -118,7 +100,9 @@ function RestoreVersionModal({ collection, documentId, versionId, versionLabel,
                         className: clsx('byline-coll-restore-button', restore_version_modal_module.button),
                         children: true === pending ? /*#__PURE__*/ jsx(LoaderEllipsis, {
                             size: 42
-                        }) : t('collections.restore.confirmButton')
+                        }) : t('collections.restore.confirmButton', {
+                            status: restoreStatusLabel
+                        })
                     })
                 ]
             })