@open-mercato/ui 0.6.7-develop.6842.1.8cd8a8883c → 0.6.7-develop.6859.1.e4727b568a

package/dist/backend/crud/useGroupOrder.js

@@ -29,10 +29,7 @@ function useGroupOrder(pageType, defaultGroupIds) {
     const saved = readJsonFromLocalStorage(getStorageKey(pageType), null);
     setSavedOrder(Array.isArray(saved) ? saved : null);
   }, [pageType]);
-  const mergedIds = React.useMemo(
-    () => savedOrder ? mergeOrder(savedOrder, defaultGroupIds) : defaultGroupIds,
-    [defaultGroupIds, savedOrder]
-  );
+  const mergedIds = savedOrder ? mergeOrder(savedOrder, defaultGroupIds) : defaultGroupIds;
   const stableIdsRef = React.useRef(mergedIds);
   if (!arraysEqual(stableIdsRef.current, mergedIds)) {
     stableIdsRef.current = mergedIds;
@@ -43,6 +40,7 @@ function useGroupOrder(pageType, defaultGroupIds) {
       const next = [...stableIdsRef.current];
       const [moved] = next.splice(fromIndex, 1);
       next.splice(toIndex, 0, moved);
+      stableIdsRef.current = next;
       writeJsonToLocalStorage(getStorageKey(pageType), next);
       setSavedOrder(next);
     },

package/dist/backend/crud/useGroupOrder.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/backend/crud/useGroupOrder.ts"],
-  "sourcesContent": ["'use client'\nimport * as React from 'react'\nimport {\n  readJsonFromLocalStorage,\n  writeJsonToLocalStorage,\n} from '@open-mercato/shared/lib/browser/safeLocalStorage'\n\nconst STORAGE_PREFIX = 'om:group-order:'\n\nfunction getStorageKey(pageType: string) {\n  return `${STORAGE_PREFIX}${pageType}`\n}\n\nfunction mergeOrder(saved: string[], defaults: string[]): string[] {\n  const known = new Set(defaults)\n  const result = saved.filter((id) => known.has(id))\n  for (const id of defaults) {\n    if (!result.includes(id)) result.push(id)\n  }\n  return result\n}\n\nfunction arraysEqual(a: string[], b: string[]): boolean {\n  if (a.length !== b.length) return false\n  for (let i = 0; i < a.length; i += 1) {\n    if (a[i] !== b[i]) return false\n  }\n  return true\n}\n\n/**\n * Returns the group IDs in the user's preferred order.\n * Falls back to the default order when no preference is stored.\n *\n * State holds only the saved preference; the visible order is derived during\n * render. Syncing derived order back into state via an effect looped forever\n * when a host recreated `defaultGroupIds` with different content on every\n * render (#4386), so no effect writes state from `defaultGroupIds` here.\n */\nexport function useGroupOrder(pageType: string, defaultGroupIds: string[]) {\n  const [savedOrder, setSavedOrder] = React.useState<string[] | null>(null)\n\n  React.useEffect(() => {\n    const saved = readJsonFromLocalStorage<string[] | null>(getStorageKey(pageType), null)\n    setSavedOrder(Array.isArray(saved) ? saved : null)\n  }, [pageType])\n\n  const mergedIds = React.useMemo(\n    () => (savedOrder ? mergeOrder(savedOrder, defaultGroupIds) : defaultGroupIds),\n    [defaultGroupIds, savedOrder],\n  )\n\n  const stableIdsRef = React.useRef(mergedIds)\n  if (!arraysEqual(stableIdsRef.current, mergedIds)) {\n    stableIdsRef.current = mergedIds\n  }\n  const orderedIds = stableIdsRef.current\n\n  const reorder = React.useCallback(\n    (fromIndex: number, toIndex: number) => {\n      const next = [...stableIdsRef.current]\n      const [moved] = next.splice(fromIndex, 1)\n      next.splice(toIndex, 0, moved)\n      writeJsonToLocalStorage(getStorageKey(pageType), next)\n      setSavedOrder(next)\n    },\n    [pageType],\n  )\n\n  return { orderedIds, reorder }\n}\n"],
-  "mappings": ";AACA,YAAY,WAAW;AACvB;AAAA,EACE;AAAA,EACA;AAAA,OACK;AAEP,MAAM,iBAAiB;AAEvB,SAAS,cAAc,UAAkB;AACvC,SAAO,GAAG,cAAc,GAAG,QAAQ;AACrC;AAEA,SAAS,WAAW,OAAiB,UAA8B;AACjE,QAAM,QAAQ,IAAI,IAAI,QAAQ;AAC9B,QAAM,SAAS,MAAM,OAAO,CAAC,OAAO,MAAM,IAAI,EAAE,CAAC;AACjD,aAAW,MAAM,UAAU;AACzB,QAAI,CAAC,OAAO,SAAS,EAAE,EAAG,QAAO,KAAK,EAAE;AAAA,EAC1C;AACA,SAAO;AACT;AAEA,SAAS,YAAY,GAAa,GAAsB;AACtD,MAAI,EAAE,WAAW,EAAE,OAAQ,QAAO;AAClC,WAAS,IAAI,GAAG,IAAI,EAAE,QAAQ,KAAK,GAAG;AACpC,QAAI,EAAE,CAAC,MAAM,EAAE,CAAC,EAAG,QAAO;AAAA,EAC5B;AACA,SAAO;AACT;AAWO,SAAS,cAAc,UAAkB,iBAA2B;AACzE,QAAM,CAAC,YAAY,aAAa,IAAI,MAAM,SAA0B,IAAI;AAExE,QAAM,UAAU,MAAM;AACpB,UAAM,QAAQ,yBAA0C,cAAc,QAAQ,GAAG,IAAI;AACrF,kBAAc,MAAM,QAAQ,KAAK,IAAI,QAAQ,IAAI;AAAA,EACnD,GAAG,CAAC,QAAQ,CAAC;AAEb,QAAM,YAAY,MAAM;AAAA,IACtB,MAAO,aAAa,WAAW,YAAY,eAAe,IAAI;AAAA,IAC9D,CAAC,iBAAiB,UAAU;AAAA,EAC9B;AAEA,QAAM,eAAe,MAAM,OAAO,SAAS;AAC3C,MAAI,CAAC,YAAY,aAAa,SAAS,SAAS,GAAG;AACjD,iBAAa,UAAU;AAAA,EACzB;AACA,QAAM,aAAa,aAAa;AAEhC,QAAM,UAAU,MAAM;AAAA,IACpB,CAAC,WAAmB,YAAoB;AACtC,YAAM,OAAO,CAAC,GAAG,aAAa,OAAO;AACrC,YAAM,CAAC,KAAK,IAAI,KAAK,OAAO,WAAW,CAAC;AACxC,WAAK,OAAO,SAAS,GAAG,KAAK;AAC7B,8BAAwB,cAAc,QAAQ,GAAG,IAAI;AACrD,oBAAc,IAAI;AAAA,IACpB;AAAA,IACA,CAAC,QAAQ;AAAA,EACX;AAEA,SAAO,EAAE,YAAY,QAAQ;AAC/B;",
+  "sourcesContent": ["'use client'\nimport * as React from 'react'\nimport {\n  readJsonFromLocalStorage,\n  writeJsonToLocalStorage,\n} from '@open-mercato/shared/lib/browser/safeLocalStorage'\n\nconst STORAGE_PREFIX = 'om:group-order:'\n\nfunction getStorageKey(pageType: string) {\n  return `${STORAGE_PREFIX}${pageType}`\n}\n\nfunction mergeOrder(saved: string[], defaults: string[]): string[] {\n  const known = new Set(defaults)\n  const result = saved.filter((id) => known.has(id))\n  for (const id of defaults) {\n    if (!result.includes(id)) result.push(id)\n  }\n  return result\n}\n\nfunction arraysEqual(a: string[], b: string[]): boolean {\n  if (a.length !== b.length) return false\n  for (let i = 0; i < a.length; i += 1) {\n    if (a[i] !== b[i]) return false\n  }\n  return true\n}\n\n/**\n * Returns the group IDs in the user's preferred order.\n * Falls back to the default order when no preference is stored.\n *\n * State holds only the saved preference; the visible order is derived during\n * render. Syncing derived order back into state via an effect looped forever\n * when a host recreated `defaultGroupIds` with different content on every\n * render (#4386), so no effect writes state from `defaultGroupIds` here.\n *\n * `stableIdsRef` is mutated during render, which React's render-purity rule\n * normally forbids. It is safe here because the guard swaps the reference only\n * when the *content* differs: a concurrent render that React discards can leave\n * behind a different array identity, but never a content-stale value, and the\n * render that commits always leaves `stableIdsRef.current` content-equal to its\n * own `mergedIds`. `reorder` advances the same ref from its event handler so\n * that several reorders within one commit compose instead of overwriting each\n * other; a discarded state update leaves the ref ahead of `savedOrder` only\n * until the next render's content guard pulls it back (#4691).\n */\nexport function useGroupOrder(pageType: string, defaultGroupIds: string[]) {\n  const [savedOrder, setSavedOrder] = React.useState<string[] | null>(null)\n\n  React.useEffect(() => {\n    const saved = readJsonFromLocalStorage<string[] | null>(getStorageKey(pageType), null)\n    setSavedOrder(Array.isArray(saved) ? saved : null)\n  }, [pageType])\n\n  const mergedIds = savedOrder ? mergeOrder(savedOrder, defaultGroupIds) : defaultGroupIds\n\n  const stableIdsRef = React.useRef(mergedIds)\n  if (!arraysEqual(stableIdsRef.current, mergedIds)) {\n    stableIdsRef.current = mergedIds\n  }\n  const orderedIds = stableIdsRef.current\n\n  const reorder = React.useCallback(\n    (fromIndex: number, toIndex: number) => {\n      const next = [...stableIdsRef.current]\n      const [moved] = next.splice(fromIndex, 1)\n      next.splice(toIndex, 0, moved)\n      stableIdsRef.current = next\n      writeJsonToLocalStorage(getStorageKey(pageType), next)\n      setSavedOrder(next)\n    },\n    [pageType],\n  )\n\n  return { orderedIds, reorder }\n}\n"],
+  "mappings": ";AACA,YAAY,WAAW;AACvB;AAAA,EACE;AAAA,EACA;AAAA,OACK;AAEP,MAAM,iBAAiB;AAEvB,SAAS,cAAc,UAAkB;AACvC,SAAO,GAAG,cAAc,GAAG,QAAQ;AACrC;AAEA,SAAS,WAAW,OAAiB,UAA8B;AACjE,QAAM,QAAQ,IAAI,IAAI,QAAQ;AAC9B,QAAM,SAAS,MAAM,OAAO,CAAC,OAAO,MAAM,IAAI,EAAE,CAAC;AACjD,aAAW,MAAM,UAAU;AACzB,QAAI,CAAC,OAAO,SAAS,EAAE,EAAG,QAAO,KAAK,EAAE;AAAA,EAC1C;AACA,SAAO;AACT;AAEA,SAAS,YAAY,GAAa,GAAsB;AACtD,MAAI,EAAE,WAAW,EAAE,OAAQ,QAAO;AAClC,WAAS,IAAI,GAAG,IAAI,EAAE,QAAQ,KAAK,GAAG;AACpC,QAAI,EAAE,CAAC,MAAM,EAAE,CAAC,EAAG,QAAO;AAAA,EAC5B;AACA,SAAO;AACT;AAqBO,SAAS,cAAc,UAAkB,iBAA2B;AACzE,QAAM,CAAC,YAAY,aAAa,IAAI,MAAM,SAA0B,IAAI;AAExE,QAAM,UAAU,MAAM;AACpB,UAAM,QAAQ,yBAA0C,cAAc,QAAQ,GAAG,IAAI;AACrF,kBAAc,MAAM,QAAQ,KAAK,IAAI,QAAQ,IAAI;AAAA,EACnD,GAAG,CAAC,QAAQ,CAAC;AAEb,QAAM,YAAY,aAAa,WAAW,YAAY,eAAe,IAAI;AAEzE,QAAM,eAAe,MAAM,OAAO,SAAS;AAC3C,MAAI,CAAC,YAAY,aAAa,SAAS,SAAS,GAAG;AACjD,iBAAa,UAAU;AAAA,EACzB;AACA,QAAM,aAAa,aAAa;AAEhC,QAAM,UAAU,MAAM;AAAA,IACpB,CAAC,WAAmB,YAAoB;AACtC,YAAM,OAAO,CAAC,GAAG,aAAa,OAAO;AACrC,YAAM,CAAC,KAAK,IAAI,KAAK,OAAO,WAAW,CAAC;AACxC,WAAK,OAAO,SAAS,GAAG,KAAK;AAC7B,mBAAa,UAAU;AACvB,8BAAwB,cAAc,QAAQ,GAAG,IAAI;AACrD,oBAAc,IAAI;AAAA,IACpB;AAAA,IACA,CAAC,QAAQ;AAAA,EACX;AAEA,SAAO,EAAE,YAAY,QAAQ;AAC/B;",
   "names": []
 }

