@open-mercato/core 0.6.7 → 0.6.8-develop.6875.1.871a4afc94

package/src/modules/dictionaries/lib/fetchAllEntries.ts

@@ -0,0 +1,72 @@
+"use client"
+
+import { fetchAllOffsetPages } from '@open-mercato/ui/backend/utils/fetchAllPages'
+import {
+  resolveDictionaryEntrySortMode,
+  sortDictionaryEntries,
+  type DictionaryEntrySortItem,
+} from './entrySort'
+
+export type DictionaryEntryItem = Record<string, unknown>
+
+export type DictionaryEntriesResult = {
+  ok: boolean
+  items: DictionaryEntryItem[]
+  pageCount: number
+  errorMessage: string | null
+}
+
+type DictionaryEntrySortView = DictionaryEntrySortItem & { entry: DictionaryEntryItem }
+
+function toRecords(items: unknown[]): DictionaryEntryItem[] {
+  return items.filter((item): item is DictionaryEntryItem => !!item && typeof item === 'object')
+}
+
+function toSortView(entry: DictionaryEntryItem): DictionaryEntrySortView {
+  const value = typeof entry.value === 'string' ? entry.value.trim() : ''
+  const label = typeof entry.label === 'string' ? entry.label.trim() : ''
+  return {
+    entry,
+    id: typeof entry.id === 'string' ? entry.id : null,
+    value: value.length ? value : null,
+    label: label.length ? label : null,
+    createdAt: typeof entry.createdAt === 'string' ? entry.createdAt : null,
+  }
+}
+
+/**
+ * Load every entry of a dictionary, walking the entries route's page cap.
+ *
+ * The route bounds each response, so any consumer that needs the full option
+ * list must page — reading `items` from a single request silently drops
+ * everything past the ceiling and makes those values unselectable.
+ */
+export async function fetchAllDictionaryEntries(
+  dictionaryId: string,
+): Promise<DictionaryEntriesResult> {
+  const pages = await fetchAllOffsetPages(`/api/dictionaries/${dictionaryId}/entries`)
+  const records = toRecords(pages.items)
+
+  if (!pages.ok) {
+    const error = pages.errorPayload?.error
+    return {
+      ok: false,
+      items: records,
+      pageCount: pages.pageCount,
+      errorMessage: typeof error === 'string' ? error : null,
+    }
+  }
+
+  // The route bounds each response and orders it in memory, so entries
+  // assembled from several pages are only sorted within each page. Re-apply the
+  // mode that produced them across the whole set. A single-page dictionary —
+  // every dictionary at or below the route ceiling — keeps the server ordering
+  // byte-for-byte.
+  if (pages.pageCount <= 1) {
+    return { ok: true, items: records, pageCount: pages.pageCount, errorMessage: null }
+  }
+
+  const sortMode = resolveDictionaryEntrySortMode(pages.firstPayload.sortMode)
+  const sorted = sortDictionaryEntries(records.map(toSortView), sortMode).map((view) => view.entry)
+  return { ok: true, items: sorted, pageCount: pages.pageCount, errorMessage: null }
+}

package/src/modules/directory/api/organization-branding/route.ts

