@open-mercato/core 0.6.6-develop.6402.1.080aab8ec9 → 0.6.6-develop.6403.1.b57089b6fe

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.6.6-develop.6402.1.080aab8ec9",
+  "version": "0.6.6-develop.6403.1.b57089b6fe",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -248,16 +248,16 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@open-mercato/ai-assistant": "0.6.6-develop.6402.1.080aab8ec9",
-    "@open-mercato/shared": "0.6.6-develop.6402.1.080aab8ec9",
-    "@open-mercato/ui": "0.6.6-develop.6402.1.080aab8ec9",
+    "@open-mercato/ai-assistant": "0.6.6-develop.6403.1.b57089b6fe",
+    "@open-mercato/shared": "0.6.6-develop.6403.1.b57089b6fe",
+    "@open-mercato/ui": "0.6.6-develop.6403.1.b57089b6fe",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.6.6-develop.6402.1.080aab8ec9",
-    "@open-mercato/shared": "0.6.6-develop.6402.1.080aab8ec9",
-    "@open-mercato/ui": "0.6.6-develop.6402.1.080aab8ec9",
+    "@open-mercato/ai-assistant": "0.6.6-develop.6403.1.b57089b6fe",
+    "@open-mercato/shared": "0.6.6-develop.6403.1.b57089b6fe",
+    "@open-mercato/ui": "0.6.6-develop.6403.1.b57089b6fe",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",

package/src/modules/planner/api/availability-weekly.ts

@@ -123,6 +123,16 @@ export const openApi = {
         { status: 400, description: 'Invalid payload', schema: z.object({ error: z.string() }) },
         { status: 401, description: 'Unauthorized', schema: z.object({ error: z.string() }) },
         { status: 403, description: 'Forbidden', schema: z.object({ error: z.string() }) },
+        {
+          status: 409,
+          description: 'Optimistic lock conflict',
+          schema: z.object({
+            error: z.string(),
+            code: z.literal('optimistic_lock_conflict'),
+            currentUpdatedAt: z.string(),
+            expectedUpdatedAt: z.string(),
+          }),
+        },
       ],
     },
   },

package/src/modules/planner/commands/availability-weekly.ts

@@ -8,14 +8,24 @@ import {
   type PlannerAvailabilityWeeklyReplaceInput,
 } from '../data/validators'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
-import type { PlannerAvailabilityKind, PlannerAvailabilitySubjectType } from '../data/entities'
+import { emitCrudSideEffects } from '@open-mercato/shared/lib/commands/helpers'
 import {
   enforceCommandOptimisticLock,
   enforceRecordGoneIsConflict,
 } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
+import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
+import type { CrudIndexerConfig } from '@open-mercato/shared/lib/crud/types'
+import type { PlannerAvailabilityKind, PlannerAvailabilitySubjectType } from '../data/entities'
 import { ensureOrganizationScope, ensureTenantScope, extractUndoPayload } from './shared'
+import { plannerAvailabilityRuleSetCrudEvents } from '../lib/crud'
+import { E } from '#generated/entities.ids.generated'
 
 const AVAILABILITY_RULE_RESOURCE_KIND = 'planner.availability.rule'
+const AVAILABILITY_RULE_SET_CACHE_RESOURCE_KIND = 'planner.availability-rule-set'
+
+const availabilityRuleSetCrudIndexer: CrudIndexerConfig<PlannerAvailabilityRuleSet> = {
+  entityType: E.planner.planner_availability_rule_set,
+}
 
 // Canonical resource kind for the parent rule set, matching the tag the CRUD
 // factory derives for `planner.availability-rule-sets.*` commands. Weekly
@@ -95,6 +105,14 @@ function toAvailabilityRuleSnapshot(record: PlannerAvailabilityRule): Availabili
   }
 }
 