package/dist/backend/utils/customFieldDefs.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/backend/utils/customFieldDefs.ts"],
-  "sourcesContent": ["import * as React from 'react'\nimport { useQuery, type UseQueryResult, type QueryClient } from '@tanstack/react-query'\nimport { readApiResultOrThrow } from './apiCall'\nimport type { CustomFieldOptionDto } from '@open-mercato/shared/modules/entities/options'\n\nexport type CustomFieldDefDto = {\n  entityId?: string\n  key: string\n  kind: string\n  label?: string\n  description?: string\n  options?: CustomFieldOptionDto[]\n  optionsUrl?: string\n  multi?: boolean\n  filterable?: boolean\n  formEditable?: boolean\n  listVisible?: boolean\n  editor?: string\n  input?: string\n  priority?: number\n  fieldset?: string\n  fieldsets?: string[]\n  group?: { code: string; title?: string; hint?: string }\n  // attachments-specific config\n  maxAttachmentSizeMb?: number\n  acceptExtensions?: string[]\n  // phone-specific config\n  defaultCountryIso2?: string\n  // optional validation rules\n  validation?: Array<\n    | { rule: 'required'; message: string }\n    | { rule: 'date'; message: string }\n    | { rule: 'integer'; message: string }\n    | { rule: 'float'; message: string }\n    | { rule: 'lt' | 'lte' | 'gt' | 'gte'; param: number; message: string }\n    | { rule: 'eq' | 'ne'; param: any; message: string }\n    | { rule: 'regex'; param: string; message: string }\n  >\n  dictionaryId?: string\n  dictionaryInlineCreate?: boolean\n  defaultValue?: string | number | boolean | null\n}\n\nexport type CustomFieldsetGroupDto = {\n  code: string\n  title?: string\n  hint?: string\n}\n\nexport type CustomFieldsetDto = {\n  code: string\n  label: string\n  icon?: string\n  description?: string\n  groups?: CustomFieldsetGroupDto[]\n}\n\nexport type CustomFieldDefinitionsPayload = {\n  items?: CustomFieldDefDto[]\n  fieldsetsByEntity?: Record<string, CustomFieldsetDto[]>\n  entitySettings?: Record<string, { singleFieldsetPerRecord?: boolean }>\n}\n\nexport function normalizeEntityIds(entityIds: string | string[] | null | undefined): string[] {\n  if (entityIds == null) return []\n  const list = Array.isArray(entityIds) ? entityIds : [entityIds]\n  const dedup = new Set<string>()\n  const normalized: string[] = []\n  for (const raw of list) {\n    const trimmed = String(raw ?? '').trim()\n    if (!trimmed || dedup.has(trimmed)) continue\n    dedup.add(trimmed)\n    normalized.push(trimmed)\n  }\n  return normalized\n}\n\nexport type CustomFieldDefinitionQueryOptions = {\n  fieldset?: string\n}\n\nfunction buildDefinitionsQuery(entityIds: string[], options?: CustomFieldDefinitionQueryOptions): string {\n  const params = new URLSearchParams()\n  entityIds.forEach((id) => {\n    if (id) params.append('entityId', id)\n  })\n  if (options?.fieldset) params.set('fieldset', options.fieldset)\n  return params.toString()\n}\n\ntype CustomFieldDefinitionsResponse = CustomFieldDefinitionsPayload\n\nfunction normalizeRecord<T>(value: unknown): Record<string, T[]> {\n  if (!value || typeof value !== 'object') return {}\n  const out: Record<string, T[]> = {}\n  for (const [key, raw] of Object.entries(value as Record<string, unknown>)) {\n    if (!Array.isArray(raw)) continue\n    out[key] = raw as T[]\n  }\n  return out\n}\n\nfunction preparePayload(data: CustomFieldDefinitionsResponse | null | undefined): CustomFieldDefinitionsPayload {\n  const items = Array.isArray(data?.items) ? [...data!.items] : []\n  items.sort((a, b) => (a.priority ?? 0) - (b.priority ?? 0))\n  const fieldsetsByEntity = normalizeRecord<CustomFieldsetDto>(data?.fieldsetsByEntity)\n  const entitySettings = (data?.entitySettings && typeof data.entitySettings === 'object'\n    ? data.entitySettings\n    : {}) as CustomFieldDefinitionsPayload['entitySettings']\n  return { items, fieldsetsByEntity, entitySettings }\n}\n\nasync function readDefinitionsViaFetch(\n  entityIds: string[],\n  fetchImpl: typeof fetch,\n  options?: CustomFieldDefinitionQueryOptions,\n): Promise<CustomFieldDefinitionsPayload> {\n  const query = buildDefinitionsQuery(entityIds, options)\n  const res = await fetchImpl(`/api/entities/definitions?${query}`, {\n    headers: { 'content-type': 'application/json' },\n  })\n  const data = await res.json().catch(() => ({ items: [] }))\n  return preparePayload(data)\n}\n\nasync function readDefinitionsViaApi(entityIds: string[], options?: CustomFieldDefinitionQueryOptions): Promise<CustomFieldDefinitionsPayload> {\n  const query = buildDefinitionsQuery(entityIds, options)\n  const payload = await readApiResultOrThrow<CustomFieldDefinitionsResponse>(\n    `/api/entities/definitions?${query}`,\n    { headers: { 'content-type': 'application/json' } },\n    {\n      errorMessage: 'Failed to load custom field definitions',\n      fallback: { items: [] },\n    },\n  )\n  return preparePayload(payload)\n}\n\nexport async function fetchCustomFieldDefinitionsPayload(\n  entityIds: string | string[],\n  fetchImpl?: typeof fetch,\n  options?: CustomFieldDefinitionQueryOptions,\n): Promise<CustomFieldDefinitionsPayload> {\n  const filtered = normalizeEntityIds(entityIds)\n  if (!filtered.length) return { items: [] }\n  return fetchImpl\n    ? await readDefinitionsViaFetch(filtered, fetchImpl, options)\n    : await readDefinitionsViaApi(filtered, options)\n}\n\nexport async function fetchCustomFieldDefs(\n  entityIds: string | string[],\n  fetchImpl?: typeof fetch,\n  options?: CustomFieldDefinitionQueryOptions,\n): Promise<CustomFieldDefDto[]> {\n  const payload = await fetchCustomFieldDefinitionsPayload(entityIds, fetchImpl, options)\n  return payload.items ?? []\n}\n\nexport type UseCustomFieldDefsOptions<TData = CustomFieldDefDto[]> = {\n  enabled?: boolean\n  staleTime?: number\n  gcTime?: number\n  /** @deprecated Custom fetch implementations are no longer needed. */\n  fetchImpl?: typeof fetch\n  keyExtras?: Array<string | number | boolean | null | undefined>\n  fieldset?: string\n  select?: (data: CustomFieldDefDto[]) => TData\n}\n\nexport function useCustomFieldDefs<TData = CustomFieldDefDto[]>(\n  entityIds: string | string[] | null | undefined,\n  options: UseCustomFieldDefsOptions<TData> = {}\n): UseQueryResult<TData> {\n  const {\n    enabled: enabledOption = true,\n    staleTime,\n    gcTime,\n    keyExtras,\n    fetchImpl,\n    fieldset,\n  } = options\n  const normalizedIds = React.useMemo(() => normalizeEntityIds(entityIds), [entityIds])\n  const idsSignature = React.useMemo(() => JSON.stringify(normalizedIds), [normalizedIds])\n  const extrasSignature = React.useMemo(() => JSON.stringify(keyExtras ?? []), [keyExtras])\n  const normalizedFieldset = typeof fieldset === 'string' && fieldset.trim().length ? fieldset.trim() : null\n  const queryKey = React.useMemo(\n    () => ['customFieldDefs', ...(keyExtras ?? []), ...normalizedIds, `fieldset:${normalizedFieldset ?? 'default'}`],\n    [idsSignature, extrasSignature, normalizedFieldset]\n  )\n  const enabled = enabledOption && normalizedIds.length > 0\n\n  return useQuery<CustomFieldDefDto[], Error, TData>({\n    queryKey,\n    queryFn: () =>\n      fetchCustomFieldDefs(\n        normalizedIds,\n        fetchImpl,\n        normalizedFieldset ? { fieldset: normalizedFieldset } : undefined\n      ),\n    enabled,\n    staleTime: staleTime ?? 5 * 60 * 1000,\n    gcTime: gcTime ?? 30 * 60 * 1000,\n    select: options.select,\n  })\n}\n\nexport type CustomFieldVisibility = 'list' | 'form' | 'filter'\n\nexport function isDefVisible(def: CustomFieldDefDto, mode: CustomFieldVisibility): boolean {\n  switch (mode) {\n    case 'list':\n      return def.listVisible !== false\n    case 'form':\n      return def.formEditable !== false\n    case 'filter':\n      return !!def.filterable\n    default:\n      return true\n  }\n}\n\nexport function filterCustomFieldDefs(defs: CustomFieldDefDto[], mode: CustomFieldVisibility): CustomFieldDefDto[] {\n  return defs\n    .filter((d) => isDefVisible(d, mode))\n    .sort((a, b) => (a.priority ?? 0) - (b.priority ?? 0))\n}\n\nexport async function invalidateCustomFieldDefs(\n  queryClient: QueryClient,\n  entityIds?: string | string[] | null,\n): Promise<void> {\n  const normalizedIds = normalizeEntityIds(entityIds)\n  const targetPrefixes = new Set(['customFieldDefs', 'customFieldForms', 'dealFormFields'])\n  if (!normalizedIds.length) {\n    await queryClient.invalidateQueries({\n      predicate: (query) => Array.isArray(query.queryKey) && typeof query.queryKey[0] === 'string' && targetPrefixes.has(query.queryKey[0] as string),\n    })\n    return\n  }\n  await queryClient.invalidateQueries({\n    predicate: (query) => {\n      if (!Array.isArray(query.queryKey)) return false\n      const [prefix] = query.queryKey\n      if (typeof prefix !== 'string' || !targetPrefixes.has(prefix)) return false\n      return normalizedIds.every((id) => query.queryKey.includes(id))\n    },\n  })\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import * as React from 'react'\nimport { useQuery, type UseQueryResult, type QueryClient } from '@tanstack/react-query'\nimport { readApiResultOrThrow } from './apiCall'\nimport type { CustomFieldOptionDto } from '@open-mercato/shared/modules/entities/options'\n\nexport type CustomFieldDefDto = {\n  entityId?: string\n  key: string\n  kind: string\n  label?: string\n  description?: string\n  options?: CustomFieldOptionDto[]\n  optionsUrl?: string\n  multi?: boolean\n  filterable?: boolean\n  formEditable?: boolean\n  listVisible?: boolean\n  editor?: string\n  input?: string\n  priority?: number\n  fieldset?: string\n  fieldsets?: string[]\n  group?: { code: string; title?: string; hint?: string }\n  // attachments-specific config\n  maxAttachmentSizeMb?: number\n  acceptExtensions?: string[]\n  // phone-specific config\n  defaultCountryIso2?: string\n  // optional validation rules\n  validation?: Array<\n    | { rule: 'required'; message: string }\n    | { rule: 'date'; message: string }\n    | { rule: 'integer'; message: string }\n    | { rule: 'float'; message: string }\n    | { rule: 'lt' | 'lte' | 'gt' | 'gte'; param: number; message: string }\n    | { rule: 'eq' | 'ne'; param: any; message: string }\n    | { rule: 'regex'; param: string; message: string }\n  >\n  dictionaryId?: string\n  dictionaryInlineCreate?: boolean\n  defaultValue?: string | number | boolean | null\n  relatedEntityId?: string\n}\n\nexport type CustomFieldsetGroupDto = {\n  code: string\n  title?: string\n  hint?: string\n}\n\nexport type CustomFieldsetDto = {\n  code: string\n  label: string\n  icon?: string\n  description?: string\n  groups?: CustomFieldsetGroupDto[]\n}\n\nexport type CustomFieldDefinitionsPayload = {\n  items?: CustomFieldDefDto[]\n  fieldsetsByEntity?: Record<string, CustomFieldsetDto[]>\n  entitySettings?: Record<string, { singleFieldsetPerRecord?: boolean }>\n}\n\nexport function normalizeEntityIds(entityIds: string | string[] | null | undefined): string[] {\n  if (entityIds == null) return []\n  const list = Array.isArray(entityIds) ? entityIds : [entityIds]\n  const dedup = new Set<string>()\n  const normalized: string[] = []\n  for (const raw of list) {\n    const trimmed = String(raw ?? '').trim()\n    if (!trimmed || dedup.has(trimmed)) continue\n    dedup.add(trimmed)\n    normalized.push(trimmed)\n  }\n  return normalized\n}\n\nexport type CustomFieldDefinitionQueryOptions = {\n  fieldset?: string\n}\n\nfunction buildDefinitionsQuery(entityIds: string[], options?: CustomFieldDefinitionQueryOptions): string {\n  const params = new URLSearchParams()\n  entityIds.forEach((id) => {\n    if (id) params.append('entityId', id)\n  })\n  if (options?.fieldset) params.set('fieldset', options.fieldset)\n  return params.toString()\n}\n\ntype CustomFieldDefinitionsResponse = CustomFieldDefinitionsPayload\n\nfunction normalizeRecord<T>(value: unknown): Record<string, T[]> {\n  if (!value || typeof value !== 'object') return {}\n  const out: Record<string, T[]> = {}\n  for (const [key, raw] of Object.entries(value as Record<string, unknown>)) {\n    if (!Array.isArray(raw)) continue\n    out[key] = raw as T[]\n  }\n  return out\n}\n\nfunction preparePayload(data: CustomFieldDefinitionsResponse | null | undefined): CustomFieldDefinitionsPayload {\n  const items = Array.isArray(data?.items) ? [...data!.items] : []\n  items.sort((a, b) => (a.priority ?? 0) - (b.priority ?? 0))\n  const fieldsetsByEntity = normalizeRecord<CustomFieldsetDto>(data?.fieldsetsByEntity)\n  const entitySettings = (data?.entitySettings && typeof data.entitySettings === 'object'\n    ? data.entitySettings\n    : {}) as CustomFieldDefinitionsPayload['entitySettings']\n  return { items, fieldsetsByEntity, entitySettings }\n}\n\nasync function readDefinitionsViaFetch(\n  entityIds: string[],\n  fetchImpl: typeof fetch,\n  options?: CustomFieldDefinitionQueryOptions,\n): Promise<CustomFieldDefinitionsPayload> {\n  const query = buildDefinitionsQuery(entityIds, options)\n  const res = await fetchImpl(`/api/entities/definitions?${query}`, {\n    headers: { 'content-type': 'application/json' },\n  })\n  const data = await res.json().catch(() => ({ items: [] }))\n  return preparePayload(data)\n}\n\nasync function readDefinitionsViaApi(entityIds: string[], options?: CustomFieldDefinitionQueryOptions): Promise<CustomFieldDefinitionsPayload> {\n  const query = buildDefinitionsQuery(entityIds, options)\n  const payload = await readApiResultOrThrow<CustomFieldDefinitionsResponse>(\n    `/api/entities/definitions?${query}`,\n    { headers: { 'content-type': 'application/json' } },\n    {\n      errorMessage: 'Failed to load custom field definitions',\n      fallback: { items: [] },\n    },\n  )\n  return preparePayload(payload)\n}\n\nexport async function fetchCustomFieldDefinitionsPayload(\n  entityIds: string | string[],\n  fetchImpl?: typeof fetch,\n  options?: CustomFieldDefinitionQueryOptions,\n): Promise<CustomFieldDefinitionsPayload> {\n  const filtered = normalizeEntityIds(entityIds)\n  if (!filtered.length) return { items: [] }\n  return fetchImpl\n    ? await readDefinitionsViaFetch(filtered, fetchImpl, options)\n    : await readDefinitionsViaApi(filtered, options)\n}\n\nexport async function fetchCustomFieldDefs(\n  entityIds: string | string[],\n  fetchImpl?: typeof fetch,\n  options?: CustomFieldDefinitionQueryOptions,\n): Promise<CustomFieldDefDto[]> {\n  const payload = await fetchCustomFieldDefinitionsPayload(entityIds, fetchImpl, options)\n  return payload.items ?? []\n}\n\nexport type UseCustomFieldDefsOptions<TData = CustomFieldDefDto[]> = {\n  enabled?: boolean\n  staleTime?: number\n  gcTime?: number\n  /** @deprecated Custom fetch implementations are no longer needed. */\n  fetchImpl?: typeof fetch\n  keyExtras?: Array<string | number | boolean | null | undefined>\n  fieldset?: string\n  select?: (data: CustomFieldDefDto[]) => TData\n}\n\nexport function useCustomFieldDefs<TData = CustomFieldDefDto[]>(\n  entityIds: string | string[] | null | undefined,\n  options: UseCustomFieldDefsOptions<TData> = {}\n): UseQueryResult<TData> {\n  const {\n    enabled: enabledOption = true,\n    staleTime,\n    gcTime,\n    keyExtras,\n    fetchImpl,\n    fieldset,\n  } = options\n  const normalizedIds = React.useMemo(() => normalizeEntityIds(entityIds), [entityIds])\n  const idsSignature = React.useMemo(() => JSON.stringify(normalizedIds), [normalizedIds])\n  const extrasSignature = React.useMemo(() => JSON.stringify(keyExtras ?? []), [keyExtras])\n  const normalizedFieldset = typeof fieldset === 'string' && fieldset.trim().length ? fieldset.trim() : null\n  const queryKey = React.useMemo(\n    () => ['customFieldDefs', ...(keyExtras ?? []), ...normalizedIds, `fieldset:${normalizedFieldset ?? 'default'}`],\n    [idsSignature, extrasSignature, normalizedFieldset]\n  )\n  const enabled = enabledOption && normalizedIds.length > 0\n\n  return useQuery<CustomFieldDefDto[], Error, TData>({\n    queryKey,\n    queryFn: () =>\n      fetchCustomFieldDefs(\n        normalizedIds,\n        fetchImpl,\n        normalizedFieldset ? { fieldset: normalizedFieldset } : undefined\n      ),\n    enabled,\n    staleTime: staleTime ?? 5 * 60 * 1000,\n    gcTime: gcTime ?? 30 * 60 * 1000,\n    select: options.select,\n  })\n}\n\nexport type CustomFieldVisibility = 'list' | 'form' | 'filter'\n\nexport function isDefVisible(def: CustomFieldDefDto, mode: CustomFieldVisibility): boolean {\n  switch (mode) {\n    case 'list':\n      return def.listVisible !== false\n    case 'form':\n      return def.formEditable !== false\n    case 'filter':\n      return !!def.filterable\n    default:\n      return true\n  }\n}\n\nexport function filterCustomFieldDefs(defs: CustomFieldDefDto[], mode: CustomFieldVisibility): CustomFieldDefDto[] {\n  return defs\n    .filter((d) => isDefVisible(d, mode))\n    .sort((a, b) => (a.priority ?? 0) - (b.priority ?? 0))\n}\n\nexport async function invalidateCustomFieldDefs(\n  queryClient: QueryClient,\n  entityIds?: string | string[] | null,\n): Promise<void> {\n  const normalizedIds = normalizeEntityIds(entityIds)\n  const targetPrefixes = new Set(['customFieldDefs', 'customFieldForms', 'dealFormFields'])\n  if (!normalizedIds.length) {\n    await queryClient.invalidateQueries({\n      predicate: (query) => Array.isArray(query.queryKey) && typeof query.queryKey[0] === 'string' && targetPrefixes.has(query.queryKey[0] as string),\n    })\n    return\n  }\n  await queryClient.invalidateQueries({\n    predicate: (query) => {\n      if (!Array.isArray(query.queryKey)) return false\n      const [prefix] = query.queryKey\n      if (typeof prefix !== 'string' || !targetPrefixes.has(prefix)) return false\n      return normalizedIds.every((id) => query.queryKey.includes(id))\n    },\n  })\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/ui",
-  "version": "0.6.7-develop.6842.1.8cd8a8883c",
+  "version": "0.6.7-develop.6859.1.e4727b568a",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -155,14 +155,14 @@
     "remark-gfm": "^4.0.1"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.6.7-develop.6842.1.8cd8a8883c",
+    "@open-mercato/shared": "0.6.7-develop.6859.1.e4727b568a",
     "react": ">=18.0.0",
     "react-dom": ">=18.0.0",
     "react-is": ">=18.0.0"
   },
   "devDependencies": {
     "@figma/code-connect": "^1.3.4",
-    "@open-mercato/shared": "0.6.7-develop.6842.1.8cd8a8883c",
+    "@open-mercato/shared": "0.6.7-develop.6859.1.e4727b568a",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^7.0.0",
     "@testing-library/react": "^16.3.1",

package/src/backend/DataTable.tsx

@@ -1699,18 +1699,31 @@ export function DataTable<T>({
     })
   }, [table, mergedColumns])
 
