@open-mercato/ui 0.6.7-develop.6860.1.f796b22e80 → 0.6.7

package/src/backend/detail/__tests__/AttachmentAssignmentsEditor.test.tsx

@@ -75,25 +75,4 @@ describe('AttachmentAssignmentsEditor (metadata dialog)', () => {
     fireEvent.click(screen.getByRole('button', { name: 'Remove assignment' }))
     expect(screen.queryByPlaceholderText('catalog.product')).toBeNull()
   })
-
-  it('keeps the surviving assignment values after removing a middle row', () => {
-    render(
-      <EditorHarness
-        initial={[
-          { type: 'catalog.product', id: 'p-1', href: '', label: '' },
-          { type: 'sales.order', id: 'o-2', href: '', label: '' },
-          { type: 'customers.person', id: 'c-3', href: '', label: '' },
-        ]}
-      />,
-    )
-
-    fireEvent.click(screen.getAllByRole('button', { name: labels.remove })[1])
-
-    const typeInputs = screen.getAllByPlaceholderText('catalog.product') as HTMLInputElement[]
-    const idInputs = screen.getAllByPlaceholderText('Record ID') as HTMLInputElement[]
-    expect(typeInputs[0]).toHaveValue('catalog.product')
-    expect(idInputs[0]).toHaveValue('p-1')
-    expect(typeInputs[1]).toHaveValue('customers.person')
-    expect(idInputs[1]).toHaveValue('c-3')
-  })
 })

package/src/backend/forms/FormHeader.tsx