+function nextRuleSetUpdatedAt(current: Date | null | undefined, fallback: Date): Date {
+  const currentMs = current instanceof Date ? current.getTime() : Number.NaN
+  if (Number.isFinite(currentMs) && fallback.getTime() <= currentMs) {
+    return new Date(currentMs + 1)
+  }
+  return fallback
+}
+
 async function loadWeeklySnapshots(
   em: EntityManager,
   params: {
@@ -173,12 +191,12 @@ const replaceWeeklyAvailabilityCommand: CommandHandler<PlannerAvailabilityWeekly
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const now = new Date()
 
-    await em.transactional(async (trx) => {
-      // The weekly rules of a rule set are a sub-resource of that rule set: the
-      // parent is the optimistic-lock consistency boundary. Guard the parent's
-      // version (so a stale weekly save loses to a concurrent rule-set
-      // change/delete) and bump its `updated_at` after the replace (so a
-      // concurrent rule-set delete/update with a stale token conflicts). See #2927.
+    // The weekly rules of a rule set are a sub-resource of that rule set: the
+    // parent is the optimistic-lock consistency boundary. Guard the parent's
+    // version (so a stale weekly save loses to a concurrent rule-set
+    // change/delete) and bump its `updated_at` after the replace (so a
+    // concurrent rule-set delete/update with a stale token conflicts). See #2927.
+    const touchedRuleSet = await em.transactional(async (trx): Promise<PlannerAvailabilityRuleSet | null> => {
       let ruleSet: PlannerAvailabilityRuleSet | null = null
       if (parsed.subjectType === 'ruleset') {
         ruleSet = await trx.findOne(PlannerAvailabilityRuleSet, {
@@ -250,13 +268,30 @@ const replaceWeeklyAvailabilityCommand: CommandHandler<PlannerAvailabilityWeekly
       })
 
       if (ruleSet) {
-        ruleSet.updatedAt = now
+        ruleSet.updatedAt = nextRuleSetUpdatedAt(ruleSet.updatedAt, now)
         trx.persist(ruleSet)
       }
 
       await trx.flush()
+      return ruleSet
     })
 
+    if (touchedRuleSet) {
+      const dataEngine = ctx.container.resolve('dataEngine') as DataEngine
+      await emitCrudSideEffects({
+        dataEngine,
+        action: 'updated',
+        entity: touchedRuleSet,
+        identifiers: {
+          id: touchedRuleSet.id,
+          organizationId: touchedRuleSet.organizationId,
+          tenantId: touchedRuleSet.tenantId,
+        },
+        events: plannerAvailabilityRuleSetCrudEvents,
+        indexer: availabilityRuleSetCrudIndexer,
+      })
+    }
+
     return { ok: true }
   },
   buildLog: async ({ input, snapshots, ctx }) => {
@@ -284,6 +319,9 @@ const replaceWeeklyAvailabilityCommand: CommandHandler<PlannerAvailabilityWeekly
           after,
         } satisfies WeeklyUndoPayload,
       },
+      context: parsed.subjectType === 'ruleset'
+        ? { cacheAliases: [AVAILABILITY_RULE_SET_CACHE_RESOURCE_KIND] }
+        : null,
     }
   },
   undo: async ({ logEntry, ctx }) => {

package/src/modules/planner/components/AvailabilityRulesEditor.tsx

@@ -19,6 +19,7 @@ import { createCrud, deleteCrud, updateCrud } from '@open-mercato/ui/backend/uti
 import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
+import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { ComboboxInput, TimePicker } from '@open-mercato/ui/backend/inputs'
 import { DictionaryEntrySelect, type DictionarySelectLabels } from '@open-mercato/core/modules/dictionaries/components/DictionaryEntrySelect'
@@ -30,7 +31,6 @@ import {
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import { normalizeCrudServerError } from '@open-mercato/ui/backend/utils/serverErrors'
-import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
 import { parseAvailabilityRuleWindow } from '@open-mercato/core/modules/planner/lib/availabilitySchedule'
 import { deleteAvailabilityRuleSet } from '@open-mercato/core/modules/planner/lib/deleteAvailabilityRuleSet'
 import { CrudForm, type CrudField } from '@open-mercato/ui/backend/CrudForm'
@@ -778,6 +778,12 @@ export function AvailabilityRulesEditor({
     void refreshBookedEvents()
   }, [refreshBookedEvents])
 
+  const refreshAfterRuleSetConflict = React.useCallback(() => {
+    void refreshRuleSets()
+    void refreshRuleSetRules()
+    void refreshAvailability()
+  }, [refreshAvailability, refreshRuleSetRules, refreshRuleSets])
+
   const weeklyDraft = React.useMemo(() => buildWeeklyDraft(activeRules), [activeRules])
   const [weeklyWindows, setWeeklyWindows] = React.useState<WeeklyWindows>(() => cloneWeeklyWindows(weeklyDraft))
   const weeklyWindowsRef = React.useRef<WeeklyWindows>(cloneWeeklyWindows(weeklyDraft))
@@ -893,14 +899,15 @@ export function AvailabilityRulesEditor({
       if (!shouldSkipRefresh) {
         await refreshAvailability()
         await refreshRuleSetRules()
+        if (usingRuleSet) {
+          await refreshRuleSets()
+        }
       }
       if (parentRuleSet) {
         await refreshRuleSets()
       }
     } catch (error) {
-      if (surfaceRecordConflict(error, t)) {
-        return
-      }
+      if (surfaceRecordConflict(error, t, { onRefresh: refreshAfterRuleSetConflict })) return
       const message = error instanceof Error ? error.message : listLabels.saveWeeklyError
       flash(message, 'error')
     } finally {
@@ -912,8 +919,9 @@ export function AvailabilityRulesEditor({
     refreshAvailability,
     refreshRuleSetRules,
     refreshRuleSets,
-    ruleSets,
+    refreshAfterRuleSetConflict,
     effectiveRulesetId,
+    ruleSets,
     subjectId,
     subjectType,
     t,
@@ -1180,7 +1188,7 @@ export function AvailabilityRulesEditor({
       refreshRuleSets,
       onSuccess: () => flash(listLabels.ruleSetDeleteSuccess, 'success'),
       onError: (error) => {
-        if (surfaceRecordConflict(error, t)) return
+        if (surfaceRecordConflict(error, t, { onRefresh: refreshAfterRuleSetConflict })) return
         console.error('planner.availability-rule-sets.delete', error)
         const normalized = normalizeCrudServerError(error)
         flash(normalized.message ?? listLabels.ruleSetDeleteError, 'error')
@@ -1195,6 +1203,7 @@ export function AvailabilityRulesEditor({
     listLabels.ruleSetDeleteSuccess,
     onRulesetChange,
     refreshAvailability,
+    refreshAfterRuleSetConflict,
     refreshRuleSets,
     ruleSets,
     rulesetId,