@open-mercato/core 0.8.1-develop.7296.1.2111d779db → 0.8.1-develop.7441.1.b42958b98c

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

@@ -10,15 +10,18 @@ import { useGuardedMutation } from "@open-mercato/ui/backend/injection/useGuarde
 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 { Alert, AlertDescription } from "@open-mercato/ui/primitives/alert";
 import { Button } from "@open-mercato/ui/primitives/button";
 import { Input } from "@open-mercato/ui/primitives/input";
 import { SwitchField } from "@open-mercato/ui/primitives/switch-field";
 import { useT } from "@open-mercato/shared/lib/i18n/context";
+import { useOrganizationScopeDetail } from "@open-mercato/shared/lib/frontend/useOrganizationScope";
 const BRANDING_API = "/api/directory/organization-branding";
 const BRANDING_ENTITY_ID = "directory.organization";
 function OrganizationBrandingPage() {
   const t = useT();
   const queryClient = useQueryClient();
+  const { organizationId, tenantId } = useOrganizationScopeDetail();
   const [logoUrl, setLogoUrl] = React.useState("");
   const [logoPreserveAspectRatio, setLogoPreserveAspectRatio] = React.useState(false);
   const [selectedFile, setSelectedFile] = React.useState(null);
@@ -30,7 +33,8 @@ function OrganizationBrandingPage() {
     blockedMessage: t("directory.branding.errors.blocked", "Branding save was blocked.")
   });
   const { data, isLoading, error } = useQuery({
-    queryKey: ["directory-organization-branding"],
+    queryKey: ["directory-organization-branding", organizationId, tenantId],
+    enabled: Boolean(organizationId),
     queryFn: () => readApiResultOrThrow(
       BRANDING_API,
       void 0,
@@ -41,7 +45,7 @@ function OrganizationBrandingPage() {
     setLogoUrl(data?.logoUrl ?? "");
     setLogoPreserveAspectRatio(data?.logoPreserveAspectRatio ?? false);
     setSelectedFile(null);
-  }, [data?.logoPreserveAspectRatio, data?.logoUrl]);
+  }, [data?.logoPreserveAspectRatio, data?.logoUrl, organizationId, tenantId]);
   React.useEffect(() => {
     if (!selectedFile || typeof URL === "undefined") {
       setFilePreviewUrl(null);
@@ -52,11 +56,11 @@ function OrganizationBrandingPage() {
     return () => URL.revokeObjectURL(nextPreviewUrl);
   }, [selectedFile]);
   const currentPreviewUrl = filePreviewUrl ?? logoUrl;
-  const uploadLogo = React.useCallback(async (organizationId) => {
+  const uploadLogo = React.useCallback(async (organizationId2) => {
     if (!selectedFile) return null;
     const form = new FormData();
     form.set("entityId", BRANDING_ENTITY_ID);
-    form.set("recordId", organizationId);
+    form.set("recordId", organizationId2);
     form.set("file", selectedFile);
     form.set("tags", JSON.stringify(["organization-logo"]));
     const upload = await readApiResultOrThrow(
@@ -126,6 +130,15 @@ function OrganizationBrandingPage() {
     event.preventDefault();
     void saveBranding();
   }, [saveBranding]);
+  if (!organizationId) {
+    return /* @__PURE__ */ jsxs(Page, { children: [
+      /* @__PURE__ */ jsx(PageHeader, { title: t("directory.branding.title", "Organization branding") }),
+      /* @__PURE__ */ jsx(PageBody, { children: /* @__PURE__ */ jsx(Alert, { status: "information", children: /* @__PURE__ */ jsx(AlertDescription, { children: t(
+        "directory.branding.organizationRequired",
+        "Branding is managed for one organization at a time. Select a single organization to continue."
+      ) }) }) })
+    ] });
+  }
   if (isLoading) {
     return /* @__PURE__ */ jsx(LoadingMessage, { label: t("directory.branding.loading", "Loading organization branding...") });
   }

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, 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 { SwitchField } from '@open-mercato/ui/primitives/switch-field'\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  logoPreserveAspectRatio: boolean\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 [logoPreserveAspectRatio, setLogoPreserveAspectRatio] = React.useState(false)\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    setLogoPreserveAspectRatio(data?.logoPreserveAspectRatio ?? false)\n    setSelectedFile(null)\n  }, [data?.logoPreserveAspectRatio, 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.url ?? upload?.item.thumbnailUrl ?? null\n  }, [selectedFile, t])\n\n  const saveBranding = React.useCallback(async (\n    nextLogoUrl?: string,\n    options?: { skipUpload?: boolean; logoPreserveAspectRatio?: boolean },\n  ) => {\n    if (!data) return\n    const shouldUpload = Boolean(selectedFile && !options?.skipUpload)\n    const resolvedLogoPreserveAspectRatio = options?.logoPreserveAspectRatio ?? logoPreserveAspectRatio\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({\n                  logoUrl: resolvedLogoUrl || null,\n                  logoPreserveAspectRatio: resolvedLogoPreserveAspectRatio,\n                }),\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          logoPreserveAspectRatio: resolvedLogoPreserveAspectRatio,\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, logoPreserveAspectRatio, 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 ${logoPreserveAspectRatio ? 'object-contain' : 'rounded-full object-cover'}`}\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\"\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, or WebP 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              <SwitchField\n                id=\"organization-logo-preserve-aspect-ratio\"\n                label={t('directory.branding.aspectRatio.label', 'Keep the aspect ratio')}\n                description={t(\n                  'directory.branding.aspectRatio.description',\n                  'When disabled, the sidebar crops the logo into the standard icon shape.',\n                )}\n                checked={logoPreserveAspectRatio}\n                disabled={saving}\n                onCheckedChange={setLogoPreserveAspectRatio}\n              />\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                    setLogoPreserveAspectRatio(false)\n                    void saveBranding('', { skipUpload: true, logoPreserveAspectRatio: false })\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": ";AAiKW,cAwBC,YAxBD;AA/JX,YAAY,WAAW;AACvB,SAAS,UAAU,sBAAsB;AACzC,SAAS,WAAW,SAAS,WAAW,YAAY;AACpD,SAAS,MAAM,UAAU,kBAAkB;AAC3C,SAAS,gBAAgB,oBAAoB;AAC7C,SAAS,aAAa;AACtB,SAAS,0BAA0B;AACnC,SAAS,gBAAgB,sBAAsB,mCAAmC;AAClF,SAAS,iCAAiC;AAC1C,SAAS,6BAA6B;AACtC,SAAS,cAAc;AACvB,SAAS,aAAa;AACtB,SAAS,mBAAmB;AAC5B,SAAS,YAAY;AAoBrB,MAAM,eAAe;AACrB,MAAM,qBAAqB;AAEZ,SAAR,2BAA4C;AACjD,QAAM,IAAI,KAAK;AACf,QAAM,cAAc,eAAe;AACnC,QAAM,CAAC,SAAS,UAAU,IAAI,MAAM,SAAS,EAAE;AAC/C,QAAM,CAAC,yBAAyB,0BAA0B,IAAI,MAAM,SAAS,KAAK;AAClF,QAAM,CAAC,cAAc,eAAe,IAAI,MAAM,SAAsB,IAAI;AACxE,QAAM,CAAC,gBAAgB,iBAAiB,IAAI,MAAM,SAAwB,IAAI;AAC9E,QAAM,CAAC,QAAQ,SAAS,IAAI,MAAM,SAAS,KAAK;AAChD,QAAM,eAAe,MAAM,OAAgC,IAAI;AAC/D,QAAM,EAAE,YAAY,IAAI,mBAAmB;AAAA,IACzC,WAAW;AAAA,IACX,gBAAgB,EAAE,qCAAqC,4BAA4B;AAAA,EACrF,CAAC;AAED,QAAM,EAAE,MAAM,WAAW,MAAM,IAAI,SAA0B;AAAA,IAC3D,UAAU,CAAC,iCAAiC;AAAA,IAC5C,SAAS,MAAM;AAAA,MACb;AAAA,MACA;AAAA,MACA,EAAE,cAAc,EAAE,kCAAkC,sCAAsC,EAAE;AAAA,IAC9F;AAAA,EACF,CAAC;AAED,QAAM,UAAU,MAAM;AACpB,eAAW,MAAM,WAAW,EAAE;AAC9B,+BAA2B,MAAM,2BAA2B,KAAK;AACjE,oBAAgB,IAAI;AAAA,EACtB,GAAG,CAAC,MAAM,yBAAyB,MAAM,OAAO,CAAC;AAEjD,QAAM,UAAU,MAAM;AACpB,QAAI,CAAC,gBAAgB,OAAO,QAAQ,aAAa;AAC/C,wBAAkB,IAAI;AACtB;AAAA,IACF;AACA,UAAM,iBAAiB,IAAI,gBAAgB,YAAY;AACvD,sBAAkB,cAAc;AAChC,WAAO,MAAM,IAAI,gBAAgB,cAAc;AAAA,EACjD,GAAG,CAAC,YAAY,CAAC;AAEjB,QAAM,oBAAoB,kBAAkB;AAE5C,QAAM,aAAa,MAAM,YAAY,OAAO,mBAAmD;AAC7F,QAAI,CAAC,aAAc,QAAO;AAC1B,UAAM,OAAO,IAAI,SAAS;AAC1B,SAAK,IAAI,YAAY,kBAAkB;AACvC,SAAK,IAAI,YAAY,cAAc;AACnC,SAAK,IAAI,QAAQ,YAAY;AAC7B,SAAK,IAAI,QAAQ,KAAK,UAAU,CAAC,mBAAmB,CAAC,CAAC;AAEtD,UAAM,SAAS,MAAM;AAAA,MACnB;AAAA,MACA;AAAA,QACE,QAAQ;AAAA,QACR,MAAM;AAAA,MACR;AAAA,MACA,EAAE,cAAc,EAAE,oCAAoC,uBAAuB,EAAE;AAAA,IACjF;AACA,WAAO,QAAQ,KAAK,OAAO,QAAQ,KAAK,gBAAgB;AAAA,EAC1D,GAAG,CAAC,cAAc,CAAC,CAAC;AAEpB,QAAM,eAAe,MAAM,YAAY,OACrC,aACA,YACG;AACH,QAAI,CAAC,KAAM;AACX,UAAM,eAAe,QAAQ,gBAAgB,CAAC,SAAS,UAAU;AACjE,UAAM,kCAAkC,SAAS,2BAA2B;AAC5E,cAAU,IAAI;AACd,QAAI;AACF,YAAM,YAAY;AAAA,QAChB,WAAW,YAAY;AACrB,gBAAM,kBAAkB,eAAe,MAAM,WAAW,KAAK,cAAc,IAAI;AAC/E,gBAAM,kBAAkB,mBAAmB,eAAe,QAAQ,KAAK;AACvE,gBAAM,WAAW,MAAM;AAAA,YACrB,0BAA0B,KAAK,SAAS;AAAA,YACxC,MAAM;AAAA,cACJ;AAAA,cACA;AAAA,gBACE,QAAQ;AAAA,gBACR,SAAS,EAAE,gBAAgB,mBAAmB;AAAA,gBAC9C,MAAM,KAAK,UAAU;AAAA,kBACnB,SAAS,mBAAmB;AAAA,kBAC5B,yBAAyB;AAAA,gBAC3B,CAAC;AAAA,cACH;AAAA,cACA,EAAE,cAAc,EAAE,kCAAkC,wCAAwC,EAAE;AAAA,YAChG;AAAA,UACF;AACA,iBAAO,SAAS;AAAA,QAClB;AAAA,QACA,SAAS;AAAA,UACP,UAAU;AAAA,UACV,UAAU,KAAK;AAAA,UACf,WAAW;AAAA,QACb;AAAA,QACA,iBAAiB;AAAA,UACf,gBAAgB,KAAK;AAAA,UACrB,UAAU,eAAe,QAAQ,KAAK,MAAM;AAAA,UAC5C,yBAAyB;AAAA,UACzB,WAAW;AAAA,QACb;AAAA,MACF,CAAC;AACD,YAAM,YAAY,kBAAkB,EAAE,UAAU,CAAC,iCAAiC,EAAE,CAAC;AACrF,aAAO,cAAc,IAAI,MAAM,oBAAoB,CAAC;AACpD,sBAAgB,IAAI;AACpB,UAAI,aAAa,QAAS,cAAa,QAAQ,QAAQ;AACvD,YAAM,EAAE,kCAAkC,+BAA+B,GAAG,SAAS;AAAA,IACvF,SAAS,KAAc;AACrB,UAAI,sBAAsB,KAAK,CAAC,EAAG;AACnC,YAAM,WAAW,EAAE,kCAAkC,wCAAwC;AAC7F,YAAM,UAAU,eAAe,QAAQ,IAAI,UAAU;AACrD,YAAM,SAAS,OAAO;AAAA,IACxB,UAAE;AACA,gBAAU,KAAK;AAAA,IACjB;AAAA,EACF,GAAG,CAAC,MAAM,yBAAyB,SAAS,aAAa,aAAa,cAAc,GAAG,UAAU,CAAC;AAElG,QAAM,eAAe,MAAM,YAAY,CAAC,UAA4C;AAClF,UAAM,eAAe;AACrB,SAAK,aAAa;AAAA,EACpB,GAAG,CAAC,YAAY,CAAC;AAEjB,MAAI,WAAW;AACb,WAAO,oBAAC,kBAAe,OAAO,EAAE,8BAA8B,kCAAkC,GAAG;AAAA,EACrG;AAEA,MAAI,SAAS,CAAC,MAAM;AAClB,WACE;AAAA,MAAC;AAAA;AAAA,QACC,OAAO,EAAE,kCAAkC,sCAAsC;AAAA,QACjF,aAAa,iBAAiB,QAAQ,MAAM,UAAU;AAAA;AAAA,IACxD;AAAA,EAEJ;AAEA,SACE,qBAAC,QACC;AAAA;AAAA,MAAC;AAAA;AAAA,QACC,OAAO,EAAE,4BAA4B,uBAAuB;AAAA,QAC5D,aAAa;AAAA,UACX;AAAA,UACA;AAAA,QACF;AAAA;AAAA,IACF;AAAA,IACA,oBAAC,YACC,8BAAC,UAAK,WAAU,aAAY,UAAU,cACpC,+BAAC,SAAI,WAAU,uCACb;AAAA,2BAAC,SAAI,WAAU,aACb;AAAA,4BAAC,SAAI,WAAU,qHACZ,8BACC;AAAA,UAAC;AAAA;AAAA,YACC,KAAK;AAAA,YACL,KAAK,EAAE,iCAAiC,yBAAyB,EAAE,MAAM,KAAK,iBAAiB,CAAC;AAAA,YAChG,WAAW,iBAAiB,0BAA0B,mBAAmB,2BAA2B;AAAA;AAAA,QACtG,IAEA,oBAAC,aAAU,WAAU,iCAAgC,eAAW,MAAC,GAErE;AAAA,QACA,oBAAC,OAAE,WAAU,uCAAuC,eAAK,kBAAiB;AAAA,QAC1E,oBAAC,OAAE,WAAU,iCACV,YAAE,mCAAmC,sBAAsB,GAC9D;AAAA,SACF;AAAA,MAEA,qBAAC,SAAI,WAAU,aACb;AAAA,6BAAC,SAAI,WAAU,aACb;AAAA,8BAAC,WAAM,SAAQ,0BAAyB,WAAU,uBAC/C,YAAE,iCAAiC,aAAa,GACnD;AAAA,UACA;AAAA,YAAC;AAAA;AAAA,cACC,KAAK;AAAA,cACL,IAAG;AAAA,cACH,MAAK;AAAA,cACL,QAAO;AAAA,cACP,UAAU,CAAC,UAAU;AACnB,sBAAM,OAAO,MAAM,cAAc,QAAQ,CAAC;AAC1C,oBAAI,CAAC,KAAM;AACX,gCAAgB,IAAI;AAAA,cACtB;AAAA;AAAA,UACF;AAAA,UACA,oBAAC,OAAE,WAAU,iCACV,YAAE,gCAAgC,sFAAsF,GAC3H;AAAA,WACF;AAAA,QAEA,qBAAC,SAAI,WAAU,aACb;AAAA,8BAAC,WAAM,SAAQ,yBAAwB,WAAU,uBAC9C,YAAE,gCAAgC,UAAU,GAC/C;AAAA,UACA;AAAA,YAAC;AAAA;AAAA,cACC,IAAG;AAAA,cACH,OAAO;AAAA,cACP,UAAU,CAAC,UAAU,WAAW,MAAM,cAAc,KAAK;AAAA,cACzD,aAAa,EAAE,sCAAsC,8BAA8B;AAAA;AAAA,UACrF;AAAA,UACA,oBAAC,OAAE,WAAU,iCACV,YAAE,+BAA+B,yFAAyF,GAC7H;AAAA,WACF;AAAA,QAEA;AAAA,UAAC;AAAA;AAAA,YACC,IAAG;AAAA,YACH,OAAO,EAAE,wCAAwC,uBAAuB;AAAA,YACxE,aAAa;AAAA,cACX;AAAA,cACA;AAAA,YACF;AAAA,YACA,SAAS;AAAA,YACT,UAAU;AAAA,YACV,iBAAiB;AAAA;AAAA,QACnB;AAAA,QAEA,qBAAC,SAAI,WAAU,qCACb;AAAA,+BAAC,UAAO,MAAK,UAAS,UAAU,QAC7B;AAAA,qBAAS,oBAAC,WAAQ,WAAU,4BAA2B,eAAW,MAAC,IAAK,oBAAC,QAAK,WAAU,eAAc,eAAW,MAAC;AAAA,YAClH,EAAE,mCAAmC,eAAe;AAAA,aACvD;AAAA,UACA;AAAA,YAAC;AAAA;AAAA,cACC,MAAK;AAAA,cACL,SAAQ;AAAA,cACR,UAAU;AAAA,cACV,SAAS,MAAM;AACb,gCAAgB,IAAI;AACpB,oBAAI,aAAa,QAAS,cAAa,QAAQ,QAAQ;AACvD,2BAAW,EAAE;AACb,2CAA2B,KAAK;AAChC,qBAAK,aAAa,IAAI,EAAE,YAAY,MAAM,yBAAyB,MAAM,CAAC;AAAA,cAC5E;AAAA,cAEA;AAAA,oCAAC,aAAU,WAAU,eAAc,eAAW,MAAC;AAAA,gBAC9C,EAAE,oCAAoC,kBAAkB;AAAA;AAAA;AAAA,UAC3D;AAAA,WACF;AAAA,SACF;AAAA,OACF,GACF,GACF;AAAA,KACF;AAEJ;",
-  "names": []
+  "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 { Alert, AlertDescription } from '@open-mercato/ui/primitives/alert'\nimport { Button } from '@open-mercato/ui/primitives/button'\nimport { Input } from '@open-mercato/ui/primitives/input'\nimport { SwitchField } from '@open-mercato/ui/primitives/switch-field'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\nimport { useOrganizationScopeDetail } from '@open-mercato/shared/lib/frontend/useOrganizationScope'\n\ntype BrandingPayload = {\n  organizationId: string\n  organizationName: string\n  tenantId: string\n  logoUrl: string | null\n  logoPreserveAspectRatio: boolean\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 { organizationId, tenantId } = useOrganizationScopeDetail()\n  const [logoUrl, setLogoUrl] = React.useState('')\n  const [logoPreserveAspectRatio, setLogoPreserveAspectRatio] = React.useState(false)\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', organizationId, tenantId],\n    enabled: Boolean(organizationId),\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    setLogoPreserveAspectRatio(data?.logoPreserveAspectRatio ?? false)\n    setSelectedFile(null)\n  }, [data?.logoPreserveAspectRatio, data?.logoUrl, organizationId, tenantId])\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.url ?? upload?.item.thumbnailUrl ?? null\n  }, [selectedFile, t])\n\n  const saveBranding = React.useCallback(async (\n    nextLogoUrl?: string,\n    options?: { skipUpload?: boolean; logoPreserveAspectRatio?: boolean },\n  ) => {\n    if (!data) return\n    const shouldUpload = Boolean(selectedFile && !options?.skipUpload)\n    const resolvedLogoPreserveAspectRatio = options?.logoPreserveAspectRatio ?? logoPreserveAspectRatio\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({\n                  logoUrl: resolvedLogoUrl || null,\n                  logoPreserveAspectRatio: resolvedLogoPreserveAspectRatio,\n                }),\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          logoPreserveAspectRatio: resolvedLogoPreserveAspectRatio,\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, logoPreserveAspectRatio, 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 (!organizationId) {\n    return (\n      <Page>\n        <PageHeader title={t('directory.branding.title', 'Organization branding')} />\n        <PageBody>\n          <Alert status=\"information\">\n            <AlertDescription>\n              {t(\n                'directory.branding.organizationRequired',\n                'Branding is managed for one organization at a time. Select a single organization to continue.',\n              )}\n            </AlertDescription>\n          </Alert>\n        </PageBody>\n      </Page>\n    )\n  }\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 ${logoPreserveAspectRatio ? 'object-contain' : 'rounded-full object-cover'}`}\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\"\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, or WebP 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              <SwitchField\n                id=\"organization-logo-preserve-aspect-ratio\"\n                label={t('directory.branding.aspectRatio.label', 'Keep the aspect ratio')}\n                description={t(\n                  'directory.branding.aspectRatio.description',\n                  'When disabled, the sidebar crops the logo into the standard icon shape.',\n                )}\n                checked={logoPreserveAspectRatio}\n                disabled={saving}\n                onCheckedChange={setLogoPreserveAspectRatio}\n              />\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                    setLogoPreserveAspectRatio(false)\n                    void saveBranding('', { skipUpload: true, logoPreserveAspectRatio: false })\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": ";AAsKM,SACE,KADF;AApKN,YAAY,WAAW;AACvB,SAAS,UAAU,sBAAsB;AACzC,SAAS,WAAW,SAAS,WAAW,YAAY;AACpD,SAAS,MAAM,UAAU,kBAAkB;AAC3C,SAAS,gBAAgB,oBAAoB;AAC7C,SAAS,aAAa;AACtB,SAAS,0BAA0B;AACnC,SAAS,gBAAgB,sBAAsB,mCAAmC;AAClF,SAAS,iCAAiC;AAC1C,SAAS,6BAA6B;AACtC,SAAS,OAAO,wBAAwB;AACxC,SAAS,cAAc;AACvB,SAAS,aAAa;AACtB,SAAS,mBAAmB;AAC5B,SAAS,YAAY;AACrB,SAAS,kCAAkC;AAoB3C,MAAM,eAAe;AACrB,MAAM,qBAAqB;AAEZ,SAAR,2BAA4C;AACjD,QAAM,IAAI,KAAK;AACf,QAAM,cAAc,eAAe;AACnC,QAAM,EAAE,gBAAgB,SAAS,IAAI,2BAA2B;AAChE,QAAM,CAAC,SAAS,UAAU,IAAI,MAAM,SAAS,EAAE;AAC/C,QAAM,CAAC,yBAAyB,0BAA0B,IAAI,MAAM,SAAS,KAAK;AAClF,QAAM,CAAC,cAAc,eAAe,IAAI,MAAM,SAAsB,IAAI;AACxE,QAAM,CAAC,gBAAgB,iBAAiB,IAAI,MAAM,SAAwB,IAAI;AAC9E,QAAM,CAAC,QAAQ,SAAS,IAAI,MAAM,SAAS,KAAK;AAChD,QAAM,eAAe,MAAM,OAAgC,IAAI;AAC/D,QAAM,EAAE,YAAY,IAAI,mBAAmB;AAAA,IACzC,WAAW;AAAA,IACX,gBAAgB,EAAE,qCAAqC,4BAA4B;AAAA,EACrF,CAAC;AAED,QAAM,EAAE,MAAM,WAAW,MAAM,IAAI,SAA0B;AAAA,IAC3D,UAAU,CAAC,mCAAmC,gBAAgB,QAAQ;AAAA,IACtE,SAAS,QAAQ,cAAc;AAAA,IAC/B,SAAS,MAAM;AAAA,MACb;AAAA,MACA;AAAA,MACA,EAAE,cAAc,EAAE,kCAAkC,sCAAsC,EAAE;AAAA,IAC9F;AAAA,EACF,CAAC;AAED,QAAM,UAAU,MAAM;AACpB,eAAW,MAAM,WAAW,EAAE;AAC9B,+BAA2B,MAAM,2BAA2B,KAAK;AACjE,oBAAgB,IAAI;AAAA,EACtB,GAAG,CAAC,MAAM,yBAAyB,MAAM,SAAS,gBAAgB,QAAQ,CAAC;AAE3E,QAAM,UAAU,MAAM;AACpB,QAAI,CAAC,gBAAgB,OAAO,QAAQ,aAAa;AAC/C,wBAAkB,IAAI;AACtB;AAAA,IACF;AACA,UAAM,iBAAiB,IAAI,gBAAgB,YAAY;AACvD,sBAAkB,cAAc;AAChC,WAAO,MAAM,IAAI,gBAAgB,cAAc;AAAA,EACjD,GAAG,CAAC,YAAY,CAAC;AAEjB,QAAM,oBAAoB,kBAAkB;AAE5C,QAAM,aAAa,MAAM,YAAY,OAAOA,oBAAmD;AAC7F,QAAI,CAAC,aAAc,QAAO;AAC1B,UAAM,OAAO,IAAI,SAAS;AAC1B,SAAK,IAAI,YAAY,kBAAkB;AACvC,SAAK,IAAI,YAAYA,eAAc;AACnC,SAAK,IAAI,QAAQ,YAAY;AAC7B,SAAK,IAAI,QAAQ,KAAK,UAAU,CAAC,mBAAmB,CAAC,CAAC;AAEtD,UAAM,SAAS,MAAM;AAAA,MACnB;AAAA,MACA;AAAA,QACE,QAAQ;AAAA,QACR,MAAM;AAAA,MACR;AAAA,MACA,EAAE,cAAc,EAAE,oCAAoC,uBAAuB,EAAE;AAAA,IACjF;AACA,WAAO,QAAQ,KAAK,OAAO,QAAQ,KAAK,gBAAgB;AAAA,EAC1D,GAAG,CAAC,cAAc,CAAC,CAAC;AAEpB,QAAM,eAAe,MAAM,YAAY,OACrC,aACA,YACG;AACH,QAAI,CAAC,KAAM;AACX,UAAM,eAAe,QAAQ,gBAAgB,CAAC,SAAS,UAAU;AACjE,UAAM,kCAAkC,SAAS,2BAA2B;AAC5E,cAAU,IAAI;AACd,QAAI;AACF,YAAM,YAAY;AAAA,QAChB,WAAW,YAAY;AACrB,gBAAM,kBAAkB,eAAe,MAAM,WAAW,KAAK,cAAc,IAAI;AAC/E,gBAAM,kBAAkB,mBAAmB,eAAe,QAAQ,KAAK;AACvE,gBAAM,WAAW,MAAM;AAAA,YACrB,0BAA0B,KAAK,SAAS;AAAA,YACxC,MAAM;AAAA,cACJ;AAAA,cACA;AAAA,gBACE,QAAQ;AAAA,gBACR,SAAS,EAAE,gBAAgB,mBAAmB;AAAA,gBAC9C,MAAM,KAAK,UAAU;AAAA,kBACnB,SAAS,mBAAmB;AAAA,kBAC5B,yBAAyB;AAAA,gBAC3B,CAAC;AAAA,cACH;AAAA,cACA,EAAE,cAAc,EAAE,kCAAkC,wCAAwC,EAAE;AAAA,YAChG;AAAA,UACF;AACA,iBAAO,SAAS;AAAA,QAClB;AAAA,QACA,SAAS;AAAA,UACP,UAAU;AAAA,UACV,UAAU,KAAK;AAAA,UACf,WAAW;AAAA,QACb;AAAA,QACA,iBAAiB;AAAA,UACf,gBAAgB,KAAK;AAAA,UACrB,UAAU,eAAe,QAAQ,KAAK,MAAM;AAAA,UAC5C,yBAAyB;AAAA,UACzB,WAAW;AAAA,QACb;AAAA,MACF,CAAC;AACD,YAAM,YAAY,kBAAkB,EAAE,UAAU,CAAC,iCAAiC,EAAE,CAAC;AACrF,aAAO,cAAc,IAAI,MAAM,oBAAoB,CAAC;AACpD,sBAAgB,IAAI;AACpB,UAAI,aAAa,QAAS,cAAa,QAAQ,QAAQ;AACvD,YAAM,EAAE,kCAAkC,+BAA+B,GAAG,SAAS;AAAA,IACvF,SAAS,KAAc;AACrB,UAAI,sBAAsB,KAAK,CAAC,EAAG;AACnC,YAAM,WAAW,EAAE,kCAAkC,wCAAwC;AAC7F,YAAM,UAAU,eAAe,QAAQ,IAAI,UAAU;AACrD,YAAM,SAAS,OAAO;AAAA,IACxB,UAAE;AACA,gBAAU,KAAK;AAAA,IACjB;AAAA,EACF,GAAG,CAAC,MAAM,yBAAyB,SAAS,aAAa,aAAa,cAAc,GAAG,UAAU,CAAC;AAElG,QAAM,eAAe,MAAM,YAAY,CAAC,UAA4C;AAClF,UAAM,eAAe;AACrB,SAAK,aAAa;AAAA,EACpB,GAAG,CAAC,YAAY,CAAC;AAEjB,MAAI,CAAC,gBAAgB;AACnB,WACE,qBAAC,QACC;AAAA,0BAAC,cAAW,OAAO,EAAE,4BAA4B,uBAAuB,GAAG;AAAA,MAC3E,oBAAC,YACC,8BAAC,SAAM,QAAO,eACZ,8BAAC,oBACE;AAAA,QACC;AAAA,QACA;AAAA,MACF,GACF,GACF,GACF;AAAA,OACF;AAAA,EAEJ;AAEA,MAAI,WAAW;AACb,WAAO,oBAAC,kBAAe,OAAO,EAAE,8BAA8B,kCAAkC,GAAG;AAAA,EACrG;AAEA,MAAI,SAAS,CAAC,MAAM;AAClB,WACE;AAAA,MAAC;AAAA;AAAA,QACC,OAAO,EAAE,kCAAkC,sCAAsC;AAAA,QACjF,aAAa,iBAAiB,QAAQ,MAAM,UAAU;AAAA;AAAA,IACxD;AAAA,EAEJ;AAEA,SACE,qBAAC,QACC;AAAA;AAAA,MAAC;AAAA;AAAA,QACC,OAAO,EAAE,4BAA4B,uBAAuB;AAAA,QAC5D,aAAa;AAAA,UACX;AAAA,UACA;AAAA,QACF;AAAA;AAAA,IACF;AAAA,IACA,oBAAC,YACC,8BAAC,UAAK,WAAU,aAAY,UAAU,cACpC,+BAAC,SAAI,WAAU,uCACb;AAAA,2BAAC,SAAI,WAAU,aACb;AAAA,4BAAC,SAAI,WAAU,qHACZ,8BACC;AAAA,UAAC;AAAA;AAAA,YACC,KAAK;AAAA,YACL,KAAK,EAAE,iCAAiC,yBAAyB,EAAE,MAAM,KAAK,iBAAiB,CAAC;AAAA,YAChG,WAAW,iBAAiB,0BAA0B,mBAAmB,2BAA2B;AAAA;AAAA,QACtG,IAEA,oBAAC,aAAU,WAAU,iCAAgC,eAAW,MAAC,GAErE;AAAA,QACA,oBAAC,OAAE,WAAU,uCAAuC,eAAK,kBAAiB;AAAA,QAC1E,oBAAC,OAAE,WAAU,iCACV,YAAE,mCAAmC,sBAAsB,GAC9D;AAAA,SACF;AAAA,MAEA,qBAAC,SAAI,WAAU,aACb;AAAA,6BAAC,SAAI,WAAU,aACb;AAAA,8BAAC,WAAM,SAAQ,0BAAyB,WAAU,uBAC/C,YAAE,iCAAiC,aAAa,GACnD;AAAA,UACA;AAAA,YAAC;AAAA;AAAA,cACC,KAAK;AAAA,cACL,IAAG;AAAA,cACH,MAAK;AAAA,cACL,QAAO;AAAA,cACP,UAAU,CAAC,UAAU;AACnB,sBAAM,OAAO,MAAM,cAAc,QAAQ,CAAC;AAC1C,oBAAI,CAAC,KAAM;AACX,gCAAgB,IAAI;AAAA,cACtB;AAAA;AAAA,UACF;AAAA,UACA,oBAAC,OAAE,WAAU,iCACV,YAAE,gCAAgC,sFAAsF,GAC3H;AAAA,WACF;AAAA,QAEA,qBAAC,SAAI,WAAU,aACb;AAAA,8BAAC,WAAM,SAAQ,yBAAwB,WAAU,uBAC9C,YAAE,gCAAgC,UAAU,GAC/C;AAAA,UACA;AAAA,YAAC;AAAA;AAAA,cACC,IAAG;AAAA,cACH,OAAO;AAAA,cACP,UAAU,CAAC,UAAU,WAAW,MAAM,cAAc,KAAK;AAAA,cACzD,aAAa,EAAE,sCAAsC,8BAA8B;AAAA;AAAA,UACrF;AAAA,UACA,oBAAC,OAAE,WAAU,iCACV,YAAE,+BAA+B,yFAAyF,GAC7H;AAAA,WACF;AAAA,QAEA;AAAA,UAAC;AAAA;AAAA,YACC,IAAG;AAAA,YACH,OAAO,EAAE,wCAAwC,uBAAuB;AAAA,YACxE,aAAa;AAAA,cACX;AAAA,cACA;AAAA,YACF;AAAA,YACA,SAAS;AAAA,YACT,UAAU;AAAA,YACV,iBAAiB;AAAA;AAAA,QACnB;AAAA,QAEA,qBAAC,SAAI,WAAU,qCACb;AAAA,+BAAC,UAAO,MAAK,UAAS,UAAU,QAC7B;AAAA,qBAAS,oBAAC,WAAQ,WAAU,4BAA2B,eAAW,MAAC,IAAK,oBAAC,QAAK,WAAU,eAAc,eAAW,MAAC;AAAA,YAClH,EAAE,mCAAmC,eAAe;AAAA,aACvD;AAAA,UACA;AAAA,YAAC;AAAA;AAAA,cACC,MAAK;AAAA,cACL,SAAQ;AAAA,cACR,UAAU;AAAA,cACV,SAAS,MAAM;AACb,gCAAgB,IAAI;AACpB,oBAAI,aAAa,QAAS,cAAa,QAAQ,QAAQ;AACvD,2BAAW,EAAE;AACb,2CAA2B,KAAK;AAChC,qBAAK,aAAa,IAAI,EAAE,YAAY,MAAM,yBAAyB,MAAM,CAAC;AAAA,cAC5E;AAAA,cAEA;AAAA,oCAAC,aAAU,WAAU,eAAc,eAAW,MAAC;AAAA,gBAC9C,EAAE,oCAAoC,kBAAkB;AAAA;AAAA;AAAA,UAC3D;AAAA,WACF;AAAA,SACF;AAAA,OACF,GACF,GACF;AAAA,KACF;AAEJ;",
+  "names": ["organizationId"]
 }

package/dist/modules/directory/commands/organizations.js

@@ -2,8 +2,15 @@ import { registerCommand } from "@open-mercato/shared/lib/commands";
 import { CrudHttpError } from "@open-mercato/shared/lib/crud/errors";
 import { Organization, Tenant } from "@open-mercato/core/modules/directory/data/entities";
 import { organizationCreateSchema, organizationUpdateSchema } from "@open-mercato/core/modules/directory/data/validators";
-import { rebuildHierarchyForTenant } from "@open-mercato/core/modules/directory/lib/hierarchy";
-import { enforceTenantSelection } from "@open-mercato/core/modules/auth/lib/tenantAccess";
+import {
+  lockOrganizationHierarchyForTenant,
+  rebuildHierarchyForTenant
+} from "@open-mercato/core/modules/directory/lib/hierarchy";
+import {
+  enforceTenantSelection,
+  normalizeTenantId,
+  resolveIsSuperAdmin
+} from "@open-mercato/core/modules/auth/lib/tenantAccess";
 import { E } from "../../../generated/entities.ids.generated.js";
 import {
   loadCustomFieldSnapshot,
@@ -76,6 +83,48 @@ function resolveTenantIdFromEntity(entity) {
   const fallback = toOptionalString(shape.tenantId) || toOptionalString(shape.tenant_id);
   return fallback;
 }
+async function resolveOrganizationActorScope(ctx) {
+  if (ctx.systemActor === true) return { isUnrestricted: true, tenantId: null };
+  const tenantId = normalizeTenantId(ctx.auth?.tenantId ?? null) ?? null;
+  const isSuperAdmin = await resolveIsSuperAdmin(ctx);
+  return { isUnrestricted: isSuperAdmin, tenantId };
+}
+function buildOrganizationTargetFilter(id, scope) {
+  if (!scope.isUnrestricted && !scope.tenantId) return null;
+  return {
+    id,
+    deletedAt: null,
+    ...scope.isUnrestricted ? {} : { tenant: scope.tenantId }
+  };
+}
+async function loadAuthorizedOrganizationTarget(em, id, ctx) {
+  const scope = await resolveOrganizationActorScope(ctx);
+  const filter = buildOrganizationTargetFilter(id, scope);
+  if (!filter) throw new CrudHttpError(404, { error: "Not found" });
+  const organization = await em.findOne(Organization, filter);
+  if (!organization) throw new CrudHttpError(404, { error: "Not found" });
+  const tenantId = resolveTenantIdFromEntity(organization);
+  if (!tenantId || !scope.isUnrestricted && tenantId !== scope.tenantId) {
+    throw new CrudHttpError(404, { error: "Not found" });
+  }
+  return { organization, tenantId };
+}
+function buildOrganizationMutationFilter(id, tenantId) {
+  return {
+    id,
+    deletedAt: null,
+    tenant: tenantId
+  };
+}
+async function assertOrganizationUndoTenantAccess(ctx, targetTenantId) {
+  const scope = await resolveOrganizationActorScope(ctx);
+  if (!scope.isUnrestricted && scope.tenantId !== targetTenantId) {
+    throw new CrudHttpError(404, { error: "Not found" });
+  }
+}
+function buildOrganizationUndoTargetFilter(id, tenantId) {
+  return { id, tenant: tenantId };
+}
 function serializeOrganization(entity, custom) {
   return {
     id: String(entity.id),
@@ -220,20 +269,21 @@ const createOrganizationCommand = {
     const tenantId = await enforceTenantSelection(ctx, parsed.tenantId);
     if (!tenantId) throw new CrudHttpError(400, { error: "Tenant scope required" });
     const parentId = parsed.parentId ?? null;
-    if (parentId) {
-      await ensureParentExists(em, tenantId, parentId);
-    }
     const childIds = normalizeChildIds(parsed.childIds ?? [], parentId ? [parentId] : []);
     if (parentId && childIds.includes(parentId)) throw new CrudHttpError(400, { error: "Child cannot equal parent" });
-    await ensureChildrenValid(em, tenantId, childIds);
-    const childParentsBefore = await loadChildParentSnapshots(em, tenantId, childIds);
     const tenantRef = em.getReference(Tenant, tenantId);
     const baseSlug = parsed.slug ? parsed.slug : slugify(parsed.name);
-    const slug = baseSlug ? await resolveUniqueSlug(em, tenantId, baseSlug) : null;
     const de = ctx.container.resolve("dataEngine");
     let organization;
     await withAtomicFlush(em, [
       async () => {
+        await lockOrganizationHierarchyForTenant(em, tenantId);
+        if (parentId) {
+          await ensureParentExists(em, tenantId, parentId);
+        }
+        await ensureChildrenValid(em, tenantId, childIds);
+        const childParentsBefore = await loadChildParentSnapshots(em, tenantId, childIds);
+        const slug = baseSlug ? await resolveUniqueSlug(em, tenantId, baseSlug) : null;
         organization = await de.createOrmEntity({
           entity: Organization,
           data: {
@@ -303,7 +353,7 @@ const createOrganizationCommand = {
       actionLabel: translate("directory.audit.organizations.create", "Create organization"),
       resourceKind: "directory.organization",
       resourceId: String(result.id),
-      tenantId: ctx.auth?.tenantId ?? resolveTenantIdFromEntity(result),
+      tenantId,
       snapshotAfter: afterSnapshots.view,
       payload: {
         undo: {
@@ -320,10 +370,12 @@ const createOrganizationCommand = {
     if (!after) return;
     const tenantId = after.tenantId;
     if (!tenantId) return;
+    await assertOrganizationUndoTenantAccess(ctx, tenantId);
     const em = ctx.container.resolve("em");
     const de = ctx.container.resolve("dataEngine");
     await withAtomicFlush(em, [
       async () => {
+        await lockOrganizationHierarchyForTenant(em, tenantId);
         await restoreChildParents(em, tenantId, childrenBefore);
         if (after.custom && Object.keys(after.custom).length) {
           const reset = buildCustomFieldResetMap(void 0, after.custom);
@@ -341,7 +393,7 @@ const createOrganizationCommand = {
         }
         await de.deleteOrmEntity({
           entity: Organization,
-          where: { id: after.id, deletedAt: null },
+          where: buildOrganizationMutationFilter(after.id, tenantId),
           soft: false
         });
         await rebuildHierarchyForTenant(em, tenantId);
@@ -353,12 +405,14 @@ const createOrganizationCommand = {
     if (!after) throw new CrudHttpError(400, { error: "[internal] redo snapshot unavailable for organization create" });
     const tenantId = after.tenantId;
     if (!tenantId) throw new CrudHttpError(400, { error: "[internal] redo snapshot missing tenant for organization create" });
+    await assertOrganizationUndoTenantAccess(ctx, tenantId);
     const em = ctx.container.resolve("em");
     const de = ctx.container.resolve("dataEngine");
     let organization;
     await withAtomicFlush(em, [
       async () => {
-        const existing = await em.findOne(Organization, { id: after.id });
+        await lockOrganizationHierarchyForTenant(em, tenantId);
+        const existing = await em.findOne(Organization, buildOrganizationUndoTargetFilter(after.id, tenantId));
         if (existing) {
           existing.deletedAt = null;
           existing.name = after.name;
@@ -420,9 +474,7 @@ const updateOrganizationCommand = {
   async prepare(rawInput, ctx) {
     const { parsed } = parseWithCustomFields(organizationUpdateSchema, rawInput);
     const em = ctx.container.resolve("em");
-    const current = await em.findOne(Organization, { id: parsed.id, deletedAt: null });
-    if (!current) throw new CrudHttpError(404, { error: "Not found" });
-    const tenantId = resolveTenantIdFromEntity(current);
+    const { organization: current, tenantId } = await loadAuthorizedOrganizationTarget(em, parsed.id, ctx);
     const currentChildIds = Array.isArray(current.childIds) ? current.childIds : [];
     const requestedChildIds = Array.isArray(parsed.childIds) ? parsed.childIds : [];
     const combinedChildIds = /* @__PURE__ */ new Set([...currentChildIds.map(String), ...requestedChildIds.map(String)]);
@@ -438,68 +490,76 @@ const updateOrganizationCommand = {
   async execute(rawInput, ctx) {
     const { parsed, custom } = parseWithCustomFields(organizationUpdateSchema, rawInput);
     const em = ctx.container.resolve("em");
-    const existing = await em.findOne(Organization, { id: parsed.id, deletedAt: null });
-    if (!existing) throw new CrudHttpError(404, { error: "Not found" });
-    const tenantId = await enforceTenantSelection(ctx, parsed.tenantId ?? resolveTenantIdFromEntity(existing));
-    if (!tenantId) throw new CrudHttpError(400, { error: "Tenant scope required" });
-    const parentId = parsed.parentId ?? null;
-    if (parentId) {
-      if (parentId === parsed.id) throw new CrudHttpError(400, { error: "Organization cannot be its own parent" });
-      if (Array.isArray(existing.descendantIds) && existing.descendantIds.includes(parentId)) {
-        throw new CrudHttpError(400, { error: "Cannot assign descendant as parent" });
-      }
-      await ensureParentExists(em, tenantId, parentId);
-    }
-    const normalizedChildIds = normalizeChildIds(parsed.childIds ?? [], [parsed.id, parentId ?? ""]);
-    if (normalizedChildIds.some((id) => id === parentId)) throw new CrudHttpError(400, { error: "Child cannot equal parent" });
-    if (Array.isArray(existing.ancestorIds) && normalizedChildIds.some((id) => existing.ancestorIds.includes(id))) {
-      throw new CrudHttpError(400, { error: "Cannot assign ancestor as child" });
-    }
-    if (normalizedChildIds.length) {
-      await ensureChildrenValid(em, tenantId, normalizedChildIds);
-      const childFilter = {
-        tenant: tenantId,
-        deletedAt: null,
-        id: { $in: normalizedChildIds }
-      };
-      const children = await em.find(Organization, childFilter);
-      for (const child of children) {
-        if (Array.isArray(child.descendantIds) && child.descendantIds.includes(parsed.id)) {
-          throw new CrudHttpError(400, { error: "Cannot assign descendant cycle" });
-        }
-      }
-    }
-    const combinedChildIds = /* @__PURE__ */ new Set([
-      ...normalizedChildIds.map(String),
-      ...Array.isArray(existing.childIds) ? existing.childIds.map(String) : []
-    ]);
-    const childParentsBefore = await loadChildParentSnapshots(em, tenantId, combinedChildIds);
-    let resolvedSlug;
-    if (parsed.slug !== void 0) {
-      resolvedSlug = parsed.slug ? await resolveUniqueSlug(em, tenantId, parsed.slug, parsed.id) : parsed.slug;
-    }
+    const { tenantId } = await loadAuthorizedOrganizationTarget(em, parsed.id, ctx);
+    const parentProvided = parsed.parentId !== void 0;
+    const childrenProvided = parsed.childIds !== void 0;
     const de = ctx.container.resolve("dataEngine");
     let resolvedOrganization;
     await withAtomicFlush(em, [
       async () => {
+        await lockOrganizationHierarchyForTenant(em, tenantId);
+        const existing = await em.findOne(
+          Organization,
+          buildOrganizationMutationFilter(parsed.id, tenantId),
+          { refresh: true }
+        );
+        if (!existing) throw new CrudHttpError(404, { error: "Not found" });
+        const parentId = parentProvided ? parsed.parentId ?? null : existing.parentId ?? null;
+        if (parentProvided && parentId) {
+          if (parentId === parsed.id) throw new CrudHttpError(400, { error: "Organization cannot be its own parent" });
+          if (Array.isArray(existing.descendantIds) && existing.descendantIds.includes(parentId)) {
+            throw new CrudHttpError(400, { error: "Cannot assign descendant as parent" });
+          }
+          await ensureParentExists(em, tenantId, parentId);
+        }
+        const normalizedChildIds = normalizeChildIds(parsed.childIds ?? [], [parsed.id, parentProvided ? parentId ?? "" : ""]);
+        if (normalizedChildIds.some((id) => id === parentId)) throw new CrudHttpError(400, { error: "Child cannot equal parent" });
+        if (Array.isArray(existing.ancestorIds) && normalizedChildIds.some((id) => existing.ancestorIds.includes(id))) {
+          throw new CrudHttpError(400, { error: "Cannot assign ancestor as child" });
+        }
+        if (normalizedChildIds.length) {
+          await ensureChildrenValid(em, tenantId, normalizedChildIds);
+          const childFilter = {
+            tenant: tenantId,
+            deletedAt: null,
+            id: { $in: normalizedChildIds }
+          };
+          const children = await em.find(Organization, childFilter);
+          for (const child of children) {
+            if (Array.isArray(child.descendantIds) && child.descendantIds.includes(parsed.id)) {
+              throw new CrudHttpError(400, { error: "Cannot assign descendant cycle" });
+            }
+          }
+        }
+        const combinedChildIds = /* @__PURE__ */ new Set([
+          ...normalizedChildIds.map(String),
+          ...Array.isArray(existing.childIds) ? existing.childIds.map(String) : []
+        ]);
+        const childParentsBefore = await loadChildParentSnapshots(em, tenantId, combinedChildIds);
+        let resolvedSlug;
+        if (parsed.slug !== void 0) {
+          resolvedSlug = parsed.slug ? await resolveUniqueSlug(em, tenantId, parsed.slug, parsed.id) : parsed.slug;
+        }
         const organization = await de.updateOrmEntity({
           entity: Organization,
-          where: { id: parsed.id, deletedAt: null },
+          where: buildOrganizationMutationFilter(parsed.id, tenantId),
           apply: (entity) => {
             if (parsed.name !== void 0) entity.name = parsed.name;
             if (resolvedSlug !== void 0) entity.slug = resolvedSlug;
             if (parsed.logoUrl !== void 0) entity.logoUrl = parsed.logoUrl ?? null;
             if (parsed.logoPreserveAspectRatio !== void 0) entity.logoPreserveAspectRatio = parsed.logoPreserveAspectRatio;
             if (parsed.isActive !== void 0) entity.isActive = parsed.isActive;
-            entity.parentId = parentId;
+            if (parentProvided) entity.parentId = parentId;
           }
         });
         if (!organization) throw new CrudHttpError(404, { error: "Not found" });
         setInternalTenantId(organization, tenantId);
         const recordId2 = String(organization.id);
         const desiredChildIds = new Set(normalizedChildIds.filter((id) => id !== recordId2));
-        await clearRemovedChildren(em, tenantId, recordId2, desiredChildIds);
-        await assignChildren(em, tenantId, recordId2, desiredChildIds);
+        if (childrenProvided) {
+          await clearRemovedChildren(em, tenantId, recordId2, desiredChildIds);
+          await assignChildren(em, tenantId, recordId2, desiredChildIds);
+        }
         const childParentsAfter = await loadChildParentSnapshots(em, tenantId, combinedChildIds);
         setUndoMeta(organization, { childParentsBefore, childParentsAfter });
         await setCustomFieldsIfAny({
@@ -561,7 +621,7 @@ const updateOrganizationCommand = {
       resourceKind: "directory.organization",
       resourceId: String(result.id),
       changes,
-      tenantId: ctx.auth?.tenantId ?? after.tenantId,
+      tenantId: after.tenantId,
       payload: {
         undo: {
           before: beforeSnapshots?.undo ?? null,
@@ -577,14 +637,16 @@ const updateOrganizationCommand = {
     if (!before) return;
     const tenantId = before.tenantId;
     if (!tenantId) return;
+    await assertOrganizationUndoTenantAccess(ctx, tenantId);
     const em = ctx.container.resolve("em");
     const de = ctx.container.resolve("dataEngine");
     let updated = null;
     await withAtomicFlush(em, [
       async () => {
+        await lockOrganizationHierarchyForTenant(em, tenantId);
         updated = await de.updateOrmEntity({
           entity: Organization,
-          where: { id: before.id },
+          where: buildOrganizationUndoTargetFilter(before.id, tenantId),
           apply: (entity) => {
             entity.name = before.name;
             if (before.slug !== void 0) entity.slug = before.slug;
@@ -594,9 +656,8 @@ const updateOrganizationCommand = {
             entity.parentId = before.parentId;
           }
         });
-        if (updated && tenantId) {
-          setInternalTenantId(updated, tenantId);
-        }
+        if (!updated) throw new CrudHttpError(404, { error: "Not found" });
+        setInternalTenantId(updated, tenantId);
         const reset = buildCustomFieldResetMap(before.custom, after?.custom);
         if (Object.keys(reset).length) {
           const resetValues = reset;
@@ -633,9 +694,7 @@ const deleteOrganizationCommand = {
   async prepare(input, ctx) {
     const id = requireId(input, "Organization id required");
     const em = ctx.container.resolve("em");
-    const existing = await em.findOne(Organization, { id, deletedAt: null });
-    if (!existing) return {};
-    const tenantId = resolveTenantIdFromEntity(existing);
+    const { organization: existing, tenantId } = await loadAuthorizedOrganizationTarget(em, id, ctx);
     const childParentsBefore = tenantId ? await loadChildParentSnapshots(em, tenantId, Array.isArray(existing.childIds) ? existing.childIds : []) : [];
     const custom = await loadCustomFieldSnapshot(em, {
       entityId: E.directory.organization,
@@ -648,10 +707,7 @@ const deleteOrganizationCommand = {
   async execute(input, ctx) {
     const id = requireId(input, "Organization id required");
     const em = ctx.container.resolve("em");
-    const existing = await em.findOne(Organization, { id, deletedAt: null });
-    if (!existing) throw new CrudHttpError(404, { error: "Not found" });
-    const tenantId = await enforceTenantSelection(ctx, resolveTenantIdFromEntity(existing));
-    if (!tenantId) throw new CrudHttpError(400, { error: "Tenant scope required" });
+    const { organization: existing, tenantId } = await loadAuthorizedOrganizationTarget(em, id, ctx);
     const parentId = existing.parentId ?? null;
     const childSnapshotsBefore = await loadChildParentSnapshots(
       em,
@@ -662,9 +718,10 @@ const deleteOrganizationCommand = {
     let resolvedDeleted;
     await withAtomicFlush(em, [
       async () => {
+        await lockOrganizationHierarchyForTenant(em, tenantId);
         const deleted = await de.deleteOrmEntity({
           entity: Organization,
-          where: { id, deletedAt: null },
+          where: buildOrganizationMutationFilter(id, tenantId),
           soft: true,
           softDeleteField: "deletedAt"
         });
@@ -702,7 +759,7 @@ const deleteOrganizationCommand = {
     });
     return resolvedDeleted;
   },
-  buildLog: async ({ snapshots, input, ctx }) => {
+  buildLog: async ({ snapshots, input }) => {
     const { translate } = await resolveTranslations();
     const beforeSnapshots = snapshots.before;
     const beforeSnapshot = beforeSnapshots?.view ?? null;
@@ -715,7 +772,7 @@ const deleteOrganizationCommand = {
       resourceKind: "directory.organization",
       resourceId: id || fallbackId || null,
       snapshotBefore: beforeSnapshot ?? null,
-      tenantId: ctx.auth?.tenantId ?? fallbackTenant,
+      tenantId: beforeUndo?.tenantId ?? fallbackTenant,
       payload: {
         undo: {
           before: beforeUndo
@@ -729,12 +786,17 @@ const deleteOrganizationCommand = {
     if (!before) return;
     const tenantId = before.tenantId;
     if (!tenantId) return;
+    await assertOrganizationUndoTenantAccess(ctx, tenantId);
     const em = ctx.container.resolve("em");
     const de = ctx.container.resolve("dataEngine");
     let organization = null;
     await withAtomicFlush(em, [
       async () => {
-        organization = await em.findOne(Organization, { id: before.id });
+        await lockOrganizationHierarchyForTenant(em, tenantId);
+        organization = await em.findOne(
+          Organization,
+          buildOrganizationUndoTargetFilter(before.id, tenantId)
+        );
         if (organization) {
           organization.deletedAt = null;
           organization.isActive = before.isActive;