@open-mercato/core 0.6.4-develop.4371.1.8f3030407e → 0.6.4

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

@@ -21,6 +21,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -37,6 +38,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -53,6 +55,24 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
+          "enumItems": [],
+          "mappedType": "text"
+        },
+        "entry_sort_mode": {
+          "name": "entry_sort_mode",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": "'label_asc'",
+          "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -69,6 +89,7 @@
           "scale": null,
           "default": "gen_random_uuid()",
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -85,6 +106,7 @@
           "scale": null,
           "default": "true",
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "boolean"
         },
@@ -101,6 +123,7 @@
           "scale": null,
           "default": "false",
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "boolean"
         },
@@ -117,6 +140,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -133,6 +157,7 @@
           "scale": null,
           "default": "'default'",
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -149,6 +174,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -165,6 +191,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -181,6 +208,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -197,6 +225,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         }
@@ -226,6 +255,7 @@
         }
       ],
       "checks": [],
+      "triggers": [],
       "foreignKeys": {},
       "comment": null
     },
@@ -246,6 +276,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -262,6 +293,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -278,6 +310,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -294,6 +327,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -310,6 +344,7 @@
           "scale": null,
           "default": "gen_random_uuid()",
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -326,6 +361,7 @@
           "scale": null,
           "default": "false",
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "boolean"
         },
@@ -342,6 +378,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -358,6 +395,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -374,6 +412,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -390,6 +429,7 @@
           "scale": null,
           "default": "0",
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "integer"
         },
@@ -406,6 +446,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -422,6 +463,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -438,6 +480,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         }
@@ -480,6 +523,7 @@
         }
       ],
       "checks": [],
