@open-mercato/core 0.6.7-develop.6863.1.61001cf9a8 → 0.6.7

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

@@ -6,19 +6,12 @@ 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,
-  directoryIdSchema,
-  organizationSwitcherResponseSchema,
-} from '../openapi'
+import { directoryTag, directoryErrorSchema, 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'
@@ -26,21 +19,6 @@ 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
@@ -163,49 +141,6 @@ 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
@@ -228,7 +163,9 @@ 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,
@@ -257,40 +194,32 @@ export async function GET(req: NextRequest) {
     }
 
     const showMenu = menuData.nodes.length > 0 || hasManageFeature || effectiveIsSuperAdmin
-    const response = showMenu
-      ? {
-          items: menuData.nodes,
-          selectedId,
-          canManage: !!hasManageFeature,
-          canViewAllOrganizations: accessible === null,
-          tenantId,
-          tenants: tenantRecords,
-          isSuperAdmin: effectiveIsSuperAdmin,
-        }
-      : {
-          items: [],
-          selectedId: null,
-          canManage: false,
-        }
+    if (!showMenu) {
+      return NextResponse.json({ items: [], selectedId: null, canManage: false })
+    }
 
-    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 })
-      }
+    const canViewAllOrganizations = accessible === null
+    const response = {
+      items: menuData.nodes,
+      selectedId,
+      canManage: !!hasManageFeature,
+      canViewAllOrganizations,
+      tenantId,
+      tenants: tenantRecords,
+      isSuperAdmin: effectiveIsSuperAdmin,
     }
 
-    await logAccess(response)
+    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()),
+    })
 
     return NextResponse.json(response)
   } catch (err) {

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

@@ -251,7 +251,6 @@ 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,
@@ -345,12 +344,10 @@ 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())
@@ -436,7 +433,6 @@ 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,
@@ -479,12 +475,10 @@ 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)
   }
 
@@ -549,7 +543,6 @@ 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,9 +2,7 @@ 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'
@@ -96,12 +94,6 @@ 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,
@@ -119,6 +111,7 @@ 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
@@ -263,7 +256,6 @@ 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,7 +12,6 @@ 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 = {
@@ -20,7 +19,6 @@ type BrandingPayload = {
   organizationName: string
   tenantId: string
   logoUrl: string | null
-  logoPreserveAspectRatio: boolean
   updatedAt: string | null
 }
 
@@ -40,7 +38,6 @@ 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)
@@ -61,9 +58,8 @@ export default function OrganizationBrandingPage() {
 
   React.useEffect(() => {
     setLogoUrl(data?.logoUrl ?? '')
-    setLogoPreserveAspectRatio(data?.logoPreserveAspectRatio ?? false)
     setSelectedFile(null)
-  }, [data?.logoPreserveAspectRatio, data?.logoUrl])
+  }, [data?.logoUrl])
 
   React.useEffect(() => {
     if (!selectedFile || typeof URL === 'undefined') {
@@ -93,16 +89,12 @@ export default function OrganizationBrandingPage() {
       },
       { errorMessage: t('directory.branding.errors.upload', 'Failed to upload logo') },
     )
-    return upload?.item.url ?? upload?.item.thumbnailUrl ?? null
+    return upload?.item.thumbnailUrl ?? upload?.item.url ?? null
   }, [selectedFile, t])
 
