@open-mercato/core 0.6.7 → 0.6.8-develop.6874.1.982d6097d8

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

@@ -5,6 +5,7 @@ import { Tenant } from '@open-mercato/core/modules/directory/data/entities'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
 import type { EntityManager, FilterQuery } from '@mikro-orm/postgresql'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { requireSuperAdmin } from '@open-mercato/core/modules/auth/lib/tenantAccess'
 import { E } from '#generated/entities.ids.generated'
 import {
   parseWithCustomFields,
@@ -48,6 +49,7 @@ type SerializedTenant = ReturnType<typeof serializeTenant>
 const createTenantCommand: CommandHandler<TenantPayload, Tenant> = {
   id: 'directory.tenants.create',
   async execute(rawInput, ctx) {
+    await requireSuperAdmin(ctx)
     const { parsed, custom } = parseWithCustomFields(tenantCreateSchema, rawInput)
     const de = (ctx.container.resolve('dataEngine') as DataEngine)
 
@@ -126,6 +128,7 @@ const createTenantCommand: CommandHandler<TenantPayload, Tenant> = {
 const updateTenantCommand: CommandHandler<TenantPayload, Tenant> = {
   id: 'directory.tenants.update',
   async prepare(rawInput, ctx) {
+    await requireSuperAdmin(ctx)
     const { parsed } = parseWithCustomFields(tenantUpdateSchema, rawInput)
     const em = (ctx.container.resolve('em') as EntityManager)
     const current = await em.findOne(Tenant, { id: parsed.id, deletedAt: null })
@@ -133,6 +136,7 @@ const updateTenantCommand: CommandHandler<TenantPayload, Tenant> = {
     return { before: serializeTenant(current) }
   },
   async execute(rawInput, ctx) {
+    await requireSuperAdmin(ctx)
     const { parsed, custom } = parseWithCustomFields(tenantUpdateSchema, rawInput)
     const de = (ctx.container.resolve('dataEngine') as DataEngine)
     const tenant = await de.updateOrmEntity({
@@ -191,12 +195,14 @@ const updateTenantCommand: CommandHandler<TenantPayload, Tenant> = {
 const deleteTenantCommand: CommandHandler<{ body: any; query: Record<string, string> }, Tenant> = {
   id: 'directory.tenants.delete',
   async prepare(input, ctx) {
+    await requireSuperAdmin(ctx)
     const id = requireId(input, 'Tenant id required')
     const em = (ctx.container.resolve('em') as EntityManager)
     const existing = await em.findOne(Tenant, { id, deletedAt: null })
     return existing ? { before: serializeTenant(existing) } : {}
   },
   async execute(rawInput, ctx) {
+    await requireSuperAdmin(ctx)
     const id = requireId(rawInput, 'Tenant id required')
     const de = (ctx.container.resolve('dataEngine') as DataEngine)
     const tenant = await de.deleteOrmEntity({

package/src/modules/directory/data/entities.ts

@@ -43,6 +43,9 @@ export class Organization {
   @Property({ name: 'logo_url', type: 'text', nullable: true })
   logoUrl?: string | null
 
+  @Property({ name: 'logo_preserve_aspect_ratio', type: 'boolean', default: false })
+  logoPreserveAspectRatio: boolean = false
+
   @Property({ name: 'is_active', type: 'boolean', default: true })
   isActive: boolean = true
 

package/src/modules/directory/data/validators.ts

@@ -28,6 +28,7 @@ export const organizationCreateSchema = z.object({
   name: z.string().min(1).max(200),
   slug: slugField,
   logoUrl: logoUrlField,
+  logoPreserveAspectRatio: z.boolean().optional(),
   isActive: z.boolean().optional(),
   parentId: z.string().uuid().nullable().optional(),
   childIds: z.array(z.string().uuid()).optional(),
@@ -39,6 +40,7 @@ export const organizationUpdateSchema = z.object({
   name: z.string().min(1).max(200).optional(),
   slug: slugField,
   logoUrl: logoUrlField,
+  logoPreserveAspectRatio: z.boolean().optional(),
   isActive: z.boolean().optional(),
   parentId: z.string().uuid().nullable().optional(),
   childIds: z.array(z.string().uuid()).optional(),

package/src/modules/directory/extension-points.ts

@@ -0,0 +1,11 @@
+import { dataTableExtensionHost, defineModuleExtensionPoints } from '@open-mercato/shared/modules/widgets/extension-points'
+
+export const extensionPoints = defineModuleExtensionPoints({
+  moduleId: 'directory',
+  hosts: {
+    organizationsTable: dataTableExtensionHost({ tableId: 'directory.organizations.list', source: 'backend/directory/organizations/page.tsx' }),
+    tenantsTable: dataTableExtensionHost({ tableId: 'directory.tenants.list', source: 'backend/directory/tenants/page.tsx' }),
+  },
+})
+
+export default extensionPoints

package/src/modules/directory/i18n/de.json

@@ -7,6 +7,8 @@
   "directory.audit.tenants.update": "Mandanten aktualisieren",
   "directory.branding.actions.reset": "Standardlogo verwenden",
   "directory.branding.actions.save": "Branding speichern",
+  "directory.branding.aspectRatio.description": "Wenn deaktiviert, schneidet die Seitenleiste das Logo auf die Standard-Iconform zu.",
+  "directory.branding.aspectRatio.label": "Seitenverhältnis beibehalten",
   "directory.branding.currentScope": "Aktuelle Organisation",
   "directory.branding.description": "Legen Sie das Logo fest, das in der Backend-Seitenleiste für die aktuell ausgewählte Organisation verwendet wird.",
   "directory.branding.errors.blocked": "Das Speichern des Brandings wurde blockiert.",
@@ -16,7 +18,7 @@
   "directory.branding.errors.organizationRequired": "Wählen Sie eine einzelne Organisation aus, bevor Sie das Seitenleisten-Branding ändern.",
   "directory.branding.errors.save": "Organisationsbranding konnte nicht aktualisiert werden",
   "directory.branding.errors.upload": "Logo konnte nicht hochgeladen werden",
-  "directory.branding.file.hint": "PNG, JPG, WebP oder SVG funktioniert am besten. Hochgeladene Dateien werden als Organisationsanhänge gespeichert.",
+  "directory.branding.file.hint": "PNG, JPG oder WebP funktioniert am besten. Hochgeladene Dateien werden als Organisationsanhänge gespeichert.",
   "directory.branding.file.label": "Logo hochladen",
   "directory.branding.flash.saved": "Organisationsbranding aktualisiert",
   "directory.branding.loading": "Organisationsbranding wird geladen...",
@@ -52,6 +54,7 @@
   "directory.organizations.form.field.slug": "Slug",
   "directory.organizations.form.field.slug.description": "URL-sicherer Bezeichner für das Kundenportal (Kleinbuchstaben, Zahlen, Bindestriche, Unterstriche).",
   "directory.organizations.form.field.tenant": "Mandant",
+  "directory.organizations.form.field.tenantReadonlyDescription": "Der Mandant kann für eine bestehende Organisation nicht geändert werden.",
   "directory.organizations.form.group.customFields": "Benutzerdefinierte Daten",
   "directory.organizations.form.group.details": "Details",
   "directory.organizations.form.loading": "Organisation wird geladen...",

package/src/modules/directory/i18n/en.json

@@ -7,6 +7,8 @@
   "directory.audit.tenants.update": "Update tenant",
   "directory.branding.actions.reset": "Use default logo",
   "directory.branding.actions.save": "Save branding",
+  "directory.branding.aspectRatio.description": "When disabled, the sidebar crops the logo into the standard icon shape.",
+  "directory.branding.aspectRatio.label": "Keep the aspect ratio",
   "directory.branding.currentScope": "Current organization",
   "directory.branding.description": "Set the logo used in the backend sidebar for the currently selected organization.",
   "directory.branding.errors.blocked": "Branding save was blocked.",
@@ -16,7 +18,7 @@
   "directory.branding.errors.organizationRequired": "Select a single organization before changing sidebar branding.",
   "directory.branding.errors.save": "Failed to update organization branding",
   "directory.branding.errors.upload": "Failed to upload logo",
-  "directory.branding.file.hint": "PNG, JPG, WebP, or SVG works best. Uploaded files are stored as organization attachments.",
+  "directory.branding.file.hint": "PNG, JPG, or WebP works best. Uploaded files are stored as organization attachments.",
   "directory.branding.file.label": "Upload logo",
   "directory.branding.flash.saved": "Organization branding updated",
   "directory.branding.loading": "Loading organization branding...",
@@ -52,6 +54,7 @@
   "directory.organizations.form.field.slug": "Slug",
   "directory.organizations.form.field.slug.description": "URL-safe identifier used for the customer portal (lowercase letters, numbers, hyphens, underscores).",
   "directory.organizations.form.field.tenant": "Tenant",
+  "directory.organizations.form.field.tenantReadonlyDescription": "Tenant cannot be changed for an existing organization.",
   "directory.organizations.form.group.customFields": "Custom Data",
   "directory.organizations.form.group.details": "Details",
   "directory.organizations.form.loading": "Loading organization...",

package/src/modules/directory/i18n/es.json

@@ -7,6 +7,8 @@
   "directory.audit.tenants.update": "Actualizar inquilino",
   "directory.branding.actions.reset": "Usar logo predeterminado",
   "directory.branding.actions.save": "Guardar marca",
+  "directory.branding.aspectRatio.description": "Cuando está desactivado, la barra lateral recorta el logo con la forma de icono estándar.",
+  "directory.branding.aspectRatio.label": "Mantener la relación de aspecto",
   "directory.branding.currentScope": "Organización actual",
   "directory.branding.description": "Define el logo usado en la barra lateral del backend para la organización seleccionada.",
   "directory.branding.errors.blocked": "Se bloqueó el guardado de la marca.",
@@ -16,7 +18,7 @@
   "directory.branding.errors.organizationRequired": "Selecciona una sola organización antes de cambiar la marca de la barra lateral.",
   "directory.branding.errors.save": "No se pudo actualizar la marca de la organización",
   "directory.branding.errors.upload": "No se pudo subir el logo",
-  "directory.branding.file.hint": "PNG, JPG, WebP o SVG funcionan mejor. Los archivos subidos se guardan como adjuntos de la organización.",
+  "directory.branding.file.hint": "PNG, JPG o WebP funcionan mejor. Los archivos subidos se guardan como adjuntos de la organización.",
   "directory.branding.file.label": "Subir logo",
   "directory.branding.flash.saved": "Marca de la organización actualizada",
   "directory.branding.loading": "Cargando marca de la organización...",
@@ -52,6 +54,7 @@
   "directory.organizations.form.field.slug": "Slug",
   "directory.organizations.form.field.slug.description": "Identificador seguro para URL usado en el portal de clientes (minúsculas, números, guiones, guiones bajos).",
   "directory.organizations.form.field.tenant": "Inquilino",
+  "directory.organizations.form.field.tenantReadonlyDescription": "El inquilino no se puede cambiar para una organización existente.",
   "directory.organizations.form.group.customFields": "Datos personalizados",
   "directory.organizations.form.group.details": "Detalles",
   "directory.organizations.form.loading": "Cargando organización...",

package/src/modules/directory/i18n/ko.json

@@ -0,0 +1,105 @@
+{
+  "directory.audit.organizations.create": "조직 생성",
+  "directory.audit.organizations.delete": "조직 삭제",
+  "directory.audit.organizations.update": "조직 수정",
+  "directory.audit.tenants.create": "테넌트 생성",
+  "directory.audit.tenants.delete": "테넌트 삭제",
+  "directory.audit.tenants.update": "테넌트 수정",
+  "directory.branding.actions.reset": "기본 로고 사용",
+  "directory.branding.actions.save": "브랜딩 저장",
+  "directory.branding.aspectRatio.description": "비활성화되면 사이드바에서 로고가 표준 아이콘 모양으로 잘립니다.",
+  "directory.branding.aspectRatio.label": "가로 세로 비율 유지",
+  "directory.branding.currentScope": "현재 조직",
+  "directory.branding.description": "현재 선택된 조직에 대해 백엔드 사이드바에 사용되는 로고를 설정하세요.",
+  "directory.branding.errors.blocked": "브랜딩 저장이 차단되었습니다.",
+  "directory.branding.errors.invalidLogoUrl": "유효한 이미지 URL을 입력하세요.",
+  "directory.branding.errors.load": "조직 브랜딩을 불러오지 못했습니다",
+  "directory.branding.errors.notFound": "조직을 찾을 수 없습니다",
+  "directory.branding.errors.organizationRequired": "사이드바 브랜딩을 변경하기 전에 단일 조직을 선택하세요.",
+  "directory.branding.errors.save": "조직 브랜딩 업데이트에 실패했습니다",
+  "directory.branding.errors.upload": "로고 업로드에 실패했습니다",
+  "directory.branding.file.hint": "PNG, JPG, WebP 또는 SVG가 가장 적합합니다. 업로드된 파일은 조직 첨부 파일로 저장됩니다.",
+  "directory.branding.file.label": "로고 업로드",
+  "directory.branding.flash.saved": "조직 브랜딩이 업데이트되었습니다",
+  "directory.branding.loading": "조직 브랜딩을 불러오는 중...",
+  "directory.branding.nav": "조직 브랜딩",
+  "directory.branding.previewAlt": "{{name}} 로고 미리보기",
+  "directory.branding.title": "조직 브랜딩",
+  "directory.branding.url.hint": "외부 이미지 URL을 사용하거나 비워 두면 기본 Open Mercato 로고로 대체됩니다.",
+  "directory.branding.url.label": "로고 URL",
+  "directory.branding.url.placeholder": "https://example.com/logo.svg",
+  "directory.nav.group": "디렉터리",
+  "directory.nav.organizations": "조직",
+  "directory.nav.organizations.create": "조직 생성",
+  "directory.nav.tenants": "테넌트",
+  "directory.nav.tenants.create": "테넌트 생성",
+  "directory.organizations.common.none": "—",
+  "directory.organizations.errors.deleteFailed": "조직 삭제에 실패했습니다",
+  "directory.organizations.errors.orgIdRequired": "조직 식별자는 필수입니다",
+  "directory.organizations.errors.tenantRequired": "슈퍼 관리자는 테넌트 선택이 필요합니다",
+  "directory.organizations.flash.created": "조직이 생성되었습니다",
+  "directory.organizations.flash.deleted": "조직이 삭제되었습니다",
+  "directory.organizations.flash.updated": "조직이 수정되었습니다",
+  "directory.organizations.form.action.create": "생성",
+  "directory.organizations.form.action.save": "저장",
+  "directory.organizations.form.actions.backToList": "조직 목록으로 돌아가기",
+  "directory.organizations.form.children.empty": "직접 할당된 하위 조직이 없습니다.",
+  "directory.organizations.form.errors.load": "조직을 불러오지 못했습니다",
+  "directory.organizations.form.errors.missingId": "조직 식별자가 누락되었습니다.",
+  "directory.organizations.form.errors.notFound": "조직을 찾을 수 없습니다",
+  "directory.organizations.form.field.children": "하위 조직",
+  "directory.organizations.form.field.isActive": "활성",
+  "directory.organizations.form.field.name": "이름",
+  "directory.organizations.form.field.parent": "상위 조직",
+  "directory.organizations.form.field.slug": "슬러그",
+  "directory.organizations.form.field.slug.description": "고객 포털에 사용되는 URL 안전 식별자입니다 (소문자, 숫자, 하이픈, 밑줄).",
+  "directory.organizations.form.field.tenant": "테넌트",
+  "directory.organizations.form.field.tenantReadonlyDescription": "기존 조직의 테넌트를 변경할 수 없습니다.",
+  "directory.organizations.form.group.customFields": "커스텀 데이터",
+  "directory.organizations.form.group.details": "상세 정보",
+  "directory.organizations.form.loading": "조직을 불러오는 중...",
+  "directory.organizations.form.pathLabel": "경로: {path}",
+  "directory.organizations.form.rootOption": "— 최상위 레벨 —",
+  "directory.organizations.form.tenant.select": "테넌트 선택",
+  "directory.organizations.form.title.edit": "조직 편집",
+  "directory.organizations.list.actions.create": "생성",
+  "directory.organizations.list.actions.delete": "삭제",
+  "directory.organizations.list.actions.edit": "편집",
+  "directory.organizations.list.columns.active": "활성",
+  "directory.organizations.list.columns.children": "하위 조직",
+  "directory.organizations.list.columns.organization": "조직",
+  "directory.organizations.list.columns.parent": "상위 조직",
+  "directory.organizations.list.columns.path": "경로",
+  "directory.organizations.list.columns.tenant": "테넌트",
+  "directory.organizations.list.confirmDelete": "조직 \"{{name}}\"을(를) 보관하시겠습니까?",
+  "directory.organizations.list.error.delete": "조직 삭제에 실패했습니다",
+  "directory.organizations.list.error.load": "조직을 불러오지 못했습니다",
+  "directory.organizations.list.filters.active": "활성",
+  "directory.organizations.list.filters.all": "전체",
+  "directory.organizations.list.filters.inactive": "비활성",
+  "directory.organizations.list.filters.status": "상태",
+  "directory.organizations.list.searchPlaceholder": "조직 검색",
+  "directory.organizations.list.title": "조직",
+  "directory.tenants.form.actions.backToList": "테넌트 목록으로 돌아가기",
+  "directory.tenants.form.errors.delete": "테넌트 삭제에 실패했습니다",
+  "directory.tenants.form.errors.load": "테넌트를 불러오지 못했습니다",
+  "directory.tenants.form.errors.notFound": "테넌트를 찾을 수 없습니다",
+  "directory.tenants.form.fields.active": "활성",
+  "directory.tenants.form.fields.name": "이름",
+  "directory.tenants.form.groups.custom": "커스텀 데이터",
+  "directory.tenants.form.groups.details": "상세 정보",
+  "directory.tenants.form.loading": "테넌트를 불러오는 중…",
+  "directory.tenants.form.title.edit": "테넌트 편집",
+  "directory.tenants.list.actions.create": "생성",
+  "directory.tenants.list.columns.active": "활성",
+  "directory.tenants.list.columns.created": "생성일",
+  "directory.tenants.list.columns.tenant": "테넌트",
+  "directory.tenants.list.confirmDelete": "테넌트 \"{{name}}\"을(를) 삭제하시겠습니까? 보관 처리됩니다.",
+  "directory.tenants.list.error.delete": "테넌트 삭제에 실패했습니다",
+  "directory.tenants.list.error.load": "테넌트를 불러오지 못했습니다",
+  "directory.tenants.list.filters.active": "활성",
+  "directory.tenants.list.filters.inactive": "비활성",
+  "directory.tenants.list.filters.status": "상태",
+  "directory.tenants.list.success.delete": "테넌트가 삭제되었습니다",
+  "directory.tenants.list.title": "테넌트"
+}

package/src/modules/directory/i18n/pl.json

@@ -7,6 +7,8 @@
   "directory.audit.tenants.update": "Aktualizuj najemcę",
   "directory.branding.actions.reset": "Użyj domyślnego logo",
   "directory.branding.actions.save": "Zapisz branding",
+  "directory.branding.aspectRatio.description": "Gdy opcja jest wyłączona, sidebar przycina logo do standardowego kształtu ikony.",
+  "directory.branding.aspectRatio.label": "Zachowaj proporcje",
   "directory.branding.currentScope": "Aktualna organizacja",
   "directory.branding.description": "Ustaw logo używane w sidebarze backendu dla aktualnie wybranej organizacji.",
   "directory.branding.errors.blocked": "Zapis brandingu został zablokowany.",
@@ -16,7 +18,7 @@
   "directory.branding.errors.organizationRequired": "Wybierz pojedynczą organizację przed zmianą brandingu sidebara.",
   "directory.branding.errors.save": "Nie udało się zaktualizować brandingu organizacji",
   "directory.branding.errors.upload": "Nie udało się przesłać logo",
-  "directory.branding.file.hint": "Najlepiej sprawdzi się PNG, JPG, WebP albo SVG. Przesłane pliki są zapisywane jako załączniki organizacji.",
+  "directory.branding.file.hint": "Najlepiej sprawdzi się PNG, JPG albo WebP. Przesłane pliki są zapisywane jako załączniki organizacji.",
   "directory.branding.file.label": "Prześlij logo",
   "directory.branding.flash.saved": "Branding organizacji zaktualizowany",
   "directory.branding.loading": "Ładowanie brandingu organizacji...",
@@ -52,6 +54,7 @@
   "directory.organizations.form.field.slug": "Identyfikator URL",
   "directory.organizations.form.field.slug.description": "Identyfikator używany w adresie portalu klienta (małe litery, cyfry, myślniki, podkreślenia).",
   "directory.organizations.form.field.tenant": "Najemca",
+  "directory.organizations.form.field.tenantReadonlyDescription": "Najemcy nie można zmienić dla istniejącej organizacji.",
   "directory.organizations.form.group.customFields": "Dane niestandardowe",
   "directory.organizations.form.group.details": "Szczegóły",
   "directory.organizations.form.loading": "Ładowanie organizacji...",

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

@@ -161,6 +161,23 @@
           "enumItems": [],
           "mappedType": "text"
         },
+        "logo_preserve_aspect_ratio": {
+          "name": "logo_preserve_aspect_ratio",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": "false",
+          "comment": null,
+          "collation": null,
+          "enumItems": [],
+          "mappedType": "boolean"
+        },
         "name": {
           "name": "name",
           "type": "text",
@@ -448,4 +465,4 @@
   ],
   "views": [],
   "nativeEnums": {}
-}
+}

package/src/modules/directory/migrations/Migration20260626145500_directory_logo_preserve_aspect_ratio.ts

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

package/src/modules/directory/subscribers/invalidateOrgScopeCache.ts

@@ -8,6 +8,7 @@
 // for races where the event fires after a request reads the cache.
 
 import { buildOrgScopeTenantCacheTag } from '@open-mercato/core/modules/directory/utils/organizationScope'
+import { runWithCacheTenant } from '@open-mercato/cache'
 
 type CacheService = {
   deleteByTags(tags: string[]): Promise<number>
@@ -34,7 +35,9 @@ export default async function handle(
   }
   if (!cache) return
   try {
-    await cache.deleteByTags([buildOrgScopeTenantCacheTag(tenantId)])
+    await runWithCacheTenant(tenantId, () =>
+      cache.deleteByTags([buildOrgScopeTenantCacheTag(tenantId)]),
+    )
   } catch {
     // best-effort; TTL is the backstop.
   }

package/src/modules/directory/utils/organizationScope.ts

@@ -5,7 +5,7 @@ import { Organization } from '@open-mercato/core/modules/directory/data/entities
 import { isAllOrganizationsSelection } from '@open-mercato/core/modules/directory/constants'
 import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
 import type { AuthContext } from '@open-mercato/shared/lib/auth/server'
-import type { CacheStrategy } from '@open-mercato/cache'
+import { getCurrentCacheTenant, runWithCacheTenant, type CacheStrategy } from '@open-mercato/cache'
 import { parseSelectedOrganizationCookie, parseSelectedTenantCookie } from './scopeCookies'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
@@ -104,11 +104,15 @@ function resolveCacheFromContainer(container: AwilixContainer | null | undefined
 export async function invalidateOrganizationScopeCacheForUser(
   container: AwilixContainer,
   userId: string,
+  tenantId?: string | null,
 ): Promise<void> {
   const cache = resolveCacheFromContainer(container)
   if (!cache?.deleteByTags) return
   try {
-    await cache.deleteByTags([buildOrgScopeUserCacheTag(userId)])
+    const cacheTenantId = tenantId === undefined ? getCurrentCacheTenant() : tenantId
+    await runWithCacheTenant(cacheTenantId, () =>
+      cache.deleteByTags([buildOrgScopeUserCacheTag(userId)]),
+    )
   } catch (err) {
     logger.warn('Cache invalidate user failed', { err })
   }
@@ -121,7 +125,9 @@ export async function invalidateOrganizationScopeCacheForTenant(
   const cache = resolveCacheFromContainer(container)
   if (!cache?.deleteByTags) return
   try {
-    await cache.deleteByTags([buildOrgScopeTenantCacheTag(tenantId)])
+    await runWithCacheTenant(tenantId, () =>
+      cache.deleteByTags([buildOrgScopeTenantCacheTag(tenantId)]),
+    )
   } catch (err) {
     logger.warn('Cache invalidate tenant failed', { err })
   }

package/src/modules/entities/api/definitions.ts

@@ -14,6 +14,7 @@ import {
 } from './definitions.cache'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { filterSelectableSystemEntityIds, isSystemEntitySelectable } from '@open-mercato/shared/lib/entities/system-entities'
+import { isOrmBackedSystemEntityId } from '@open-mercato/shared/lib/data/engine'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import { loadEntityFieldsetConfigs, CustomFieldsetDefinition } from '../lib/fieldsets'
 import { installCustomEntitiesFromModules } from '../lib/install-from-ce'
@@ -24,6 +25,12 @@ import {
   beginEntitiesMutationGuard,
   FIELD_DEFINITION_RESOURCE_KIND,
 } from './definitions.mutation-guard'
+import {
+  canReadAllEntityMetadata,
+  canReadEntityMetadata,
+  getDeclaredCustomEntityRestriction,
+  resolveEntityAclRequirement,
+} from '../lib/entityAcl'
 import {
   createExactDefinitionWhere,
   createScopedDefinitionTombstone,
@@ -226,8 +233,8 @@ export async function GET(req: Request) {
   const auth = await getAuthFromRequest(req)
   if (!auth) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
 
-  const entityIds = filterSelectableSystemEntityIds(requestedEntityIds)
-  if (!entityIds.length) {
+  const selectableEntityIds = filterSelectableSystemEntityIds(requestedEntityIds)
+  if (!selectableEntityIds.length) {
     return NextResponse.json({ items: [] })
   }
 
@@ -241,6 +248,48 @@ export async function GET(req: Request) {
   const organizationId = definitionScope.organizationId
   const { resolve } = container
   const em = resolve('em') as any
+  const rbac = resolve('rbacService') as RbacService
+  const acl = await rbac.loadAcl(auth.sub ?? '', {
+    tenantId,
+    organizationId,
+  })
+  const designerCanRead = canReadAllEntityMetadata(acl)
+  const customEntityRestrictions = new Map<string, boolean>()
+  for (const entityId of selectableEntityIds) {
+    if (isOrmBackedSystemEntityId(em, entityId)) continue
+    const declaredRestriction = getDeclaredCustomEntityRestriction(entityId)
+    if (declaredRestriction !== undefined) customEntityRestrictions.set(entityId, declaredRestriction)
+  }
+  if (!designerCanRead) {
+    const unresolvedEntityIds = selectableEntityIds.filter(
+      (entityId) => !resolveEntityAclRequirement(entityId) && !customEntityRestrictions.has(entityId),
+    )
+    if (unresolvedEntityIds.length) {
+      const registrations = await em.find(CustomEntity as any, {
+        entityId: { $in: unresolvedEntityIds },
+        isActive: true,
+        $and: [
+          { $or: [{ tenantId }, { tenantId: null }] },
+          { $or: [{ organizationId }, { organizationId: null }] },
+        ],
+      } as any)
+      for (const registration of registrations as any[]) {
+        const entityId = String(registration.entityId)
+        if (!isOrmBackedSystemEntityId(em, entityId)) {
+          customEntityRestrictions.set(entityId, registration.accessRestricted === true)
+        }
+      }
+    }
+  }
+  const entityIds = selectableEntityIds.filter((entityId) => canReadEntityMetadata({
+    entityId,
+    isCustomEntity: customEntityRestrictions.has(entityId),
+    isRestricted: customEntityRestrictions.get(entityId) === true,
+    acl,
+  }))
+  if (!entityIds.length) {
+    return NextResponse.json({ items: [], fieldsetsByEntity: {}, entitySettings: {} })
+  }
   let cache: CacheStrategy | undefined
   try {
     cache = resolve('cache') as CacheStrategy
@@ -249,7 +298,6 @@ export async function GET(req: Request) {
   let canManageDefinitions = false
   if (typeof auth.sub === 'string' && auth.sub.length > 0) {
     try {
-      const rbac = resolve('rbacService') as RbacService
       canManageDefinitions = await rbac.userHasAllFeatures(auth.sub, ['entities.definitions.manage'], {
         tenantId,
         organizationId,
@@ -393,6 +441,9 @@ export async function GET(req: Request) {
         label: d.configJson?.label || d.key,
         description: d.configJson?.description || undefined,
         multi: Boolean(d.configJson?.multi),
+        relatedEntityId: d.kind === 'relation' && typeof d.configJson?.relatedEntityId === 'string'
+          ? d.configJson.relatedEntityId.trim() || undefined
+          : undefined,
         options: (() => {
           if (d.kind === 'currency') return undefined
           const normalizedOptions = normalizeCustomFieldOptions(d.configJson?.options)
@@ -659,6 +710,7 @@ const customFieldDefinitionSchema = z.object({
   label: z.string(),
   description: z.string().optional(),
   multi: z.boolean().optional(),
+  relatedEntityId: z.string().optional(),
   options: z.array(customFieldOptionValueSchema).optional(),
   optionsUrl: z.string().optional(),
   filterable: z.boolean().optional(),

package/src/modules/entities/api/entities.ts

@@ -10,6 +10,8 @@ import { isSystemEntitySelectable } from '@open-mercato/shared/lib/entities/syst
 import { SYSTEM_ENTITY_RECORDS_BLOCKED_CODE, isOrmBackedSystemEntityId } from '@open-mercato/shared/lib/data/engine'
 import { enforceCommandOptimisticLockWithGuards } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
 import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
+import { canReadEntityMetadata, getDeclaredCustomEntityRestriction } from '../lib/entityAcl'
 import {
   beginEntitiesMutationGuard,
   ENTITY_DEFINITION_RESOURCE_KIND,
@@ -29,6 +31,11 @@ export async function GET(req: Request) {
 
   const { resolve } = await createRequestContainer()
   const em = resolve('em') as any
+  const rbac = resolve('rbacService') as RbacService
+  const acl = await rbac.loadAcl(auth.sub ?? '', {
+    tenantId: auth.tenantId,
+    organizationId: auth.orgId ?? null,
+  })
 
   // Generated entities from code
   const AllEntities = getEntityIds()
@@ -79,8 +86,27 @@ export async function GET(req: Request) {
     byId.set(cu.entityId, { ...existing, ...cu, source: existing?.source ?? cu.source })
   }
 
+  const visibleEntityIds = new Set(
+    Array.from(byId.values())
+      .filter((item: any) => {
+        const isOrmBacked = isOrmBackedSystemEntityId(em, item.entityId)
+        const declaredRestriction = isOrmBacked
+          ? undefined
+          : getDeclaredCustomEntityRestriction(item.entityId)
+        return canReadEntityMetadata({
+          entityId: item.entityId,
+          isCustomEntity: !isOrmBacked
+            && (item.source === 'custom' || declaredRestriction !== undefined),
+          isRestricted: declaredRestriction ?? item.accessRestricted === true,
+          acl,
+        })
+      })
+      .map((item: any) => item.entityId),
+  )
+  if (!visibleEntityIds.size) return NextResponse.json({ items: [] })
+
   // Count field definitions scoped to current tenant/org (same scoping as custom entities)
-  const defsWhere: any = { isActive: true }
+  const defsWhere: any = { isActive: true, entityId: { $in: Array.from(visibleEntityIds) } }
   defsWhere.$and = [
     //{ $or: [ { organizationId: auth.orgId ?? undefined as any }, { organizationId: null } ] }, // the entities and custom fields are defined per tenant
     { tenantId: auth.tenantId ?? undefined as any },
@@ -99,7 +125,9 @@ export async function GET(req: Request) {
   const counts: Record<string, number> = {}
   for (const [eid, set] of keySets.entries()) counts[eid] = set.size
 
-  const items = Array.from(byId.values()).map((it: any) => ({ ...it, count: counts[it.entityId] || 0 }))
+  const items = Array.from(byId.values())
+    .filter((item: any) => visibleEntityIds.has(item.entityId))
+    .map((item: any) => ({ ...item, count: counts[item.entityId] || 0 }))
   return NextResponse.json({ items })
 }