+      "triggers": [],
       "foreignKeys": {
         "dictionary_entries_dictionary_id_foreign": {
           "columnNames": [

package/src/modules/dictionaries/migrations/Migration20260602202147_dictionaries.ts

@@ -0,0 +1,13 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260602202147_dictionaries extends Migration {
+
+  override up(): void | Promise<void> {
+    this.addSql(`alter table "dictionaries" add "entry_sort_mode" text not null default 'label_asc';`);
+  }
+
+  override down(): void | Promise<void> {
+    this.addSql(`alter table "dictionaries" drop column "entry_sort_mode";`);
+  }
+
+}

package/src/modules/directory/api/get/organizations/lookup.ts

@@ -29,23 +29,16 @@ export async function GET(req: Request) {
   const organization = await em.findOne(
     Organization,
     { slug: parsed.data.slug, deletedAt: null },
-    { populate: ['tenant'] },
   )
   if (!organization) {
     return NextResponse.json({ ok: false, error: 'Organization not found.' }, { status: 404 })
   }
-  const tenantId = typeof organization.tenant === 'string'
-    ? organization.tenant
-    : organization.tenant?.id
-      ? String(organization.tenant.id)
-      : null
   return NextResponse.json({
     ok: true,
     organization: {
       id: String(organization.id),
       name: organization.name,
       slug: organization.slug,
-      tenantId,
     },
   })
 }
@@ -58,7 +51,6 @@ const orgLookupSuccessSchema = z.object({
     id: z.string().uuid(),
     name: z.string(),
     slug: z.string(),
-    tenantId: z.string().uuid().nullable(),
   }),
 })
 

package/src/modules/directory/api/organizations/route.ts

@@ -28,7 +28,8 @@ import {
   directoryOkSchema,
   organizationListResponseSchema,
 } from '../openapi'
-import { resolveIsSuperAdmin } from '@open-mercato/core/modules/auth/lib/tenantAccess'
+import { resolveIsSuperAdmin, enforceTenantSelection } from '@open-mercato/core/modules/auth/lib/tenantAccess'
+import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { findWithDecryption, findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 
 type CrudInput = Record<string, unknown>
@@ -154,22 +155,42 @@ export async function GET(req: Request) {
   const includeInactive = parseBooleanToken(query.includeInactive) === true || status !== 'active'
 
   if (!allowAllTenants && !tenantId && !authTenantId && ids?.length) {
-    const scopedOrgs: Organization[] = await findWithDecryption(
-      em,
-      Organization,
-      { id: { $in: ids }, deletedAt: null },
-      { populate: ['tenant'] },
-      { tenantId: authTenantId, organizationId: null },
-    )
-    const tenantCandidates = new Set<string>()
-    for (const org of scopedOrgs) {
-      const orgTenantId = org.tenant?.id ? stringId(org.tenant.id) : ''
-      if (orgTenantId) tenantCandidates.add(orgTenantId)
+    let scopedIds = ids
+    if (!isSuperAdmin) {
+      let allowedIds: string[] | null = null
+      try {
+        const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req })
+        allowedIds = Array.isArray(scope.allowedIds) ? scope.allowedIds : null
+      } catch {}
+      const allowedSet = allowedIds ? new Set(allowedIds) : new Set<string>()
+      scopedIds = ids.filter((id) => allowedSet.has(id))
     }
-    if (tenantCandidates.size === 1) {
-      tenantId = Array.from(tenantCandidates)[0] ?? null
-    } else if (tenantCandidates.size > 1) {
-      return NextResponse.json({ items: [], error: 'Tenant scope required' }, { status: 400 })
+    if (scopedIds.length) {
+      const scopedOrgs: Organization[] = await findWithDecryption(
+        em,
+        Organization,
+        { id: { $in: scopedIds }, deletedAt: null },
+        { populate: ['tenant'] },
+        { tenantId: authTenantId, organizationId: null },
+      )
+      const tenantCandidates = new Set<string>()
+      for (const org of scopedOrgs) {
+        const orgTenantId = org.tenant?.id ? stringId(org.tenant.id) : ''
+        if (orgTenantId) tenantCandidates.add(orgTenantId)
+      }
+      if (tenantCandidates.size === 1) {
+        const candidateTenantId = Array.from(tenantCandidates)[0] ?? null
+        try {
+          tenantId = await enforceTenantSelection({ auth, container }, candidateTenantId)
+        } catch (error) {
+          if (isCrudHttpError(error)) {
+            return NextResponse.json(error.body, { status: error.status })
+          }
+          throw error
+        }
+      } else if (tenantCandidates.size > 1) {
+        return NextResponse.json({ items: [], error: 'Tenant scope required' }, { status: 400 })
+      }
     }
   }
 
@@ -446,8 +467,10 @@ export async function GET(req: Request) {
   const orgs = await em.find(Organization, orgListFilter, { orderBy: { name: 'ASC' } })
   const hierarchy = computeHierarchyForOrganizations(orgs, tenantId)
   const slugByOrgId = new Map<string, string | null>()
+  const updatedAtByOrgId = new Map<string, string | null>()
   for (const org of orgs) {
     slugByOrgId.set(String(org.id), org.slug ?? null)
+    updatedAtByOrgId.set(String(org.id), org.updatedAt instanceof Date ? org.updatedAt.toISOString() : null)
   }
 
   // Manage view: paginated flat list for a single tenant
@@ -510,6 +533,7 @@ export async function GET(req: Request) {
       id: node.id,
       name: node.name,
       slug: slugByOrgId.get(recordId) ?? null,
+      updatedAt: updatedAtByOrgId.get(recordId) ?? null,
       tenantId: node.tenantId,
       tenantName,
       parentId: node.parentId,

package/src/modules/directory/backend/directory/organizations/[id]/edit/page.tsx

@@ -35,6 +35,8 @@ type OrganizationResponse = {
     descendantIds: string[]
     isActive: boolean
     pathLabel: string
+    updatedAt?: string | null
+    updated_at?: string | null
   } & Record<string, unknown>>
 }
 
@@ -145,6 +147,11 @@ export default function EditOrganizationPage({ params }: { params?: { id?: strin
           parentId: record.parentId || '',
           isActive: record.isActive,
           tenantId: resolvedTenantId,
+          updatedAt: typeof record.updatedAt === 'string'
+            ? record.updatedAt
+            : typeof record.updated_at === 'string'
+              ? record.updated_at
+              : null,
           ...customValues,
         })
         setPathLabel(record.pathLabel)
@@ -310,6 +317,7 @@ export default function EditOrganizationPage({ params }: { params?: { id?: strin
           groups={groups}
           entityId={E.directory.organization}
           initialValues={initialValues ?? { id: orgId, tenantId: tenantId ?? null, name: '', slug: '', parentId: '', isActive: true, childIds: [] }}
+          optimisticLockUpdatedAt={typeof initialValues?.updatedAt === 'string' ? initialValues.updatedAt : null}
           isLoading={loading}
           loadingMessage={t('directory.organizations.form.loading', 'Loading organization...')}
           submitLabel={t('directory.organizations.form.action.save', 'Save')}

package/src/modules/directory/backend/directory/organizations/page.tsx

@@ -5,11 +5,13 @@ import { useQuery, useQueryClient } from '@tanstack/react-query'
 import type { ColumnDef } from '@tanstack/react-table'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { DataTable } from '@open-mercato/ui/backend/DataTable'
+import { ListEmptyState } from '@open-mercato/ui/backend/filters/ListEmptyState'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import type { FilterValues } from '@open-mercato/ui/backend/FilterBar'
 import { BooleanIcon } from '@open-mercato/ui/backend/ValueIcons'
 import { Button } from '@open-mercato/ui/primitives/button'
-import { apiCall, apiCallOrThrow, readApiResultOrThrow } 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 { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
@@ -32,6 +34,7 @@ type OrganizationRow = {
   childrenCount: number
   descendantsCount: number
   isActive: boolean
+  updatedAt?: string | null
 }
 
 type OrganizationsResponse = {
@@ -184,10 +187,13 @@ export default function DirectoryOrganizationsPage() {
     if (!confirmed) return
 
     try {
-      await apiCallOrThrow(
-        `/api/directory/organizations?id=${encodeURIComponent(org.id)}`,
-        { method: 'DELETE' },
-        { errorMessage: t('directory.organizations.list.error.delete', 'Failed to delete organization') },
+      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 queryClient.invalidateQueries({ queryKey: ['directory-organizations'] })
       flash(t('directory.organizations.flash.deleted', 'Organization deleted'), 'success')
@@ -249,6 +255,13 @@ export default function DirectoryOrganizationsPage() {
               />
             ) : null
           )}
+          emptyState={(
+            <ListEmptyState
+              entityName={t('directory.organizations.list.title', 'Organizations')}
+              createHref="/backend/directory/organizations/create"
+              createLabel={t('directory.organizations.list.actions.create', 'Create')}
+            />
+          )}
           pagination={{ page, pageSize: 50, total, totalPages, onPageChange: setPage }}
           isLoading={isLoading}
         />

package/src/modules/directory/backend/directory/tenants/[id]/edit/page.tsx

@@ -6,7 +6,8 @@ import { CrudForm, type CrudField, type CrudFormGroup } from '@open-mercato/ui/b
 import { collectCustomFieldValues } from '@open-mercato/ui/backend/utils/customFieldValues'
 import { updateCrud } from '@open-mercato/ui/backend/utils/crud'
 import { raiseCrudError } from '@open-mercato/ui/backend/utils/serverErrors'
-import { readApiResultOrThrow, apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { readApiResultOrThrow, apiCall, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { extractCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-fields-client'
@@ -15,6 +16,7 @@ type TenantFormValues = {
   id: string
   name: string
   isActive: boolean
+  updatedAt?: string | null
 } & Record<string, unknown>
 
 export default function EditTenantPage({ params }: { params?: { id?: string } }) {
@@ -57,6 +59,11 @@ export default function EditTenantPage({ params }: { params?: { id?: string } })
           id: String(row.id),
           name: String(row.name),
           isActive: !!row.isActive,
+          updatedAt: typeof row.updatedAt === 'string'
+            ? row.updatedAt
+            : typeof row.updated_at === 'string'
+              ? row.updated_at
+              : null,
           ...cfValues,
         }
         if (!cancelled) setInitial(values)
@@ -114,6 +121,7 @@ export default function EditTenantPage({ params }: { params?: { id?: string } })
           groups={groups}
           entityId={E.directory.tenant}
           initialValues={(initial || { id: tenantId, name: '', isActive: true }) as Partial<TenantFormValues>}
+          optimisticLockUpdatedAt={initial?.updatedAt}
           isLoading={loading}
           loadingMessage={t('directory.tenants.form.loading', 'Loading tenant…')}
           submitLabel={t('common.save', 'Save')}
@@ -137,10 +145,13 @@ export default function EditTenantPage({ params }: { params?: { id?: string } })
             await updateCrud('directory/tenants', payload)
           }}
           onDelete={async () => {
-            const call = await apiCall(
-              `/api/directory/tenants?id=${encodeURIComponent(tenantId)}`,
-              { method: 'DELETE' },
-            )
+            const headers = buildOptimisticLockHeader(initial?.updatedAt)
+            const call = await withScopedApiRequestHeaders(headers, () => (
+              apiCall(
+                `/api/directory/tenants?id=${encodeURIComponent(tenantId)}`,
+                { method: 'DELETE' },
+              )
+            ))
             if (!call.ok) {
               await raiseCrudError(call.response, t('directory.tenants.form.errors.delete', 'Failed to delete tenant'))
             }

package/src/modules/directory/backend/directory/tenants/page.tsx

@@ -5,11 +5,13 @@ import { useQuery, useQueryClient } from '@tanstack/react-query'
 import type { ColumnDef, SortingState } from '@tanstack/react-table'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { DataTable } from '@open-mercato/ui/backend/DataTable'
+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 type { FilterValues } from '@open-mercato/ui/backend/FilterBar'
 import { Button } from '@open-mercato/ui/primitives/button'
-import { apiCall, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiCall, 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 { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
@@ -125,9 +127,12 @@ export default function DirectoryTenantsPage() {
     if (!confirmed) return
 
     try {
-      const call = await apiCall(
-        `/api/directory/tenants?id=${encodeURIComponent(tenant.id)}`,
-        { method: 'DELETE' },
+      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'))
@@ -175,6 +180,13 @@ export default function DirectoryTenantsPage() {
               />
             ) : null
           )}
+          emptyState={(
+            <ListEmptyState
+              entityName={t('directory.tenants.list.title', 'Tenants')}
+              createHref="/backend/directory/tenants/create"
+              createLabel={t('directory.tenants.list.actions.create', 'Create')}
+            />
+          )}
           pagination={{ page, pageSize: 20, total, totalPages, onPageChange: setPage }}
           isLoading={isLoading}
         />

package/src/modules/directory/commands/organizations.ts

@@ -15,6 +15,7 @@ import {
   diffCustomFieldChanges,
 } from '@open-mercato/shared/lib/commands/customFieldSnapshots'
 import { extractUndoPayload } from '@open-mercato/shared/lib/commands/undo'
+import { resolveRedoSnapshot } from '@open-mercato/shared/lib/commands/redo'
 import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
 import {
   parseWithCustomFields,
@@ -413,6 +414,72 @@ const createOrganizationCommand: CommandHandler<Record<string, unknown>, Organiz
       },
     ], { transaction: true })
   },
+  redo: async ({ logEntry, ctx }) => {
+    const after = resolveRedoSnapshot<OrganizationUndoSnapshot>(logEntry)
+    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' })
+    const em = (ctx.container.resolve('em') as EntityManager)
+    const de = (ctx.container.resolve('dataEngine') as DataEngine)
+    let organization!: Organization
+    await withAtomicFlush(em, [
+      async () => {
+        const existing = await em.findOne(Organization, { id: after.id })
+        if (existing) {
+          existing.deletedAt = null
+          existing.name = after.name
+          if (after.slug !== undefined) existing.slug = after.slug ?? null
+          existing.isActive = after.isActive
+          existing.parentId = after.parentId
+          await em.flush()
+          organization = existing
+        } else {
+          organization = await de.createOrmEntity({
+            entity: Organization,
+            data: {
+              id: after.id,
+              name: after.name,
+              slug: after.slug ?? null,
+              tenant: em.getReference(Tenant, tenantId),
+              isActive: after.isActive,
+              parentId: after.parentId,
+            },
+          })
+        }
+        setInternalTenantId(organization, tenantId)
+
+        if (after.custom && Object.keys(after.custom).length) {
+          const reset = buildCustomFieldResetMap(after.custom, undefined)
+          if (Object.keys(reset).length) {
+            const resetValues = reset as Parameters<DataEngine['setCustomFields']>[0]['values']
+            await de.setCustomFields({
+              entityId: E.directory.organization,
+              recordId: after.id,
+              tenantId,
+              organizationId: after.id,
+              values: resetValues,
+              notify: false,
+            })
+          }
+        }
+
+        await assignChildren(em, tenantId, after.id, after.childParents.map((entry) => entry.childId))
+        await rebuildHierarchyForTenant(em, tenantId)
+      },
+    ], { transaction: true })
+
+    const identifiers = { id: after.id, organizationId: after.id, tenantId }
+    await emitCrudSideEffects({
+      dataEngine: de,
+      action: 'created',
+      entity: organization,
+      identifiers,
+      events: organizationCrudEvents,
+      indexer: organizationCrudIndexer,
+    })
+
+    return organization
+  },
 }
 
 const updateOrganizationCommand: CommandHandler<Record<string, unknown>, Organization> = {
@@ -689,7 +756,10 @@ const deleteOrganizationCommand: CommandHandler<{ body: any; query: Record<strin
         setInternalTenantId(deleted, tenantId)
         deleted.isActive = false
         deleted.parentId = null
-
+        resolvedDeleted = deleted
+      },
+      async () => {
+        const deleted = resolvedDeleted
         const childrenFilter: FilterQuery<Organization> = { tenant: tenantId, parentId: id, deletedAt: null }
         const children = await em.find(Organization, childrenFilter)
         const toPersist: Organization[] = []
@@ -698,11 +768,11 @@ const deleteOrganizationCommand: CommandHandler<{ body: any; query: Record<strin
           toPersist.push(child)
         }
         toPersist.push(deleted)
-        if (toPersist.length) await em.persist(toPersist).flush()
+        if (toPersist.length) em.persist(toPersist)
         setUndoMeta(deleted, { childParentsBefore: childSnapshotsBefore })
-
+      },
+      async () => {
         await rebuildHierarchyForTenant(em, tenantId)
-        resolvedDeleted = deleted
       },
     ], { transaction: true })