-  const saveBranding = React.useCallback(async (
-    nextLogoUrl?: string,
-    options?: { skipUpload?: boolean; logoPreserveAspectRatio?: boolean },
-  ) => {
+  const saveBranding = React.useCallback(async (nextLogoUrl?: string, options?: { skipUpload?: boolean }) => {
     if (!data) return
     const shouldUpload = Boolean(selectedFile && !options?.skipUpload)
-    const resolvedLogoPreserveAspectRatio = options?.logoPreserveAspectRatio ?? logoPreserveAspectRatio
     setSaving(true)
     try {
       await runMutation({
@@ -116,10 +108,7 @@ export default function OrganizationBrandingPage() {
               {
                 method: 'PUT',
                 headers: { 'content-type': 'application/json' },
-                body: JSON.stringify({
-                  logoUrl: resolvedLogoUrl || null,
-                  logoPreserveAspectRatio: resolvedLogoPreserveAspectRatio,
-                }),
+                body: JSON.stringify({ logoUrl: resolvedLogoUrl || null }),
               },
               { errorMessage: t('directory.branding.errors.save', 'Failed to update organization branding') },
             ),
@@ -134,7 +123,6 @@ export default function OrganizationBrandingPage() {
         mutationPayload: {
           organizationId: data.organizationId,
           logoUrl: (nextLogoUrl ?? logoUrl.trim()) || null,
-          logoPreserveAspectRatio: resolvedLogoPreserveAspectRatio,
           hasUpload: shouldUpload,
         },
       })
@@ -151,7 +139,7 @@ export default function OrganizationBrandingPage() {
     } finally {
       setSaving(false)
     }
-  }, [data, logoPreserveAspectRatio, logoUrl, queryClient, runMutation, selectedFile, t, uploadLogo])
+  }, [data, logoUrl, queryClient, runMutation, selectedFile, t, uploadLogo])
 
   const handleSubmit = React.useCallback((event: React.FormEvent<HTMLFormElement>) => {
     event.preventDefault()
@@ -189,7 +177,7 @@ export default function OrganizationBrandingPage() {
                   <img
                     src={currentPreviewUrl}
                     alt={t('directory.branding.previewAlt', '{{name}} logo preview', { name: data.organizationName })}
-                    className={`h-full w-full ${logoPreserveAspectRatio ? 'object-contain' : 'rounded-full object-cover'}`}
+                    className="h-full w-full object-contain"
                   />
                 ) : (
                   <ImagePlus className="size-10 text-muted-foreground" aria-hidden />
@@ -210,7 +198,7 @@ export default function OrganizationBrandingPage() {
                   ref={fileInputRef}
                   id="organization-logo-file"
                   type="file"
-                  accept="image/png,image/jpeg,image/webp"
+                  accept="image/png,image/jpeg,image/webp,image/svg+xml"
                   onChange={(event) => {
                     const file = event.currentTarget.files?.[0]
                     if (!file) return
@@ -218,7 +206,7 @@ export default function OrganizationBrandingPage() {
                   }}
                 />
                 <p className="text-xs text-muted-foreground">
-                  {t('directory.branding.file.hint', 'PNG, JPG, or WebP works best. Uploaded files are stored as organization attachments.')}
+                  {t('directory.branding.file.hint', 'PNG, JPG, WebP, or SVG works best. Uploaded files are stored as organization attachments.')}
                 </p>
               </div>
 
@@ -237,18 +225,6 @@ 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 />}
@@ -262,8 +238,7 @@ export default function OrganizationBrandingPage() {
                     setSelectedFile(null)
                     if (fileInputRef.current) fileInputRef.current.value = ''
                     setLogoUrl('')
-                    setLogoPreserveAspectRatio(false)
-                    void saveBranding('', { skipUpload: true, logoPreserveAspectRatio: false })
+                    void saveBranding('', { skipUpload: true })
                   }}
                 >
                   <RotateCcw className="mr-2 size-4" aria-hidden />

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

@@ -5,6 +5,7 @@ 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,
@@ -51,7 +52,6 @@ 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,7 +133,6 @@ 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]))
@@ -200,13 +199,18 @@ export default function EditOrganizationPage({ params }: { params?: { id?: strin
         id: 'tenantId',
         label: t('directory.organizations.form.field.tenant', 'Tenant'),
         type: 'custom',
-        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>
+        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"
+          />
         ),
       } as CrudField,
     ] : []),
@@ -256,7 +260,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, tenantName])
+  ], [actorIsSuperAdmin, childSummary, parentTree, t, tenantId])
 
   const detailFields = React.useMemo(() => (
     actorIsSuperAdmin

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

@@ -1,6 +1,5 @@
 "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'
@@ -272,7 +271,7 @@ export default function DirectoryOrganizationsPage() {
             setPage(1)
           }}
           sortable={false}
-          perspective={{ tableId: extensionPoints.hosts.organizationsTable.tableId }}
+          perspective={{ tableId: 'directory.organizations.list' }}
           rowActions={(row) => (
             canManage ? (
               <RowActions

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

@@ -1,6 +1,5 @@
 "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'
@@ -194,7 +193,7 @@ export default function DirectoryTenantsPage() {
           sortable
           sorting={sorting}
           onSortingChange={(state) => { setSorting(state); setPage(1) }}
-          perspective={{ tableId: extensionPoints.hosts.tenantsTable.tableId }}
+          perspective={{ tableId: 'directory.tenants.list' }}
           rowActions={(row) => (
             canManage ? (
               <RowActions

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

@@ -85,7 +85,6 @@ type OrganizationUndoSnapshot = {
   name: string
   slug?: string | null
   logoUrl?: string | null
-  logoPreserveAspectRatio?: boolean
   isActive: boolean
   parentId: string | null
   childParents: ChildParentSnapshot[]
@@ -123,7 +122,6 @@ 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] : [],
@@ -149,7 +147,6 @@ 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) => ({
@@ -310,7 +307,6 @@ const createOrganizationCommand: CommandHandler<Record<string, unknown>, Organiz
             name: parsed.name,
             slug,
             logoUrl: parsed.logoUrl ?? null,
-            logoPreserveAspectRatio: parsed.logoPreserveAspectRatio ?? false,
             isActive: parsed.isActive ?? true,
             parentId,
           },
@@ -438,7 +434,6 @@ 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()
@@ -451,7 +446,6 @@ 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,
@@ -577,7 +571,6 @@ 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
           },
@@ -644,7 +637,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', 'logoPreserveAspectRatio', 'isActive', 'parentId'])
+    const changes = buildChanges(beforeRecord, after as Record<string, unknown>, ['name', 'slug', 'logoUrl', 'isActive', 'parentId'])
     const customDiff = diffCustomFieldChanges(beforeRecord?.custom, custom)
     for (const [key, diff] of Object.entries(customDiff)) {
       changes[`cf_${key}`] = diff
@@ -682,7 +675,6 @@ 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
           },

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

@@ -5,7 +5,6 @@ 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,
@@ -49,7 +48,6 @@ 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)
 
@@ -128,7 +126,6 @@ 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 })
@@ -136,7 +133,6 @@ 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({
@@ -195,14 +191,12 @@ 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,9 +43,6 @@ 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,7 +28,6 @@ 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(),
@@ -40,7 +39,6 @@ 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/i18n/de.json

@@ -7,8 +7,6 @@
   "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.",
@@ -18,7 +16,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 oder WebP funktioniert am besten. Hochgeladene Dateien werden als Organisationsanhänge gespeichert.",
+  "directory.branding.file.hint": "PNG, JPG, WebP oder SVG 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...",
@@ -54,7 +52,6 @@
   "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...",