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

package/src/backend/AppShell.tsx

@@ -87,7 +87,6 @@ function isBooleanRecord(value: unknown): value is Record<string, boolean> {
 export type ShellLogo = {
   src: string
   alt?: string
-  preserveAspectRatio?: boolean
 }
 
 export type AppShellProps = {
@@ -187,56 +186,6 @@ function shouldBypassLogoOptimization(src?: string | null): boolean {
   return /^https?:\/\//.test(value) || /^\/api\/attachments\/(?:image|file)\//.test(value)
 }
 
-function ShellBrandLogo({
-  logo,
-  brandName,
-  unoptimized,
-  compact = false,
-  mobile = false,
-}: {
-  logo?: ShellLogo
-  brandName: string
-  unoptimized?: boolean
-  compact?: boolean
-  mobile?: boolean
-}) {
-  const src = logo?.src ?? '/open-mercato.svg'
-  const alt = logo?.alt ?? brandName
-  const isCustomLogo = Boolean(logo?.src)
-  const preserveAspectRatio = Boolean(logo?.preserveAspectRatio)
-  if (!isCustomLogo || !preserveAspectRatio) {
-    return (
-      <Image
-        src={src}
-        alt={alt}
-        width={mobile ? 28 : 40}
-        height={mobile ? 28 : 40}
-        className={`${mobile ? 'rounded' : 'rounded-full'} shrink-0 object-cover`}
-        unoptimized={unoptimized ? true : undefined}
-      />
-    )
-  }
-
-  const width = compact ? 40 : mobile ? 96 : 120
-  const height = mobile ? 28 : 40
-  const className = compact
-    ? 'h-10 max-w-10 w-auto shrink-0 object-contain'
-    : mobile
-      ? 'h-7 max-w-24 w-auto shrink-0 object-contain'
-      : 'h-10 max-w-[120px] w-auto shrink-0 object-contain'
-
-  return (
-    <Image
-      src={src}
-      alt={alt}
-      width={width}
-      height={height}
-      className={className}
-      unoptimized={unoptimized ? true : undefined}
-    />
-  )
-}
-
 function mergeSidebarItemsWithInjected(
   items: SidebarItem[],
   injectedItems: InjectionMenuItem[],
@@ -811,7 +760,7 @@ function AppShellBody({ productName, logo, email, canManageUpgradeActions = fals
               className={`flex items-center gap-3 rounded-xl transition-colors hover:bg-muted ${compact ? 'p-2 justify-center' : 'p-3'}`}
               aria-label={t('appShell.goToDashboard')}
             >
-              <ShellBrandLogo logo={resolvedLogo} brandName={resolvedBrandName} compact={compact} unoptimized={resolvedLogoBypassesOptimization} />
+              <Image src={resolvedLogo?.src ?? "/open-mercato.svg"} alt={resolvedLogo?.alt ?? resolvedBrandName} width={40} height={40} className="rounded-full shrink-0" unoptimized={resolvedLogoBypassesOptimization ? true : undefined} />
               {!compact && <span className="truncate text-sm font-medium text-foreground">{resolvedBrandName}</span>}
             </Link>
           </div>
@@ -944,7 +893,7 @@ function AppShellBody({ productName, logo, email, canManageUpgradeActions = fals
                 className={`flex items-center gap-3 rounded-xl transition-colors hover:bg-muted ${compact ? 'p-2 justify-center' : 'p-3'}`}
                 aria-label={t('appShell.goToDashboard')}
               >
-                <ShellBrandLogo logo={resolvedLogo} brandName={resolvedBrandName} compact={compact} unoptimized={resolvedLogoBypassesOptimization} />
+                <Image src={resolvedLogo?.src ?? "/open-mercato.svg"} alt={resolvedLogo?.alt ?? resolvedBrandName} width={40} height={40} className="rounded-full shrink-0" unoptimized={resolvedLogoBypassesOptimization ? true : undefined} />
                 {!compact && <span className="truncate text-sm font-medium text-foreground">{resolvedBrandName}</span>}
               </Link>
             </div>
@@ -1010,7 +959,7 @@ function AppShellBody({ productName, logo, email, canManageUpgradeActions = fals
               className={`flex items-center gap-3 rounded-xl transition-colors hover:bg-muted ${compact ? 'p-2 justify-center' : 'p-3'}`}
               aria-label={t('appShell.goToDashboard')}
             >
-              <ShellBrandLogo logo={resolvedLogo} brandName={resolvedBrandName} compact={compact} unoptimized={resolvedLogoBypassesOptimization} />
+              <Image src={resolvedLogo?.src ?? "/open-mercato.svg"} alt={resolvedLogo?.alt ?? resolvedBrandName} width={40} height={40} className="rounded-full shrink-0" unoptimized={resolvedLogoBypassesOptimization ? true : undefined} />
               {!compact && <span className="truncate text-sm font-medium text-foreground">{resolvedBrandName}</span>}
             </Link>
           </div>
@@ -1509,7 +1458,7 @@ function AppShellBody({ productName, logo, email, canManageUpgradeActions = fals
           <aside className="absolute left-0 top-0 flex h-full w-[280px] max-w-[85vw] flex-col bg-background border-r shadow-lg overflow-hidden">
             <div className="shrink-0 flex items-center justify-between gap-2 border-b px-4 py-3">
               <Link href="/backend" className="flex items-center gap-2 min-w-0 text-sm font-semibold" onClick={() => setMobileOpen(false)} aria-label={t('appShell.goToDashboard')}>
-                <ShellBrandLogo logo={resolvedLogo} brandName={resolvedBrandName} mobile unoptimized={resolvedLogoBypassesOptimization} />
+                <Image src={resolvedLogo?.src ?? "/open-mercato.svg"} alt={resolvedLogo?.alt ?? resolvedBrandName} width={28} height={28} className="rounded shrink-0" unoptimized={resolvedLogoBypassesOptimization ? true : undefined} />
                 <span className="truncate">{resolvedBrandName}</span>
               </Link>
               <IconButton variant="ghost" size="sm" onClick={() => setMobileOpen(false)} aria-label={t('appShell.closeMenu')}>

package/src/backend/AuthSessionGuard.tsx

@@ -1,37 +1,9 @@
 'use client'
 import * as React from 'react'
 import { apiCall } from './utils/apiCall'
-import { clearAllPerspectiveState } from './perspectiveState'
 
 export const AUTH_IDENTITY_STORAGE_KEY = 'om:auth:identity'
 export const AUTH_IDENTITY_BROADCAST_CHANNEL = 'om-auth-identity'
-export const AUTH_IDENTITY_USER_STORAGE_KEY = 'om:auth:identity:user'
-
-/**
- * Purge browser-local DataTable perspective state whenever the backend renders for a
- * different user than the one it last rendered for (#4185).
- *
- * The login form also purges on submit, but that only fires when its client handler
- * runs: a form submitted before hydration, an SSO/magic-link return, or any other
- * entry point into the backend bypasses it entirely and the previous account's unsaved
- * column widths carry over. Anchoring the purge to the observed server identity covers
- * every route into the backend instead of one form.
- *
- * Missing identity metadata is treated as a legacy browser state and purged once:
- * snapshots may predate this marker and belong to a different account. After the
- * marker is recorded, an account's own unsaved widths survive a plain reload.
- */
-function purgePerspectiveStateOnIdentityChange(serverUserId: string | null): void {
-  if (typeof window === 'undefined' || !serverUserId) return
-  try {
-    const lastSeenUserId = window.localStorage.getItem(AUTH_IDENTITY_USER_STORAGE_KEY)
-    if (lastSeenUserId === serverUserId) return
-    clearAllPerspectiveState()
-    window.localStorage.setItem(AUTH_IDENTITY_USER_STORAGE_KEY, serverUserId)
-  } catch {
-    // private mode / quota errors are non-fatal
-  }
-}
 
 type FeatureCheckResponse = {
   ok: boolean
@@ -52,7 +24,6 @@ export const __reload = {
 export function AuthSessionGuard({ serverUserId }: AuthSessionGuardProps) {
   React.useEffect(() => {
     if (typeof window === 'undefined') return
-    purgePerspectiveStateOnIdentityChange(serverUserId)
     let cancelled = false
     let reloadScheduled = false
 

package/src/backend/BackendChromeProvider.tsx

@@ -3,10 +3,7 @@
 import * as React from 'react'
 import { apiCall } from './utils/apiCall'
 import { subscribeOrganizationScopeChanged, getCurrentOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/organizationEvents'
-import type {
-  BackendChromeCurrentOrganization,
-  BackendChromePayload,
-} from '@open-mercato/shared/modules/navigation/backendChrome'
+import type { BackendChromePayload } from '@open-mercato/shared/modules/navigation/backendChrome'
 
 type BackendChromeContextValue = {
   payload: BackendChromePayload | null
@@ -102,18 +99,3 @@ export function useBackendChrome(): BackendChromeContextValue {
     refresh: async () => {},
   }
 }
-
-/**
- * The organization the backend chrome is currently scoped to, for UI that needs to label
- * "you are viewing: <name>".
- *
- * Reads the payload this provider already holds, so it costs no additional request. Returns `null`
- * under an all-organizations selection, outside a provider, or before the payload has arrived — treat
- * it as "unknown", not as "no organization".
- *
- * Prefer this over `payload.brand`, which only populates when the organization has a logo configured.
- */
-export function useCurrentOrganization(): BackendChromeCurrentOrganization | null {
-  const { payload } = useBackendChrome()
-  return payload?.currentOrganization ?? null
-}

package/src/backend/CrudForm.tsx

@@ -107,7 +107,6 @@ import type { InjectionFieldDefinition, FieldContext } from '@open-mercato/share
 import { insertByInjectionPlacement } from '@open-mercato/shared/modules/widgets/injection-position'
 import { evaluateInjectedVisibility } from './injection/visibility-utils'
 import { ComponentReplacementHandles } from '@open-mercato/shared/modules/widgets/component-registry'
-import { crudFormExtensionSpotId, extensionSpotChildId } from '@open-mercato/shared/modules/widgets/extension-points'
 import { RichEditor, type RichEditorLabels } from '../primitives/rich-editor'
 import MarkdownField from './inputs/MarkdownField'
 
@@ -817,7 +816,7 @@ export function CrudForm<TValues extends Record<string, unknown>>({
     if (injectionSpotId) return injectionSpotId
     if (resolvedEntityIds.length) {
       const normalized = resolvedEntityIds[0].replace(/[:]+/g, '.')
-      return crudFormExtensionSpotId(normalized)
+      return `crud-form:${normalized}`
     }
     return undefined
   }, [injectionSpotId, resolvedEntityIds])
@@ -826,9 +825,7 @@ export function CrudForm<TValues extends Record<string, unknown>>({
     if (resolvedEntityIds.length) return ComponentReplacementHandles.crudForm(resolvedEntityIds[0].replace(/[:]+/g, '.'))
     return ComponentReplacementHandles.crudForm('unknown')
   }, [replacementHandle, resolvedEntityIds])
-  const headerInjectionSpotId = resolvedInjectionSpotId
-    ? extensionSpotChildId(resolvedInjectionSpotId, 'header')
-    : undefined
+  const headerInjectionSpotId = resolvedInjectionSpotId ? `${resolvedInjectionSpotId}:header` : undefined
   
   const recordId = React.useMemo(() => {
     const raw = values.id
@@ -1086,9 +1083,7 @@ export function CrudForm<TValues extends Record<string, unknown>>({
     triggerOnLoad: true,
   })
   const { widgets: injectedFieldWidgets } = useInjectionDataWidgets(
-    resolvedInjectionSpotId
-      ? extensionSpotChildId(resolvedInjectionSpotId, 'fields')
-      : '__disabled__:fields'
+    resolvedInjectionSpotId ? `${resolvedInjectionSpotId}:fields` : '__disabled__:fields'
   )
   
   const { triggerEvent: triggerInjectionEvent } = useInjectionSpotEvents(resolvedInjectionSpotId ?? '', injectionWidgets)
@@ -2407,19 +2402,10 @@ export function CrudForm<TValues extends Record<string, unknown>>({
 
   const handleFieldsetSelectionChange = React.useCallback(
     (entityId: string, nextCode: string | null) => {
-      // The fieldset selector never renders an empty option, so a user can never
-      // pick "no fieldset". An empty/null value here only comes from Radix's
-      // hidden native <select>, which fires a spurious onChange when the
-      // controlled value is changed programmatically after mount (e.g. when the
-      // persisted customFieldsetCode arrives via async initialValues and the
-      // binding hydrates the selection). Honoring that reset would wipe both the
-      // selection and the bound value, collapsing the form back to the default
-      // fieldset (#2646). Ignore it.
-      if (!nextCode) return
       setCfFieldsetSelections((prev) => ({ ...prev, [entityId]: nextCode }))
       const bindingKey = customFieldsetBindings?.[entityId]?.valueKey
       if (bindingKey) {
-        setValue(bindingKey, nextCode)
+        setValue(bindingKey, nextCode ?? undefined)
       }
     },
     [customFieldsetBindings, setValue],

package/src/backend/DataTable.tsx

@@ -59,7 +59,6 @@ import type {
   InjectionRowActionDefinition,
 } from '@open-mercato/shared/modules/widgets/injection'
 import { ComponentReplacementHandles } from '@open-mercato/shared/modules/widgets/component-registry'
-import { dataTableExtensionSpotId, extensionSpotChildId } from '@open-mercato/shared/modules/widgets/extension-points'
 import { insertByInjectionPlacement } from '@open-mercato/shared/modules/widgets/injection-position'
 import { useVirtualizer } from '@tanstack/react-virtual'
 import type {
@@ -95,11 +94,6 @@ import {
 } from '@dnd-kit/sortable'
 import { CSS } from '@dnd-kit/utilities'
 import { createLogger } from '@open-mercato/shared/lib/logger'
-import { clearAllPerspectiveState, PERSPECTIVE_COOKIE_PREFIX, PERSPECTIVE_STORAGE_PREFIX } from './perspectiveState'
-
-// Re-exported so `@open-mercato/ui/backend/DataTable` stays the published import
-// path for the purge (BACKWARD_COMPATIBILITY: import paths are a contract surface).
-export { clearAllPerspectiveState }
 
 const logger = createLogger('ui').child({ component: 'DataTable' })
 
@@ -475,6 +469,8 @@ function resolveExportSections(config: DataTableExportConfig | null | undefined)
   return sections
 }
 
+const PERSPECTIVE_COOKIE_PREFIX = 'om_table_perspective'
+const PERSPECTIVE_STORAGE_PREFIX = 'om_table_perspective_snapshot'
 
 // Bounds for user-driven column resizing (#1835). Widths outside this range are
 // clamped so a persisted/dragged value can never collapse a column to nothing or
@@ -1356,8 +1352,8 @@ export function DataTable<T>({
   }, [injectionSpotId, perspective?.tableId, extensionTableIdProp])
   const resolvedInjectionSpotId =
     injectionSpotId
-    ?? (perspective?.tableId ? dataTableExtensionSpotId(perspective.tableId) : null)
-    ?? (extensionTableIdProp ? dataTableExtensionSpotId(extensionTableIdProp) : null)
+    ?? (perspective?.tableId ? `data-table:${perspective.tableId}` : null)
+    ?? (extensionTableIdProp ? `data-table:${extensionTableIdProp}` : null)
   const resolvedReplacementHandle = replacementHandle ?? ComponentReplacementHandles.dataTable(extensionTableId ?? 'unknown')
   const baseInjectionContext = React.useMemo(
     () => {
@@ -1380,32 +1376,32 @@ export function DataTable<T>({
     [injectionContext, perspective?.tableId, extensionTableId, title]
   )
   const headerInjectionSpotId = React.useMemo(
-    () => (resolvedInjectionSpotId ? extensionSpotChildId(resolvedInjectionSpotId, 'header') : null),
+    () => (resolvedInjectionSpotId ? `${resolvedInjectionSpotId}:header` : null),
     [resolvedInjectionSpotId]
   )
   const toolbarInjectionSpotId = React.useMemo(
-    () => (resolvedInjectionSpotId ? extensionSpotChildId(resolvedInjectionSpotId, 'toolbar') : null),
+    () => (resolvedInjectionSpotId ? `${resolvedInjectionSpotId}:toolbar` : null),
     [resolvedInjectionSpotId]
   )
   const searchTrailingInjectionSpotId = React.useMemo(
-    () => (resolvedInjectionSpotId ? extensionSpotChildId(resolvedInjectionSpotId, 'search-trailing') : null),
+    () => (resolvedInjectionSpotId ? `${resolvedInjectionSpotId}:search-trailing` : null),
     [resolvedInjectionSpotId]
   )
   const footerInjectionSpotId = React.useMemo(
-    () => (resolvedInjectionSpotId ? extensionSpotChildId(resolvedInjectionSpotId, 'footer') : null),
+    () => (resolvedInjectionSpotId ? `${resolvedInjectionSpotId}:footer` : null),
     [resolvedInjectionSpotId]
   )
   const { widgets: columnWidgets } = useInjectionDataWidgets(
-    extensionTableId ? dataTableExtensionSpotId(extensionTableId, 'columns') : '__disabled__:columns',
+    extensionTableId ? `data-table:${extensionTableId}:columns` : '__disabled__:columns',
   )
   const { widgets: rowActionWidgets } = useInjectionDataWidgets(
-    extensionTableId ? dataTableExtensionSpotId(extensionTableId, 'row-actions') : '__disabled__:row-actions',
+    extensionTableId ? `data-table:${extensionTableId}:row-actions` : '__disabled__:row-actions',
   )
   const { widgets: bulkActionWidgets } = useInjectionDataWidgets(
-    extensionTableId ? dataTableExtensionSpotId(extensionTableId, 'bulk-actions') : '__disabled__:bulk-actions',
+    extensionTableId ? `data-table:${extensionTableId}:bulk-actions` : '__disabled__:bulk-actions',
   )
   const { widgets: filterWidgets } = useInjectionDataWidgets(
-    extensionTableId ? dataTableExtensionSpotId(extensionTableId, 'filters') : '__disabled__:filters',
+    extensionTableId ? `data-table:${extensionTableId}:filters` : '__disabled__:filters',
   )
   const injectedColumnDefs = React.useMemo<{ def: ColumnDef<T, unknown>; placement: InjectionColumnDefinition['placement'] }[]>(() => {
     const entries: InjectionColumnDefinition[] = []
@@ -1699,31 +1695,18 @@ export function DataTable<T>({
     })
   }, [table, mergedColumns])
 
-  // A stored perspective seeds `columnVisibility` at mount and wins outright over the
-  // `meta.hidden` defaults, so the auto-hide pass is skipped entirely in that case.
-  const visibilitySeededByStoredSettings = React.useRef(Boolean(mergedInitialSettings?.columnVisibility))
-  // Auto-hiding is a per-column default, applied once per column — not an enforcement.
-  // It cannot be latched by a single has-run boolean: columns arrive in waves, because
-  // custom-field columns are built from definitions fetched asynchronously. The first
-  // render carries no `cf_*` column at all, so a run-once pass found nothing to hide and
-  // still burned the latch, leaving fields declared `listVisible: false` visible for the
-  // rest of the session after a hard page load (#4859).
-  // It also cannot lean on `columnVisibility` as the record of what has been decided:
-  // `handleColumnChooserToggle` *deletes* a column's entry when the user turns it back on,
-  // so a re-shown column is indistinguishable from one never seen and would be hidden again
-  // on the next wave. Hence an explicit per-column record of what this pass has applied.
-  const autoHiddenColumnIds = React.useRef<Set<string>>(new Set())
+  const initialVisibilityApplied = React.useRef(Boolean(mergedInitialSettings?.columnVisibility))
   React.useEffect(() => {
-    if (visibilitySeededByStoredSettings.current) return
+    if (initialVisibilityApplied.current) return
     const hidden: VisibilityState = {}
     table.getAllLeafColumns().forEach((column) => {
       const hiddenMeta = (column.columnDef as any)?.meta?.hidden
-      if (!hiddenMeta || autoHiddenColumnIds.current.has(column.id)) return
-      hidden[column.id] = false
-      autoHiddenColumnIds.current.add(column.id)
+      if (hiddenMeta) hidden[column.id] = false
     })
-    if (!Object.keys(hidden).length) return
-    setColumnVisibility((prev) => ({ ...hidden, ...prev }))
+    if (Object.keys(hidden).length) {
+      setColumnVisibility((prev) => ({ ...hidden, ...prev }))
+    }
+    initialVisibilityApplied.current = true
   }, [table, mergedColumns])
 
   const getCurrentSettings = React.useCallback((): PerspectiveSettings => {

package/src/backend/JsonBuilder.tsx

@@ -164,7 +164,7 @@ export function JsonBuilder({
                         disabled={disabled}
                     />
                     {parseError && (
-                        <div className="text-xs text-status-error-text">Invalid JSON format</div>
+                        <div className="text-xs text-red-600">Invalid JSON format</div>
                     )}
                 </div>
             ) : (
@@ -185,7 +185,7 @@ export function JsonBuilder({
                 </div>
             )}
 
-            {error && <div className="text-xs text-status-error-text">{error}</div>}
+            {error && <div className="text-xs text-red-600">{error}</div>}
             {ConfirmDialogElement}
         </div>
     )
@@ -363,7 +363,7 @@ function JsonNode({ data, onChange, onDelete, readOnly, label, isRoot, confirm }
                             type="button"
                             variant="ghost"
                             size="xs"
-                            className="text-muted-foreground hover:text-destructive opacity-0 group-hover:opacity-100 transition-opacity"
+                            className="text-muted-foreground hover:text-red-500 opacity-0 group-hover:opacity-100 transition-opacity"
                             title="Remove item"
                             onClick={onDelete}
                         >

package/src/backend/NextStepCallout.tsx

@@ -42,16 +42,16 @@ type NextStepCalloutProps = {
 const STEP_STYLES: Record<NonNullable<NextStepCalloutStep['state']>, string> = {
   pending: '',
   active: 'border-primary/40 bg-primary/10 text-primary',
-  completed: 'border-status-success-border bg-status-success-bg text-status-success-text',
+  completed: 'border-emerald-500/30 bg-emerald-500/10 text-emerald-200',
 }
 
 const STATUS_STYLES: Record<NextStepCalloutStatusTone, string> = {
   default: 'border-border bg-background/80 text-foreground',
   info: 'border-primary/20 bg-primary/5 text-primary',
-  success: 'border-status-success-border bg-status-success-bg text-status-success-text',
-  warning: 'border-status-warning-border bg-status-warning-bg text-status-warning-text',
+  success: 'border-emerald-500/20 bg-emerald-500/5 text-emerald-200',
+  warning: 'border-amber-500/20 bg-amber-500/5 text-amber-200',
   danger: 'border-destructive/20 bg-destructive/5 text-destructive',
-  muted: 'border-status-neutral-border bg-status-neutral-bg text-status-neutral-text',
+  muted: 'border-zinc-500/20 bg-zinc-500/5 text-zinc-200',
 }
 
 export function NextStepCallout({

package/src/backend/ProfileDropdown.tsx

@@ -29,7 +29,6 @@ const localeLabels: Record<Locale, string> = {
   de: 'Deutsch',
   es: 'Español',
   pl: 'Polski',
-  ko: '한국어',
 }
 
 export function ProfileDropdown({

package/src/backend/RowActions.tsx

@@ -123,7 +123,7 @@ export function RowActions({ items = [] }: { items?: RowActionItem[] }) {
               <a
                 key={idx}
                 href={it.href}
-                className={`block w-full text-left px-2 py-1 text-sm rounded hover:bg-accent ${it.destructive ? 'text-destructive' : ''}`}
+                className={`block w-full text-left px-2 py-1 text-sm rounded hover:bg-accent ${it.destructive ? 'text-red-600' : ''}`}
                 role="menuitem"
                 onClick={(event) => {
                   event.stopPropagation()
@@ -138,7 +138,7 @@ export function RowActions({ items = [] }: { items?: RowActionItem[] }) {
                 type="button"
                 variant="ghost"
                 size="sm"
-                className={`w-full justify-start rounded-none font-normal ${it.destructive ? 'text-destructive' : ''}`}
+                className={`w-full justify-start rounded-none font-normal ${it.destructive ? 'text-red-600' : ''}`}
                 role="menuitem"
                 onClick={(event) => {
                   event.stopPropagation()

package/src/backend/__tests__/AppShell.test.tsx

@@ -226,11 +226,7 @@ describe('AppShell', () => {
     expect(screen.getByTestId('injection-spot:backend:layout:footer')).toBeInTheDocument()
   })
 
-  it.each([
-    ['internal-file', '/api/attachments/file/aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa'],
-    ['internal-image-query', '/api/attachments/image/aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa/acme.svg?width=320&height=320'],
-    ['external-webp', 'https://example.com/acme-wide-logo.webp'],
-  ])('uses an aspect-ratio-preserving backend chrome brand logo when enabled for %s', async (variant, logoSrc) => {
+  it('uses backend chrome brand logo when the selected organization has one', async () => {
     const previousFetch = global.fetch
     const previousWindowFetch = window.fetch
     const previousOriginalFetch = (window as Window & { __omOriginalFetch?: typeof fetch }).__omOriginalFetch
@@ -239,9 +235,8 @@ describe('AppShell', () => {
         brand: {
           name: 'Acme',
           logo: {
-            src: logoSrc,
+            src: '/api/attachments/image/aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa/acme.png?width=320',
             alt: 'Acme logo',
-            preserveAspectRatio: true,
           },
         },
         groups,
@@ -262,7 +257,7 @@ describe('AppShell', () => {
         <AppShell
           email="demo@example.com"
           groups={[]}
-          adminNavApi={`/api/auth/admin/nav-brand-logo-${variant}`}
+          adminNavApi="/api/auth/admin/nav-brand-logo"
         >
           <div>Child content</div>
         </AppShell>,
@@ -271,10 +266,11 @@ describe('AppShell', () => {
 
       await waitFor(() => {
         const logo = screen.getByAltText('Acme logo')
-        expect(logo).toHaveAttribute('src', logoSrc)
+        expect(logo).toHaveAttribute(
+          'src',
+          '/api/attachments/image/aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa/acme.png?width=320',
+        )
         expect(logo).toHaveAttribute('data-unoptimized', 'true')
-        expect(logo).toHaveClass('object-contain')
-        expect(logo).not.toHaveClass('rounded-full')
       })
       expect(screen.getByText('Acme')).toBeInTheDocument()
     } finally {
@@ -284,60 +280,6 @@ describe('AppShell', () => {
     }
   })
 
-  it('uses the cropped icon treatment for backend chrome brand logos by default', async () => {
-    const previousFetch = global.fetch
-    const previousWindowFetch = window.fetch
-    const previousOriginalFetch = (window as Window & { __omOriginalFetch?: typeof fetch }).__omOriginalFetch
-    const logoSrc = 'https://example.com/acme-wide-logo.webp'
-    const fetchMock = jest.fn().mockResolvedValue(
-      new Response(JSON.stringify({
-        brand: {
-          name: 'Acme',
-          logo: {
-            src: logoSrc,
-            alt: 'Acme logo',
-          },
-        },
-        groups,
-        settingsSections: [],
-        settingsPathPrefixes: [],
-        profileSections: [],
-        profilePathPrefixes: [],
-        grantedFeatures: [],
-        roles: [],
-      }), { status: 200, headers: { 'content-type': 'application/json' } }),
-    ) as typeof fetch
-    global.fetch = fetchMock
-    window.fetch = fetchMock
-    ;(window as Window & { __omOriginalFetch?: typeof fetch }).__omOriginalFetch = fetchMock
-
-    try {
-      renderWithProviders(
-        <AppShell
-          email="demo@example.com"
-          groups={[]}
-          adminNavApi="/api/auth/admin/nav-brand-logo-cropped"
-        >
-          <div>Child content</div>
-        </AppShell>,
-        { dict },
-      )
-
-      await waitFor(() => {
-        const logo = screen.getByAltText('Acme logo')
-        expect(logo).toHaveAttribute('src', logoSrc)
-        expect(logo).toHaveAttribute('data-unoptimized', 'true')
-        expect(logo).toHaveClass('object-cover')
-        expect(logo).toHaveClass('rounded-full')
-        expect(logo).not.toHaveClass('object-contain')
-      })
-    } finally {
-      global.fetch = previousFetch
-      window.fetch = previousWindowFetch
-      ;(window as Window & { __omOriginalFetch?: typeof fetch }).__omOriginalFetch = previousOriginalFetch
-    }
-  })
-
   it('renders nested settings links when settings parent route is active', async () => {
     mockPathname = '/backend/entities/user'
 

package/src/backend/__tests__/AuthSessionGuard.test.tsx

@@ -8,7 +8,6 @@ import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
 import {
   __reload,
   AUTH_IDENTITY_STORAGE_KEY,
-  AUTH_IDENTITY_USER_STORAGE_KEY,
   AuthSessionGuard,
   notifyAuthIdentityChange,
 } from '../AuthSessionGuard'
@@ -149,54 +148,3 @@ describe('notifyAuthIdentityChange', () => {
     setItemSpy.mockRestore()
   })
 })
-
-describe('perspective purge at the rendered identity boundary (#4185)', () => {
-  const snapshotKey = 'om_table_perspective_snapshot:customers-companies'
-
-  beforeEach(() => {
-    window.localStorage.clear()
-    apiCallMock.mockResolvedValue({ ok: true, status: 200, result: { ok: true } } as never)
-  })
-
-  afterEach(() => {
-    window.localStorage.clear()
-  })
-
-  it('purges legacy table state when no previous identity marker exists', () => {
-    window.localStorage.setItem(snapshotKey, '{"columnWidths":{"name":240}}')
-
-    render(<AuthSessionGuard serverUserId="user-1" />)
-
-    expect(window.localStorage.getItem(snapshotKey)).toBeNull()
-    expect(window.localStorage.getItem(AUTH_IDENTITY_USER_STORAGE_KEY)).toBe('user-1')
-  })
-
-  it('keeps a returning user\'s unsaved widths across a reload', () => {
-    window.localStorage.setItem(AUTH_IDENTITY_USER_STORAGE_KEY, 'user-1')
-    window.localStorage.setItem(snapshotKey, '{"columnWidths":{"name":240}}')
-
-    render(<AuthSessionGuard serverUserId="user-1" />)
-
-    expect(window.localStorage.getItem(snapshotKey)).toBe('{"columnWidths":{"name":240}}')
-  })
-
-  it('purges perspective state when the backend renders for a different user', () => {
-    window.localStorage.setItem(AUTH_IDENTITY_USER_STORAGE_KEY, 'user-1')
-    window.localStorage.setItem(snapshotKey, '{"columnWidths":{"name":240}}')
-
-    render(<AuthSessionGuard serverUserId="user-2" />)
-
-    expect(window.localStorage.getItem(snapshotKey)).toBeNull()
-    expect(window.localStorage.getItem(AUTH_IDENTITY_USER_STORAGE_KEY)).toBe('user-2')
-  })
-
-  it('does nothing when the shell renders without an authenticated user', () => {
-    window.localStorage.setItem(AUTH_IDENTITY_USER_STORAGE_KEY, 'user-1')
-    window.localStorage.setItem(snapshotKey, '{"columnWidths":{"name":240}}')
-
-    render(<AuthSessionGuard serverUserId={null} />)
-
-    expect(window.localStorage.getItem(snapshotKey)).toBe('{"columnWidths":{"name":240}}')
-    expect(window.localStorage.getItem(AUTH_IDENTITY_USER_STORAGE_KEY)).toBe('user-1')
-  })
-})