@byline/host-tanstack-start 1.1.0 → 1.2.1

package/src/admin-shell/collections/history.tsx

@@ -11,7 +11,7 @@ import { useParams, useRouterState } from '@tanstack/react-router'
 
 import type { CollectionAdminConfig, CollectionDefinition, WorkflowStatus } from '@byline/core'
 import type { AnyCollectionSchemaTypes } from '@byline/core/zod-schemas'
-import { Container, IconButton, Section, Select, Table } from '@byline/ui'
+import { Button, CloseIcon, Container, IconButton, Modal, Section, Select, Table } from '@byline/ui/react'
 import { renderFormatted, StatusBadge } from '@byline/ui/react'
 import cx from 'classnames'
 
@@ -20,6 +20,7 @@ import { RouterPager } from '../chrome/router-pager.js'
 import { TableHeadingCellSortable } from '../chrome/th-sortable.js'
 import { formatNumber } from '../chrome/utils.js'
 import styles from './history.module.css'
+import { RestoreVersionModal } from './restore-version-modal.js'
 import { ViewMenu } from './view-menu.js'
 import type { ContentLocaleOption } from './view-menu.js'
 
@@ -27,7 +28,6 @@ import type { ContentLocaleOption } from './view-menu.js'
  * Resolve a column value from a document, checking `fields` first (user-defined
  * collection fields) then the root (metadata like status, updated_at).
  */