@@ -32,11 +32,13 @@ const brandingResponseSchema = z.object({
   organizationName: z.string(),
   tenantId: z.string().uuid(),
   logoUrl: z.string().nullable(),
+  logoPreserveAspectRatio: z.boolean(),
   updatedAt: z.string().nullable(),
 })
 
 const brandingUpdateSchema = z.object({
   logoUrl: organizationUpdateSchema.shape.logoUrl,
+  logoPreserveAspectRatio: organizationUpdateSchema.shape.logoPreserveAspectRatio,
 })
 
 const errorSchema = z.object({
@@ -132,6 +134,7 @@ function toResponsePayload(organization: Organization, tenantId: string) {
     organizationName: organization.name,
     tenantId,
     logoUrl: organization.logoUrl ?? null,
+    logoPreserveAspectRatio: !!organization.logoPreserveAspectRatio,
     updatedAt: toIsoOrNull(organization.updatedAt),
   }
 }
@@ -211,7 +214,12 @@ export async function PUT(req: Request) {
       operation: 'update',
       requestMethod: req.method,
       requestHeaders: req.headers,
-      mutationPayload: { logoUrl: parsed.data.logoUrl ?? null },
+      mutationPayload: {
+        logoUrl: parsed.data.logoUrl ?? null,
+        ...(parsed.data.logoPreserveAspectRatio !== undefined
+          ? { logoPreserveAspectRatio: parsed.data.logoPreserveAspectRatio }
+          : {}),
+      },
     })
     if (guardResult && !guardResult.ok) {
       return NextResponse.json(guardResult.body, { status: guardResult.status })
@@ -232,6 +240,9 @@ export async function PUT(req: Request) {
           id: resolved.organizationId,
           tenantId: resolved.tenantId,
           logoUrl: parsed.data.logoUrl ?? null,
+          ...(parsed.data.logoPreserveAspectRatio !== undefined
+            ? { logoPreserveAspectRatio: parsed.data.logoPreserveAspectRatio }
+            : {}),
         },
         ctx,
       },

package/src/modules/directory/api/organization-switcher/route.ts

@@ -6,12 +6,19 @@ import { Organization } from '@open-mercato/core/modules/directory/data/entities
 import { computeHierarchyForOrganizations, type ComputedHierarchy } from '@open-mercato/core/modules/directory/lib/hierarchy'
 import { isAllOrganizationsSelection } from '@open-mercato/core/modules/directory/constants'
 import {
+  buildOrgScopeTenantCacheTag,
   getSelectedOrganizationFromRequest,
   getSelectedTenantFromRequest,
   resolveOrganizationScope,
 } from '@open-mercato/core/modules/directory/utils/organizationScope'
+import { runWithCacheTenant, type CacheStrategy } from '@open-mercato/cache'
 import type { OpenApiMethodDoc, OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
-import { directoryTag, directoryErrorSchema, organizationSwitcherResponseSchema } from '../openapi'
+import {
+  directoryTag,
+  directoryErrorSchema,
+  directoryIdSchema,
+  organizationSwitcherResponseSchema,
+} from '../openapi'
 import { Tenant } from '@open-mercato/core/modules/directory/data/entities'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
@@ -19,6 +26,21 @@ import type { FilterQuery } from '@mikro-orm/core'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('directory').child({ component: 'organization-switcher' })
+const ORGANIZATION_SWITCHER_CACHE_TTL_MS = 60_000
+const organizationSwitcherCachePayloadSchema = organizationSwitcherResponseSchema.or(
+  organizationSwitcherResponseSchema.pick({
+    items: true,
+    selectedId: true,
+    canManage: true,
+  }),
+)
+
+function buildSelectionCacheKeyPart(rawSelected: string | null): string | null {
+  if (isAllOrganizationsSelection(rawSelected)) return 'mode:all'
+  if (rawSelected === null) return 'mode:none'
+  const parsedOrganizationId = directoryIdSchema.safeParse(rawSelected)
+  return parsedOrganizationId.success ? `org:${parsedOrganizationId.data.toLowerCase()}` : null
+}
 
 type OrganizationMenuNode = {
   id: string
@@ -141,6 +163,49 @@ export async function GET(req: NextRequest) {
       })
     }
 