-  const initialVisibilityApplied = React.useRef(Boolean(mergedInitialSettings?.columnVisibility))
+  // 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())
   React.useEffect(() => {
-    if (initialVisibilityApplied.current) return
+    if (visibilitySeededByStoredSettings.current) return
     const hidden: VisibilityState = {}
     table.getAllLeafColumns().forEach((column) => {
       const hiddenMeta = (column.columnDef as any)?.meta?.hidden
-      if (hiddenMeta) hidden[column.id] = false
+      if (!hiddenMeta || autoHiddenColumnIds.current.has(column.id)) return
+      hidden[column.id] = false
+      autoHiddenColumnIds.current.add(column.id)
     })
-    if (Object.keys(hidden).length) {
-      setColumnVisibility((prev) => ({ ...hidden, ...prev }))
-    }
-    initialVisibilityApplied.current = true
+    if (!Object.keys(hidden).length) return
+    setColumnVisibility((prev) => ({ ...hidden, ...prev }))
   }, [table, mergedColumns])
 
   const getCurrentSettings = React.useCallback((): PerspectiveSettings => {

package/src/backend/__tests__/DataTable.metaHiddenLateColumns.test.tsx

@@ -0,0 +1,105 @@
+/**
+ * @jest-environment jsdom
+ */
+import * as React from 'react'
+import { render, screen, waitFor } from '@testing-library/react'
+import type { ColumnDef } from '@tanstack/react-table'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { I18nProvider } from '@open-mercato/shared/lib/i18n/context'
+import { DataTable } from '../DataTable'
+
+jest.mock('next/navigation', () => ({
+  useRouter: () => ({ push: jest.fn(), replace: jest.fn(), prefetch: jest.fn(), refresh: jest.fn() }),
+}))
+
+jest.mock('../injection/useInjectionDataWidgets', () => ({
+  useInjectionDataWidgets: () => ({ widgets: [], isLoading: false }),
+}))
+
+jest.mock('@open-mercato/shared/modules/widgets/injection-loader', () => ({
+  getInjectionRegistryVersion: () => 0,
+  subscribeToInjectionRegistryChanges: () => () => {},
+  loadInjectionWidgetsForSpot: jest.fn(async () => []),
+  loadInjectionDataWidgetsForSpot: jest.fn(async () => []),
+}))
+
+type Row = { id: string; name: string }
+
+const ROWS: Row[] = [{ id: '1', name: 'Row one' }]
+
+const BASE_COLUMNS: ColumnDef<Row>[] = [
+  { accessorKey: 'name', header: 'Name' },
+]
+
+const COLUMNS_WITH_CUSTOM_FIELDS: ColumnDef<Row>[] = [
+  ...BASE_COLUMNS,
+  { accessorKey: 'cf_archived_note', header: 'Archived note', meta: { hidden: true } },
+  { accessorKey: 'cf_active_note', header: 'Active note' },
+]
+
+function Harness({ columns, initialSettings }: { columns: ColumnDef<Row>[]; initialSettings?: unknown }) {
+  const queryClient = React.useMemo(
+    () => new QueryClient({ defaultOptions: { queries: { retry: false, gcTime: 0 } } }),
+    [],
+  )
+  return (
+    <QueryClientProvider client={queryClient}>
+      <I18nProvider locale="en" dict={{}}>
+        <DataTable
+          columns={columns as never}
+          data={ROWS as never}
+          {...(initialSettings
+            ? ({ perspective: { tableId: 'meta-hidden-late-columns', initialState: { initialSettings } } } as never)
+            : {})}
+        />
+      </I18nProvider>
+    </QueryClientProvider>
+  )
+}
+
+describe('DataTable — meta.hidden on columns that arrive after the first render', () => {
+  it('hides a meta.hidden column that only appears on a later render', async () => {
+    // The regression: the auto-hide pass used to be latched by a single boolean ref, so it
+    // ran on the first render — when no `cf_*` column existed yet — found nothing to hide,
+    // and never ran again. Custom fields declared `listVisible: false` stayed visible for
+    // the whole session after a hard page load, while a client-side navigation (definitions
+    // already in the query cache) rendered them correctly.
+    const { rerender } = render(<Harness columns={BASE_COLUMNS} />)
+    await waitFor(() => expect(screen.getByText('Name')).toBeTruthy())
+
+    rerender(<Harness columns={COLUMNS_WITH_CUSTOM_FIELDS} />)
+
+    await waitFor(() => expect(screen.queryByText('Archived note')).toBeNull())
+  })
+
+  it('leaves a late column without meta.hidden visible', async () => {
+    // Pins the other half of the contract, so the fix can never degrade into
+    // "columns that arrive late are dropped".
+    const { rerender } = render(<Harness columns={BASE_COLUMNS} />)
+    await waitFor(() => expect(screen.getByText('Name')).toBeTruthy())
+
+    rerender(<Harness columns={COLUMNS_WITH_CUSTOM_FIELDS} />)
+
+    await waitFor(() => expect(screen.getByText('Active note')).toBeTruthy())
+  })
+
+  it('hides a meta.hidden column that is present from the very first render', async () => {
+    // The behaviour the original latch was written for, which must survive the fix.
+    render(<Harness columns={COLUMNS_WITH_CUSTOM_FIELDS} />)
+
+    await waitFor(() => expect(screen.getByText('Active note')).toBeTruthy())
+    expect(screen.queryByText('Archived note')).toBeNull()
+  })
+
+  it('lets a stored perspective override the meta.hidden defaults', async () => {
+    // A saved perspective seeds columnVisibility at mount and wins outright.
+    render(
+      <Harness
+        columns={COLUMNS_WITH_CUSTOM_FIELDS}
+        initialSettings={{ columnVisibility: { cf_archived_note: true } }}
+      />,
+    )
+
+    await waitFor(() => expect(screen.getByText('Archived note')).toBeTruthy())
+  })
+})

package/src/backend/crud/__tests__/useGroupOrder.test.ts

@@ -37,6 +37,16 @@ describe('useGroupOrder', () => {
     expect(result.current.orderedIds).toEqual(['a', 'd', 'b', 'c'])
   })
 
+  it('composes two reorder() calls made within a single commit', () => {
+    const { result } = renderHook(() => useGroupOrder('people', ['a', 'b', 'c']))
+    act(() => {
+      result.current.reorder(0, 2)
+      result.current.reorder(0, 1)
+    })
+    expect(result.current.orderedIds).toEqual(['c', 'b', 'a'])
+    expect(JSON.parse(localStorage.getItem('om:group-order:people')!)).toEqual(['c', 'b', 'a'])
+  })
+
   it('updates ordering when defaults change to include a new id', () => {
     const { result, rerender } = renderHook(
       ({ ids }) => useGroupOrder('p', ids),

package/src/backend/crud/useGroupOrder.ts

@@ -36,6 +36,16 @@ function arraysEqual(a: string[], b: string[]): boolean {
  * render. Syncing derived order back into state via an effect looped forever
  * when a host recreated `defaultGroupIds` with different content on every
  * render (#4386), so no effect writes state from `defaultGroupIds` here.
+ *
+ * `stableIdsRef` is mutated during render, which React's render-purity rule
+ * normally forbids. It is safe here because the guard swaps the reference only
+ * when the *content* differs: a concurrent render that React discards can leave
+ * behind a different array identity, but never a content-stale value, and the
+ * render that commits always leaves `stableIdsRef.current` content-equal to its
+ * own `mergedIds`. `reorder` advances the same ref from its event handler so
+ * that several reorders within one commit compose instead of overwriting each
+ * other; a discarded state update leaves the ref ahead of `savedOrder` only
+ * until the next render's content guard pulls it back (#4691).
  */
 export function useGroupOrder(pageType: string, defaultGroupIds: string[]) {
   const [savedOrder, setSavedOrder] = React.useState<string[] | null>(null)
@@ -45,10 +55,7 @@ export function useGroupOrder(pageType: string, defaultGroupIds: string[]) {
     setSavedOrder(Array.isArray(saved) ? saved : null)
   }, [pageType])
 
-  const mergedIds = React.useMemo(
-    () => (savedOrder ? mergeOrder(savedOrder, defaultGroupIds) : defaultGroupIds),
-    [defaultGroupIds, savedOrder],
-  )
+  const mergedIds = savedOrder ? mergeOrder(savedOrder, defaultGroupIds) : defaultGroupIds
 
   const stableIdsRef = React.useRef(mergedIds)
   if (!arraysEqual(stableIdsRef.current, mergedIds)) {
@@ -61,6 +68,7 @@ export function useGroupOrder(pageType: string, defaultGroupIds: string[]) {
       const next = [...stableIdsRef.current]
       const [moved] = next.splice(fromIndex, 1)
       next.splice(toIndex, 0, moved)
+      stableIdsRef.current = next
       writeJsonToLocalStorage(getStorageKey(pageType), next)
       setSavedOrder(next)
     },

package/src/backend/utils/customFieldDefs.ts

@@ -39,6 +39,7 @@ export type CustomFieldDefDto = {
   dictionaryId?: string
   dictionaryInlineCreate?: boolean
   defaultValue?: string | number | boolean | null
+  relatedEntityId?: string
 }
 
 export type CustomFieldsetGroupDto = {