-// biome-ignore lint/suspicious/noExplicitAny: collection rows are heterogeneous
 function getColumnValue(document: any, fieldName: string): any {
   if (document.fields && fieldName in document.fields) {
     return document.fields[fieldName]
@@ -75,7 +75,7 @@ function padRows(value: number) {
       key={`empty-row-${
         // biome-ignore lint/suspicious/noArrayIndexKey: we're okay here
         index
-      }`}
+        }`}
       className={cx('byline-coll-history-pad-row', styles.padRow)}
     >
        
@@ -112,6 +112,15 @@ export const HistoryView = ({
     versionId: string
     label: string
   } | null>(null)
+  const [restoreTarget, setRestoreTarget] = useState<{
+    versionId: string
+    label: string
+    versionNumber: number
+  } | null>(null)
+  const currentVersionId =
+    currentDocument && typeof currentDocument.versionId === 'string'
+      ? (currentDocument.versionId as string)
+      : null
 
   function handleOnPageSizeChange(value: string | null): void {
     if (typeof value !== 'string' || value.length === 0) return
@@ -164,8 +173,8 @@ export const HistoryView = ({
                     scope="col"
                     className={cx('byline-coll-history-col-version', styles.colVersion)}
                   />
-                  {columns.map((column) => {
-                    return (
+                  {columns.flatMap((column) => {
+                    const cell = (
                       <TableHeadingCellSortable
                         key={String(column.fieldName)}
                         fieldName={String(column.fieldName)}
@@ -176,6 +185,17 @@ export const HistoryView = ({
                         className={column.className}
                       />
                     )
+                    if (column.fieldName === 'title') {
+                      return [
+                        cell,
+                        <th
+                          key="__restore"
+                          scope="col"
+                          className={cx('byline-coll-history-col-restore', styles.colRestore)}
+                        />,
+                      ]
+                    }
+                    return [cell]
                   })}
                 </Table.Row>
               </Table.Header>
@@ -214,84 +234,119 @@ export const HistoryView = ({
                           </IconButton>
                         ) : null}
                       </Table.Cell>
-                      {columns.map((column) => (
-                        <Table.Cell
-                          key={String(column.fieldName)}
-                          className={cx({
-                            'byline-coll-history-cell-right': column.align === 'right',
-                            [styles.cellRight]: column.align === 'right',
-                            'byline-coll-history-cell-center': column.align === 'center',
-                            [styles.cellCenter]: column.align === 'center',
-                          })}
-                        >
-                          {column.fieldName === 'title' ? (
-                            versionId && currentDocument ? (
-                              <button
-                                type="button"
-                                className={cx(
-                                  'byline-coll-history-title-button',
-                                  styles.titleButton
-                                )}
-                                onClick={() =>
-                                  setSelectedVersion({
-                                    versionId,
-                                    label: new Date(document.createdAt).toLocaleString(),
-                                  })
-                                }
-                              >
-                                {column.formatter
-                                  ? renderFormatted(
+                      {columns.flatMap((column) => {
+                        const dataCell = (
+                          <Table.Cell
+                            key={String(column.fieldName)}
+                            className={cx({
+                              'byline-coll-history-cell-right': column.align === 'right',
+                              [styles.cellRight]: column.align === 'right',
+                              'byline-coll-history-cell-center': column.align === 'center',
+                              [styles.cellCenter]: column.align === 'center',
+                            })}
+                          >
+                            {column.fieldName === 'title' ? (
+                              versionId && currentDocument ? (
+                                <button
+                                  type="button"
+                                  className={cx(
+                                    'byline-coll-history-title-button',
+                                    styles.titleButton
+                                  )}
+                                  onClick={() =>
+                                    setSelectedVersion({
+                                      versionId,
+                                      label: new Date(document.createdAt).toLocaleString(),
+                                    })
+                                  }
+                                >
+                                  {column.formatter
+                                    ? renderFormatted(
                                       getColumnValue(document, column.fieldName as string),
                                       document,
                                       column.formatter
                                     )
-                                  : resolveDisplayValue(
+                                    : resolveDisplayValue(
                                       getColumnValue(document, column.fieldName as string),
                                       locale,
                                       defaultContentLocale
                                     ) || '------'}
-                              </button>
-                            ) : (
-                              <Link
-                                to={'/admin/collections/$collection/$id' as never}
-                                params={{
-                                  collection,
-                                  id: document.id,
-                                }}
-                              >
-                                {column.formatter
-                                  ? renderFormatted(
+                                </button>
+                              ) : (
+                                <Link
+                                  to={'/admin/collections/$collection/$id' as never}
+                                  params={{
+                                    collection,
+                                    id: document.id,
+                                  }}
+                                >
+                                  {column.formatter
+                                    ? renderFormatted(
                                       getColumnValue(document, column.fieldName as string),
                                       document,
                                       column.formatter
                                     )
-                                  : resolveDisplayValue(
+                                    : resolveDisplayValue(
                                       getColumnValue(document, column.fieldName as string),
                                       locale,
                                       defaultContentLocale
                                     ) || '------'}
-                              </Link>
-                            )
-                          ) : column.formatter ? (
-                            renderFormatted(
-                              getColumnValue(document, column.fieldName as string),
-                              document,
-                              column.formatter
-                            )
-                          ) : column.fieldName === 'status' && workflowStatuses ? (
-                            <StatusBadge
-                              status={document.status}
-                              workflowStatuses={workflowStatuses}
-                            />
-                          ) : (
-                            resolveDisplayValue(
-                              getColumnValue(document, column.fieldName as string),
-                              locale,
-                              defaultContentLocale
-                            ) || ''
-                          )}
-                        </Table.Cell>
-                      ))}
+                                </Link>
+                              )
+                            ) : column.formatter ? (
+                              renderFormatted(
+                                getColumnValue(document, column.fieldName as string),
+                                document,
+                                column.formatter
+                              )
+                            ) : column.fieldName === 'status' && workflowStatuses ? (
+                              <StatusBadge
+                                status={document.status}
+                                workflowStatuses={workflowStatuses}
+                              />
+                            ) : (
+                              resolveDisplayValue(
+                                getColumnValue(document, column.fieldName as string),
+                                locale,
+                                defaultContentLocale
+                              ) || ''
+                            )}
+                          </Table.Cell>
+                        )
+                        if (column.fieldName === 'title') {
+                          return [
+                            dataCell,
+                            <Table.Cell
+                              key="__restore"
+                              className={cx('byline-coll-history-restore-cell', styles.restoreCell)}
+                            >
+                              {versionId && versionId !== currentVersionId ? (
+                                <Button
+                                  type="button"
+                                  variant="outlined"
+                                  size="xs"
+                                  intent="noeffect"
+                                  onClick={() =>
+                                    setRestoreTarget({
+                                      versionId,
+                                      label: new Date(document.createdAt).toLocaleString(),
+                                      versionNumber,
+                                    })
+                                  }
+                                  className={cx(
+                                    'byline-coll-history-restore-button',
+                                    styles.restoreButton
+                                  )}
+                                  title="Restore this version as the current draft"
+                                >
+                                  Restore
+                                </Button>
+                              ) : null}
+                            </Table.Cell>,
+                          ]
+                        }
+                        return [dataCell]
+                      })}
                     </Table.Row>
                   )
                 })}
@@ -347,6 +402,33 @@ export const HistoryView = ({
           />
         </Suspense>
       )}
+
+      <Modal
+        isOpen={restoreTarget != null}
+        onDismiss={() => setRestoreTarget(null)}
+        closeOnOverlayClick={false}
+      >
+        <Modal.Container className={cx('byline-coll-history-restore-modal', styles.restoreModal)}>
+          <Modal.Header
+            className={cx('byline-coll-history-restore-modal-head', styles.restoreModalHead)}
+          >
+            <h3 className="m-0">Restore version</h3>
+            <IconButton aria-label="Close" size="xs" onClick={() => setRestoreTarget(null)}>
+              <CloseIcon width="14px" height="14px" svgClassName="white-icon" />
+            </IconButton>
+          </Modal.Header>
+          {restoreTarget ? (
+            <RestoreVersionModal
+              collection={collection}
+              documentId={id}
+              versionId={restoreTarget.versionId}
+              versionLabel={restoreTarget.label}
+              versionNumber={restoreTarget.versionNumber}
+              onClose={() => setRestoreTarget(null)}
+            />
+          ) : null}
+        </Modal.Container>
+      </Modal>
     </>
   )
 }

package/src/admin-shell/collections/list.tsx

@@ -20,7 +20,7 @@ import {
   Section,
   Select,
   Table,
-} from '@byline/ui'
+} from '@byline/ui/react'
 import { renderFormatted, StatusBadge } from '@byline/ui/react'
 import cx from 'classnames'
 

package/src/admin-shell/collections/preview-link.tsx

@@ -40,7 +40,7 @@
 import { useState } from 'react'
 
 import type { CollectionAdminConfig, PreviewDocument } from '@byline/core'
-import { ExternalLinkIcon, IconButton, useToastManager } from '@byline/ui'
+import { ExternalLinkIcon, IconButton, useToastManager } from '@byline/ui/react'
 import cx from 'classnames'
 
 import { enablePreviewModeFn } from '../../server-fns/preview/index.js'

package/src/admin-shell/collections/restore-version-modal.module.css

@@ -0,0 +1,48 @@
+/**
+ * RestoreVersionModal — modal body for the "make current" action on the
+ * collection history view.
+ *
+ * Override handles:
+ *   .byline-coll-restore-content   — outer Modal.Content (gap)
+ *   .byline-coll-restore-body      — vertical stack of identity rows
+ *   .byline-coll-restore-warning   — warning paragraph
+ *   .byline-coll-restore-actions   — Cancel/Restore row
+ *   .byline-coll-restore-button    — action buttons (min-width)
+ */
+
+.content,
+:global(.byline-coll-restore-content) {
+  gap: 0.25rem;
+}
+
+.body,
+:global(.byline-coll-restore-body) {
+  display: flex;
+  flex-direction: column;
+  gap: 0;
+}
+
+.row,
+:global(.byline-coll-restore-row) {
+  margin: 0;
+}
+
+.warning,
+:global(.byline-coll-restore-warning) {
+  margin-top: 0.75rem;
+}
+
+.actions,
+:global(.byline-coll-restore-actions) {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 0.5rem;
+  margin-top: 1.5rem;
+  margin-bottom: 1rem;
+}
+
+.button,
+:global(.byline-coll-restore-button) {
+  min-width: 4rem;
+}

package/src/admin-shell/collections/restore-version-modal.tsx

@@ -0,0 +1,131 @@
+'use client'
+
+/**
+ * This Source Code is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) Infonomic Company Limited
+ */
+
+/**
+ * Restore-version modal body.
+ *
+ * Confirmation dialog for the "make current" action on the history view.
+ * Calls the restore-version server fn, invalidates the router, and
+ * navigates to the document's edit view so the user lands on the freshly
+ * restored draft.
+ */
+
+import { useState } from 'react'
+import { useRouter } from '@tanstack/react-router'
+
+import { Alert, Button, LoaderEllipsis, Modal } from '@byline/ui/react'
+import cx from 'classnames'
+
+import { restoreDocumentVersion } from '../../server-fns/collections/index.js'
+import { useNavigate } from '../chrome/loose-router.js'
+import styles from './restore-version-modal.module.css'
+
+interface RestoreVersionModalProps {
+  collection: string
+  documentId: string
+  versionId: string
+  versionLabel: string
+  versionNumber: number
+  onClose: () => void
+}
+
+export function RestoreVersionModal({
+  collection,
+  documentId,
+  versionId,
+  versionLabel,
+  versionNumber,
+  onClose,
+}: RestoreVersionModalProps) {
+  const navigate = useNavigate()
+  const router = useRouter()
+  const [error, setError] = useState<string | null>(null)
+  const [pending, setPending] = useState(false)
+
+  async function handleRestore() {
+    if (pending) return
+    setPending(true)
+    setError(null)
+    try {
+      await restoreDocumentVersion({
+        data: { collection, id: documentId, versionId },
+      })
+      onClose()
+      await router.invalidate()
+      navigate({
+        to: '/admin/collections/$collection/$id' as never,
+        params: { collection, id: documentId },
+      })
+    } catch (err) {
+      const code = getErrorCode(err)
+      if (code === 'ERR_INVALID_TRANSITION') {
+        setError('This version is already the current version of the document.')
+      } else if (code === 'ERR_NOT_FOUND') {
+        setError('The selected version could not be found. The history may be out of date.')
+      } else if (code === 'ERR_FORBIDDEN' || code === 'ERR_UNAUTHENTICATED') {
+        setError('You do not have permission to restore versions for this collection.')
+      } else {
+        setError('Could not restore this version. Please try again.')
+      }
+      setPending(false)
+    }
+  }
+
+  return (
+    <Modal.Content className={cx('byline-coll-restore-content', styles.content)}>
+      <div className={cx('byline-coll-restore-body', styles.body)}>
+        {error ? (
+          <Alert intent="danger" close={false}>
+            {error}
+          </Alert>
+        ) : null}
+        <p className={cx('byline-coll-restore-row', styles.row)}>
+          <span className="muted">Version:</span> {versionNumber}
+        </p>
+        <p className={cx('byline-coll-restore-row', styles.row)}>
+          <span className="muted">Created:</span> {versionLabel}
+        </p>
+        <p className={cx('byline-coll-restore-warning', styles.warning)}>
+          This will create a new draft version of this document with the content from version{' '}
+          {versionNumber}, and that draft will become the current version. The existing versions
+          (including any published version) are preserved in history. The restored draft will need
+          to be published through the normal workflow.
+        </p>
+      </div>
+      <div className={cx('byline-coll-restore-actions', styles.actions)}>
+        <Button
+          type="button"
+          intent="secondary"
+          size="sm"
+          onClick={onClose}
+          disabled={pending}
+          className={cx('byline-coll-restore-button', styles.button)}
+        >
+          Cancel
+        </Button>
+        <Button
+          size="sm"
+          intent="primary"
+          onClick={handleRestore}
+          disabled={pending}
+          className={cx('byline-coll-restore-button', styles.button)}
+        >
+          {pending === true ? <LoaderEllipsis size={42} /> : 'Restore as Draft'}
+        </Button>
+      </div>
+    </Modal.Content>
+  )
+}
+
+function getErrorCode(err: unknown): string | null {
+  return typeof (err as { code?: unknown })?.code === 'string'
+    ? (err as { code: string }).code
+    : null
+}

package/src/admin-shell/collections/view-menu.tsx

@@ -9,7 +9,7 @@
 import { useEffect } from 'react'
 
 import type { CollectionAdminConfig, PreviewDocument } from '@byline/core'
-import { Button, HistoryIcon, IconButton, Label, Select } from '@byline/ui'
+import { Button, HistoryIcon, IconButton, Label, Select } from '@byline/ui/react'
 import cx from 'classnames'
 
 import { useNavigate } from '../chrome/loose-router.js'

package/src/routes/create-admin-account-route.tsx

@@ -8,7 +8,7 @@
 
 import { createFileRoute } from '@tanstack/react-router'
 
-import { Container, Section } from '@byline/ui'
+import { Container, Section } from '@byline/ui/react'
 import { AccountSelfContainer } from '@byline/ui/react'
 
 import { BreadcrumbsClient } from '../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js'

package/src/routes/create-admin-role-edit-route.tsx

@@ -8,7 +8,7 @@
 
 import { createFileRoute, notFound } from '@tanstack/react-router'
 
-import { Container, Section } from '@byline/ui'
+import { Container, Section } from '@byline/ui/react'
 
 import { RoleContainer } from '../admin-shell/admin-roles/container.js'
 import { BreadcrumbsClient } from '../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js'

package/src/routes/create-admin-user-edit-route.tsx

@@ -8,7 +8,7 @@
 
 import { createFileRoute, notFound } from '@tanstack/react-router'
 
-import { Container, Section } from '@byline/ui'
+import { Container, Section } from '@byline/ui/react'
 
 import { AccountContainer } from '../admin-shell/admin-users/container.js'
 import { BreadcrumbsClient } from '../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js'

package/src/routes/create-collection-list-route.tsx

@@ -15,7 +15,7 @@ import {
   getCollectionDefinition,
   getWorkflowStatuses,
 } from '@byline/core'
-import { useToastManager } from '@byline/ui'
+import { useToastManager } from '@byline/ui/react'
 import { z } from 'zod'
 
 import { BreadcrumbsClient } from '../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js'

package/src/server-fns/auth/current-user.ts

@@ -21,11 +21,9 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { type Actor, AuthError } from '@byline/auth'
-import { getServerConfig } from '@byline/core'
-import type { PgAdapter } from '@byline/db-postgres'
-import { createAdminUsersRepository } from '@byline/db-postgres/admin'
 
 import { getAdminRequestContext } from '../../auth/auth-context.js'
+import { bylineCore } from '../../integrations/byline-core.js'
 
 export interface CurrentAdminUser {
   id: string
@@ -57,9 +55,7 @@ export const getCurrentAdminUser = createServerFn({ method: 'GET' }).handler(
       throw new Error('unexpected null actor after getAdminRequestContext')
     }
 
-    const db = (getServerConfig().db as PgAdapter).drizzle
-    const users = createAdminUsersRepository(db)
-    const row = await users.getById(actor.id)
+    const row = await bylineCore().adminStore!.adminUsers.getById(actor.id)
     if (!row) {
       // Session resolved to an admin id that no longer exists — force the
       // caller back through sign-in rather than return partial data.
@@ -97,9 +93,7 @@ export const getCurrentAdminUserSoft = createServerFn({ method: 'GET' }).handler
       }
       if (!actor) return null
 
-      const db = (getServerConfig().db as PgAdapter).drizzle
-      const users = createAdminUsersRepository(db)
-      const row = await users.getById(actor.id)
+      const row = await bylineCore().adminStore!.adminUsers.getById(actor.id)
       if (!row) return null
 
       return {

package/src/server-fns/collections/index.ts

@@ -10,6 +10,7 @@ export * from './delete'
 export * from './get'
 export * from './history'
 export * from './list'
+export * from './restore-version'
 export * from './stats'
 export * from './status'
 export * from './update'

package/src/server-fns/collections/restore-version.ts

@@ -0,0 +1,59 @@
+/**
+ * This Source Code is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) Infonomic Company Limited
+ */
+
+import { createServerFn } from '@tanstack/react-start'
+
+import { ERR_NOT_FOUND, getLogger, getServerConfig } from '@byline/core'
+import type { DocumentLifecycleContext } from '@byline/core/services'
+import { restoreDocumentVersion as restoreDocumentVersionService } from '@byline/core/services'
+
+import { getAdminRequestContext } from '../../auth/auth-context.js'
+import { ensureCollection } from '../../integrations/api-utils.js'
+
+// ---------------------------------------------------------------------------
+// Restore a historical document version as the new current version
+// ---------------------------------------------------------------------------
+
+export const restoreDocumentVersion = createServerFn({ method: 'POST' })
+  .inputValidator((input: { collection: string; id: string; versionId: string }) => input)
+  .handler(async ({ data: input }) => {
+    const { collection: path, id, versionId } = input
+    const logger = getLogger()
+    const config = await ensureCollection(path)
+    if (!config) {
+      throw ERR_NOT_FOUND({
+        message: 'Collection not found',
+        details: { collectionPath: path },
+      }).log(logger)
+    }
+
+    const serverConfig = getServerConfig()
+    const ctx: DocumentLifecycleContext = {
+      db: serverConfig.db,
+      definition: config.definition,
+      collectionId: config.collection.id,
+      collectionVersion: config.collection.version,
+      collectionPath: path,
+      logger,
+      defaultLocale: serverConfig.i18n.content.defaultLocale,
+      slugifier: serverConfig.slugifier,
+      requestContext: await getAdminRequestContext(),
+    }
+
+    const result = await restoreDocumentVersionService(ctx, {
+      documentId: id,
+      sourceVersionId: versionId,
+    })
+
+    return {
+      status: 'ok' as const,
+      documentId: result.documentId,
+      documentVersionId: result.documentVersionId,
+      sourceVersionId: result.sourceVersionId,
+    }
+  })

package/src/server-fns/collections/upload.ts

@@ -10,7 +10,7 @@ import type {
 import { ERR_NOT_FOUND, ERR_VALIDATION, getServerConfig, getUploadFields } from '@byline/core'
 import { getLogger, withLogContext } from '@byline/core/logger'
 import { uploadField as coreUploadField } from '@byline/core/services'
-import { extractImageMeta, generateImageVariants, isBypassMimeType } from '@byline/storage-local'
+import { extractImageMeta, generateImageVariants, isBypassMimeType } from '@byline/core/image'
 
 import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { ensureCollection } from '../../integrations/api-utils.js'