@byline/host-tanstack-start 3.20.4 → 4.0.0

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

@@ -28,6 +28,7 @@ import {
 } from '@byline/ui/react'
 import cx from 'classnames'
 
+import { getAdminRoutePath } from '../../routes/admin-path.js'
 import { Link, useNavigate } from '../chrome/loose-router.js'
 import { RouterPager } from '../chrome/router-pager.js'
 import {
@@ -45,7 +46,7 @@ import type {
 // are fixed at module scope; the `label` field is filled in per-render
 // inside the component so it can flow through `t(...)`. Same pattern the
 // account container's `panels` map uses.
-type ColumnTemplate = Omit<TableHeadingCellSortableProps, 'lng' | 'label'> & {
+type ColumnTemplate = Omit<TableHeadingCellSortableProps, 'lng' | 'label' | 'path'> & {
   labelKey: string
 }
 
@@ -53,7 +54,6 @@ const columnTemplates: ColumnTemplate[] = [
   {
     fieldName: 'given_name',
     labelKey: 'adminUsers.list.columns.givenName',
-    path: '/admin/users',
     sortable: true,
     scope: 'col',
     align: 'left',
@@ -62,7 +62,6 @@ const columnTemplates: ColumnTemplate[] = [
   {
     fieldName: 'family_name',
     labelKey: 'adminUsers.list.columns.familyName',
-    path: '/admin/users',
     sortable: true,
     scope: 'col',
     align: 'left',
@@ -71,7 +70,6 @@ const columnTemplates: ColumnTemplate[] = [
   {
     fieldName: 'email',
     labelKey: 'adminUsers.list.columns.email',
-    path: '/admin/users',
     sortable: true,
     scope: 'col',
     align: 'left',
@@ -80,7 +78,6 @@ const columnTemplates: ColumnTemplate[] = [
   {
     fieldName: 'updated_at',
     labelKey: 'adminUsers.list.columns.updated',
-    path: '/admin/users',
     sortable: true,
     scope: 'col',
     align: 'right',
@@ -89,7 +86,6 @@ const columnTemplates: ColumnTemplate[] = [
   {
     fieldName: 'created_at',
     labelKey: 'adminUsers.list.columns.created',
-    path: '/admin/users',
     sortable: true,
     scope: 'col',
     align: 'right',
@@ -136,7 +132,12 @@ export function AdminUsersListView({ data }: { data: AdminUserListResponse }) {
   const [isCreateDrawerOpen, setIsCreateDrawerOpen] = useState(false)
 
   const tableColumnDefs = useMemo(
-    () => columnTemplates.map(({ labelKey, ...rest }) => ({ ...rest, label: t(labelKey) })),
+    () =>
+      columnTemplates.map(({ labelKey, ...rest }) => ({
+        ...rest,
+        label: t(labelKey),
+        path: getAdminRoutePath('users'),
+      })),
     [t]
   )
 
@@ -232,7 +233,7 @@ export function AdminUsersListView({ data }: { data: AdminUserListResponse }) {
                   })}
                 >
                   <Table.Cell>
-                    <Link to={'/admin/users/$id' as never} params={{ id: user.id }}>
+                    <Link to={getAdminRoutePath('users', '$id')} params={{ id: user.id }}>
                       {user.given_name ?? (
                         <span
                           className={cx('muted byline-admin-users-list-not-set', styles.notSet)}

package/src/admin-shell/chrome/admin-app-bar.tsx

@@ -14,6 +14,7 @@ import { LanguageMenu, useTranslation } from '@byline/i18n/react'
 import { Button } from '@byline/ui/react'
 import cx from 'classnames'
 
+import { getSignInRoutePath } from '../../routes/sign-in-path.js'
 import { adminSignOut, type CurrentAdminUser } from '../../server-fns/auth/index.js'
 import styles from './admin-app-bar.module.css'
 import { AdminDrawerToggle } from './admin-drawer-toggle.js'
@@ -48,7 +49,7 @@ export function AdminAppBar({ user }: AdminAppBarProps) {
       console.warn('sign-out request failed', err)
     }
     // Full-page navigation so the admin guard re-runs with cleared cookies.
-    window.location.assign('/sign-in')
+    window.location.assign(getSignInRoutePath())
   }
 
   return (

package/src/admin-shell/chrome/admin-menu-drawer.tsx

@@ -27,6 +27,11 @@ import cx from 'classnames'
 import { useSwipeable } from 'react-swipeable'
 
 import { useAbilities } from '../../integrations/abilities.jsx'
+import {
+  getAdminRoutePath,
+  isAdminRoutePathActive,
+  isRoutePathWithin,
+} from '../../routes/admin-path.js'
 import styles from './admin-menu-drawer.module.css'
 import { useAdminMenu } from './admin-menu-provider.jsx'
 import { Link } from './loose-router.js'
@@ -35,8 +40,8 @@ import { PreviewToggle } from './preview-toggle.jsx'
 const isActive = (currentPath: string, linkHref: string): boolean => {
   // Root admin highlights only on exact match so it doesn't stay lit on
   // every admin subpath.
-  if (linkHref === '/admin') return currentPath === '/admin'
-  return currentPath.startsWith(linkHref)
+  if (linkHref === getAdminRoutePath()) return isAdminRoutePathActive(currentPath)
+  return isRoutePathWithin(currentPath, linkHref)
 }
 
 interface MenuItemProps {
@@ -119,7 +124,7 @@ export function AdminMenuDrawer(): React.JSX.Element | null {
       <nav className={cx('byline-admin-menu-drawer admin-menu-drawer', styles.nav)}>
         <ul>
           <MenuItem
-            to="/admin"
+            to={getAdminRoutePath()}
             label={t('chrome.menu.dashboard')}
             icon={<HomeIcon width="20px" height="20px" />}
             pathname={pathname}
@@ -130,7 +135,7 @@ export function AdminMenuDrawer(): React.JSX.Element | null {
               <li className="menu-separator" />
               {canReadUsers && (
                 <MenuItem
-                  to="/admin/users"
+                  to={getAdminRoutePath('users')}
                   label={t('chrome.menu.adminUsers')}
                   icon={<UsersIcon width="20px" height="20px" />}
                   pathname={pathname}
@@ -139,7 +144,7 @@ export function AdminMenuDrawer(): React.JSX.Element | null {
               )}
               {canReadRoles && (
                 <MenuItem
-                  to="/admin/roles"
+                  to={getAdminRoutePath('roles')}
                   label={t('chrome.menu.adminRoles')}
                   icon={<RolesIcon width="20px" height="20px" />}
                   pathname={pathname}
@@ -148,7 +153,7 @@ export function AdminMenuDrawer(): React.JSX.Element | null {
               )}
               {canReadPermissions && (
                 <MenuItem
-                  to="/admin/permissions"
+                  to={getAdminRoutePath('permissions')}
                   label={t('chrome.menu.permissions')}
                   icon={<SettingsSlidersIcon width="20px" height="20px" />}
                   pathname={pathname}
@@ -157,7 +162,7 @@ export function AdminMenuDrawer(): React.JSX.Element | null {
               )}
               {canReadActivity && (
                 <MenuItem
-                  to="/admin/activity"
+                  to={getAdminRoutePath('activity')}
                   label={t('chrome.menu.activity')}
                   icon={<ActivityIcon width="20px" height="20px" />}
                   pathname={pathname}
@@ -169,7 +174,7 @@ export function AdminMenuDrawer(): React.JSX.Element | null {
           <li className="menu-separator" />
           <PreviewToggle compact={compact} />
           <MenuItem
-            to="/admin/account"
+            to={getAdminRoutePath('account')}
             label={t('chrome.account')}
             icon={<UserIcon />}
             pathname={pathname}

package/src/admin-shell/chrome/admin-menu-provider.tsx

@@ -12,6 +12,7 @@ import type React from 'react'
 import { createContext, useContext, useEffect, useMemo, useRef, useState } from 'react'
 import { useRouterState } from '@tanstack/react-router'
 
+import { isAdminRoutePathActive } from '../../routes/admin-path.js'
 import { useMediaQuery } from './use-media-query.js'
 
 interface AdminMenuContextType {
@@ -37,7 +38,7 @@ interface AdminMenuProviderProps {
  * deliberate open stays open.
  */
 function isWideRoute(pathname: string): boolean {
-  return pathname.startsWith('/admin/collections')
+  return isAdminRoutePathActive(pathname, 'collections')
 }
 
 export function AdminMenuProvider({ children }: AdminMenuProviderProps): React.JSX.Element {

package/src/admin-shell/chrome/dashboard.tsx

@@ -12,6 +12,7 @@ import { useTranslation } from '@byline/i18n/react'
 import { Card, Container, Section } from '@byline/ui/react'
 import cx from 'classnames'
 
+import { getAdminRoutePath } from '../../routes/admin-path.js'
 import styles from './dashboard.module.css'
 import { Link } from './loose-router.js'
 import type { CollectionStatusCount } from '../../server-fns/collections/index.js'
@@ -42,7 +43,7 @@ function StatTile({
   const modifier = tileModifier(ws.name)
   return (
     <Link
-      to={'/admin/collections/$collection' as never}
+      to={getAdminRoutePath('collections', '$collection')}
       params={{ collection: collectionPath }}
       search={{ status: ws.name }}
       className={cx('byline-dashboard-stat-tile', styles.statTile, modifier.global, modifier.local)}
@@ -77,7 +78,7 @@ export function AdminDashboard({ statsMap }: AdminDashboardProps) {
             return (
               <Card key={collection.path}>
                 <Link
-                  to={'/admin/collections/$collection' as never}
+                  to={getAdminRoutePath('collections', '$collection')}
                   params={{ collection: collection.path }}
                   className={cx('byline-dashboard-card-link', styles.cardLink)}
                 >
@@ -114,7 +115,7 @@ export function AdminDashboard({ statsMap }: AdminDashboardProps) {
                     </div>
                   ) : (
                     <Link
-                      to={'/admin/collections/$collection' as never}
+                      to={getAdminRoutePath('collections', '$collection')}
                       params={{ collection: collection.path }}
                       className={cx('byline-dashboard-empty-link', styles.emptyLink)}
                     >

package/src/admin-shell/chrome/sign-in-page.tsx

@@ -19,7 +19,7 @@ import { setInterfaceLocaleFn } from '../../server-fns/i18n/index.js'
 import styles from './sign-in-page.module.css'
 
 interface SignInPageProps {
-  callbackUrl?: string
+  redirectTo: string
   activeLocale: LocaleCode
 }
 
@@ -44,7 +44,7 @@ interface SignInPageProps {
  * the form's action row can render a plain "Home" link beside the submit
  * button.
  */
-export function SignInPage({ callbackUrl, activeLocale }: SignInPageProps) {
+export function SignInPage({ redirectTo, activeLocale }: SignInPageProps) {
   const { i18n, serverURL } = getClientConfig()
   const localeDefinitions = buildLocaleDefinitions(
     i18n.interface.locales,
@@ -68,7 +68,7 @@ export function SignInPage({ callbackUrl, activeLocale }: SignInPageProps) {
             <LanguageMenu />
           </div>
           <div className={cx('byline-sign-in-page-inner', styles.inner)}>
-            <SignInForm callbackUrl={callbackUrl} homeUrl={serverURL} />
+            <SignInForm redirectTo={redirectTo} homeUrl={serverURL} />
           </div>
         </main>
       </BylineAdminServicesProvider>

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

@@ -13,6 +13,7 @@ import type { CollectionAdminConfig, CollectionDefinition } from '@byline/core'
 import { useTranslation } from '@byline/i18n/react'
 import { Container, Section, useToastManager } from '@byline/ui/react'
 
+import { getAdminRoutePath } from '../../routes/admin-path.js'
 import { createCollectionDocument } from '../../server-fns/collections/index.js'
 import { useNavigate } from '../chrome/loose-router.js'
 import { useTanStackNavigationGuard } from './tanstack-navigation-guard.js'
@@ -66,13 +67,13 @@ export const CreateView = ({
       // doesn't return the new document's id.
       if (result?.documentId) {
         navigate({
-          to: '/admin/collections/$collection/$id' as never,
+          to: getAdminRoutePath('collections', '$collection', '$id'),
           params: { collection: path, id: result.documentId } as never,
           search: { action: 'created' },
         })
       } else {
         navigate({
-          to: '/admin/collections/$collection' as never,
+          to: getAdminRoutePath('collections', '$collection'),
           params: { collection: path },
           search: { action: 'created' },
         })
@@ -117,7 +118,7 @@ export const CreateView = ({
           useNavigationGuard={useTanStackNavigationGuard}
           onCancel={() =>
             navigate({
-              to: '/admin/collections/$collection' as never,
+              to: getAdminRoutePath('collections', '$collection'),
               params: { collection: path },
             })
           }

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

@@ -52,12 +52,17 @@ const ACTION_KEYS: Record<string, string> = {
   'document.locales.changed': 'collections.documentHistory.actionLocalesChanged',
   'document.status.changed': 'collections.documentHistory.actionStatusChanged',
   'document.deleted': 'collections.documentHistory.actionDeleted',
+  'document.tree.placed': 'collections.documentHistory.actionTreePlaced',
+  'document.tree.reparented': 'collections.documentHistory.actionTreeReparented',
+  'document.tree.reordered': 'collections.documentHistory.actionTreeReordered',
+  'document.tree.removed': 'collections.documentHistory.actionTreeRemoved',
 }
 
 /** Render an audit before/after value inline: arrays comma-join, nullish → em-dash. */
 function formatAuditValue(value: unknown): string {
   if (value == null) return '—'
   if (Array.isArray(value)) return value.length > 0 ? value.join(', ') : '—'
+  if (typeof value === 'object') return JSON.stringify(value)
   return String(value)
 }
 

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

@@ -15,11 +15,13 @@ import type { AnyCollectionSchemaTypes } from '@byline/core/zod-schemas'
 import { useTranslation } from '@byline/i18n/react'
 import { Container, Section, useToastManager } from '@byline/ui/react'
 
+import { getAdminRoutePath } from '../../routes/admin-path.js'
 import {
   copyDocumentToLocale,
   deleteDocument,
   deleteDocumentLocale,
   duplicateCollectionDocument,
+  hasDeleteSideEffectFailures,
   unpublishDocument,
   updateCollectionDocumentSystemFields,
   updateCollectionDocumentWithPatches,
@@ -73,7 +75,7 @@ export const EditView = ({
 
   const handleLocaleChange = (newLocale: string) => {
     navigate({
-      to: '/admin/collections/$collection/$id' as never,
+      to: getAdminRoutePath('collections', '$collection', '$id'),
       params: { collection: path, id: String(initialData.id) },
       search: { locale: newLocale },
     })
@@ -98,7 +100,7 @@ export const EditView = ({
       setEditState({ status: 'success', message: description })
       // Refresh the page to reflect the new status.
       navigate({
-        to: '/admin/collections/$collection/$id' as never,
+        to: getAdminRoutePath('collections', '$collection', '$id'),
         params: { collection: path, id: String(initialData.id) },
         search: (prev: Record<string, unknown>) => ({ ...prev }),
       })
@@ -149,7 +151,7 @@ export const EditView = ({
       })
       setEditState({ status: 'success', message: description })
       navigate({
-        to: '/admin/collections/$collection/$id' as never,
+        to: getAdminRoutePath('collections', '$collection', '$id'),
         params: { collection: path, id: String(initialData.id) },
         search: (prev: Record<string, unknown>) => ({ ...prev }),
       })
@@ -196,7 +198,7 @@ export const EditView = ({
       })
       // Navigate to the new document's edit view.
       navigate({
-        to: '/admin/collections/$collection/$id' as never,
+        to: getAdminRoutePath('collections', '$collection', '$id'),
         params: { collection: path, id: result.documentId },
       })
     } catch (err) {
@@ -270,7 +272,7 @@ export const EditView = ({
       // Switch the form to the target locale so the editor sees the
       // copied content immediately.
       navigate({
-        to: '/admin/collections/$collection/$id' as never,
+        to: getAdminRoutePath('collections', '$collection', '$id'),
         params: { collection: path, id: String(initialData.id) },
         search: { locale: targetLocale },
       })
@@ -322,7 +324,7 @@ export const EditView = ({
       // The deleted locale may be the one being viewed — land on the default
       // locale (which always survives) so the loader re-fetches a valid view.
       navigate({
-        to: '/admin/collections/$collection/$id' as never,
+        to: getAdminRoutePath('collections', '$collection', '$id'),
         params: { collection: path, id: String(initialData.id) },
         search: { locale: defaultContentLocale },
       })
@@ -347,14 +349,19 @@ export const EditView = ({
 
   const handleDelete = async () => {
     try {
-      await deleteDocument({ data: { collection: path, id: String(initialData.id) } })
-      const description = t('collections.edit.deletedDescription', { label: singular })
+      const result = await deleteDocument({
+        data: { collection: path, id: String(initialData.id) },
+      })
+      const hasSideEffectFailures = hasDeleteSideEffectFailures(result)
+      const description = hasSideEffectFailures
+        ? t('collections.edit.deletedWithWarningsDescription', { label: singular })
+        : t('collections.edit.deletedDescription', { label: singular })
       toastManager.add({
         title: t('collections.edit.deleteTitle', { label: singular }),
         description,
         data: {
-          intent: 'success',
-          iconType: 'success',
+          intent: hasSideEffectFailures ? 'warning' : 'success',
+          iconType: hasSideEffectFailures ? 'warning' : 'success',
           icon: true,
           close: true,
         },
@@ -362,7 +369,7 @@ export const EditView = ({
       setEditState({ status: 'success', message: description })
       // Navigate back to the collection list after deletion.
       navigate({
-        to: '/admin/collections/$collection' as never,
+        to: getAdminRoutePath('collections', '$collection'),
         params: { collection: path },
       })
     } catch (err) {
@@ -457,7 +464,7 @@ export const EditView = ({
       // The new version will have a fresh version ID, draft status, and
       // updated publishedVersion metadata.
       navigate({
-        to: '/admin/collections/$collection/$id' as never,
+        to: getAdminRoutePath('collections', '$collection', '$id'),
         params: { collection: path, id: String(initialData.id) },
         search: (prev: Record<string, unknown>) => ({ ...prev }),
       })
@@ -524,7 +531,7 @@ export const EditView = ({
           workflowStatuses={workflowStatuses}
           onCancel={() =>
             navigate({
-              to: '/admin/collections/$collection' as never,
+              to: getAdminRoutePath('collections', '$collection'),
               params: { collection: path },
             })
           }

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

@@ -26,6 +26,7 @@ import {
 } from '@byline/ui/react'
 import cx from 'classnames'
 
+import { getAdminRouteId, getAdminRoutePath } from '../../routes/admin-path.js'
 import { Link, useNavigate } from '../chrome/loose-router.js'
 import { RouterPager } from '../chrome/router-pager.js'
 import { TableHeadingCellSortable } from '../chrome/th-sortable.js'
@@ -139,8 +140,8 @@ export const HistoryView = ({
   defaultContentLocale: string
 }) => {
   const { id, collection } = useParams({
-    from: '/_byline/admin/collections/$collection/$id/history',
-  })
+    from: getAdminRouteId('collections', '$collection', '$id', 'history') as never,
+  }) as { id: string; collection: string }
   const navigate = useNavigate()
   const { getCollectionDocumentVersion } = useBylineAdminServices()
   const { t } = useTranslation('byline-admin')
@@ -181,7 +182,7 @@ export const HistoryView = ({
       delete params.tab
     }
     navigate({
-      to: '/admin/collections/$collection/$id/history' as never,
+      to: getAdminRoutePath('collections', '$collection', '$id', 'history'),
       params: { collection, id } as never,
       search: params,
     })
@@ -193,7 +194,7 @@ export const HistoryView = ({
     delete params.page
     params.page_size = Number.parseInt(value, 10)
     navigate({
-      to: '/admin/collections/$collection/$id/history' as never,
+      to: getAdminRoutePath('collections', '$collection', '$id', 'history'),
       params: { collection, id } as never,
       search: params,
     })
@@ -382,7 +383,7 @@ export const HistoryView = ({
                                     </button>
                                   ) : (
                                     <Link
-                                      to={'/admin/collections/$collection/$id' as never}
+                                      to={getAdminRoutePath('collections', '$collection', '$id')}
                                       params={{
                                         collection,
                                         id: document.id,

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

@@ -43,6 +43,7 @@ import {
 } from '@dnd-kit/sortable'
 import cx from 'classnames'
 
+import { getAdminRoutePath } from '../../routes/admin-path.js'
 import { Link, useNavigate } from '../chrome/loose-router.js'
 import { RouterPager } from '../chrome/router-pager.js'
 import { SortAscendingIcon } from '../chrome/sort-icons.js'
@@ -274,7 +275,7 @@ export const ListView = ({
       delete params.page
       params.query = query
       navigate({
-        to: '/admin/collections/$collection' as never,
+        to: getAdminRoutePath('collections', '$collection'),
         params: { collection: data.included.collection.path },
         search: params,
       })
@@ -286,7 +287,7 @@ export const ListView = ({
     delete params.page
     delete params.query
     navigate({
-      to: '/admin/collections/$collection' as never,
+      to: getAdminRoutePath('collections', '$collection'),
       params: { collection: data.included.collection.path },
       search: params,
     })
@@ -302,7 +303,7 @@ export const ListView = ({
       params.status = value
     }
     navigate({
-      to: '/admin/collections/$collection' as never,
+      to: getAdminRoutePath('collections', '$collection'),
       params: { collection: data.included.collection.path },
       search: params,
     })
@@ -314,7 +315,7 @@ export const ListView = ({
     delete params.page
     params.page_size = Number.parseInt(value, 10)
     navigate({
-      to: '/admin/collections/$collection' as never,
+      to: getAdminRoutePath('collections', '$collection'),
       params: { collection: data.included.collection.path },
       search: params,
     })
@@ -336,7 +337,7 @@ export const ListView = ({
             aria-label={t('collections.list.createAriaLabel')}
             render={
               <Link
-                to={'/admin/collections/$collection/create' as never}
+                to={getAdminRoutePath('collections', '$collection', 'create')}
                 params={{ collection: data.included.collection.path }}
               />
             }
@@ -454,7 +455,7 @@ export const ListView = ({
                           >
                             {useAsTitle && column.fieldName === useAsTitle ? (
                               <Link
-                                to={'/admin/collections/$collection/$id' as never}
+                                to={getAdminRoutePath('collections', '$collection', '$id')}
                                 params={{
                                   collection: data.included.collection.path,
                                   id: document.id,
@@ -530,7 +531,7 @@ export const ListView = ({
                         >
                           {useAsTitle && column.fieldName === useAsTitle ? (
                             <Link
-                              to={'/admin/collections/$collection/$id' as never}
+                              to={getAdminRoutePath('collections', '$collection', '$id')}
                               params={{
                                 collection: data.included.collection.path,
                                 id: document.id,

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

@@ -24,6 +24,7 @@ import { useTranslation } from '@byline/i18n/react'
 import { Alert, Button, LoaderEllipsis, Modal } from '@byline/ui/react'
 import cx from 'classnames'
 
+import { getAdminRoutePath } from '../../routes/admin-path.js'
 import { restoreDocumentVersion } from '../../server-fns/collections/index.js'
 import { useNavigate } from '../chrome/loose-router.js'
 import styles from './restore-version-modal.module.css'
@@ -62,7 +63,7 @@ export function RestoreVersionModal({
       onClose()
       await router.invalidate()
       navigate({
-        to: '/admin/collections/$collection/$id' as never,
+        to: getAdminRoutePath('collections', '$collection', '$id'),
         params: { collection, id: documentId },
       })
     } catch (err) {