@@ -181,10 +181,11 @@ function DetailHeader({
               {onDelete ? (
                 <Button
                   type="button"
-                  variant="destructive"
+                  variant="outline"
                   size="sm"
                   onClick={onDelete}
                   disabled={isDeleting}
+                  className="text-red-600 border-red-200 hover:bg-red-50 rounded"
                 >
                   {isDeleting ? (
                     <Loader2 className="size-4 mr-2 animate-spin" />

package/src/backend/icons/lucideRegistry.generated.tsx

@@ -2,7 +2,8 @@
 // AUTO-GENERATED by @open-mercato/ui build. Do not edit by hand.
 // Generated from discovered icon string usages across the repo.
 
-import type { LucideIcon } from 'lucide-react';
+import type * as React from 'react'
+import type { LucideIcon } from 'lucide-react'
 import {
   Activity,
   AlertCircle,
@@ -149,7 +150,7 @@ import {
   Wrench,
   X,
   XCircle,
-} from 'lucide-react';
+} from 'lucide-react'
 
 export const LUCIDE_ICON_REGISTRY: Record<string, LucideIcon> = {
   'activity': Activity,
@@ -297,4 +298,37 @@ export const LUCIDE_ICON_REGISTRY: Record<string, LucideIcon> = {
   'wrench': Wrench,
   'x': X,
   'x-circle': XCircle,
-};
+}
+
+function normalizeKebabIconName(input: string): string {
+  const trimmed = input.trim()
+  if (!trimmed) return ''
+  const withoutPrefix = trimmed.startsWith('lucide:') ? trimmed.slice('lucide:'.length) : trimmed
+  if (!withoutPrefix) return ''
+  if (!withoutPrefix.includes('-') && !withoutPrefix.includes('_') && !withoutPrefix.includes(' ') && /[A-Z]/.test(withoutPrefix)) {
+    return withoutPrefix
+      .replace(/([a-z0-9])([A-Z])/g, '$1-$2')
+      .replace(/([A-Z])([A-Z][a-z])/g, '$1-$2')
+      .toLowerCase()
+  }
+  return withoutPrefix
+    .replace(/[_\s]+/g, '-')
+    .replace(/-+/g, '-')
+    .toLowerCase()
+}
+
+export function resolveRegisteredLucideIcon(name: string | undefined): LucideIcon | null {
+  if (!name) return null
+  const normalized = normalizeKebabIconName(name)
+  if (!normalized) return null
+  return (LUCIDE_ICON_REGISTRY as Record<string, LucideIcon | undefined>)[normalized] ?? null
+}
+
+export function resolveRegisteredLucideIconNode(
+  name: string | undefined,
+  className: string
+): React.ReactNode | null {
+  const Icon = resolveRegisteredLucideIcon(name)
+  if (!Icon) return null
+  return <Icon className={className} />
+}

package/src/backend/icons/lucideRegistry.ts

@@ -1,8 +1,8 @@
 export {
   resolveRegisteredLucideIcon,
   resolveRegisteredLucideIconNode,
-} from './lucideRegistryRuntime'
-export { LUCIDE_ICON_REGISTRY } from './lucideRegistry.generated'
+  LUCIDE_ICON_REGISTRY,
+} from './lucideRegistry.generated'
 
 import type { LucideIcon } from 'lucide-react'
 import { LUCIDE_ICON_REGISTRY } from './lucideRegistry.generated'

package/src/backend/injection/spotIds.ts

@@ -1,8 +1,4 @@
 import type { InjectionSpotId } from '@open-mercato/shared/modules/widgets/injection'
-import {
-  crudFormExtensionSpotId,
-  dataTableExtensionSpotId,
-} from '@open-mercato/shared/modules/widgets/extension-points'
 
 export const BACKEND_RECORD_CURRENT_INJECTION_SPOT_ID: InjectionSpotId = 'backend:record:current'
 export const BACKEND_LAYOUT_TOP_INJECTION_SPOT_ID: InjectionSpotId = 'backend:layout:top'
@@ -22,33 +18,32 @@ export const GLOBAL_HEADER_STATUS_INDICATORS_INJECTION_SPOT_ID: InjectionSpotId
 
 // Standardized pattern helpers
 export const CrudFormInjectionSpots = {
-  base: (entityId: string): InjectionSpotId => crudFormExtensionSpotId(entityId),
-  beforeFields: (entityId: string): InjectionSpotId => crudFormExtensionSpotId(entityId, 'before-fields'),
-  afterFields: (entityId: string): InjectionSpotId => crudFormExtensionSpotId(entityId, 'after-fields'),
-  header: (entityId: string): InjectionSpotId => crudFormExtensionSpotId(entityId, 'header'),
-  fields: (entityId: string): InjectionSpotId => crudFormExtensionSpotId(entityId, 'fields'),
-  footer: (entityId: string): InjectionSpotId => crudFormExtensionSpotId(entityId, 'footer'),
-  sidebar: (entityId: string): InjectionSpotId => crudFormExtensionSpotId(entityId, 'sidebar'),
-  group: (entityId: string, groupId: string): InjectionSpotId => crudFormExtensionSpotId(entityId, `group:${groupId}`),
-  fieldBefore: (entityId: string, fieldId: string): InjectionSpotId => crudFormExtensionSpotId(entityId, `field:${fieldId}:before`),
-  fieldAfter: (entityId: string, fieldId: string): InjectionSpotId => crudFormExtensionSpotId(entityId, `field:${fieldId}:after`),
+  base: (entityId: string): InjectionSpotId => `crud-form:${entityId}`,
+  beforeFields: (entityId: string): InjectionSpotId => `crud-form:${entityId}:before-fields`,
+  afterFields: (entityId: string): InjectionSpotId => `crud-form:${entityId}:after-fields`,
+  header: (entityId: string): InjectionSpotId => `crud-form:${entityId}:header`,
+  footer: (entityId: string): InjectionSpotId => `crud-form:${entityId}:footer`,
+  sidebar: (entityId: string): InjectionSpotId => `crud-form:${entityId}:sidebar`,
+  group: (entityId: string, groupId: string): InjectionSpotId => `crud-form:${entityId}:group:${groupId}`,
+  fieldBefore: (entityId: string, fieldId: string): InjectionSpotId => `crud-form:${entityId}:field:${fieldId}:before`,
+  fieldAfter: (entityId: string, fieldId: string): InjectionSpotId => `crud-form:${entityId}:field:${fieldId}:after`,
 } as const
 
 export const DataTableInjectionSpots = {
-  header: (tableId: string): InjectionSpotId => dataTableExtensionSpotId(tableId, 'header'),
-  footer: (tableId: string): InjectionSpotId => dataTableExtensionSpotId(tableId, 'footer'),
-  toolbar: (tableId: string): InjectionSpotId => dataTableExtensionSpotId(tableId, 'toolbar'),
+  header: (tableId: string): InjectionSpotId => `data-table:${tableId}:header`,
+  footer: (tableId: string): InjectionSpotId => `data-table:${tableId}:footer`,
+  toolbar: (tableId: string): InjectionSpotId => `data-table:${tableId}:toolbar`,
   // Slot rendered immediately after the search input on the same row as the
   // FilterBar — intended for compact, icon-sized triggers (AI assistants,
   // saved view shortcuts, etc.). Hosts pass the resolved spot ID through to
   // FilterBar's `searchTrailing` prop. Stays empty when the table has no
   // search input.
-  searchTrailing: (tableId: string): InjectionSpotId => dataTableExtensionSpotId(tableId, 'search-trailing'),
-  emptyState: (tableId: string): InjectionSpotId => dataTableExtensionSpotId(tableId, 'empty-state'),
-  columns: (tableId: string): InjectionSpotId => dataTableExtensionSpotId(tableId, 'columns'),
-  rowActions: (tableId: string): InjectionSpotId => dataTableExtensionSpotId(tableId, 'row-actions'),
-  bulkActions: (tableId: string): InjectionSpotId => dataTableExtensionSpotId(tableId, 'bulk-actions'),
-  filters: (tableId: string): InjectionSpotId => dataTableExtensionSpotId(tableId, 'filters'),
+  searchTrailing: (tableId: string): InjectionSpotId => `data-table:${tableId}:search-trailing`,
+  emptyState: (tableId: string): InjectionSpotId => `data-table:${tableId}:empty-state`,
+  columns: (tableId: string): InjectionSpotId => `data-table:${tableId}:columns`,
+  rowActions: (tableId: string): InjectionSpotId => `data-table:${tableId}:row-actions`,
+  bulkActions: (tableId: string): InjectionSpotId => `data-table:${tableId}:bulk-actions`,
+  filters: (tableId: string): InjectionSpotId => `data-table:${tableId}:filters`,
 } as const
 
 // Portal chrome spot IDs (FROZEN once shipped)

package/src/backend/schedule/ScheduleAgenda.tsx

@@ -57,9 +57,9 @@ function getStatusLabel(status: ScheduleItem['status'], t: (key: string, fallbac
 }
 
 function getKindStyles(kind: ScheduleItem['kind']): string {
-  if (kind === 'event') return 'border-status-info-border bg-status-info-bg text-status-info-text'
-  if (kind === 'exception') return 'border-status-warning-border bg-status-warning-bg text-status-warning-text'
-  return 'border-status-success-border bg-status-success-bg text-status-success-text'
+  if (kind === 'event') return 'border-blue-500/40 bg-blue-500/10 text-blue-950'
+  if (kind === 'exception') return 'border-amber-500/40 bg-amber-500/10 text-amber-950'
+  return 'border-emerald-500/40 bg-emerald-500/10 text-emerald-950'
 }
 
 export type ScheduleAgendaProps = {

package/src/backend/schedule/ScheduleGrid.tsx

@@ -57,9 +57,9 @@ function getStatusLabel(status: ScheduleItem['status'], t: (key: string, fallbac
 }
 
 function getKindStyles(kind: ScheduleItem['kind']): string {
-  if (kind === 'event') return 'border-status-info-border bg-status-info-bg text-status-info-text'
-  if (kind === 'exception') return 'border-status-warning-border bg-status-warning-bg text-status-warning-text'
-  return 'border-status-success-border bg-status-success-bg text-status-success-text'
+  if (kind === 'event') return 'border-blue-500/40 bg-blue-500/10 text-blue-950'
+  if (kind === 'exception') return 'border-amber-500/40 bg-amber-500/10 text-amber-950'
+  return 'border-emerald-500/40 bg-emerald-500/10 text-emerald-950'
 }
 
 export type ScheduleGridProps = {

package/src/backend/schedule/ScheduleToolbar.tsx

@@ -1,19 +1,8 @@
 "use client"
 
 import * as React from 'react'
-import { DateRangePicker } from '../../primitives/date-range-picker'
-import { IconButton } from '../../primitives/icon-button'
-import {
-  SegmentedControl,
-  SegmentedControlItem,
-} from '../../primitives/segmented-control'
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '../../primitives/select'
+import { Button } from '../../primitives/button'
+import { Input } from '../../primitives/input'
 import type { ScheduleRange, ScheduleViewMode } from './types'
 import { cn } from '@open-mercato/shared/lib/utils'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -38,19 +27,17 @@ const VIEW_OPTIONS: Array<{ id: ScheduleViewMode; labelKey: string; fallback: st
   { id: 'agenda', labelKey: 'schedule.view.agenda', fallback: 'Agenda' },
 ]
 
-function getTimezoneOptions(current?: string): string[] {
-  const options = new Set<string>()
-  if (current) options.add(current)
-  options.add('UTC')
-  const resolved = Intl.DateTimeFormat().resolvedOptions().timeZone
-  if (resolved) options.add(resolved)
-  const intlWithSupportedValues = Intl as typeof Intl & { supportedValuesOf?: (input: 'timeZone') => string[] }
-  if (typeof intlWithSupportedValues.supportedValuesOf === 'function') {
-    intlWithSupportedValues.supportedValuesOf('timeZone').forEach((timezone) => {
-      if (timezone) options.add(timezone)
-    })
-  }
-  return Array.from(options).sort((a, b) => a.localeCompare(b))
+function formatDateInputValue(value: Date): string {
+  const year = value.getFullYear()
+  const month = String(value.getMonth() + 1).padStart(2, '0')
+  const day = String(value.getDate()).padStart(2, '0')
+  return `${year}-${month}-${day}`
+}
+
+function parseDateInputValue(value: string, fallback: Date): Date {
+  if (!value) return fallback
+  const next = new Date(`${value}T00:00:00`)
+  return Number.isNaN(next.getTime()) ? fallback : next
 }
 
 export type ScheduleToolbarProps = {
@@ -133,76 +120,68 @@ export function ScheduleToolbar({
     onRangeChange({ start: nextStart, end: endOfDay(addDays(nextStart, rangeLength - 1)) })
   }, [onRangeChange, range.start, rangeLength, view])
 
-  const timezoneOptions = React.useMemo(() => getTimezoneOptions(timezone), [timezone])
-
   return (
-    <div className={cn('flex flex-wrap items-center gap-x-4 gap-y-2 rounded-xl border bg-card p-3', className)}>
-      <SegmentedControl
-        value={view}
-        onValueChange={(value) => {
-          const nextView = value as ScheduleViewMode
-          if (nextView === view) return
-          onViewChange(nextView)
-          onRangeChange(deriveRangeForView(new Date(), nextView))
-        }}
-        aria-label={t('schedule.view.label', 'Schedule view')}
-        className="shrink-0"
-      >
+    <div className={cn('flex flex-col gap-3 rounded-xl border bg-card p-4 md:flex-row md:items-center md:justify-between', className)}>
+      <div className="flex flex-wrap items-center gap-2">
         {VIEW_OPTIONS.map((option) => (
-          <SegmentedControlItem key={option.id} value={option.id}>
+          <Button
+            key={option.id}
+            variant={view === option.id ? 'default' : 'outline'}
+            size="sm"
+            onClick={() => {
+              if (option.id === view) return
+              onViewChange(option.id)
+              onRangeChange(deriveRangeForView(new Date(), option.id))
+            }}
+          >
             {t(option.labelKey, option.fallback)}
-          </SegmentedControlItem>
+          </Button>
         ))}
-      </SegmentedControl>
-      <div className="flex shrink-0 items-center gap-1">
-        <IconButton
-          type="button"
-          variant="outline"
-          onClick={() => shiftRange('prev')}
-          aria-label={t('schedule.range.prev', 'Previous')}
-        >
+      </div>
+      <div className="flex flex-wrap items-center gap-2">
+        <Button type="button" variant="outline" size="sm" onClick={() => shiftRange('prev')} aria-label={t('schedule.range.prev', 'Previous')}>
           <ChevronLeft className="size-4" aria-hidden />
-        </IconButton>
-        <div className="min-w-0 whitespace-nowrap px-1 text-sm font-medium text-foreground">{rangeLabel}</div>
-        <IconButton
-          type="button"
-          variant="outline"
-          onClick={() => shiftRange('next')}
-          aria-label={t('schedule.range.next', 'Next')}
-        >
+        </Button>
+        <div className="text-sm font-medium text-foreground">{rangeLabel}</div>
+        <Button type="button" variant="outline" size="sm" onClick={() => shiftRange('next')} aria-label={t('schedule.range.next', 'Next')}>
           <ChevronRight className="size-4" aria-hidden />
-        </IconButton>
+        </Button>
       </div>
-      <div className="flex min-w-0 flex-wrap items-center gap-x-3 gap-y-2 md:ml-auto">
-        <DateRangePicker
-          value={range}
-          onChange={(next) => {
-            if (!next) return
-            onRangeChange({ start: startOfDay(next.start), end: endOfDay(next.end) })
-          }}
-          size="sm"
-          showPresets={false}
-          numberOfMonths={2}
-          aria-label={t('schedule.range.label', 'Date range')}
-        />
-        {onTimezoneChange ? (
-          <Select value={timezone ?? undefined} onValueChange={onTimezoneChange}>
-            <SelectTrigger
-              size="sm"
-              className="w-auto min-w-[10rem]"
-              aria-label={t('schedule.range.timezone', 'Timezone')}
-            >
-              <SelectValue placeholder={t('schedule.range.timezone.placeholder', 'UTC')} />
-            </SelectTrigger>
-            <SelectContent>
-              {timezoneOptions.map((option) => (
-                <SelectItem key={option} value={option}>
-                  {option}
-                </SelectItem>
-              ))}
-            </SelectContent>
-          </Select>
-        ) : null}
+      <div className="flex flex-wrap items-center gap-3">
+        <label className="flex items-center gap-2 text-xs text-muted-foreground">
+          <span>{t('schedule.range.start', 'Start')}</span>
+          <Input
+            type="date"
+            value={formatDateInputValue(range.start)}
+            onChange={(event) => {
+              const nextStart = parseDateInputValue(event.target.value, range.start)
+              onRangeChange({ start: nextStart, end: range.end })
+            }}
+            className="h-8 w-full sm:w-[140px]"
+          />
+        </label>
+        <label className="flex items-center gap-2 text-xs text-muted-foreground">
+          <span>{t('schedule.range.end', 'End')}</span>
+          <Input
+            type="date"
+            value={formatDateInputValue(range.end)}
+            onChange={(event) => {
+              const nextEnd = parseDateInputValue(event.target.value, range.end)
+              onRangeChange({ start: range.start, end: nextEnd })
+            }}
+            className="h-8 w-full sm:w-[140px]"
+          />
+        </label>
+        <label className="flex items-center gap-2 text-xs text-muted-foreground">
+          <span>{t('schedule.range.timezone', 'Timezone')}</span>
+          <Input
+            type="text"
+            value={timezone ?? ''}
+            onChange={(event) => onTimezoneChange?.(event.target.value)}
+            className="h-8 w-full sm:w-[180px]"
+            placeholder={t('schedule.range.timezone.placeholder', 'UTC')}
+          />
+        </label>
       </div>
     </div>
   )

package/src/backend/sidebar/SidebarCustomizationEditor.tsx

@@ -14,7 +14,6 @@ import { Switch } from '../../primitives/switch'
 import { Card, CardContent, CardHeader, CardTitle } from '../../primitives/card'
 import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '../../primitives/dialog'
 import { Tag } from '../../primitives/tag'
-import { Badge } from '../../primitives/badge'
 import {
   Select,
   SelectContent,
@@ -32,14 +31,12 @@ import { useConfirmDialog } from '../confirm-dialog'
 import { useGuardedMutation } from '../injection/useGuardedMutation'
 import {
   applyCustomizationDraft,
-  applyGroupHidden,
   applyItemOrder,
   cloneSidebarGroups,
   collectSidebarDefaults,
   filterMainSidebarGroups,
   mergeGroupOrder,
   resolveGroupKey,
-  resolveGroupVisibility,
   resolveItemKey,
   type SidebarCustomizationDraft,
   type SidebarGroup,
@@ -551,19 +548,6 @@ export function SidebarCustomizationEditor({
     })
   }, [updateDraft])
 
-  /**
-   * Hiding a whole group previously meant toggling every item in it one at a time — a dozen-plus
-   * clicks for what reads as a single decision. Writes the same `hiddenItemIds` keys the per-item
-   * switches do, so the persisted settings are indistinguishable from reaching this state by hand.
-   */
-  const setGroupHidden = React.useCallback((groupKey: string, hidden: boolean) => {
-    updateDraft((draft) => {
-      const group = baseSnapshotRef.current?.find((candidate) => resolveGroupKey(candidate) === groupKey)
-      if (!group) return draft
-      return { ...draft, hiddenItemIds: applyGroupHidden(draft.hiddenItemIds, group, hidden) }
-    })
-  }, [updateDraft])
-
   const reset = React.useCallback(() => {
     if (!baseSnapshotRef.current) return
     if (selectedVariant) {
@@ -1238,30 +1222,7 @@ export function SidebarCustomizationEditor({
                             </p>
                           ) : null}
                         </div>
-                        <div className="flex shrink-0 items-center gap-2 mt-6">
-                          {(() => {
-                            const visibility = resolveGroupVisibility(baseGroup, draft.hiddenItemIds)
-                            const groupName = trimmedValue.length > 0 ? trimmedValue : placeholder
-                            const label = visibility === 'partial'
-                              ? t('appShell.sidebarCustomizationHideGroupPartial', 'Some items in {group} are hidden — turn off to hide the whole group', { group: groupName })
-                              : t('appShell.sidebarCustomizationShowGroup', 'Show {group}', { group: groupName })
-                            return (
-                              <>
-                                {visibility === 'hidden' ? (
-                                  <Badge variant="muted" size="sm" className="uppercase tracking-wide">
-                                    {t('appShell.sidebarCustomizationHiddenBadge', 'Hidden')}
-                                  </Badge>
-                                ) : null}
-                                <Switch
-                                  checked={visibility !== 'hidden'}
-                                  onCheckedChange={(next) => setGroupHidden(groupId, next !== true)}
-                                  disabled={isBusy}
-                                  aria-label={label}
-                                  title={label}
-                                />
-                              </>
-                            )
-                          })()}
+                        <div className="flex shrink-0 items-center gap-1 mt-[26px]">
                           <IconButton
                             type="button"
                             variant="outline"
@@ -1388,9 +1349,9 @@ function ItemRow({ item, draft, saving, onLabelChange, onHiddenChange, t, depth,
       </div>
       <div className="flex shrink-0 items-center gap-2 pt-1.5">
         {hidden ? (
-          <Badge variant="muted" size="sm" className="uppercase tracking-wide">
+          <span className="rounded-full border border-border bg-muted px-2 py-0.5 text-xs font-medium uppercase tracking-wide text-muted-foreground">
             {t('appShell.sidebarCustomizationHiddenBadge', 'Hidden')}
-          </Badge>
+          </span>
         ) : null}
         <Switch
           checked={!hidden}

package/src/backend/sidebar/customization-helpers.ts

@@ -156,53 +156,6 @@ export function applyCustomizationDraft(
   return result
 }
 
-/** Every item key a group owns, including nested children. */
-export function collectGroupItemKeys(group: SidebarGroup): string[] {
-  const keys: string[] = []
-  const walk = (items: SidebarItem[]) => {
-    for (const item of items) {
-      keys.push(resolveItemKey(item))
-      if (item.children?.length) walk(item.children)
-    }
-  }
-  walk(group.items)
-  return keys
-}
-
-/**
- * Whether a group is fully visible, fully hidden, or in between. `AppShell` drops a group once every
- * one of its items is hidden, so `'hidden'` is the state that removes the group from the sidebar.
- */
-export function resolveGroupVisibility(
-  group: SidebarGroup,
-  hiddenItemIds: Record<string, boolean>,
-): 'visible' | 'hidden' | 'partial' {
-  const keys = collectGroupItemKeys(group)
-  if (keys.length === 0) return 'visible'
-  const hiddenCount = keys.filter((key) => hiddenItemIds[key]).length
-  if (hiddenCount === 0) return 'visible'
-  if (hiddenCount === keys.length) return 'hidden'
-  return 'partial'
-}
-
-/**
- * Hides or shows every item in a group at once. Writes the same `hiddenItemIds` keys the per-item
- * switches use, so the resulting settings are indistinguishable from reaching this state by toggling
- * each item by hand — no new persisted shape, no migration.
- */
-export function applyGroupHidden(
-  hiddenItemIds: Record<string, boolean>,
-  group: SidebarGroup,
-  hidden: boolean,
-): Record<string, boolean> {
-  const next = { ...hiddenItemIds }
-  for (const key of collectGroupItemKeys(group)) {
-    if (hidden) next[key] = true
-    else delete next[key]
-  }
-  return next
-}
-
 /**
  * Filters groups to include only main sidebar items.
  * Excludes items with pageContext 'settings' or 'profile' from customization.

package/src/backend/utils/__tests__/api.test.ts

@@ -149,6 +149,33 @@ describe('apiFetch', () => {
     expect(flash).not.toHaveBeenCalled()
   })
 
+  it('stays silent when a login-page 401 lands after the post-login navigation', async () => {
+    window.history.pushState({}, '', '/login')
+    ;(window as unknown as Record<string, unknown>).__omOriginalFetch = jest.fn(async () => {
+      // The sign-in completes while the pre-auth probe is still in flight, so the
+      // app has already client-navigated to /backend when the 401 arrives.
+      window.history.pushState({}, '', '/backend')
+      return createMockResponse(401, { error: 'Unauthorized' })
+    })
+
+    const result = await apiFetch('/api/auth/feature-check', { method: 'POST' })
+
+    expect(result.status).toBe(401)
+    expect(flash).not.toHaveBeenCalled()
+  })
+
+  it('stays silent when a 401 lands after navigating to the login page', async () => {
+    ;(window as unknown as Record<string, unknown>).__omOriginalFetch = jest.fn(async () => {
+      window.history.pushState({}, '', '/login')
+      return createMockResponse(401, { error: 'Unauthorized' })
+    })
+
+    const result = await apiFetch('/api/private')
+
+    expect(result.status).toBe(401)
+    expect(flash).not.toHaveBeenCalled()
+  })
+
   it('throws UnauthorizedError for 401 responses by default', async () => {
     ;(window as unknown as Record<string, unknown>).__omOriginalFetch = jest.fn(async () =>
       createMockResponse(401, { error: 'Unauthorized' }),

package/src/backend/utils/__tests__/apiCall.test.ts

@@ -107,64 +107,3 @@ describe('readApiResultOrThrow', () => {
     expect(result).toBeNull()
   })
 })
-
-describe('aborted requests', () => {
-  beforeEach(() => {
-    jest.resetAllMocks()
-  })
-
-  function createAbortedBodyResponse(): Response {
-    const abortError = new Error('The operation was aborted.')
-    abortError.name = 'AbortError'
-    const response = {
-      ok: true,
-      status: 200,
-      headers: new Map<string, string>(),
-      text: jest.fn(async () => { throw abortError }),
-      clone: () => response,
-    } as unknown as Response
-    return response
-  }
-
-  it('rejects with AbortError instead of reporting an empty payload', async () => {
-    ;(apiFetch as jest.Mock).mockResolvedValue(createAbortedBodyResponse())
-    const controller = new AbortController()
-    controller.abort()
-
-    await expect(
-      readApiResultOrThrow('/api/interactions', { signal: controller.signal }),
-    ).rejects.toMatchObject({ name: 'AbortError' })
-  })
-
-  it('does not mask a genuinely empty payload when the request was not aborted', async () => {
-    ;(apiFetch as jest.Mock).mockResolvedValue(createMockResponse('', { status: 200 }))
-    const controller = new AbortController()
-
-    await expect(
-      readApiResultOrThrow('/api/interactions', { signal: controller.signal }),
-    ).rejects.toThrow('Missing response payload (200)')
-  })
-
-  it('keeps the caller-provided fallback when one is configured', async () => {
-    ;(apiFetch as jest.Mock).mockResolvedValue(createAbortedBodyResponse())
-    const controller = new AbortController()
-    controller.abort()
-
-    const call = await apiCall<{ items: string[] }>(
-      '/api/interactions',
-      { signal: controller.signal },
-      { fallback: { items: [] } },
-    )
-    expect(call.result).toEqual({ items: [] })
-  })
-
-  it('propagates AbortError raised by a custom parser', async () => {
-    ;(apiFetch as jest.Mock).mockResolvedValue(createMockResponse('{}', { status: 200 }))
-    const abortError = new Error('The operation was aborted.')
-    abortError.name = 'AbortError'
-
-    await expect(
-      apiCall('/api/interactions', undefined, { parse: async () => { throw abortError } }),
-    ).rejects.toMatchObject({ name: 'AbortError' })
-  })
-})