+    const rawSelected = getSelectedOrganizationFromRequest(req)
+    const requestedAll = isAllOrganizationsSelection(rawSelected)
+    const selectedKeyPart = buildSelectionCacheKeyPart(rawSelected)
+    const cacheKey = selectedKeyPart
+      ? `org-switcher:v1:${auth.sub}:${tenantId}:${selectedKeyPart}`
+      : null
+    let cache: CacheStrategy | null = null
+    if (!actorIsSuperAdmin && cacheKey) {
+      try {
+        cache = container.resolve<CacheStrategy>('cache')
+      } catch {
+        cache = null
+      }
+    }
+
+    const logAccess = async (payload: { items: unknown[]; selectedId: string | null }) => {
+      await logCrudAccess({
+        container,
+        auth,
+        request: req,
+        items: payload.items,
+        idField: 'id',
+        resourceKind: 'directory.organization_switcher',
+        organizationId: payload.selectedId,
+        tenantId,
+        query: Object.fromEntries(url.searchParams.entries()),
+      })
+    }
+
+    if (cache && cacheKey) {
+      const activeCache = cache
+      try {
+        const cached = await runWithCacheTenant(tenantId, () => activeCache.get(cacheKey))
+        const parsedCached = organizationSwitcherCachePayloadSchema.safeParse(cached)
+        if (parsedCached.success) {
+          await logAccess(parsedCached.data)
+          return NextResponse.json(parsedCached.data)
+        }
+      } catch (err) {
+        logger.warn('Failed to read organization switcher cache', { err })
+      }
+    }
+
     const scopedOrgId = actorTenantId && actorTenantId === tenantId ? auth.orgId ?? null : null
     const acl = await rbac.loadAcl(auth.sub, { tenantId, organizationId: scopedOrgId })
     const aclIsSuperAdmin = acl?.isSuperAdmin === true
@@ -163,9 +228,7 @@ export async function GET(req: NextRequest) {
       { orderBy: { name: 'ASC' } },
     )
     const hierarchy = computeHierarchyForOrganizations(orgEntities, tenantId)
-    const rawSelected = getSelectedOrganizationFromRequest(req)
     let hasSelectionCookie = rawSelected !== null
