@open-mercato/core 0.6.6-develop.6204.1.30b1f58642 → 0.6.6-develop.6227.1.2695efff30

package/dist/modules/directory/api/organization-branding/route.js

@@ -4,6 +4,11 @@ import { runWithCacheTenant } from "@open-mercato/cache";
 import { getAuthFromRequest } from "@open-mercato/shared/lib/auth/server";
 import { createRequestContainer } from "@open-mercato/shared/lib/di/container";
 import { isCrudHttpError } from "@open-mercato/shared/lib/crud/errors";
+import {
+  runCrudMutationGuardAfterSuccess,
+  validateCrudMutationGuard
+} from "@open-mercato/shared/lib/crud/mutation-guard";
+import { enforceCommandOptimisticLock } from "@open-mercato/shared/lib/crud/optimistic-lock-command";
 import { findOneWithDecryption } from "@open-mercato/shared/lib/encryption/find";
 import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
 import { Organization } from "@open-mercato/core/modules/directory/data/entities";
@@ -18,7 +23,8 @@ const brandingResponseSchema = z.object({
   organizationId: z.string().uuid(),
   organizationName: z.string(),
   tenantId: z.string().uuid(),
-  logoUrl: z.string().nullable()
+  logoUrl: z.string().nullable(),
+  updatedAt: z.string().nullable()
 });
 const brandingUpdateSchema = z.object({
   logoUrl: organizationUpdateSchema.shape.logoUrl
@@ -84,12 +90,24 @@ async function resolveCurrentOrganization(req) {
   }
   return { auth, container, organization, organizationId, tenantId, translate };
 }
+function toIsoOrNull(value) {
+  if (value == null) return null;
+  if (value instanceof Date) {
+    const ms = value.getTime();
+    return Number.isFinite(ms) ? new Date(ms).toISOString() : null;
+  }
+  const trimmed = String(value).trim();
+  if (!trimmed) return null;
+  const parsed = new Date(trimmed);
+  return Number.isFinite(parsed.getTime()) ? parsed.toISOString() : null;
+}
 function toResponsePayload(organization, tenantId) {
   return {
     organizationId: String(organization.id),
     organizationName: organization.name,
     tenantId,
-    logoUrl: organization.logoUrl ?? null
+    logoUrl: organization.logoUrl ?? null,
+    updatedAt: toIsoOrNull(organization.updatedAt)
   };
 }
 async function invalidateSidebarBrandingCache(container, organizationId, tenantId) {
@@ -139,6 +157,26 @@ async function PUT(req) {
     );
   }
   try {
+    enforceCommandOptimisticLock({
+      resourceKind: "directory.organization",
+      resourceId: resolved.organizationId,
+      current: resolved.organization.updatedAt ?? null,
+      request: req
+    });
+    const guardResult = await validateCrudMutationGuard(resolved.container, {
+      tenantId: resolved.tenantId,
+      organizationId: resolved.organizationId,
+      userId: resolved.auth.sub,
+      resourceKind: "directory.organization",
+      resourceId: resolved.organizationId,
+      operation: "update",
+      requestMethod: req.method,
+      requestHeaders: req.headers,
+      mutationPayload: { logoUrl: parsed.data.logoUrl ?? null }
+    });
+    if (guardResult && !guardResult.ok) {
+      return NextResponse.json(guardResult.body, { status: guardResult.status });
+    }
     const commandBus = resolved.container.resolve("commandBus");
     const ctx = buildCommandContext(
       resolved.container,
@@ -158,6 +196,19 @@ async function PUT(req) {
         ctx
       }
     );
+    if (guardResult?.ok && guardResult.shouldRunAfterSuccess) {
+      await runCrudMutationGuardAfterSuccess(resolved.container, {
+        tenantId: resolved.tenantId,
+        organizationId: resolved.organizationId,
+        userId: resolved.auth.sub,
+        resourceKind: "directory.organization",
+        resourceId: resolved.organizationId,
+        operation: "update",
+        requestMethod: req.method,
+        requestHeaders: req.headers,
+        metadata: guardResult.metadata ?? null
+      });
+    }
     await invalidateSidebarBrandingCache(resolved.container, resolved.organizationId, resolved.tenantId);
     return NextResponse.json(toResponsePayload(result, resolved.tenantId));
   } catch (err) {
@@ -200,6 +251,7 @@ const openApi = {
       errors: [
         { status: 400, description: "Save failed", schema: errorSchema },
         { status: 401, description: "Unauthorized", schema: errorSchema },
+        { status: 409, description: "Organization branding changed since it was loaded", schema: errorSchema },
         { status: 422, description: "Invalid logo URL", schema: errorSchema }
       ]
     }

package/dist/modules/directory/api/organization-branding/route.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/modules/directory/api/organization-branding/route.ts"],
-  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { z } from 'zod'\nimport type { EntityManager } from '@mikro-orm/postgresql'\nimport { runWithCacheTenant } from '@open-mercato/cache'\nimport type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport { Organization } from '@open-mercato/core/modules/directory/data/entities'\nimport { organizationUpdateSchema } from '@open-mercato/core/modules/directory/data/validators'\nimport { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'\nimport '@open-mercato/core/modules/directory/commands/organizations'\n\nexport const metadata = {\n  GET: { requireAuth: true, requireFeatures: ['directory.organizations.view'] },\n  PUT: { requireAuth: true, requireFeatures: ['directory.organizations.manage'] },\n}\n\nconst brandingResponseSchema = z.object({\n  organizationId: z.string().uuid(),\n  organizationName: z.string(),\n  tenantId: z.string().uuid(),\n  logoUrl: z.string().nullable(),\n})\n\nconst brandingUpdateSchema = z.object({\n  logoUrl: organizationUpdateSchema.shape.logoUrl,\n})\n\nconst errorSchema = z.object({\n  error: z.string(),\n})\n\ntype RequestContainer = Awaited<ReturnType<typeof createRequestContainer>>\n\nfunction buildCommandContext(\n  container: RequestContainer,\n  auth: NonNullable<Awaited<ReturnType<typeof getAuthFromRequest>>>,\n  req: Request,\n  organizationId: string,\n  tenantId: string,\n): CommandRuntimeContext {\n  return {\n    container,\n    auth,\n    organizationScope: {\n      selectedId: organizationId,\n      filterIds: [organizationId],\n      allowedIds: null,\n      tenantId,\n    },\n    selectedOrganizationId: organizationId,\n    organizationIds: [organizationId],\n    request: req,\n  }\n}\n\nasync function resolveCurrentOrganization(req: Request) {\n  const { translate } = await resolveTranslations()\n  const auth = await getAuthFromRequest(req)\n  if (!auth?.sub) {\n    return {\n      response: NextResponse.json({ error: translate('api.errors.unauthorized', 'Unauthorized') }, { status: 401 }),\n    }\n  }\n\n  const container = await createRequestContainer()\n  const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req })\n  const organizationId = scope.selectedId ?? auth.orgId ?? null\n  const tenantId = scope.tenantId ?? auth.tenantId ?? null\n  if (!organizationId || !tenantId) {\n    return {\n      response: NextResponse.json(\n        {\n          error: translate(\n            'directory.branding.errors.organizationRequired',\n            'Select a single organization before changing sidebar branding.',\n          ),\n        },\n        { status: 400 },\n      ),\n    }\n  }\n\n  const em = container.resolve('em') as EntityManager\n  const organization = await findOneWithDecryption(\n    em,\n    Organization,\n    { id: organizationId, tenant: tenantId, deletedAt: null },\n    { populate: ['tenant'] },\n    { tenantId, organizationId },\n  )\n  if (!organization) {\n    return {\n      response: NextResponse.json(\n        { error: translate('directory.branding.errors.notFound', 'Organization not found') },\n        { status: 404 },\n      ),\n    }\n  }\n\n  return { auth, container, organization, organizationId, tenantId, translate }\n}\n\nfunction toResponsePayload(organization: Organization, tenantId: string) {\n  return {\n    organizationId: String(organization.id),\n    organizationName: organization.name,\n    tenantId,\n    logoUrl: organization.logoUrl ?? null,\n  }\n}\n\nasync function invalidateSidebarBrandingCache(container: RequestContainer, organizationId: string, tenantId: string) {\n  try {\n    const cache = container.resolve('cache') as {\n      deleteByTags?: (tags: string[]) => Promise<unknown>\n    } | null\n    await runWithCacheTenant(tenantId, () =>\n      cache?.deleteByTags?.([\n        `nav:sidebar:organization:${organizationId}`,\n        `nav:sidebar:tenant:${tenantId}`,\n      ]),\n    )\n  } catch {\n    // Cache invalidation is best-effort; the persisted branding is the source of truth.\n  }\n}\n\nexport async function GET(req: Request) {\n  const resolved = await resolveCurrentOrganization(req)\n  if ('response' in resolved) return resolved.response\n\n  return NextResponse.json(toResponsePayload(resolved.organization, resolved.tenantId))\n}\n\nexport async function PUT(req: Request) {\n  const resolved = await resolveCurrentOrganization(req)\n  if ('response' in resolved) return resolved.response\n\n  let body: unknown\n  try {\n    body = await req.json()\n  } catch {\n    return NextResponse.json(\n      { error: resolved.translate('directory.branding.errors.invalidLogoUrl', 'Enter a valid image URL.') },\n      { status: 422 },\n    )\n  }\n  if (!body || typeof body !== 'object' || !Object.prototype.hasOwnProperty.call(body, 'logoUrl')) {\n    return NextResponse.json(\n      { error: resolved.translate('directory.branding.errors.invalidLogoUrl', 'Enter a valid image URL.') },\n      { status: 422 },\n    )\n  }\n\n  const parsed = brandingUpdateSchema.safeParse(body)\n  if (!parsed.success) {\n    return NextResponse.json(\n      {\n        error: resolved.translate('directory.branding.errors.invalidLogoUrl', 'Enter a valid image URL.'),\n        issues: parsed.error.issues,\n      },\n      { status: 422 },\n    )\n  }\n\n  try {\n    const commandBus = resolved.container.resolve('commandBus') as CommandBus\n    const ctx = buildCommandContext(\n      resolved.container,\n      resolved.auth,\n      req,\n      resolved.organizationId,\n      resolved.tenantId,\n    )\n    const { result } = await commandBus.execute<Record<string, unknown>, Organization>(\n      'directory.organizations.update',\n      {\n        input: {\n          id: resolved.organizationId,\n          tenantId: resolved.tenantId,\n          logoUrl: parsed.data.logoUrl ?? null,\n        },\n        ctx,\n      },\n    )\n    await invalidateSidebarBrandingCache(resolved.container, resolved.organizationId, resolved.tenantId)\n    return NextResponse.json(toResponsePayload(result, resolved.tenantId))\n  } catch (err) {\n    if (isCrudHttpError(err)) {\n      return NextResponse.json(err.body, { status: err.status })\n    }\n    console.error('directory.organization-branding.update failed', err)\n    return NextResponse.json(\n      { error: resolved.translate('directory.branding.errors.save', 'Failed to update organization branding.') },\n      { status: 400 },\n    )\n  }\n}\n\nexport const openApi: OpenApiRouteDoc = {\n  tag: 'Directory',\n  summary: 'Current organization branding',\n  methods: {\n    GET: {\n      summary: 'Read sidebar branding for the selected organization',\n      description: 'Returns the logo URL used by the backend sidebar for the currently selected organization.',\n      responses: [\n        { status: 200, description: 'Organization branding', schema: brandingResponseSchema },\n      ],\n      errors: [\n        { status: 400, description: 'A concrete organization scope is required', schema: errorSchema },\n        { status: 401, description: 'Unauthorized', schema: errorSchema },\n        { status: 404, description: 'Organization not found', schema: errorSchema },\n      ],\n    },\n    PUT: {\n      summary: 'Update sidebar branding for the selected organization',\n      description: 'Stores an external image URL or an internal attachment image URL as the selected organization logo.',\n      requestBody: {\n        contentType: 'application/json',\n        schema: brandingUpdateSchema,\n      },\n      responses: [\n        { status: 200, description: 'Updated organization branding', schema: brandingResponseSchema },\n      ],\n      errors: [\n        { status: 400, description: 'Save failed', schema: errorSchema },\n        { status: 401, description: 'Unauthorized', schema: errorSchema },\n        { status: 422, description: 'Invalid logo URL', schema: errorSchema },\n      ],\n    },\n  },\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { z } from 'zod'\nimport type { EntityManager } from '@mikro-orm/postgresql'\nimport { runWithCacheTenant } from '@open-mercato/cache'\nimport type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport {\n  runCrudMutationGuardAfterSuccess,\n  validateCrudMutationGuard,\n} from '@open-mercato/shared/lib/crud/mutation-guard'\nimport { enforceCommandOptimisticLock } from '@open-mercato/shared/lib/crud/optimistic-lock-command'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport { Organization } from '@open-mercato/core/modules/directory/data/entities'\nimport { organizationUpdateSchema } from '@open-mercato/core/modules/directory/data/validators'\nimport { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'\nimport '@open-mercato/core/modules/directory/commands/organizations'\n\nexport const metadata = {\n  GET: { requireAuth: true, requireFeatures: ['directory.organizations.view'] },\n  PUT: { requireAuth: true, requireFeatures: ['directory.organizations.manage'] },\n}\n\nconst brandingResponseSchema = z.object({\n  organizationId: z.string().uuid(),\n  organizationName: z.string(),\n  tenantId: z.string().uuid(),\n  logoUrl: z.string().nullable(),\n  updatedAt: z.string().nullable(),\n})\n\nconst brandingUpdateSchema = z.object({\n  logoUrl: organizationUpdateSchema.shape.logoUrl,\n})\n\nconst errorSchema = z.object({\n  error: z.string(),\n})\n\ntype RequestContainer = Awaited<ReturnType<typeof createRequestContainer>>\n\nfunction buildCommandContext(\n  container: RequestContainer,\n  auth: NonNullable<Awaited<ReturnType<typeof getAuthFromRequest>>>,\n  req: Request,\n  organizationId: string,\n  tenantId: string,\n): CommandRuntimeContext {\n  return {\n    container,\n    auth,\n    organizationScope: {\n      selectedId: organizationId,\n      filterIds: [organizationId],\n      allowedIds: null,\n      tenantId,\n    },\n    selectedOrganizationId: organizationId,\n    organizationIds: [organizationId],\n    request: req,\n  }\n}\n\nasync function resolveCurrentOrganization(req: Request) {\n  const { translate } = await resolveTranslations()\n  const auth = await getAuthFromRequest(req)\n  if (!auth?.sub) {\n    return {\n      response: NextResponse.json({ error: translate('api.errors.unauthorized', 'Unauthorized') }, { status: 401 }),\n    }\n  }\n\n  const container = await createRequestContainer()\n  const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req })\n  const organizationId = scope.selectedId ?? auth.orgId ?? null\n  const tenantId = scope.tenantId ?? auth.tenantId ?? null\n  if (!organizationId || !tenantId) {\n    return {\n      response: NextResponse.json(\n        {\n          error: translate(\n            'directory.branding.errors.organizationRequired',\n            'Select a single organization before changing sidebar branding.',\n          ),\n        },\n        { status: 400 },\n      ),\n    }\n  }\n\n  const em = container.resolve('em') as EntityManager\n  const organization = await findOneWithDecryption(\n    em,\n    Organization,\n    { id: organizationId, tenant: tenantId, deletedAt: null },\n    { populate: ['tenant'] },\n    { tenantId, organizationId },\n  )\n  if (!organization) {\n    return {\n      response: NextResponse.json(\n        { error: translate('directory.branding.errors.notFound', 'Organization not found') },\n        { status: 404 },\n      ),\n    }\n  }\n\n  return { auth, container, organization, organizationId, tenantId, translate }\n}\n\nfunction toIsoOrNull(value: Date | string | null | undefined): string | null {\n  if (value == null) return null\n  if (value instanceof Date) {\n    const ms = value.getTime()\n    return Number.isFinite(ms) ? new Date(ms).toISOString() : null\n  }\n  const trimmed = String(value).trim()\n  if (!trimmed) return null\n  const parsed = new Date(trimmed)\n  return Number.isFinite(parsed.getTime()) ? parsed.toISOString() : null\n}\n\nfunction toResponsePayload(organization: Organization, tenantId: string) {\n  return {\n    organizationId: String(organization.id),\n    organizationName: organization.name,\n    tenantId,\n    logoUrl: organization.logoUrl ?? null,\n    updatedAt: toIsoOrNull(organization.updatedAt),\n  }\n}\n\nasync function invalidateSidebarBrandingCache(container: RequestContainer, organizationId: string, tenantId: string) {\n  try {\n    const cache = container.resolve('cache') as {\n      deleteByTags?: (tags: string[]) => Promise<unknown>\n    } | null\n    await runWithCacheTenant(tenantId, () =>\n      cache?.deleteByTags?.([\n        `nav:sidebar:organization:${organizationId}`,\n        `nav:sidebar:tenant:${tenantId}`,\n      ]),\n    )\n  } catch {\n    // Cache invalidation is best-effort; the persisted branding is the source of truth.\n  }\n}\n\nexport async function GET(req: Request) {\n  const resolved = await resolveCurrentOrganization(req)\n  if ('response' in resolved) return resolved.response\n\n  return NextResponse.json(toResponsePayload(resolved.organization, resolved.tenantId))\n}\n\nexport async function PUT(req: Request) {\n  const resolved = await resolveCurrentOrganization(req)\n  if ('response' in resolved) return resolved.response\n\n  let body: unknown\n  try {\n    body = await req.json()\n  } catch {\n    return NextResponse.json(\n      { error: resolved.translate('directory.branding.errors.invalidLogoUrl', 'Enter a valid image URL.') },\n      { status: 422 },\n    )\n  }\n  if (!body || typeof body !== 'object' || !Object.prototype.hasOwnProperty.call(body, 'logoUrl')) {\n    return NextResponse.json(\n      { error: resolved.translate('directory.branding.errors.invalidLogoUrl', 'Enter a valid image URL.') },\n      { status: 422 },\n    )\n  }\n\n  const parsed = brandingUpdateSchema.safeParse(body)\n  if (!parsed.success) {\n    return NextResponse.json(\n      {\n        error: resolved.translate('directory.branding.errors.invalidLogoUrl', 'Enter a valid image URL.'),\n        issues: parsed.error.issues,\n      },\n      { status: 422 },\n    )\n  }\n\n  try {\n    // Refuse a stale overwrite when two tabs edit the same organization branding.\n    // Strictly additive \u2014 a no-op when the client omits the expected-version header.\n    enforceCommandOptimisticLock({\n      resourceKind: 'directory.organization',\n      resourceId: resolved.organizationId,\n      current: resolved.organization.updatedAt ?? null,\n      request: req,\n    })\n\n    // Mutation-guard contract for custom write routes: validate before the write,\n    // then run the after-success hook once the command persists.\n    const guardResult = await validateCrudMutationGuard(resolved.container, {\n      tenantId: resolved.tenantId,\n      organizationId: resolved.organizationId,\n      userId: resolved.auth.sub,\n      resourceKind: 'directory.organization',\n      resourceId: resolved.organizationId,\n      operation: 'update',\n      requestMethod: req.method,\n      requestHeaders: req.headers,\n      mutationPayload: { logoUrl: parsed.data.logoUrl ?? null },\n    })\n    if (guardResult && !guardResult.ok) {\n      return NextResponse.json(guardResult.body, { status: guardResult.status })\n    }\n\n    const commandBus = resolved.container.resolve('commandBus') as CommandBus\n    const ctx = buildCommandContext(\n      resolved.container,\n      resolved.auth,\n      req,\n      resolved.organizationId,\n      resolved.tenantId,\n    )\n    const { result } = await commandBus.execute<Record<string, unknown>, Organization>(\n      'directory.organizations.update',\n      {\n        input: {\n          id: resolved.organizationId,\n          tenantId: resolved.tenantId,\n          logoUrl: parsed.data.logoUrl ?? null,\n        },\n        ctx,\n      },\n    )\n\n    if (guardResult?.ok && guardResult.shouldRunAfterSuccess) {\n      await runCrudMutationGuardAfterSuccess(resolved.container, {\n        tenantId: resolved.tenantId,\n        organizationId: resolved.organizationId,\n        userId: resolved.auth.sub,\n        resourceKind: 'directory.organization',\n        resourceId: resolved.organizationId,\n        operation: 'update',\n        requestMethod: req.method,\n        requestHeaders: req.headers,\n        metadata: guardResult.metadata ?? null,\n      })\n    }\n\n    await invalidateSidebarBrandingCache(resolved.container, resolved.organizationId, resolved.tenantId)\n    return NextResponse.json(toResponsePayload(result, resolved.tenantId))\n  } catch (err) {\n    if (isCrudHttpError(err)) {\n      return NextResponse.json(err.body, { status: err.status })\n    }\n    console.error('directory.organization-branding.update failed', err)\n    return NextResponse.json(\n      { error: resolved.translate('directory.branding.errors.save', 'Failed to update organization branding.') },\n      { status: 400 },\n    )\n  }\n}\n\nexport const openApi: OpenApiRouteDoc = {\n  tag: 'Directory',\n  summary: 'Current organization branding',\n  methods: {\n    GET: {\n      summary: 'Read sidebar branding for the selected organization',\n      description: 'Returns the logo URL used by the backend sidebar for the currently selected organization.',\n      responses: [\n        { status: 200, description: 'Organization branding', schema: brandingResponseSchema },\n      ],\n      errors: [\n        { status: 400, description: 'A concrete organization scope is required', schema: errorSchema },\n        { status: 401, description: 'Unauthorized', schema: errorSchema },\n        { status: 404, description: 'Organization not found', schema: errorSchema },\n      ],\n    },\n    PUT: {\n      summary: 'Update sidebar branding for the selected organization',\n      description: 'Stores an external image URL or an internal attachment image URL as the selected organization logo.',\n      requestBody: {\n        contentType: 'application/json',\n        schema: brandingUpdateSchema,\n      },\n      responses: [\n        { status: 200, description: 'Updated organization branding', schema: brandingResponseSchema },\n      ],\n      errors: [\n        { status: 400, description: 'Save failed', schema: errorSchema },\n        { status: 401, description: 'Unauthorized', schema: errorSchema },\n        { status: 409, description: 'Organization branding changed since it was loaded', schema: errorSchema },\n        { status: 422, description: 'Invalid logo URL', schema: errorSchema },\n      ],\n    },\n  },\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/directory/backend/directory/branding/page.js

@@ -7,7 +7,9 @@ import { Page, PageBody, PageHeader } from "@open-mercato/ui/backend/Page";
 import { LoadingMessage, ErrorMessage } from "@open-mercato/ui/backend/detail";
 import { flash } from "@open-mercato/ui/backend/FlashMessages";
 import { useGuardedMutation } from "@open-mercato/ui/backend/injection/useGuardedMutation";
-import { apiCallOrThrow, readApiResultOrThrow } from "@open-mercato/ui/backend/utils/apiCall";
+import { apiCallOrThrow, readApiResultOrThrow, withScopedApiRequestHeaders } from "@open-mercato/ui/backend/utils/apiCall";
+import { buildOptimisticLockHeader } from "@open-mercato/ui/backend/utils/optimisticLock";
+import { surfaceRecordConflict } from "@open-mercato/ui/backend/conflicts";
 import { Button } from "@open-mercato/ui/primitives/button";
 import { Input } from "@open-mercato/ui/primitives/input";
 import { useT } from "@open-mercato/shared/lib/i18n/context";
@@ -73,14 +75,17 @@ function OrganizationBrandingPage() {
         operation: async () => {
           const uploadedLogoUrl = shouldUpload ? await uploadLogo(data.organizationId) : null;
           const resolvedLogoUrl = uploadedLogoUrl ?? nextLogoUrl ?? logoUrl.trim();
-          const response = await apiCallOrThrow(
-            BRANDING_API,
-            {
-              method: "PUT",
-              headers: { "content-type": "application/json" },
-              body: JSON.stringify({ logoUrl: resolvedLogoUrl || null })
-            },
-            { errorMessage: t("directory.branding.errors.save", "Failed to update organization branding") }
+          const response = await withScopedApiRequestHeaders(
+            buildOptimisticLockHeader(data.updatedAt),
+            () => apiCallOrThrow(
+              BRANDING_API,
+              {
+                method: "PUT",
+                headers: { "content-type": "application/json" },
+                body: JSON.stringify({ logoUrl: resolvedLogoUrl || null })
+              },
+              { errorMessage: t("directory.branding.errors.save", "Failed to update organization branding") }
+            )
           );
           return response.result;
         },
@@ -101,6 +106,7 @@ function OrganizationBrandingPage() {
       if (fileInputRef.current) fileInputRef.current.value = "";
       flash(t("directory.branding.flash.saved", "Organization branding updated"), "success");
     } catch (err) {
+      if (surfaceRecordConflict(err, t)) return;
       const fallback = t("directory.branding.errors.save", "Failed to update organization branding");
       const message = err instanceof Error ? err.message : fallback;
       flash(message, "error");

package/dist/modules/directory/backend/directory/branding/page.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/modules/directory/backend/directory/branding/page.tsx"],
-  "sourcesContent": ["'use client'\n\nimport * as React from 'react'\nimport { useQuery, useQueryClient } from '@tanstack/react-query'\nimport { ImagePlus, Loader2, RotateCcw, Save } from 'lucide-react'\nimport { Page, PageBody, PageHeader } from '@open-mercato/ui/backend/Page'\nimport { LoadingMessage, ErrorMessage } from '@open-mercato/ui/backend/detail'\nimport { flash } from '@open-mercato/ui/backend/FlashMessages'\nimport { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'\nimport { apiCallOrThrow, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'\nimport { Button } from '@open-mercato/ui/primitives/button'\nimport { Input } from '@open-mercato/ui/primitives/input'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\n\ntype BrandingPayload = {\n  organizationId: string\n  organizationName: string\n  tenantId: string\n  logoUrl: string | null\n}\n\ntype UploadPayload = {\n  ok: true\n  item: {\n    id: string\n    url: string\n    thumbnailUrl?: string\n  }\n}\n\nconst BRANDING_API = '/api/directory/organization-branding'\nconst BRANDING_ENTITY_ID = 'directory.organization'\n\nexport default function OrganizationBrandingPage() {\n  const t = useT()\n  const queryClient = useQueryClient()\n  const [logoUrl, setLogoUrl] = React.useState('')\n  const [selectedFile, setSelectedFile] = React.useState<File | null>(null)\n  const [filePreviewUrl, setFilePreviewUrl] = React.useState<string | null>(null)\n  const [saving, setSaving] = React.useState(false)\n  const fileInputRef = React.useRef<HTMLInputElement | null>(null)\n  const { runMutation } = useGuardedMutation({\n    contextId: 'directory.organization-branding',\n    blockedMessage: t('directory.branding.errors.blocked', 'Branding save was blocked.'),\n  })\n\n  const { data, isLoading, error } = useQuery<BrandingPayload>({\n    queryKey: ['directory-organization-branding'],\n    queryFn: () => readApiResultOrThrow<BrandingPayload>(\n      BRANDING_API,\n      undefined,\n      { errorMessage: t('directory.branding.errors.load', 'Failed to load organization branding') },\n    ),\n  })\n\n  React.useEffect(() => {\n    setLogoUrl(data?.logoUrl ?? '')\n    setSelectedFile(null)\n  }, [data?.logoUrl])\n\n  React.useEffect(() => {\n    if (!selectedFile || typeof URL === 'undefined') {\n      setFilePreviewUrl(null)\n      return\n    }\n    const nextPreviewUrl = URL.createObjectURL(selectedFile)\n    setFilePreviewUrl(nextPreviewUrl)\n    return () => URL.revokeObjectURL(nextPreviewUrl)\n  }, [selectedFile])\n\n  const currentPreviewUrl = filePreviewUrl ?? logoUrl\n\n  const uploadLogo = React.useCallback(async (organizationId: string): Promise<string | null> => {\n    if (!selectedFile) return null\n    const form = new FormData()\n    form.set('entityId', BRANDING_ENTITY_ID)\n    form.set('recordId', organizationId)\n    form.set('file', selectedFile)\n    form.set('tags', JSON.stringify(['organization-logo']))\n\n    const upload = await readApiResultOrThrow<UploadPayload>(\n      '/api/attachments',\n      {\n        method: 'POST',\n        body: form,\n      },\n      { errorMessage: t('directory.branding.errors.upload', 'Failed to upload logo') },\n    )\n    return upload?.item.thumbnailUrl ?? upload?.item.url ?? null\n  }, [selectedFile, t])\n\n  const saveBranding = React.useCallback(async (nextLogoUrl?: string, options?: { skipUpload?: boolean }) => {\n    if (!data) return\n    const shouldUpload = Boolean(selectedFile && !options?.skipUpload)\n    setSaving(true)\n    try {\n      await runMutation({\n        operation: async () => {\n          const uploadedLogoUrl = shouldUpload ? await uploadLogo(data.organizationId) : null\n          const resolvedLogoUrl = uploadedLogoUrl ?? nextLogoUrl ?? logoUrl.trim()\n          // optimistic-lock-exempt: selected organization branding uses a scoped command endpoint without an exposed updatedAt token.\n          const response = await apiCallOrThrow<BrandingPayload>(\n            BRANDING_API,\n            {\n              method: 'PUT',\n              headers: { 'content-type': 'application/json' },\n              body: JSON.stringify({ logoUrl: resolvedLogoUrl || null }),\n            },\n            { errorMessage: t('directory.branding.errors.save', 'Failed to update organization branding') },\n          )\n          return response.result\n        },\n        context: {\n          entityId: BRANDING_ENTITY_ID,\n          recordId: data.organizationId,\n          operation: 'update-branding',\n        },\n        mutationPayload: {\n          organizationId: data.organizationId,\n          logoUrl: (nextLogoUrl ?? logoUrl.trim()) || null,\n          hasUpload: shouldUpload,\n        },\n      })\n      await queryClient.invalidateQueries({ queryKey: ['directory-organization-branding'] })\n      window.dispatchEvent(new Event('om:refresh-sidebar'))\n      setSelectedFile(null)\n      if (fileInputRef.current) fileInputRef.current.value = ''\n      flash(t('directory.branding.flash.saved', 'Organization branding updated'), 'success')\n    } catch (err: unknown) {\n      const fallback = t('directory.branding.errors.save', 'Failed to update organization branding')\n      const message = err instanceof Error ? err.message : fallback\n      flash(message, 'error')\n    } finally {\n      setSaving(false)\n    }\n  }, [data, logoUrl, queryClient, runMutation, selectedFile, t, uploadLogo])\n\n  const handleSubmit = React.useCallback((event: React.FormEvent<HTMLFormElement>) => {\n    event.preventDefault()\n    void saveBranding()\n  }, [saveBranding])\n\n  if (isLoading) {\n    return <LoadingMessage label={t('directory.branding.loading', 'Loading organization branding...')} />\n  }\n\n  if (error || !data) {\n    return (\n      <ErrorMessage\n        label={t('directory.branding.errors.load', 'Failed to load organization branding')}\n        description={error instanceof Error ? error.message : undefined}\n      />\n    )\n  }\n\n  return (\n    <Page>\n      <PageHeader\n        title={t('directory.branding.title', 'Organization branding')}\n        description={t(\n          'directory.branding.description',\n          'Set the logo used in the backend sidebar for the currently selected organization.',\n        )}\n      />\n      <PageBody>\n        <form className=\"space-y-5\" onSubmit={handleSubmit}>\n          <div className=\"grid gap-5 lg:grid-cols-[260px_1fr]\">\n            <div className=\"space-y-3\">\n              <div className=\"flex aspect-square w-full max-w-[220px] items-center justify-center overflow-hidden rounded-lg border bg-muted/30\">\n                {currentPreviewUrl ? (\n                  <img\n                    src={currentPreviewUrl}\n                    alt={t('directory.branding.previewAlt', '{{name}} logo preview', { name: data.organizationName })}\n                    className=\"h-full w-full object-contain\"\n                  />\n                ) : (\n                  <ImagePlus className=\"size-10 text-muted-foreground\" aria-hidden />\n                )}\n              </div>\n              <p className=\"text-sm font-medium text-foreground\">{data.organizationName}</p>\n              <p className=\"text-xs text-muted-foreground\">\n                {t('directory.branding.currentScope', 'Current organization')}\n              </p>\n            </div>\n\n            <div className=\"space-y-4\">\n              <div className=\"space-y-2\">\n                <label htmlFor=\"organization-logo-file\" className=\"text-sm font-medium\">\n                  {t('directory.branding.file.label', 'Upload logo')}\n                </label>\n                <Input\n                  ref={fileInputRef}\n                  id=\"organization-logo-file\"\n                  type=\"file\"\n                  accept=\"image/png,image/jpeg,image/webp,image/svg+xml\"\n                  onChange={(event) => {\n                    const file = event.currentTarget.files?.[0]\n                    if (!file) return\n                    setSelectedFile(file)\n                  }}\n                />\n                <p className=\"text-xs text-muted-foreground\">\n                  {t('directory.branding.file.hint', 'PNG, JPG, WebP, or SVG works best. Uploaded files are stored as organization attachments.')}\n                </p>\n              </div>\n\n              <div className=\"space-y-2\">\n                <label htmlFor=\"organization-logo-url\" className=\"text-sm font-medium\">\n                  {t('directory.branding.url.label', 'Logo URL')}\n                </label>\n                <Input\n                  id=\"organization-logo-url\"\n                  value={logoUrl}\n                  onChange={(event) => setLogoUrl(event.currentTarget.value)}\n                  placeholder={t('directory.branding.url.placeholder', 'https://example.com/logo.svg')}\n                />\n                <p className=\"text-xs text-muted-foreground\">\n                  {t('directory.branding.url.hint', 'Use an external image URL or leave empty to fall back to the default Open Mercato logo.')}\n                </p>\n              </div>\n\n              <div className=\"flex flex-wrap items-center gap-2\">\n                <Button type=\"submit\" disabled={saving}>\n                  {saving ? <Loader2 className=\"mr-2 size-4 animate-spin\" aria-hidden /> : <Save className=\"mr-2 size-4\" aria-hidden />}\n                  {t('directory.branding.actions.save', 'Save branding')}\n                </Button>\n                <Button\n                  type=\"button\"\n                  variant=\"outline\"\n                  disabled={saving}\n                  onClick={() => {\n                    setSelectedFile(null)\n                    if (fileInputRef.current) fileInputRef.current.value = ''\n                    setLogoUrl('')\n                    void saveBranding('', { skipUpload: true })\n                  }}\n                >\n                  <RotateCcw className=\"mr-2 size-4\" aria-hidden />\n                  {t('directory.branding.actions.reset', 'Use default logo')}\n                </Button>\n              </div>\n            </div>\n          </div>\n        </form>\n      </PageBody>\n    </Page>\n  )\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["'use client'\n\nimport * as React from 'react'\nimport { useQuery, useQueryClient } from '@tanstack/react-query'\nimport { ImagePlus, Loader2, RotateCcw, Save } from 'lucide-react'\nimport { Page, PageBody, PageHeader } from '@open-mercato/ui/backend/Page'\nimport { LoadingMessage, ErrorMessage } from '@open-mercato/ui/backend/detail'\nimport { flash } from '@open-mercato/ui/backend/FlashMessages'\nimport { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'\nimport { apiCallOrThrow, readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'\nimport { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'\nimport { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'\nimport { Button } from '@open-mercato/ui/primitives/button'\nimport { Input } from '@open-mercato/ui/primitives/input'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\n\ntype BrandingPayload = {\n  organizationId: string\n  organizationName: string\n  tenantId: string\n  logoUrl: string | null\n  updatedAt: string | null\n}\n\ntype UploadPayload = {\n  ok: true\n  item: {\n    id: string\n    url: string\n    thumbnailUrl?: string\n  }\n}\n\nconst BRANDING_API = '/api/directory/organization-branding'\nconst BRANDING_ENTITY_ID = 'directory.organization'\n\nexport default function OrganizationBrandingPage() {\n  const t = useT()\n  const queryClient = useQueryClient()\n  const [logoUrl, setLogoUrl] = React.useState('')\n  const [selectedFile, setSelectedFile] = React.useState<File | null>(null)\n  const [filePreviewUrl, setFilePreviewUrl] = React.useState<string | null>(null)\n  const [saving, setSaving] = React.useState(false)\n  const fileInputRef = React.useRef<HTMLInputElement | null>(null)\n  const { runMutation } = useGuardedMutation({\n    contextId: 'directory.organization-branding',\n    blockedMessage: t('directory.branding.errors.blocked', 'Branding save was blocked.'),\n  })\n\n  const { data, isLoading, error } = useQuery<BrandingPayload>({\n    queryKey: ['directory-organization-branding'],\n    queryFn: () => readApiResultOrThrow<BrandingPayload>(\n      BRANDING_API,\n      undefined,\n      { errorMessage: t('directory.branding.errors.load', 'Failed to load organization branding') },\n    ),\n  })\n\n  React.useEffect(() => {\n    setLogoUrl(data?.logoUrl ?? '')\n    setSelectedFile(null)\n  }, [data?.logoUrl])\n\n  React.useEffect(() => {\n    if (!selectedFile || typeof URL === 'undefined') {\n      setFilePreviewUrl(null)\n      return\n    }\n    const nextPreviewUrl = URL.createObjectURL(selectedFile)\n    setFilePreviewUrl(nextPreviewUrl)\n    return () => URL.revokeObjectURL(nextPreviewUrl)\n  }, [selectedFile])\n\n  const currentPreviewUrl = filePreviewUrl ?? logoUrl\n\n  const uploadLogo = React.useCallback(async (organizationId: string): Promise<string | null> => {\n    if (!selectedFile) return null\n    const form = new FormData()\n    form.set('entityId', BRANDING_ENTITY_ID)\n    form.set('recordId', organizationId)\n    form.set('file', selectedFile)\n    form.set('tags', JSON.stringify(['organization-logo']))\n\n    const upload = await readApiResultOrThrow<UploadPayload>(\n      '/api/attachments',\n      {\n        method: 'POST',\n        body: form,\n      },\n      { errorMessage: t('directory.branding.errors.upload', 'Failed to upload logo') },\n    )\n    return upload?.item.thumbnailUrl ?? upload?.item.url ?? null\n  }, [selectedFile, t])\n\n  const saveBranding = React.useCallback(async (nextLogoUrl?: string, options?: { skipUpload?: boolean }) => {\n    if (!data) return\n    const shouldUpload = Boolean(selectedFile && !options?.skipUpload)\n    setSaving(true)\n    try {\n      await runMutation({\n        operation: async () => {\n          const uploadedLogoUrl = shouldUpload ? await uploadLogo(data.organizationId) : null\n          const resolvedLogoUrl = uploadedLogoUrl ?? nextLogoUrl ?? logoUrl.trim()\n          const response = await withScopedApiRequestHeaders(\n            buildOptimisticLockHeader(data.updatedAt),\n            () => apiCallOrThrow<BrandingPayload>(\n              BRANDING_API,\n              {\n                method: 'PUT',\n                headers: { 'content-type': 'application/json' },\n                body: JSON.stringify({ logoUrl: resolvedLogoUrl || null }),\n              },\n              { errorMessage: t('directory.branding.errors.save', 'Failed to update organization branding') },\n            ),\n          )\n          return response.result\n        },\n        context: {\n          entityId: BRANDING_ENTITY_ID,\n          recordId: data.organizationId,\n          operation: 'update-branding',\n        },\n        mutationPayload: {\n          organizationId: data.organizationId,\n          logoUrl: (nextLogoUrl ?? logoUrl.trim()) || null,\n          hasUpload: shouldUpload,\n        },\n      })\n      await queryClient.invalidateQueries({ queryKey: ['directory-organization-branding'] })\n      window.dispatchEvent(new Event('om:refresh-sidebar'))\n      setSelectedFile(null)\n      if (fileInputRef.current) fileInputRef.current.value = ''\n      flash(t('directory.branding.flash.saved', 'Organization branding updated'), 'success')\n    } catch (err: unknown) {\n      if (surfaceRecordConflict(err, t)) return\n      const fallback = t('directory.branding.errors.save', 'Failed to update organization branding')\n      const message = err instanceof Error ? err.message : fallback\n      flash(message, 'error')\n    } finally {\n      setSaving(false)\n    }\n  }, [data, logoUrl, queryClient, runMutation, selectedFile, t, uploadLogo])\n\n  const handleSubmit = React.useCallback((event: React.FormEvent<HTMLFormElement>) => {\n    event.preventDefault()\n    void saveBranding()\n  }, [saveBranding])\n\n  if (isLoading) {\n    return <LoadingMessage label={t('directory.branding.loading', 'Loading organization branding...')} />\n  }\n\n  if (error || !data) {\n    return (\n      <ErrorMessage\n        label={t('directory.branding.errors.load', 'Failed to load organization branding')}\n        description={error instanceof Error ? error.message : undefined}\n      />\n    )\n  }\n\n  return (\n    <Page>\n      <PageHeader\n        title={t('directory.branding.title', 'Organization branding')}\n        description={t(\n          'directory.branding.description',\n          'Set the logo used in the backend sidebar for the currently selected organization.',\n        )}\n      />\n      <PageBody>\n        <form className=\"space-y-5\" onSubmit={handleSubmit}>\n          <div className=\"grid gap-5 lg:grid-cols-[260px_1fr]\">\n            <div className=\"space-y-3\">\n              <div className=\"flex aspect-square w-full max-w-[220px] items-center justify-center overflow-hidden rounded-lg border bg-muted/30\">\n                {currentPreviewUrl ? (\n                  <img\n                    src={currentPreviewUrl}\n                    alt={t('directory.branding.previewAlt', '{{name}} logo preview', { name: data.organizationName })}\n                    className=\"h-full w-full object-contain\"\n                  />\n                ) : (\n                  <ImagePlus className=\"size-10 text-muted-foreground\" aria-hidden />\n                )}\n              </div>\n              <p className=\"text-sm font-medium text-foreground\">{data.organizationName}</p>\n              <p className=\"text-xs text-muted-foreground\">\n                {t('directory.branding.currentScope', 'Current organization')}\n              </p>\n            </div>\n\n            <div className=\"space-y-4\">\n              <div className=\"space-y-2\">\n                <label htmlFor=\"organization-logo-file\" className=\"text-sm font-medium\">\n                  {t('directory.branding.file.label', 'Upload logo')}\n                </label>\n                <Input\n                  ref={fileInputRef}\n                  id=\"organization-logo-file\"\n                  type=\"file\"\n                  accept=\"image/png,image/jpeg,image/webp,image/svg+xml\"\n                  onChange={(event) => {\n                    const file = event.currentTarget.files?.[0]\n                    if (!file) return\n                    setSelectedFile(file)\n                  }}\n                />\n                <p className=\"text-xs text-muted-foreground\">\n                  {t('directory.branding.file.hint', 'PNG, JPG, WebP, or SVG works best. Uploaded files are stored as organization attachments.')}\n                </p>\n              </div>\n\n              <div className=\"space-y-2\">\n                <label htmlFor=\"organization-logo-url\" className=\"text-sm font-medium\">\n                  {t('directory.branding.url.label', 'Logo URL')}\n                </label>\n                <Input\n                  id=\"organization-logo-url\"\n                  value={logoUrl}\n                  onChange={(event) => setLogoUrl(event.currentTarget.value)}\n                  placeholder={t('directory.branding.url.placeholder', 'https://example.com/logo.svg')}\n                />\n                <p className=\"text-xs text-muted-foreground\">\n                  {t('directory.branding.url.hint', 'Use an external image URL or leave empty to fall back to the default Open Mercato logo.')}\n                </p>\n              </div>\n\n              <div className=\"flex flex-wrap items-center gap-2\">\n                <Button type=\"submit\" disabled={saving}>\n                  {saving ? <Loader2 className=\"mr-2 size-4 animate-spin\" aria-hidden /> : <Save className=\"mr-2 size-4\" aria-hidden />}\n                  {t('directory.branding.actions.save', 'Save branding')}\n                </Button>\n                <Button\n                  type=\"button\"\n                  variant=\"outline\"\n                  disabled={saving}\n                  onClick={() => {\n                    setSelectedFile(null)\n                    if (fileInputRef.current) fileInputRef.current.value = ''\n                    setLogoUrl('')\n                    void saveBranding('', { skipUpload: true })\n                  }}\n                >\n                  <RotateCcw className=\"mr-2 size-4\" aria-hidden />\n                  {t('directory.branding.actions.reset', 'Use default logo')}\n                </Button>\n              </div>\n            </div>\n          </div>\n        </form>\n      </PageBody>\n    </Page>\n  )\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/directory/backend/directory/organizations/page.js

@@ -12,6 +12,8 @@ import { Button } from "@open-mercato/ui/primitives/button";
 import { apiCall, apiCallOrThrow, readApiResultOrThrow, withScopedApiRequestHeaders } from "@open-mercato/ui/backend/utils/apiCall";
 import { buildOptimisticLockHeader } from "@open-mercato/ui/backend/utils/optimisticLock";
 import { flash } from "@open-mercato/ui/backend/FlashMessages";
+import { useGuardedMutation } from "@open-mercato/ui/backend/injection/useGuardedMutation";
+import { surfaceRecordConflict } from "@open-mercato/ui/backend/conflicts";
 import { useConfirmDialog } from "@open-mercato/ui/backend/confirm-dialog";
 import { useOrganizationScopeVersion } from "@open-mercato/shared/lib/frontend/useOrganizationScope";
 import { useT } from "@open-mercato/shared/lib/i18n/context";
@@ -138,6 +140,11 @@ function DirectoryOrganizationsPage() {
   }, [isSuperAdmin, t]);
   const total = data?.total ?? 0;
   const totalPages = data?.totalPages ?? 0;
+  const deleteMutationContextId = "directory-organizations-list:single-delete";
+  const { runMutation: runDeleteMutation, retryLastMutation: retryDeleteMutation } = useGuardedMutation({
+    contextId: deleteMutationContextId,
+    blockedMessage: t("ui.forms.flash.saveBlocked", "Save blocked by validation")
+  });
   const handleDelete = React.useCallback(async (org) => {
     const confirmLabel = t("directory.organizations.list.confirmDelete", 'Archive organization "{{name}}"?', { name: org.name });
     const confirmed = await confirm({
@@ -147,22 +154,34 @@ function DirectoryOrganizationsPage() {
     });
     if (!confirmed) return;
     try {
-      await withScopedApiRequestHeaders(
-        buildOptimisticLockHeader(org.updatedAt),
-        () => apiCallOrThrow(
-          `/api/directory/organizations?id=${encodeURIComponent(org.id)}`,
-          { method: "DELETE" },
-          { errorMessage: t("directory.organizations.list.error.delete", "Failed to delete organization") }
-        )
-      );
+      await runDeleteMutation({
+        operation: () => withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(org.updatedAt),
+          () => apiCallOrThrow(
+            `/api/directory/organizations?id=${encodeURIComponent(org.id)}`,
+            { method: "DELETE" },
+            { errorMessage: t("directory.organizations.list.error.delete", "Failed to delete organization") }
+          )
+        ),
+        context: {
+          formId: deleteMutationContextId,
+          resourceKind: "directory.organization",
+          resourceId: org.id,
+          retryLastMutation: retryDeleteMutation
+        }
+      });
       await queryClient.invalidateQueries({ queryKey: ["directory-organizations"] });
       flash(t("directory.organizations.flash.deleted", "Organization deleted"), "success");
     } catch (err) {
+      if (surfaceRecordConflict(err, t)) {
+        await queryClient.invalidateQueries({ queryKey: ["directory-organizations"] });
+        return;
+      }
       const fallback = t("directory.organizations.list.error.delete", "Failed to delete organization");
       const message = err instanceof Error ? err.message : fallback;
       flash(message, "error");
     }
-  }, [confirm, queryClient, t]);
+  }, [confirm, deleteMutationContextId, queryClient, retryDeleteMutation, runDeleteMutation, t]);
   return /* @__PURE__ */ jsxs(Page, { children: [
     /* @__PURE__ */ jsx(PageBody, { children: /* @__PURE__ */ jsx(
       DataTable,

package/dist/modules/directory/backend/directory/organizations/page.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/modules/directory/backend/directory/organizations/page.tsx"],
-  "sourcesContent": ["\"use client\"\nimport * as React from 'react'\nimport Link from 'next/link'\nimport { useQuery, useQueryClient } from '@tanstack/react-query'\nimport type { ColumnDef } from '@tanstack/react-table'\nimport { Page, PageBody } from '@open-mercato/ui/backend/Page'\nimport { DataTable } from '@open-mercato/ui/backend/DataTable'\nimport { ListEmptyState } from '@open-mercato/ui/backend/filters/ListEmptyState'\nimport { RowActions } from '@open-mercato/ui/backend/RowActions'\nimport type { FilterValues } from '@open-mercato/ui/backend/FilterBar'\nimport { BooleanIcon } from '@open-mercato/ui/backend/ValueIcons'\nimport { Button } from '@open-mercato/ui/primitives/button'\nimport { apiCall, apiCallOrThrow, readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'\nimport { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'\nimport { flash } from '@open-mercato/ui/backend/FlashMessages'\nimport { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'\nimport { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\n\ntype OrganizationRow = {\n  id: string\n  name: string\n  tenantId: string\n  tenantName?: string | null\n  parentId: string | null\n  parentName: string | null\n  depth: number\n  rootId: string\n  treePath: string\n  pathLabel: string\n  ancestorIds: string[]\n  childIds: string[]\n  descendantIds: string[]\n  childrenCount: number\n  descendantsCount: number\n  isActive: boolean\n  updatedAt?: string | null\n}\n\ntype OrganizationsResponse = {\n  items: OrganizationRow[]\n  total: number\n  page: number\n  pageSize: number\n  totalPages: number\n  isSuperAdmin?: boolean\n}\n\nconst TREE_BASE_INDENT = 18\nconst TREE_STEP_INDENT = 14\n\nfunction formatTreeLabel(name: string, depth: number): string {\n  if (depth <= 0) return name\n  return `${'\\u00A0'.repeat(Math.max(0, (depth - 1) * 2))}\u21B3 ${name}`\n}\n\nfunction computeIndent(depth: number): number {\n  if (depth <= 0) return 0\n  return TREE_BASE_INDENT + (depth - 1) * TREE_STEP_INDENT\n}\n\nexport default function DirectoryOrganizationsPage() {\n  const queryClient = useQueryClient()\n  const { confirm, ConfirmDialogElement } = useConfirmDialog()\n  const [page, setPage] = React.useState(1)\n  const [status, setStatus] = React.useState<string>('all')\n  const [search, setSearch] = React.useState('')\n  const [canManage, setCanManage] = React.useState(false)\n  const scopeVersion = useOrganizationScopeVersion()\n  const t = useT()\n\n  React.useEffect(() => {\n    let cancelled = false\n    async function load() {\n      try {\n        const call = await apiCall<{ granted?: string[]; ok?: boolean }>('/api/auth/feature-check', {\n          method: 'POST',\n          headers: { 'content-type': 'application/json' },\n          body: JSON.stringify({ features: ['directory.organizations.manage'] }),\n        })\n        if (!cancelled) {\n          const granted = Array.isArray(call.result?.granted) ? call.result?.granted : []\n          setCanManage(call.result?.ok === true || granted.includes('directory.organizations.manage'))\n        }\n      } catch {\n        if (!cancelled) setCanManage(false)\n      }\n    }\n    load()\n    return () => { cancelled = true }\n  }, [])\n\n  const queryParams = React.useMemo(() => {\n    const params = new URLSearchParams()\n    params.set('view', 'manage')\n    params.set('page', String(page))\n    params.set('pageSize', '50')\n    params.set('status', status)\n    if (status !== 'active') params.set('includeInactive', 'true')\n    if (search) params.set('search', search)\n    return params.toString()\n  }, [page, status, search])\n\n  const { data, isLoading } = useQuery<OrganizationsResponse>({\n    queryKey: ['directory-organizations', queryParams, scopeVersion],\n    queryFn: async () => {\n      return readApiResultOrThrow<OrganizationsResponse>(\n        `/api/directory/organizations?${queryParams}`,\n        undefined,\n        { errorMessage: t('directory.organizations.list.error.load', 'Failed to load organizations') },\n      )\n    },\n  })\n\n  const rows = data?.items ?? []\n  const isSuperAdmin = data?.isSuperAdmin ?? false\n  const columns = React.useMemo<ColumnDef<OrganizationRow>[]>(() => {\n    const base: ColumnDef<OrganizationRow>[] = [\n      {\n        accessorKey: 'name',\n        header: t('directory.organizations.list.columns.organization', 'Organization'),\n        cell: ({ row }) => {\n          const depth = row.original.depth ?? 0\n          return (\n            <div className=\"flex items-center text-sm font-medium leading-none text-foreground\">\n              <span\n                style={{ marginLeft: computeIndent(depth), whiteSpace: 'pre' }}\n              >\n                {formatTreeLabel(row.original.name, depth)}\n              </span>\n            </div>\n          )\n        },\n        meta: { priority: 1 },\n      },\n      {\n        accessorKey: 'pathLabel',\n        header: t('directory.organizations.list.columns.path', 'Path'),\n        meta: { priority: 3 },\n        cell: ({ getValue }) => {\n          const value = getValue<string>()\n          return <span className=\"text-xs text-muted-foreground\">{value}</span>\n        },\n      },\n      {\n        accessorKey: 'parentName',\n        header: t('directory.organizations.list.columns.parent', 'Parent'),\n        meta: { priority: 4 },\n        cell: ({ getValue }) => getValue<string>() || t('directory.organizations.common.none', '\u2014'),\n      },\n      {\n        accessorKey: 'childrenCount',\n        header: t('directory.organizations.list.columns.children', 'Children'),\n        meta: { priority: 5 },\n      },\n      {\n        accessorKey: 'isActive',\n        header: t('directory.organizations.list.columns.active', 'Active'),\n        enableSorting: false,\n        meta: { priority: 2 },\n        cell: ({ getValue }) => <BooleanIcon value={Boolean(getValue())} />, \n      },\n    ]\n    if (isSuperAdmin) {\n      base.splice(1, 0, {\n        accessorKey: 'tenantName',\n        header: t('directory.organizations.list.columns.tenant', 'Tenant'),\n        meta: { priority: 2 },\n        cell: ({ row }) => {\n          const value = row.original.tenantName ?? row.original.tenantId\n          return <span className=\"text-xs text-muted-foreground\">{value}</span>\n        },\n      })\n    }\n    return base\n  }, [isSuperAdmin, t])\n  const total = data?.total ?? 0\n  const totalPages = data?.totalPages ?? 0\n\n  const handleDelete = React.useCallback(async (org: OrganizationRow) => {\n    const confirmLabel = t('directory.organizations.list.confirmDelete', 'Archive organization \"{{name}}\"?', { name: org.name })\n    const confirmed = await confirm({\n      title: t('directory.organizations.list.actions.delete', 'Delete'),\n      text: confirmLabel,\n      variant: 'destructive',\n    })\n    if (!confirmed) return\n\n    try {\n      await withScopedApiRequestHeaders(\n        buildOptimisticLockHeader(org.updatedAt),\n        () => apiCallOrThrow(\n          `/api/directory/organizations?id=${encodeURIComponent(org.id)}`,\n          { method: 'DELETE' },\n          { errorMessage: t('directory.organizations.list.error.delete', 'Failed to delete organization') },\n        ),\n      )\n      await queryClient.invalidateQueries({ queryKey: ['directory-organizations'] })\n      flash(t('directory.organizations.flash.deleted', 'Organization deleted'), 'success')\n    } catch (err: unknown) {\n      const fallback = t('directory.organizations.list.error.delete', 'Failed to delete organization')\n      const message = err instanceof Error ? err.message : fallback\n      flash(message, 'error')\n    }\n  }, [confirm, queryClient, t])\n\n  return (\n    <Page>\n      <PageBody>\n        <DataTable\n          title={t('directory.organizations.list.title', 'Organizations')}\n          actions={canManage ? (\n            <Button asChild>\n              <Link href=\"/backend/directory/organizations/create\">\n                {t('directory.organizations.list.actions.create', 'Create')}\n              </Link>\n            </Button>\n          ) : undefined}\n          columns={columns}\n          data={rows}\n          searchValue={search}\n          searchPlaceholder={t('directory.organizations.list.searchPlaceholder', 'Search organizations')}\n          onSearchChange={(value) => { setSearch(value); setPage(1) }}\n          filters={[\n            {\n              id: 'status',\n              label: t('directory.organizations.list.filters.status', 'Status'),\n              type: 'select',\n              options: [\n                { value: 'all', label: t('directory.organizations.list.filters.all', 'All') },\n                { value: 'active', label: t('directory.organizations.list.filters.active', 'Active') },\n                { value: 'inactive', label: t('directory.organizations.list.filters.inactive', 'Inactive') },\n              ],\n            },\n          ]}\n          filterValues={status === 'all' ? {} : { status }}\n          onFiltersApply={(vals: FilterValues) => {\n            const nextStatus = (vals.status as string) || 'all'\n            setStatus(nextStatus)\n            setPage(1)\n          }}\n          onFiltersClear={() => {\n            setStatus('all')\n            setPage(1)\n          }}\n          sortable={false}\n          perspective={{ tableId: 'directory.organizations.list' }}\n          rowActions={(row) => (\n            canManage ? (\n              <RowActions\n                items={[\n                  { id: 'edit', label: t('directory.organizations.list.actions.edit', 'Edit'), href: `/backend/directory/organizations/${row.id}/edit` },\n                  { id: 'delete', label: t('directory.organizations.list.actions.delete', 'Delete'), destructive: true, onSelect: () => handleDelete(row) },\n                ]}\n              />\n            ) : null\n          )}\n          emptyState={(\n            <ListEmptyState\n              entityName={t('directory.organizations.list.title', 'Organizations')}\n              createHref=\"/backend/directory/organizations/create\"\n              createLabel={t('directory.organizations.list.actions.create', 'Create')}\n            />\n          )}\n          pagination={{ page, pageSize: 50, total, totalPages, onPageChange: setPage }}\n          isLoading={isLoading}\n        />\n      </PageBody>\n      {ConfirmDialogElement}\n    </Page>\n  )\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["\"use client\"\nimport * as React from 'react'\nimport Link from 'next/link'\nimport { useQuery, useQueryClient } from '@tanstack/react-query'\nimport type { ColumnDef } from '@tanstack/react-table'\nimport { Page, PageBody } from '@open-mercato/ui/backend/Page'\nimport { DataTable } from '@open-mercato/ui/backend/DataTable'\nimport { ListEmptyState } from '@open-mercato/ui/backend/filters/ListEmptyState'\nimport { RowActions } from '@open-mercato/ui/backend/RowActions'\nimport type { FilterValues } from '@open-mercato/ui/backend/FilterBar'\nimport { BooleanIcon } from '@open-mercato/ui/backend/ValueIcons'\nimport { Button } from '@open-mercato/ui/primitives/button'\nimport { apiCall, apiCallOrThrow, readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'\nimport { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'\nimport { flash } from '@open-mercato/ui/backend/FlashMessages'\nimport { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'\nimport { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'\nimport { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'\nimport { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\n\ntype OrganizationRow = {\n  id: string\n  name: string\n  tenantId: string\n  tenantName?: string | null\n  parentId: string | null\n  parentName: string | null\n  depth: number\n  rootId: string\n  treePath: string\n  pathLabel: string\n  ancestorIds: string[]\n  childIds: string[]\n  descendantIds: string[]\n  childrenCount: number\n  descendantsCount: number\n  isActive: boolean\n  updatedAt?: string | null\n}\n\ntype OrganizationsResponse = {\n  items: OrganizationRow[]\n  total: number\n  page: number\n  pageSize: number\n  totalPages: number\n  isSuperAdmin?: boolean\n}\n\nconst TREE_BASE_INDENT = 18\nconst TREE_STEP_INDENT = 14\n\nfunction formatTreeLabel(name: string, depth: number): string {\n  if (depth <= 0) return name\n  return `${'\\u00A0'.repeat(Math.max(0, (depth - 1) * 2))}\u21B3 ${name}`\n}\n\nfunction computeIndent(depth: number): number {\n  if (depth <= 0) return 0\n  return TREE_BASE_INDENT + (depth - 1) * TREE_STEP_INDENT\n}\n\nexport default function DirectoryOrganizationsPage() {\n  const queryClient = useQueryClient()\n  const { confirm, ConfirmDialogElement } = useConfirmDialog()\n  const [page, setPage] = React.useState(1)\n  const [status, setStatus] = React.useState<string>('all')\n  const [search, setSearch] = React.useState('')\n  const [canManage, setCanManage] = React.useState(false)\n  const scopeVersion = useOrganizationScopeVersion()\n  const t = useT()\n\n  React.useEffect(() => {\n    let cancelled = false\n    async function load() {\n      try {\n        const call = await apiCall<{ granted?: string[]; ok?: boolean }>('/api/auth/feature-check', {\n          method: 'POST',\n          headers: { 'content-type': 'application/json' },\n          body: JSON.stringify({ features: ['directory.organizations.manage'] }),\n        })\n        if (!cancelled) {\n          const granted = Array.isArray(call.result?.granted) ? call.result?.granted : []\n          setCanManage(call.result?.ok === true || granted.includes('directory.organizations.manage'))\n        }\n      } catch {\n        if (!cancelled) setCanManage(false)\n      }\n    }\n    load()\n    return () => { cancelled = true }\n  }, [])\n\n  const queryParams = React.useMemo(() => {\n    const params = new URLSearchParams()\n    params.set('view', 'manage')\n    params.set('page', String(page))\n    params.set('pageSize', '50')\n    params.set('status', status)\n    if (status !== 'active') params.set('includeInactive', 'true')\n    if (search) params.set('search', search)\n    return params.toString()\n  }, [page, status, search])\n\n  const { data, isLoading } = useQuery<OrganizationsResponse>({\n    queryKey: ['directory-organizations', queryParams, scopeVersion],\n    queryFn: async () => {\n      return readApiResultOrThrow<OrganizationsResponse>(\n        `/api/directory/organizations?${queryParams}`,\n        undefined,\n        { errorMessage: t('directory.organizations.list.error.load', 'Failed to load organizations') },\n      )\n    },\n  })\n\n  const rows = data?.items ?? []\n  const isSuperAdmin = data?.isSuperAdmin ?? false\n  const columns = React.useMemo<ColumnDef<OrganizationRow>[]>(() => {\n    const base: ColumnDef<OrganizationRow>[] = [\n      {\n        accessorKey: 'name',\n        header: t('directory.organizations.list.columns.organization', 'Organization'),\n        cell: ({ row }) => {\n          const depth = row.original.depth ?? 0\n          return (\n            <div className=\"flex items-center text-sm font-medium leading-none text-foreground\">\n              <span\n                style={{ marginLeft: computeIndent(depth), whiteSpace: 'pre' }}\n              >\n                {formatTreeLabel(row.original.name, depth)}\n              </span>\n            </div>\n          )\n        },\n        meta: { priority: 1 },\n      },\n      {\n        accessorKey: 'pathLabel',\n        header: t('directory.organizations.list.columns.path', 'Path'),\n        meta: { priority: 3 },\n        cell: ({ getValue }) => {\n          const value = getValue<string>()\n          return <span className=\"text-xs text-muted-foreground\">{value}</span>\n        },\n      },\n      {\n        accessorKey: 'parentName',\n        header: t('directory.organizations.list.columns.parent', 'Parent'),\n        meta: { priority: 4 },\n        cell: ({ getValue }) => getValue<string>() || t('directory.organizations.common.none', '\u2014'),\n      },\n      {\n        accessorKey: 'childrenCount',\n        header: t('directory.organizations.list.columns.children', 'Children'),\n        meta: { priority: 5 },\n      },\n      {\n        accessorKey: 'isActive',\n        header: t('directory.organizations.list.columns.active', 'Active'),\n        enableSorting: false,\n        meta: { priority: 2 },\n        cell: ({ getValue }) => <BooleanIcon value={Boolean(getValue())} />, \n      },\n    ]\n    if (isSuperAdmin) {\n      base.splice(1, 0, {\n        accessorKey: 'tenantName',\n        header: t('directory.organizations.list.columns.tenant', 'Tenant'),\n        meta: { priority: 2 },\n        cell: ({ row }) => {\n          const value = row.original.tenantName ?? row.original.tenantId\n          return <span className=\"text-xs text-muted-foreground\">{value}</span>\n        },\n      })\n    }\n    return base\n  }, [isSuperAdmin, t])\n  const total = data?.total ?? 0\n  const totalPages = data?.totalPages ?? 0\n\n  const deleteMutationContextId = 'directory-organizations-list:single-delete'\n  const { runMutation: runDeleteMutation, retryLastMutation: retryDeleteMutation } = useGuardedMutation<{\n    formId: string\n    resourceKind: string\n    resourceId: string\n    retryLastMutation: () => Promise<boolean>\n  }>({\n    contextId: deleteMutationContextId,\n    blockedMessage: t('ui.forms.flash.saveBlocked', 'Save blocked by validation'),\n  })\n\n  const handleDelete = React.useCallback(async (org: OrganizationRow) => {\n    const confirmLabel = t('directory.organizations.list.confirmDelete', 'Archive organization \"{{name}}\"?', { name: org.name })\n    const confirmed = await confirm({\n      title: t('directory.organizations.list.actions.delete', 'Delete'),\n      text: confirmLabel,\n      variant: 'destructive',\n    })\n    if (!confirmed) return\n\n    try {\n      await runDeleteMutation({\n        operation: () => withScopedApiRequestHeaders(\n          buildOptimisticLockHeader(org.updatedAt),\n          () => apiCallOrThrow(\n            `/api/directory/organizations?id=${encodeURIComponent(org.id)}`,\n            { method: 'DELETE' },\n            { errorMessage: t('directory.organizations.list.error.delete', 'Failed to delete organization') },\n          ),\n        ),\n        context: {\n          formId: deleteMutationContextId,\n          resourceKind: 'directory.organization',\n          resourceId: org.id,\n          retryLastMutation: retryDeleteMutation,\n        },\n      })\n      await queryClient.invalidateQueries({ queryKey: ['directory-organizations'] })\n      flash(t('directory.organizations.flash.deleted', 'Organization deleted'), 'success')\n    } catch (err: unknown) {\n      // A stale delete surfaces the unified conflict bar (via the guarded\n      // mutation) \u2014 skip the generic error flash to avoid a double message.\n      if (surfaceRecordConflict(err, t)) {\n        await queryClient.invalidateQueries({ queryKey: ['directory-organizations'] })\n        return\n      }\n      const fallback = t('directory.organizations.list.error.delete', 'Failed to delete organization')\n      const message = err instanceof Error ? err.message : fallback\n      flash(message, 'error')\n    }\n  }, [confirm, deleteMutationContextId, queryClient, retryDeleteMutation, runDeleteMutation, t])\n\n  return (\n    <Page>\n      <PageBody>\n        <DataTable\n          title={t('directory.organizations.list.title', 'Organizations')}\n          actions={canManage ? (\n            <Button asChild>\n              <Link href=\"/backend/directory/organizations/create\">\n                {t('directory.organizations.list.actions.create', 'Create')}\n              </Link>\n            </Button>\n          ) : undefined}\n          columns={columns}\n          data={rows}\n          searchValue={search}\n          searchPlaceholder={t('directory.organizations.list.searchPlaceholder', 'Search organizations')}\n          onSearchChange={(value) => { setSearch(value); setPage(1) }}\n          filters={[\n            {\n              id: 'status',\n              label: t('directory.organizations.list.filters.status', 'Status'),\n              type: 'select',\n              options: [\n                { value: 'all', label: t('directory.organizations.list.filters.all', 'All') },\n                { value: 'active', label: t('directory.organizations.list.filters.active', 'Active') },\n                { value: 'inactive', label: t('directory.organizations.list.filters.inactive', 'Inactive') },\n              ],\n            },\n          ]}\n          filterValues={status === 'all' ? {} : { status }}\n          onFiltersApply={(vals: FilterValues) => {\n            const nextStatus = (vals.status as string) || 'all'\n            setStatus(nextStatus)\n            setPage(1)\n          }}\n          onFiltersClear={() => {\n            setStatus('all')\n            setPage(1)\n          }}\n          sortable={false}\n          perspective={{ tableId: 'directory.organizations.list' }}\n          rowActions={(row) => (\n            canManage ? (\n              <RowActions\n                items={[\n                  { id: 'edit', label: t('directory.organizations.list.actions.edit', 'Edit'), href: `/backend/directory/organizations/${row.id}/edit` },\n                  { id: 'delete', label: t('directory.organizations.list.actions.delete', 'Delete'), destructive: true, onSelect: () => handleDelete(row) },\n                ]}\n              />\n            ) : null\n          )}\n          emptyState={(\n            <ListEmptyState\n              entityName={t('directory.organizations.list.title', 'Organizations')}\n              createHref=\"/backend/directory/organizations/create\"\n              createLabel={t('directory.organizations.list.actions.create', 'Create')}\n            />\n          )}\n          pagination={{ page, pageSize: 50, total, totalPages, onPageChange: setPage }}\n          isLoading={isLoading}\n        />\n      </PageBody>\n      {ConfirmDialogElement}\n    </Page>\n  )\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/directory/backend/directory/tenants/page.js

@@ -9,10 +9,11 @@ import { ListEmptyState } from "@open-mercato/ui/backend/filters/ListEmptyState"
 import { RowActions } from "@open-mercato/ui/backend/RowActions";
 import { BooleanIcon } from "@open-mercato/ui/backend/ValueIcons";
 import { Button } from "@open-mercato/ui/primitives/button";
-import { apiCall, readApiResultOrThrow, withScopedApiRequestHeaders } from "@open-mercato/ui/backend/utils/apiCall";
+import { apiCall, apiCallOrThrow, readApiResultOrThrow, withScopedApiRequestHeaders } from "@open-mercato/ui/backend/utils/apiCall";
 import { buildOptimisticLockHeader } from "@open-mercato/ui/backend/utils/optimisticLock";
 import { flash } from "@open-mercato/ui/backend/FlashMessages";
-import { raiseCrudError } from "@open-mercato/ui/backend/utils/serverErrors";
+import { useGuardedMutation } from "@open-mercato/ui/backend/injection/useGuardedMutation";
+import { surfaceRecordConflict } from "@open-mercato/ui/backend/conflicts";
 import { useConfirmDialog } from "@open-mercato/ui/backend/confirm-dialog";
 import { useOrganizationScopeVersion } from "@open-mercato/shared/lib/frontend/useOrganizationScope";
 import { useT } from "@open-mercato/shared/lib/i18n/context";
@@ -95,6 +96,11 @@ function DirectoryTenantsPage() {
   const rows = data?.items ?? [];
   const total = data?.total ?? 0;
   const totalPages = data?.totalPages ?? 0;
+  const deleteMutationContextId = "directory-tenants-list:single-delete";
+  const { runMutation: runDeleteMutation, retryLastMutation: retryDeleteMutation } = useGuardedMutation({
+    contextId: deleteMutationContextId,
+    blockedMessage: t("ui.forms.flash.saveBlocked", "Save blocked by validation")
+  });
   const handleDelete = React.useCallback(async (tenant) => {
     const confirmMessage = t("directory.tenants.list.confirmDelete", 'Delete tenant "{{name}}"? This will archive it.').replace("{{name}}", tenant.name);
     const confirmed = await confirm({
@@ -104,23 +110,33 @@ function DirectoryTenantsPage() {
     });
     if (!confirmed) return;
     try {
-      const call = await withScopedApiRequestHeaders(
-        buildOptimisticLockHeader(tenant.updatedAt),
-        () => apiCall(
-          `/api/directory/tenants?id=${encodeURIComponent(tenant.id)}`,
-          { method: "DELETE" }
-        )
-      );
-      if (!call.ok) {
-        await raiseCrudError(call.response, t("directory.tenants.list.error.delete", "Failed to delete tenant"));
-      }
+      await runDeleteMutation({
+        operation: () => withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(tenant.updatedAt),
+          () => apiCallOrThrow(
+            `/api/directory/tenants?id=${encodeURIComponent(tenant.id)}`,
+            { method: "DELETE" },
+            { errorMessage: t("directory.tenants.list.error.delete", "Failed to delete tenant") }
+          )
+        ),
+        context: {
+          formId: deleteMutationContextId,
+          resourceKind: "directory.tenant",
+          resourceId: tenant.id,
+          retryLastMutation: retryDeleteMutation
+        }
+      });
       await queryClient.invalidateQueries({ queryKey: ["directory-tenants"] });
       flash(t("directory.tenants.list.success.delete", "Tenant deleted"), "success");
     } catch (err) {
+      if (surfaceRecordConflict(err, t)) {
+        await queryClient.invalidateQueries({ queryKey: ["directory-tenants"] });
+        return;
+      }
       const message = err instanceof Error ? err.message : t("directory.tenants.list.error.delete", "Failed to delete tenant");
       flash(message, "error");
     }
-  }, [confirm, queryClient, t]);
+  }, [confirm, deleteMutationContextId, queryClient, retryDeleteMutation, runDeleteMutation, t]);
   return /* @__PURE__ */ jsxs(Page, { children: [
     /* @__PURE__ */ jsx(PageBody, { children: /* @__PURE__ */ jsx(
       DataTable,