@open-mercato/core 0.6.6-develop.6296.1.5e8bdfee17 → 0.6.6-develop.6300.1.08ff40c897

package/src/modules/configs/lib/module-config-service.ts

@@ -4,7 +4,7 @@ import type { AppContainer } from '@open-mercato/shared/lib/di/container'
 import { ModuleConfig } from '../data/entities'
 import { moduleConfigKeySchema } from '../data/validators'
 
-const CACHE_VERSION = 'v1'
+const CACHE_VERSION = 'v2'
 const CACHE_TTL_MS = 60_000
 
 type CachePayload = {
@@ -12,7 +12,10 @@ type CachePayload = {
   record?: ModuleConfigRecord | null
 }
 
-const cacheKey = (moduleId: string, name: string) => `module-config:${CACHE_VERSION}:${moduleId}:${name}`
+const scopeKeyPart = (tenantId?: string | null) => (tenantId ?? 'global')
+
+const cacheKey = (moduleId: string, name: string, tenantId?: string | null) =>
+  `module-config:${CACHE_VERSION}:${moduleId}:${name}:${scopeKeyPart(tenantId)}`
 const moduleTag = (moduleId: string) => `module-config:module:${moduleId}`
 
 const resolveEm = (container: AppContainer): EntityManager | null => {
@@ -31,10 +34,13 @@ const resolveCache = (container: AppContainer): CacheStrategy | null => {
   }
 }
 
-const toRecord = (entity: ModuleConfig): ModuleConfigRecord => ({
+const toRecord = (entity: ModuleConfig, source: ModuleConfigSource): ModuleConfigRecord => ({
   moduleId: entity.moduleId,
   name: entity.name,
   value: entity.valueJson ?? null,
+  tenantId: entity.tenantId ?? null,
+  organizationId: entity.organizationId ?? null,
+  source,
   createdAt: entity.createdAt.toISOString(),
   updatedAt: entity.updatedAt.toISOString(),
 })
@@ -73,10 +79,20 @@ const deleteCacheByModule = async (cache: CacheStrategy | null, moduleId: string
 
 const normalizeKey = (moduleId: string, name: string) => moduleConfigKeySchema.parse({ moduleId, name })
 
+export type ModuleConfigSource = 'tenant' | 'instance'
+
+export type ConfigScope = {
+  tenantId?: string | null
+  organizationId?: string | null
+}
+
 export type ModuleConfigRecord = {
   moduleId: string
   name: string
   value: unknown
+  tenantId: string | null
+  organizationId: string | null
+  source: ModuleConfigSource
   createdAt: string
   updatedAt: string
 }
@@ -88,18 +104,23 @@ export type ModuleConfigDefault = {
 }
 
 export type ModuleConfigService = {
-  getRecord(moduleId: string, name: string): Promise<ModuleConfigRecord | null>
-  getValue<T = unknown>(moduleId: string, name: string, options?: { defaultValue?: T | null }): Promise<T | null>
-  setValue(moduleId: string, name: string, value: unknown): Promise<ModuleConfigRecord | null>
+  getRecord(moduleId: string, name: string, scope?: ConfigScope): Promise<ModuleConfigRecord | null>
+  getValue<T = unknown>(
+    moduleId: string,
+    name: string,
+    options?: { defaultValue?: T | null; scope?: ConfigScope },
+  ): Promise<T | null>
+  setValue(moduleId: string, name: string, value: unknown, scope?: ConfigScope): Promise<ModuleConfigRecord | null>
   restoreDefaults(defaults: ModuleConfigDefault[], options?: { force?: boolean }): Promise<void>
-  invalidate(moduleId: string, name?: string): Promise<void>
+  invalidate(moduleId: string, name?: string, scope?: ConfigScope): Promise<void>
 }
 
 export function createModuleConfigService(container: AppContainer): ModuleConfigService {
-  const getRecord = async (rawModuleId: string, rawName: string): Promise<ModuleConfigRecord | null> => {
+  const getRecord = async (rawModuleId: string, rawName: string, scope?: ConfigScope): Promise<ModuleConfigRecord | null> => {
     const { moduleId, name } = normalizeKey(rawModuleId, rawName)
+    const tenantId = scope?.tenantId ?? null
     const cache = resolveCache(container)
-    const key = cacheKey(moduleId, name)
+    const key = cacheKey(moduleId, name, tenantId)
     const cached = await readCache(cache, key)
     if (cached) {
       if (!cached.found) return null
@@ -109,47 +130,84 @@ export function createModuleConfigService(container: AppContainer): ModuleConfig
     const em = resolveEm(container)
     if (!em) return null
     const repo = em.getRepository(ModuleConfig)
-    const entity = await repo.findOne({ moduleId, name })
-    if (!entity) {
+
+    if (tenantId) {
+      const scoped = await repo.findOne({ moduleId, name, tenantId })
+      if (scoped) {
+        const record = toRecord(scoped, 'tenant')
+        await writeCache(cache, key, { found: true, record }, moduleId)
+        return record
+      }
+      const global = await repo.findOne({ moduleId, name, tenantId: null })
+      if (!global) {
+        await writeCache(cache, key, { found: false }, moduleId)
+        return null
+      }
+      const record = toRecord(global, 'instance')
+      await writeCache(cache, key, { found: true, record }, moduleId)
+      return record
+    }
+
+    const global = await repo.findOne({ moduleId, name, tenantId: null })
+    if (!global) {
       await writeCache(cache, key, { found: false }, moduleId)
       return null
     }
-    const record = toRecord(entity)
+    const record = toRecord(global, 'instance')
     await writeCache(cache, key, { found: true, record }, moduleId)
     return record
   }
 
-  const getValue = async <T>(rawModuleId: string, rawName: string, options?: { defaultValue?: T | null }): Promise<T | null> => {
-    const record = await getRecord(rawModuleId, rawName)
+  const getValue = async <T>(
+    rawModuleId: string,
+    rawName: string,
+    options?: { defaultValue?: T | null; scope?: ConfigScope },
+  ): Promise<T | null> => {
+    const record = await getRecord(rawModuleId, rawName, options?.scope)
     if (!record) return options?.defaultValue ?? null
     const value = record.value as T | null | undefined
     if (value === undefined || value === null) return options?.defaultValue ?? null
     return value
   }
 
-  const setValue = async (rawModuleId: string, rawName: string, value: unknown): Promise<ModuleConfigRecord | null> => {
+  const setValue = async (
+    rawModuleId: string,
+    rawName: string,
+    value: unknown,
+    scope?: ConfigScope,
+  ): Promise<ModuleConfigRecord | null> => {
     const em = resolveEm(container)
     if (!em) return null
     const { moduleId, name } = normalizeKey(rawModuleId, rawName)
+    const tenantId = scope?.tenantId ?? null
+    const organizationId = scope?.organizationId ?? null
     const repo = em.getRepository(ModuleConfig)
     const now = new Date()
-    let entity = await repo.findOne({ moduleId, name })
+    let entity = await repo.findOne({ moduleId, name, tenantId })
     if (!entity) {
       entity = repo.create({
         moduleId,
         name,
         valueJson: value ?? null,
+        tenantId,
+        organizationId,
         createdAt: now,
         updatedAt: now,
       })
       em.persist(entity)
     } else {
       entity.valueJson = value ?? null
+      entity.organizationId = organizationId
       entity.updatedAt = now
     }
     await em.flush()
-    const record = toRecord(entity)
-    await writeCache(resolveCache(container), cacheKey(moduleId, name), { found: true, record }, moduleId)
+    const record = toRecord(entity, tenantId ? 'tenant' : 'instance')
+    const cache = resolveCache(container)
+    if (tenantId) {
+      await writeCache(cache, cacheKey(moduleId, name, tenantId), { found: true, record }, moduleId)
+    } else {
+      await deleteCacheByModule(cache, moduleId)
+    }
     return record
   }
 
@@ -165,12 +223,14 @@ export function createModuleConfigService(container: AppContainer): ModuleConfig
       let entity: ModuleConfig | null = null
       try {
         const { moduleId, name } = normalizeKey(entry.moduleId, entry.name)
-        entity = await repo.findOne({ moduleId, name })
+        entity = await repo.findOne({ moduleId, name, tenantId: null })
         if (!entity) {
           entity = repo.create({
             moduleId,
             name,
             valueJson: entry.value ?? null,
+            tenantId: null,
+            organizationId: null,
           })
           em.persist(entity)
           dirty = true
@@ -186,17 +246,17 @@ export function createModuleConfigService(container: AppContainer): ModuleConfig
     if (!dirty) return
     await em.flush()
     for (const entity of touched) {
-      const record = toRecord(entity)
-      await writeCache(cache, cacheKey(entity.moduleId, entity.name), { found: true, record }, entity.moduleId)
+      const record = toRecord(entity, 'instance')
+      await writeCache(cache, cacheKey(entity.moduleId, entity.name, null), { found: true, record }, entity.moduleId)
     }
   }
 
-  const invalidate = async (rawModuleId: string, rawName?: string) => {
+  const invalidate = async (rawModuleId: string, rawName?: string, scope?: ConfigScope) => {
     const cache = resolveCache(container)
     if (!cache) return
     if (rawName) {
       const { moduleId, name } = normalizeKey(rawModuleId, rawName)
-      await deleteCacheKey(cache, cacheKey(moduleId, name))
+      await deleteCacheKey(cache, cacheKey(moduleId, name, scope?.tenantId ?? null))
       return
     }
     const moduleId = moduleConfigKeySchema.shape.moduleId.parse(rawModuleId)
@@ -211,4 +271,3 @@ export function createModuleConfigService(container: AppContainer): ModuleConfig
     invalidate,
   }
 }
-

package/src/modules/configs/migrations/.snapshot-open-mercato.json

@@ -43,6 +43,24 @@
           "nullable": true,
           "mappedType": "json"
         },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "uuid"
+        },
+        "tenant_id": {
+          "name": "tenant_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "uuid"
+        },
         "created_at": {
           "name": "created_at",
           "type": "timestamptz",
@@ -68,15 +86,34 @@
       "schema": "public",
       "indexes": [
         {
-          "keyName": "module_configs_module_name_unique",
+          "keyName": "module_configs_global_unique",
+          "columnNames": [],
+          "composite": false,
+          "constraint": false,
+          "primary": false,
+          "unique": false,
+          "expression": "create unique index \"module_configs_global_unique\" on \"module_configs\" (\"module_id\", \"name\") where \"tenant_id\" is null"
+        },
+        {
+          "keyName": "module_configs_scoped_unique",
+          "columnNames": [],
+          "composite": false,
+          "constraint": false,
+          "primary": false,
+          "unique": false,
+          "expression": "create unique index \"module_configs_scoped_unique\" on \"module_configs\" (\"module_id\", \"name\", \"tenant_id\") where \"tenant_id\" is not null"
+        },
+        {
+          "keyName": "module_configs_module_name_tenant_idx",
           "columnNames": [
             "module_id",
-            "name"
+            "name",
+            "tenant_id"
           ],
           "composite": true,
-          "constraint": true,
+          "constraint": false,
           "primary": false,
-          "unique": true
+          "unique": false
         },
         {
           "keyName": "module_configs_pkey",

package/src/modules/configs/migrations/.snapshot-openmercato.json

@@ -43,6 +43,24 @@
           "nullable": true,
           "mappedType": "json"
         },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "uuid"
+        },
+        "tenant_id": {
+          "name": "tenant_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "uuid"
+        },
         "created_at": {
           "name": "created_at",
           "type": "timestamptz",
@@ -68,15 +86,34 @@
       "schema": "public",
       "indexes": [
         {
-          "keyName": "module_configs_module_name_unique",
+          "keyName": "module_configs_global_unique",
+          "columnNames": [],
+          "composite": false,
+          "constraint": false,
+          "primary": false,
+          "unique": false,
+          "expression": "create unique index \"module_configs_global_unique\" on \"module_configs\" (\"module_id\", \"name\") where \"tenant_id\" is null"
+        },
+        {
+          "keyName": "module_configs_scoped_unique",
+          "columnNames": [],
+          "composite": false,
+          "constraint": false,
+          "primary": false,
+          "unique": false,
+          "expression": "create unique index \"module_configs_scoped_unique\" on \"module_configs\" (\"module_id\", \"name\", \"tenant_id\") where \"tenant_id\" is not null"
+        },
+        {
+          "keyName": "module_configs_module_name_tenant_idx",
           "columnNames": [
             "module_id",
-            "name"
+            "name",
+            "tenant_id"
           ],
           "composite": true,
-          "constraint": true,
+          "constraint": false,
           "primary": false,
-          "unique": true
+          "unique": false
         },
         {
           "keyName": "module_configs_pkey",

package/src/modules/configs/migrations/Migration20260617150000.ts

@@ -0,0 +1,21 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260617150000 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`alter table "module_configs" add column "organization_id" uuid null, add column "tenant_id" uuid null;`);
+    this.addSql(`alter table "module_configs" drop constraint "module_configs_module_name_unique";`);
+    this.addSql(`create unique index "module_configs_global_unique" on "module_configs" ("module_id", "name") where "tenant_id" is null;`);
+    this.addSql(`create unique index "module_configs_scoped_unique" on "module_configs" ("module_id", "name", "tenant_id") where "tenant_id" is not null;`);
+    this.addSql(`create index "module_configs_module_name_tenant_idx" on "module_configs" ("module_id", "name", "tenant_id");`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`drop index if exists "module_configs_module_name_tenant_idx";`);
+    this.addSql(`drop index if exists "module_configs_scoped_unique";`);
+    this.addSql(`drop index if exists "module_configs_global_unique";`);
+    this.addSql(`alter table "module_configs" add constraint "module_configs_module_name_unique" unique ("module_id", "name");`);
+    this.addSql(`alter table "module_configs" drop column "organization_id", drop column "tenant_id";`);
+  }
+
+}

package/src/modules/customers/api/activities/route.ts

@@ -74,6 +74,12 @@ const ADAPTER_HEADERS = {
 // canonical bridge) read path. Keeps memory bounded on tenants with large
 // activity history; deep-pagination beyond this window is not supported here —
 // use /api/customers/interactions instead.
+//
+// Audited for the #3386 rollout (P2): this merged path sorts only on
+// non-encrypted system timestamps (createdAt/occurredAt, see
+// resolveActivitySortValue), so the #3278 two-phase *encrypted*-sort migration
+// is intentionally not applied here. Merge-order correctness across the page
+// boundary is covered by __tests__/merged-pagination.test.ts.
 const MERGED_ACTIVITY_FETCH_CAP = 2000
 
 type ActivityItem = {

package/src/modules/customers/backend/customers/deals/pipeline/page.tsx

@@ -83,6 +83,11 @@ import { BulkActionsBar } from './components/BulkActionsBar'
 import { ChangeStageDialog } from './components/ChangeStageDialog'
 import { ChangeOwnerDialog } from './components/ChangeOwnerDialog'
 import { buildCrudExportUrl, deleteCrud } from '@open-mercato/ui/backend/utils/crud'
+import {
+  readVersionedPreference,
+  writeVersionedPreference,
+  clearVersionedPreference,
+} from '@open-mercato/shared/lib/browser/versionedPreference'
 import { runBulkDelete, groupBulkDeleteFailures } from '@open-mercato/ui/backend/utils/bulkDelete'
 import {
   fetchAssignableStaffMembers,
@@ -170,35 +175,37 @@ const MIN_LANE_WIDTH = 240
 const MAX_LANE_WIDTH = 576
 const LANE_GAP = 14
 const LANE_WIDTHS_STORAGE_KEY_PREFIX = 'kanban-lane-widths-v2'
+const LANE_WIDTHS_STORAGE_VERSION = 1
+
+function isNumberRecord(value: unknown): value is Record<string, number> {
+  return !!value && typeof value === 'object' && !Array.isArray(value)
+    && Object.values(value as Record<string, unknown>).every((v) => typeof v === 'number')
+}
 
 function loadLaneWidths(scopeKey: string): Record<string, number> {
-  if (typeof window === 'undefined') return {}
-  try {
-    const raw = window.localStorage.getItem(`${LANE_WIDTHS_STORAGE_KEY_PREFIX}:${scopeKey}`)
-    if (!raw) return {}
-    const parsed = JSON.parse(raw)
-    if (!parsed || typeof parsed !== 'object') return {}
-    const out: Record<string, number> = {}
-    for (const [k, v] of Object.entries(parsed)) {
-      if (typeof v === 'number' && Number.isFinite(v) && v >= MIN_LANE_WIDTH && v <= MAX_LANE_WIDTH) {
-        out[k] = v
-      }
+  const raw = readVersionedPreference<Record<string, number>>(
+    `${LANE_WIDTHS_STORAGE_KEY_PREFIX}:${scopeKey}`,
+    LANE_WIDTHS_STORAGE_VERSION,
+    isNumberRecord,
+    {},
+    { legacyIsValid: isNumberRecord },
+  )
+  const out: Record<string, number> = {}
+  for (const [k, v] of Object.entries(raw)) {
+    if (Number.isFinite(v) && v >= MIN_LANE_WIDTH && v <= MAX_LANE_WIDTH) {
+      out[k] = v
     }
-    return out
-  } catch {
-    return {}
   }
+  return out
 }
 
 function saveLaneWidths(scopeKey: string, widths: Record<string, number>) {
-  if (typeof window === 'undefined') return
-  try {
-    if (Object.keys(widths).length === 0) {
-      window.localStorage.removeItem(`${LANE_WIDTHS_STORAGE_KEY_PREFIX}:${scopeKey}`)
-    } else {
-      window.localStorage.setItem(`${LANE_WIDTHS_STORAGE_KEY_PREFIX}:${scopeKey}`, JSON.stringify(widths))
-    }
-  } catch {}
+  const key = `${LANE_WIDTHS_STORAGE_KEY_PREFIX}:${scopeKey}`
+  if (Object.keys(widths).length === 0) {
+    clearVersionedPreference(key)
+  } else {
+    writeVersionedPreference(key, LANE_WIDTHS_STORAGE_VERSION, widths)
+  }
 }
 
 function normalizeAmount(value: unknown): number | null {

package/src/modules/customers/components/detail/CompanyKpiBar.tsx

@@ -7,14 +7,15 @@ import { KpiCard, type KpiTrend } from '@open-mercato/ui/backend/charts/KpiCard'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { IconButton } from '@open-mercato/ui/primitives/icon-button'
 import {
-  readJsonFromLocalStorage,
-  writeJsonToLocalStorage,
-  removeLocalStorageKey,
-} from '@open-mercato/shared/lib/browser/safeLocalStorage'
+  readVersionedIdSet,
+  writeVersionedIdSet,
+  clearVersionedPreference,
+} from '@open-mercato/shared/lib/browser/versionedPreference'
 import type { CompanyOverview, DealSummary, InteractionSummary } from '../formConfig'
 import { formatCurrency } from './utils'
 
 const STORAGE_KEY = 'om:company-detail-kpi-hidden'
+const STORAGE_VERSION = 1
 
 function sumActiveDeals(deals: DealSummary[]): number {
   return deals
@@ -100,7 +101,7 @@ export function CompanyKpiBar({ data }: CompanyKpiBarProps) {
   }, [data.interactions, data.kpis?.clientTenureYears])
 
   const [hiddenTiles, setHiddenTiles] = React.useState<Set<string>>(
-    () => new Set(readJsonFromLocalStorage<string[]>(STORAGE_KEY, [])),
+    () => readVersionedIdSet(STORAGE_KEY, STORAGE_VERSION),
   )
 
   const toggleTile = React.useCallback((tileId: string) => {
@@ -108,14 +109,14 @@ export function CompanyKpiBar({ data }: CompanyKpiBarProps) {
       const next = new Set(prev)
       if (next.has(tileId)) next.delete(tileId)
       else next.add(tileId)
-      writeJsonToLocalStorage(STORAGE_KEY, [...next])
+      writeVersionedIdSet(STORAGE_KEY, STORAGE_VERSION, next)
       return next
     })
   }, [])
 
   const showAllTiles = React.useCallback(() => {
     setHiddenTiles(new Set())
-    removeLocalStorageKey(STORAGE_KEY)
+    clearVersionedPreference(STORAGE_KEY)
   }, [])
 
   const kpiTiles = React.useMemo(() => [

package/src/modules/customers/components/detail/CompanyPeopleSection.tsx

@@ -8,9 +8,9 @@ import { Badge } from '@open-mercato/ui/primitives/badge'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { apiCallOrThrow, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import {
-  readJsonFromLocalStorage,
-  writeJsonToLocalStorage,
-} from '@open-mercato/shared/lib/browser/safeLocalStorage'
+  readVersionedIdSet,
+  writeVersionedIdSet,
+} from '@open-mercato/shared/lib/browser/versionedPreference'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { createTranslatorWithFallback } from '@open-mercato/shared/lib/i18n/translate'
 import { useAppEvent } from '@open-mercato/ui/backend/injection/useAppEvent'
@@ -60,6 +60,7 @@ export type CompanyPeopleSectionProps = {
 }
 
 const COMPANY_PEOPLE_PAGE_SIZE = 20
+const STARRED_PEOPLE_STORAGE_VERSION = 1
 
 function normalizeCompanyPerson(record: Record<string, unknown>): CompanyPersonSummary | null {
   const id = typeof record.id === 'string' ? record.id : null
@@ -206,7 +207,7 @@ export function CompanyPeopleSection({
   const [listTotalCount, setListTotalCount] = React.useState(initialPeople.length)
   const [listLoading, setListLoading] = React.useState(true)
   const [starredIds, setStarredIds] = React.useState<Set<string>>(
-    () => new Set(readJsonFromLocalStorage<string[]>(`om:starred-people:${companyId}`, [])),
+    () => readVersionedIdSet(`om:starred-people:${companyId}`, STARRED_PEOPLE_STORAGE_VERSION),
   )
   const pendingPeopleChangeRef = React.useRef(false)
 
@@ -229,7 +230,7 @@ export function CompanyPeopleSection({
         const next = new Set(prev)
         if (next.has(personId)) next.delete(personId)
         else next.add(personId)
-        writeJsonToLocalStorage(`om:starred-people:${companyId}`, [...next])
+        writeVersionedIdSet(`om:starred-people:${companyId}`, STARRED_PEOPLE_STORAGE_VERSION, next)
         return next
       })
     },