-    const requestedAll = isAllOrganizationsSelection(rawSelected)
     const scope = await resolveOrganizationScope({
       em,
       rbac,
@@ -194,32 +257,40 @@ export async function GET(req: NextRequest) {
     }
 
     const showMenu = menuData.nodes.length > 0 || hasManageFeature || effectiveIsSuperAdmin
-    if (!showMenu) {
-      return NextResponse.json({ items: [], selectedId: null, canManage: false })
-    }
+    const response = showMenu
+      ? {
+          items: menuData.nodes,
+          selectedId,
+          canManage: !!hasManageFeature,
+          canViewAllOrganizations: accessible === null,
+          tenantId,
+          tenants: tenantRecords,
+          isSuperAdmin: effectiveIsSuperAdmin,
+        }
+      : {
+          items: [],
+          selectedId: null,
+          canManage: false,
+        }
 
-    const canViewAllOrganizations = accessible === null
-    const response = {
-      items: menuData.nodes,
-      selectedId,
-      canManage: !!hasManageFeature,
-      canViewAllOrganizations,
-      tenantId,
-      tenants: tenantRecords,
-      isSuperAdmin: effectiveIsSuperAdmin,
+    if (cache && cacheKey) {
+      const activeCache = cache
+      try {
+        await runWithCacheTenant(tenantId, () =>
+          activeCache.set(cacheKey, response, {
+            ttl: ORGANIZATION_SWITCHER_CACHE_TTL_MS,
+            tags: [
+              buildOrgScopeTenantCacheTag(tenantId),
+              `rbac:user:${auth.sub}`,
+            ],
+          }),
+        )
+      } catch (err) {
+        logger.warn('Failed to write organization switcher cache', { err })
+      }
     }
 
-    await logCrudAccess({
-      container,
-      auth,
-      request: req,
-      items: response.items,
-      idField: 'id',
-      resourceKind: 'directory.organization_switcher',
-      organizationId: response.selectedId,
-      tenantId,
-      query: Object.fromEntries(url.searchParams.entries()),
-    })
+    await logAccess(response)
 
     return NextResponse.json(response)
   } catch (err) {

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

@@ -251,6 +251,7 @@ export async function GET(req: Request) {
       id: stringId(org.id),
       name: org.name,
       logoUrl: org.logoUrl ?? null,
+      logoPreserveAspectRatio: !!org.logoPreserveAspectRatio,
       parentId: org.parentId ?? null,
       tenantId: tenantId,
       isActive: !!org.isActive,
@@ -344,10 +345,12 @@ export async function GET(req: Request) {
     const slugByOrgId = new Map<string, string | null>()
     const updatedAtByOrgId = new Map<string, string | null>()
     const logoUrlByOrgId = new Map<string, string | null>()
+    const logoPreserveAspectRatioByOrgId = new Map<string, boolean>()
     for (const org of allOrgs) {
       slugByOrgId.set(String(org.id), org.slug ?? null)
       updatedAtByOrgId.set(String(org.id), org.updatedAt instanceof Date ? org.updatedAt.toISOString() : null)
       logoUrlByOrgId.set(String(org.id), org.logoUrl ?? null)
+      logoPreserveAspectRatioByOrgId.set(String(org.id), !!org.logoPreserveAspectRatio)
     }
 
     const tenantIds = Array.from(byTenant.keys())
@@ -433,6 +436,7 @@ export async function GET(req: Request) {
         slug: slugByOrgId.get(recordId) ?? null,
         updatedAt: updatedAtByOrgId.get(recordId) ?? null,
         logoUrl: logoUrlByOrgId.get(recordId) ?? null,
+        logoPreserveAspectRatio: logoPreserveAspectRatioByOrgId.get(recordId) ?? false,
         tenantId: tid,
         tenantName: tenantNameMap[tid] ?? tid,
         parentId: node.parentId,
@@ -475,10 +479,12 @@ export async function GET(req: Request) {
   const hierarchy = computeHierarchyForOrganizations(orgs, tenantId)
   const slugByOrgId = new Map<string, string | null>()
   const logoUrlByOrgId = new Map<string, string | null>()
+  const logoPreserveAspectRatioByOrgId = new Map<string, boolean>()
   const updatedAtByOrgId = new Map<string, string | null>()
   for (const org of orgs) {
     slugByOrgId.set(String(org.id), org.slug ?? null)
     logoUrlByOrgId.set(String(org.id), org.logoUrl ?? null)
+    logoPreserveAspectRatioByOrgId.set(String(org.id), !!org.logoPreserveAspectRatio)
     updatedAtByOrgId.set(String(org.id), org.updatedAt instanceof Date ? org.updatedAt.toISOString() : null)
   }
 
@@ -543,6 +549,7 @@ export async function GET(req: Request) {
       name: node.name,
       slug: slugByOrgId.get(recordId) ?? null,
       logoUrl: logoUrlByOrgId.get(recordId) ?? null,
+      logoPreserveAspectRatio: logoPreserveAspectRatioByOrgId.get(recordId) ?? false,
       updatedAt: updatedAtByOrgId.get(recordId) ?? null,
       tenantId: node.tenantId,
       tenantName,

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

@@ -2,7 +2,9 @@ import { NextResponse } from 'next/server'
 import { z } from 'zod'
 import { logCrudAccess, makeCrudRoute } from '@open-mercato/shared/lib/crud/factory'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
+import { resolveIsSuperAdmin } from '@open-mercato/core/modules/auth/lib/tenantAccess'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
+
 import { Tenant } from '@open-mercato/core/modules/directory/data/entities'
 import { tenantCreateSchema, tenantUpdateSchema } from '@open-mercato/core/modules/directory/data/validators'
 import { loadCustomFieldValues, buildCustomFieldFiltersFromQuery } from '@open-mercato/shared/lib/crud/custom-fields'
@@ -94,6 +96,12 @@ export async function GET(req: Request) {
     return NextResponse.json({ items: [], total: 0, page: 1, pageSize: 50, totalPages: 1 }, { status: 401 })
   }
 
+  const container = await createRequestContainer()
+  const isSuperAdmin = await resolveIsSuperAdmin({ auth, container })
+  if (!isSuperAdmin) {
+    return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
+  }
+
   const url = new URL(req.url)
   const parsed = listQuerySchema.safeParse({
     id: url.searchParams.get('id') ?? undefined,
@@ -111,7 +119,6 @@ export async function GET(req: Request) {
     )
   }
 
-  const container = await createRequestContainer()
   const em = container.resolve('em') as EntityManager
 
   const { id, page, pageSize, search, sortField, sortDir, isActive } = parsed.data
@@ -256,6 +263,7 @@ const tenantGetDoc: OpenApiMethodDoc = {
   errors: [
     { status: 400, description: 'Invalid query parameters', schema: directoryErrorSchema },
     { status: 401, description: 'Authentication required', schema: directoryErrorSchema },
+    { status: 403, description: 'Requires super-admin', schema: directoryErrorSchema },
   ],
 }
 

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

@@ -12,6 +12,7 @@ import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimi
 import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Input } from '@open-mercato/ui/primitives/input'
+import { SwitchField } from '@open-mercato/ui/primitives/switch-field'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 
 type BrandingPayload = {
@@ -19,6 +20,7 @@ type BrandingPayload = {
   organizationName: string
   tenantId: string
   logoUrl: string | null
+  logoPreserveAspectRatio: boolean
   updatedAt: string | null
 }
 
@@ -38,6 +40,7 @@ export default function OrganizationBrandingPage() {
   const t = useT()
   const queryClient = useQueryClient()
   const [logoUrl, setLogoUrl] = React.useState('')
+  const [logoPreserveAspectRatio, setLogoPreserveAspectRatio] = React.useState(false)
   const [selectedFile, setSelectedFile] = React.useState<File | null>(null)
   const [filePreviewUrl, setFilePreviewUrl] = React.useState<string | null>(null)
   const [saving, setSaving] = React.useState(false)
@@ -58,8 +61,9 @@ export default function OrganizationBrandingPage() {
 
   React.useEffect(() => {
     setLogoUrl(data?.logoUrl ?? '')
+    setLogoPreserveAspectRatio(data?.logoPreserveAspectRatio ?? false)
     setSelectedFile(null)
-  }, [data?.logoUrl])
+  }, [data?.logoPreserveAspectRatio, data?.logoUrl])
 
   React.useEffect(() => {
     if (!selectedFile || typeof URL === 'undefined') {
@@ -89,12 +93,16 @@ export default function OrganizationBrandingPage() {
       },
       { errorMessage: t('directory.branding.errors.upload', 'Failed to upload logo') },
     )
-    return upload?.item.thumbnailUrl ?? upload?.item.url ?? null
+    return upload?.item.url ?? upload?.item.thumbnailUrl ?? null
   }, [selectedFile, t])
 
-  const saveBranding = React.useCallback(async (nextLogoUrl?: string, options?: { skipUpload?: boolean }) => {
+  const saveBranding = React.useCallback(async (
+    nextLogoUrl?: string,
+    options?: { skipUpload?: boolean; logoPreserveAspectRatio?: boolean },
+  ) => {
     if (!data) return
     const shouldUpload = Boolean(selectedFile && !options?.skipUpload)
+    const resolvedLogoPreserveAspectRatio = options?.logoPreserveAspectRatio ?? logoPreserveAspectRatio
     setSaving(true)
     try {
       await runMutation({
@@ -108,7 +116,10 @@ export default function OrganizationBrandingPage() {
               {
                 method: 'PUT',
                 headers: { 'content-type': 'application/json' },
-                body: JSON.stringify({ logoUrl: resolvedLogoUrl || null }),
+                body: JSON.stringify({
+                  logoUrl: resolvedLogoUrl || null,
+                  logoPreserveAspectRatio: resolvedLogoPreserveAspectRatio,
+                }),
               },
               { errorMessage: t('directory.branding.errors.save', 'Failed to update organization branding') },
             ),
@@ -123,6 +134,7 @@ export default function OrganizationBrandingPage() {
         mutationPayload: {
           organizationId: data.organizationId,
           logoUrl: (nextLogoUrl ?? logoUrl.trim()) || null,
+          logoPreserveAspectRatio: resolvedLogoPreserveAspectRatio,
           hasUpload: shouldUpload,
         },
       })
@@ -139,7 +151,7 @@ export default function OrganizationBrandingPage() {
     } finally {
       setSaving(false)
     }
-  }, [data, logoUrl, queryClient, runMutation, selectedFile, t, uploadLogo])
+  }, [data, logoPreserveAspectRatio, logoUrl, queryClient, runMutation, selectedFile, t, uploadLogo])
 
   const handleSubmit = React.useCallback((event: React.FormEvent<HTMLFormElement>) => {
     event.preventDefault()
@@ -177,7 +189,7 @@ export default function OrganizationBrandingPage() {
                   <img
                     src={currentPreviewUrl}
                     alt={t('directory.branding.previewAlt', '{{name}} logo preview', { name: data.organizationName })}
-                    className="h-full w-full object-contain"
+                    className={`h-full w-full ${logoPreserveAspectRatio ? 'object-contain' : 'rounded-full object-cover'}`}
                   />
                 ) : (
                   <ImagePlus className="size-10 text-muted-foreground" aria-hidden />
@@ -198,7 +210,7 @@ export default function OrganizationBrandingPage() {
                   ref={fileInputRef}
                   id="organization-logo-file"
                   type="file"
-                  accept="image/png,image/jpeg,image/webp,image/svg+xml"
+                  accept="image/png,image/jpeg,image/webp"
                   onChange={(event) => {
                     const file = event.currentTarget.files?.[0]
                     if (!file) return
@@ -206,7 +218,7 @@ export default function OrganizationBrandingPage() {
                   }}
                 />
                 <p className="text-xs text-muted-foreground">
-                  {t('directory.branding.file.hint', 'PNG, JPG, WebP, or SVG works best. Uploaded files are stored as organization attachments.')}
+                  {t('directory.branding.file.hint', 'PNG, JPG, or WebP works best. Uploaded files are stored as organization attachments.')}
                 </p>
               </div>
 
@@ -225,6 +237,18 @@ export default function OrganizationBrandingPage() {
                 </p>
               </div>
 
+              <SwitchField
+                id="organization-logo-preserve-aspect-ratio"
+                label={t('directory.branding.aspectRatio.label', 'Keep the aspect ratio')}
+                description={t(
+                  'directory.branding.aspectRatio.description',
+                  'When disabled, the sidebar crops the logo into the standard icon shape.',
+                )}
+                checked={logoPreserveAspectRatio}
+                disabled={saving}
+                onCheckedChange={setLogoPreserveAspectRatio}
+              />
+
               <div className="flex flex-wrap items-center gap-2">
                 <Button type="submit" disabled={saving}>
                   {saving ? <Loader2 className="mr-2 size-4 animate-spin" aria-hidden /> : <Save className="mr-2 size-4" aria-hidden />}
@@ -238,7 +262,8 @@ export default function OrganizationBrandingPage() {
                     setSelectedFile(null)
                     if (fileInputRef.current) fileInputRef.current.value = ''
                     setLogoUrl('')
-                    void saveBranding('', { skipUpload: true })
+                    setLogoPreserveAspectRatio(false)
+                    void saveBranding('', { skipUpload: true, logoPreserveAspectRatio: false })
                   }}
                 >
                   <RotateCcw className="mr-2 size-4" aria-hidden />

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

@@ -5,7 +5,6 @@ import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { extractCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-fields-client'
 import { E } from '#generated/entities.ids.generated'
 import { OrganizationSelect } from '@open-mercato/core/modules/directory/components/OrganizationSelect'
-import { TenantSelect } from '@open-mercato/core/modules/directory/components/TenantSelect'
 import {
   buildOrganizationTreeOptions,
   type OrganizationTreeNode,
@@ -52,6 +51,7 @@ export default function EditOrganizationPage({ params }: { params?: { id?: strin
   const [initialValues, setInitialValues] = React.useState<Record<string, unknown> | null>(null)
   const [pathLabel, setPathLabel] = React.useState<string>('')
   const [tenantId, setTenantId] = React.useState<string | null>(null)
+  const [tenantName, setTenantName] = React.useState<string | null>(null)
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
   const [isNotFound, setIsNotFound] = React.useState(false)
@@ -133,6 +133,7 @@ export default function EditOrganizationPage({ params }: { params?: { id?: strin
         }
         const resolvedTenantId = record.tenantId || null
         setTenantId(resolvedTenantId)
+        setTenantName(record.tenantName ?? null)
         const baseTree = await loadParentTree(resolvedTenantId, record.descendantIds ?? [])
         const fullTree = buildOrganizationTreeOptions(baseTree)
         const nodeMap = new Map(fullTree.map((opt) => [opt.value, opt]))
@@ -199,18 +200,13 @@ export default function EditOrganizationPage({ params }: { params?: { id?: strin
         id: 'tenantId',
         label: t('directory.organizations.form.field.tenant', 'Tenant'),
         type: 'custom',
-        component: ({ value, setValue }) => (
-          <TenantSelect
-            id="tenantId"
-            value={typeof value === 'string' ? value : tenantId}
-            onChange={(next) => {
-              const normalized = next ?? null
-              setTenantId(normalized)
-              setValue(normalized)
-            }}
-            includeEmptyOption={false}
-            className="w-full h-9 rounded border px-2 text-sm"
-          />
+        component: () => (
+          <div>
+            <p className="text-sm">{tenantName ?? '—'}</p>
+            <p className="mt-1 text-xs text-muted-foreground">
+              {t('directory.organizations.form.field.tenantReadonlyDescription', 'Tenant cannot be changed for an existing organization.')}
+            </p>
+          </div>
         ),
       } as CrudField,
     ] : []),
@@ -260,7 +256,7 @@ export default function EditOrganizationPage({ params }: { params?: { id?: strin
       },
     },
     { id: 'isActive', label: t('directory.organizations.form.field.isActive', 'Active'), type: 'checkbox' },
-  ], [actorIsSuperAdmin, childSummary, parentTree, t, tenantId])
+  ], [actorIsSuperAdmin, childSummary, parentTree, t, tenantId, tenantName])
 
   const detailFields = React.useMemo(() => (
     actorIsSuperAdmin

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

@@ -1,5 +1,6 @@
 "use client"
 import * as React from 'react'
+import { extensionPoints } from '@open-mercato/core/modules/directory/extension-points'
 import Link from 'next/link'
 import { useQuery, useQueryClient } from '@tanstack/react-query'
 import type { ColumnDef } from '@tanstack/react-table'
@@ -271,7 +272,7 @@ export default function DirectoryOrganizationsPage() {
             setPage(1)
           }}
           sortable={false}
-          perspective={{ tableId: 'directory.organizations.list' }}
+          perspective={{ tableId: extensionPoints.hosts.organizationsTable.tableId }}
           rowActions={(row) => (
             canManage ? (
               <RowActions

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

@@ -1,5 +1,6 @@
 "use client"
 import * as React from 'react'
+import { extensionPoints } from '@open-mercato/core/modules/directory/extension-points'
 import Link from 'next/link'
 import { useQuery, useQueryClient } from '@tanstack/react-query'
 import type { ColumnDef, SortingState } from '@tanstack/react-table'
@@ -193,7 +194,7 @@ export default function DirectoryTenantsPage() {
           sortable
           sorting={sorting}
           onSortingChange={(state) => { setSorting(state); setPage(1) }}
-          perspective={{ tableId: 'directory.tenants.list' }}
+          perspective={{ tableId: extensionPoints.hosts.tenantsTable.tableId }}
           rowActions={(row) => (
             canManage ? (
               <RowActions

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

@@ -85,6 +85,7 @@ type OrganizationUndoSnapshot = {
   name: string
   slug?: string | null
   logoUrl?: string | null
+  logoPreserveAspectRatio?: boolean
   isActive: boolean
   parentId: string | null
   childParents: ChildParentSnapshot[]
@@ -122,6 +123,7 @@ function serializeOrganization(entity: Organization, custom?: Record<string, unk
     name: entity.name,
     slug: entity.slug ?? null,
     logoUrl: entity.logoUrl ?? null,
+    logoPreserveAspectRatio: !!entity.logoPreserveAspectRatio,
     isActive: !!entity.isActive,
     parentId: entity.parentId ?? null,
     ancestorIds: Array.isArray(entity.ancestorIds) ? [...entity.ancestorIds] : [],
@@ -147,6 +149,7 @@ function captureOrganizationSnapshots(
       name: entity.name,
       slug: entity.slug ?? null,
       logoUrl: entity.logoUrl ?? null,
+      logoPreserveAspectRatio: !!entity.logoPreserveAspectRatio,
       isActive: !!entity.isActive,
       parentId: entity.parentId ?? null,
       childParents: (childParents ?? []).map((entry) => ({
@@ -307,6 +310,7 @@ const createOrganizationCommand: CommandHandler<Record<string, unknown>, Organiz
             name: parsed.name,
             slug,
             logoUrl: parsed.logoUrl ?? null,
+            logoPreserveAspectRatio: parsed.logoPreserveAspectRatio ?? false,
             isActive: parsed.isActive ?? true,
             parentId,
           },
@@ -434,6 +438,7 @@ const createOrganizationCommand: CommandHandler<Record<string, unknown>, Organiz
           existing.name = after.name
           if (after.slug !== undefined) existing.slug = after.slug ?? null
           if (after.logoUrl !== undefined) existing.logoUrl = after.logoUrl ?? null
+          if (after.logoPreserveAspectRatio !== undefined) existing.logoPreserveAspectRatio = !!after.logoPreserveAspectRatio
           existing.isActive = after.isActive
           existing.parentId = after.parentId
           await em.flush()
@@ -446,6 +451,7 @@ const createOrganizationCommand: CommandHandler<Record<string, unknown>, Organiz
               name: after.name,
               slug: after.slug ?? null,
               logoUrl: after.logoUrl ?? null,
+              logoPreserveAspectRatio: after.logoPreserveAspectRatio ?? false,
               tenant: em.getReference(Tenant, tenantId),
               isActive: after.isActive,
               parentId: after.parentId,
@@ -571,6 +577,7 @@ const updateOrganizationCommand: CommandHandler<Record<string, unknown>, Organiz
             if (parsed.name !== undefined) entity.name = parsed.name
             if (resolvedSlug !== undefined) entity.slug = resolvedSlug
             if (parsed.logoUrl !== undefined) entity.logoUrl = parsed.logoUrl ?? null
+            if (parsed.logoPreserveAspectRatio !== undefined) entity.logoPreserveAspectRatio = parsed.logoPreserveAspectRatio
             if (parsed.isActive !== undefined) entity.isActive = parsed.isActive
             entity.parentId = parentId
           },
@@ -637,7 +644,7 @@ const updateOrganizationCommand: CommandHandler<Record<string, unknown>, Organiz
       organizationId: String(result.id),
     })
     const after = serializeOrganization(result, custom)
-    const changes = buildChanges(beforeRecord, after as Record<string, unknown>, ['name', 'slug', 'logoUrl', 'isActive', 'parentId'])
+    const changes = buildChanges(beforeRecord, after as Record<string, unknown>, ['name', 'slug', 'logoUrl', 'logoPreserveAspectRatio', 'isActive', 'parentId'])
     const customDiff = diffCustomFieldChanges(beforeRecord?.custom, custom)
     for (const [key, diff] of Object.entries(customDiff)) {
       changes[`cf_${key}`] = diff
@@ -675,6 +682,7 @@ const updateOrganizationCommand: CommandHandler<Record<string, unknown>, Organiz
             entity.name = before.name
             if (before.slug !== undefined) entity.slug = before.slug
             if (before.logoUrl !== undefined) entity.logoUrl = before.logoUrl ?? null
+            if (before.logoPreserveAspectRatio !== undefined) entity.logoPreserveAspectRatio = !!before.logoPreserveAspectRatio
             entity.isActive = before.isActive
             entity.parentId = before.parentId
           },