@open-mercato/core 0.6.7-develop.6606.1.3b1ec9b1ea → 0.6.7-develop.6622.1.4d29ddaca4

package/src/modules/customers/api/interactions/[id]/visibility/route.ts

@@ -52,37 +52,24 @@ export async function PATCH(req: Request, context: RouteContext): Promise<Respon
   const container = await createRequestContainer()
   const em = (container.resolve('em') as EntityManager).fork()
   const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req })
-  const organizationId = scope?.selectedId ?? (auth as { orgId?: string | null }).orgId ?? null
-  const dscope = { tenantId: auth.tenantId as string, organizationId }
   const userId = resolveAuthActorId(auth)
 
-  const guardResult = await validateCrudMutationGuard(container, {
-    tenantId: auth.tenantId,
-    organizationId,
-    userId,
-    resourceKind: 'customers.interaction',
-    resourceId: id,
-    operation: 'custom',
-    requestMethod: req.method,
-    requestHeaders: req.headers,
-  })
-  if (guardResult && !guardResult.ok) {
-    return NextResponse.json(guardResult.body, { status: guardResult.status })
-  }
-
+  // Load the interaction by its tenant-unique id (not a hand-rolled selected
+  // org) so this keeps working under the "All organizations" scope. The record's
+  // own organization then becomes the concrete org the guard, command, and audit
+  // event are attributed to.
   const interaction = (await findOneWithDecryption(
     em,
     CustomerInteraction,
     {
       id,
       tenantId: auth.tenantId,
-      organizationId,
       deletedAt: null,
       interactionType: 'email',
     } as any,
     undefined,
-    dscope,
-  )) as { id: string; authorUserId?: string | null; visibility?: string | null } | null
+    { tenantId: auth.tenantId as string, organizationId: scope?.selectedId ?? (auth as { orgId?: string | null }).orgId ?? null },
+  )) as { id: string; organizationId?: string | null; authorUserId?: string | null; visibility?: string | null } | null
 
   if (!interaction) {
     return NextResponse.json({ error: 'Email not found' }, { status: 404 })
@@ -91,12 +78,29 @@ export async function PATCH(req: Request, context: RouteContext): Promise<Respon
   // Personal mailbox privacy (v1: strict owner-only): ONLY the author may flip
   // their own email's visibility — no admin bypass. Return 404 (not 403) for
   // everyone else so we don't leak the row's existence — this also covers
-  // non-authors who cannot see a private email in the first place.
+  // non-authors who cannot see a private email in the first place. This owner
+  // check is stricter than any org gate, so no separate org read guard is needed.
   const isAuthor = !!interaction.authorUserId && interaction.authorUserId === auth.sub
   if (!isAuthor) {
     return NextResponse.json({ error: 'Email not found' }, { status: 404 })
   }
 
+  const organizationId = interaction.organizationId ?? null
+
+  const guardResult = await validateCrudMutationGuard(container, {
+    tenantId: auth.tenantId,
+    organizationId,
+    userId,
+    resourceKind: 'customers.interaction',
+    resourceId: id,
+    operation: 'custom',
+    requestMethod: req.method,
+    requestHeaders: req.headers,
+  })
+  if (guardResult && !guardResult.ok) {
+    return NextResponse.json(guardResult.body, { status: guardResult.status })
+  }
+
   // No-op: visibility is already at the requested value.
   if (interaction.visibility === body.visibility) {
     return NextResponse.json({ ok: true, changed: false })

package/src/modules/customers/api/people/[id]/email-threads/route.ts

@@ -5,6 +5,7 @@ import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
+import { isOrganizationReadAccessAllowed } from '@open-mercato/core/modules/directory/utils/organizationScopeGuard'
 import { CustomerEntity } from '../../../../data/entities'
 import { buildPersonEmailThreads } from '../../../../lib/personEmailThreads'
 
@@ -33,12 +34,12 @@ export async function GET(req: Request, context: RouteContext): Promise<Response
 
   const container = await createRequestContainer()
   const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req })
-  const organizationId = scope?.selectedId ?? (auth as { orgId?: string | null }).orgId ?? null
   const em = (container.resolve('em') as EntityManager).fork()
-  const dscope = { tenantId: auth.tenantId as string, organizationId }
 
-  // Verify the Person exists in the caller's tenant/org (ownership check,
-  // same pattern as the [id]/emails compose route).
+  // Verify the Person exists in the caller's tenant, then fail-closed on the
+  // record's own organization — same pattern as the [id] detail route. Loading
+  // by tenant + id (not a hand-rolled selected org) keeps this working under the
+  // "All organizations" scope, where no concrete org is carried.
   const person = await findOneWithDecryption(
     em,
     CustomerEntity,
@@ -46,15 +47,18 @@ export async function GET(req: Request, context: RouteContext): Promise<Response
       id: personId,
       kind: 'person',
       tenantId: auth.tenantId,
-      organizationId,
       deletedAt: null,
     } as never,
     undefined,
-    dscope,
+    { tenantId: auth.tenantId as string, organizationId: scope?.selectedId ?? (auth as { orgId?: string | null }).orgId ?? null },
   )
   if (!person) {
     return NextResponse.json({ error: 'Person not found' }, { status: 404 })
   }
+  const organizationId = (person as { organizationId?: string | null }).organizationId ?? null
+  if (!isOrganizationReadAccessAllowed({ scope, auth, organizationId })) {
+    return NextResponse.json({ error: 'Person not found' }, { status: 404 })
+  }
 
   const viewerUserId = auth.isApiKey ? null : auth.sub ?? null
 

package/src/modules/customers/api/people/[id]/emails/route.ts

@@ -10,6 +10,7 @@ import {
   runCrudMutationGuardAfterSuccess,
 } from '@open-mercato/shared/lib/crud/mutation-guard'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
+import { isOrganizationReadAccessAllowed } from '@open-mercato/core/modules/directory/utils/organizationScopeGuard'
 import { resolveAuthActorId } from '../../../../lib/interactionRequestContext'
 import { CustomerEntity } from '../../../../data/entities'
 import type { SendAsUserService } from '@open-mercato/core/modules/communication_channels/lib/send-as-user'
@@ -66,28 +67,14 @@ export async function POST(req: Request, context: RouteContext): Promise<Respons
   const container = await createRequestContainer()
   const userId = resolveAuthActorId(auth)
   const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req })
-  const organizationId = scope?.selectedId ?? (auth as { orgId?: string | null }).orgId ?? null
-
-  const guardResult = await validateCrudMutationGuard(container, {
-    tenantId: auth.tenantId,
-    organizationId,
-    userId,
-    resourceKind: 'customers.person',
-    resourceId: personId,
-    operation: 'custom',
-    requestMethod: req.method,
-    requestHeaders: req.headers,
-  })
-  if (guardResult && !guardResult.ok) {
-    return NextResponse.json(guardResult.body, { status: guardResult.status })
-  }
 
   const em = (container.resolve('em') as EntityManager).fork()
-  const dscope = { tenantId: auth.tenantId as string, organizationId }
 
-  // 1. Verify the Person exists in the caller's tenant.
-  //    Uses CustomerEntity (kind='person') as the canonical ownership check —
-  //    the same pattern as the existing [id]/route.ts GET handler.
+  // 1. Verify the Person exists in the caller's tenant, then fail-closed on the
+  //    record's own organization — same pattern as the [id]/route.ts GET handler.
+  //    Loading by tenant + id (not a hand-rolled selected org) keeps this working
+  //    under the "All organizations" scope; the record's own org then becomes the
+  //    concrete org the guard and the outbound message are attributed to.
   const person = await findOneWithDecryption(
     em,
     CustomerEntity,
@@ -95,15 +82,32 @@ export async function POST(req: Request, context: RouteContext): Promise<Respons
       id: personId,
       kind: 'person',
       tenantId: auth.tenantId,
-      organizationId,
       deletedAt: null,
     } as never,
     undefined,
-    dscope,
+    { tenantId: auth.tenantId as string, organizationId: scope?.selectedId ?? (auth as { orgId?: string | null }).orgId ?? null },
   )
   if (!person) {
     return NextResponse.json({ error: 'Person not found' }, { status: 404 })
   }
+  const organizationId = (person as { organizationId?: string | null }).organizationId ?? null
+  if (!isOrganizationReadAccessAllowed({ scope, auth, organizationId })) {
+    return NextResponse.json({ error: 'Person not found' }, { status: 404 })
+  }
+
+  const guardResult = await validateCrudMutationGuard(container, {
+    tenantId: auth.tenantId,
+    organizationId,
+    userId,
+    resourceKind: 'customers.person',
+    resourceId: personId,
+    operation: 'custom',
+    requestMethod: req.method,
+    requestHeaders: req.headers,
+  })
+  if (guardResult && !guardResult.ok) {
+    return NextResponse.json(guardResult.body, { status: guardResult.status })
+  }
 
   // 2. Call the hub's send-as-user facade in-process (resolved via DI) so the
   //    customers module makes no HTTP self-call. `crmVisibility` and `crmPersonId`

package/src/modules/customers/components/detail/CustomFieldValuesList.tsx

@@ -30,6 +30,8 @@ type DisplayEntry = {
   value: unknown
   dictionaryMap: DictionaryMap | null
   multi: boolean
+  kind?: string
+  options?: CustomFieldDefDto['options']
 }
 
 type CustomFieldValuesListProps = {
@@ -97,10 +99,23 @@ function renderDictionaryValues(
   )
 }
 
-function renderPrimitiveValues(value: unknown): React.ReactNode {
+function resolveOptionLabel(value: unknown, options: CustomFieldDefDto['options']): unknown {
+  if (!options?.length || typeof value !== 'string') return value
+  const trimmed = value.trim()
+  const match = options.find((option) => option.value === trimmed)
+  return match ? match.label : value
+}
+
+function applyOptionLabels(value: unknown, options: CustomFieldDefDto['options']): unknown {
+  if (!options?.length) return value
+  if (Array.isArray(value)) return value.map((entry) => resolveOptionLabel(entry, options))
+  return resolveOptionLabel(value, options)
+}
+
+function renderPrimitiveValues(value: unknown, kind?: string): React.ReactNode {
   if (Array.isArray(value)) {
     const parts = value
-      .map((entry) => stringifyCustomValue(entry))
+      .map((entry) => stringifyCustomValue(entry, { kind }))
       .map((entry) => entry.trim())
       .filter((entry) => entry.length > 0)
     if (!parts.length) return null
@@ -117,7 +132,7 @@ function renderPrimitiveValues(value: unknown): React.ReactNode {
       </div>
     )
   }
-  const label = stringifyCustomValue(value).trim()
+  const label = stringifyCustomValue(value, { kind }).trim()
   if (!label.length) return null
   return <span className="text-sm text-foreground">{label}</span>
 }
@@ -179,6 +194,12 @@ function buildDisplayEntries(
   definitions.forEach((def, index) => {
     const normalizedKey = normalizeCustomFieldKey(def.key)
     if (!normalizedKey) return
+    // Operational fields marked listVisible:false must not render — neither
+    // here nor as a definition-less "extra" below, so consume the key anyway.
+    if (def.listVisible === false) {
+      consumedKeys.add(normalizedKey)
+      return
+    }
     const entry = combined.get(normalizedKey)
     if (!entry || isEmptyCustomValue(entry.value)) return
     const label = resolveCustomFieldLabel(entry.label ?? def.label, entry.key)
@@ -191,6 +212,8 @@ function buildDisplayEntries(
       value: entry.value,
       dictionaryMap,
       multi: def.multi ?? Array.isArray(entry.value),
+      kind: def.kind,
+      options: def.options,
     })
     consumedKeys.add(normalizedKey)
   })
@@ -242,7 +265,8 @@ export function CustomFieldValuesList({
     <div className={cn('grid gap-3 sm:grid-cols-2', className)}>
       {displayEntries.map((entry, index) => {
         const dictionaryContent = renderDictionaryValues(entry.value, entry.dictionaryMap, entry.multi)
-        const primitiveContent = dictionaryContent ?? renderPrimitiveValues(entry.value)
+        const primitiveContent =
+          dictionaryContent ?? renderPrimitiveValues(applyOptionLabels(entry.value, entry.options), entry.kind)
         const content =
           dictionaryContent ??
           primitiveContent ??

package/src/modules/customers/components/detail/create/CreateDealForm.tsx

@@ -27,9 +27,11 @@ const CUSTOM_FIELDS_MANAGE_HREF = `/backend/entities/system/${encodeURIComponent
 
 export type CreateDealFormProps = {
   returnTo: string
+  /** Seed values merged over EMPTY_VALUES for the initial form state. Entries set to `undefined` are ignored (the EMPTY_VALUES default wins), so a sparse `Partial<BaseValues>` can never unset a required field. Additive: omitting it preserves current behavior. */
+  initialValues?: Partial<BaseValues>
 }
 
-export function CreateDealForm({ returnTo }: CreateDealFormProps) {
+export function CreateDealForm({ returnTo, initialValues }: CreateDealFormProps) {
   const t = useT()
   const router = useRouter()
   const tr = React.useCallback(
@@ -38,7 +40,10 @@ export function CreateDealForm({ returnTo }: CreateDealFormProps) {
     [t],
   )
 
-  const [values, setValues] = React.useState<BaseValues>(EMPTY_VALUES)
+  const [values, setValues] = React.useState<BaseValues>(() => {
+    const definedSeedEntries = Object.entries(initialValues ?? {}).filter(([, seedValue]) => seedValue !== undefined)
+    return { ...EMPTY_VALUES, ...Object.fromEntries(definedSeedEntries) }
+  })
   const [errors, setErrors] = React.useState<Record<string, string>>({})
   const [isSubmitting, setIsSubmitting] = React.useState(false)
 

package/src/modules/customers/components/detail/customFieldUtils.ts

@@ -53,6 +53,7 @@ export function resolveCustomFieldLabel(label: string | null | undefined, key: s
 
 export function isEmptyCustomValue(value: unknown): boolean {
   if (value === null || value === undefined) return true
+  if (value === false) return true
   if (typeof value === 'string') return value.trim().length === 0
   if (Array.isArray(value)) return value.length === 0 || value.every((entry) => isEmptyCustomValue(entry))
   if (typeof value === 'object') {
@@ -65,11 +66,14 @@ export function isEmptyCustomValue(value: unknown): boolean {
   return false
 }
 
-export function stringifyCustomValue(value: unknown): string {
+const DATE_FIELD_KINDS = new Set(['date', 'datetime'])
+const ISO_DATE_PREFIX_RE = /^\d{4}-\d{2}-\d{2}([T ]|$)/
+
+export function stringifyCustomValue(value: unknown, options?: { kind?: string }): string {
   if (value === null || value === undefined) return ''
   if (Array.isArray(value)) {
     const parts = value
-      .map((entry) => stringifyCustomValue(entry))
+      .map((entry) => stringifyCustomValue(entry, options))
       .map((entry) => entry.trim())
       .filter((entry) => entry.length > 0)
     return parts.join(', ')
@@ -81,7 +85,15 @@ export function stringifyCustomValue(value: unknown): string {
   if (typeof value === 'string') {
     const trimmed = value.trim()
     if (!trimmed.length) return ''
-    return formatDateTime(trimmed) ?? trimmed
+    // Date-format strings only when the definition says the field is a date,
+    // or (for definition-less extras) when the value is unambiguously ISO-like.
+    // `new Date(...)` parses far too loosely to run on every string — it used
+    // to mangle plain text such as "Report 2024" into a date.
+    const kind = options?.kind
+    if (kind ? DATE_FIELD_KINDS.has(kind) : ISO_DATE_PREFIX_RE.test(trimmed)) {
+      return formatDateTime(trimmed) ?? trimmed
+    }
+    return trimmed
   }
   if (typeof value === 'number' || typeof value === 'bigint' || typeof value === 'boolean') {
     return String(value)

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

@@ -16,56 +16,56 @@
   "data_sync.dashboard.loadError": "Nie udało się załadować przebiegów",
   "data_sync.dashboard.noRuns": "Brak przebiegów synchronizacji",
   "data_sync.dashboard.schedule.cron": "Cron",
-  "data_sync.dashboard.schedule.cronHelp": "Example: `0 * * * *` runs at the start of every hour.",
-  "data_sync.dashboard.schedule.cronValue": "Cron expression",
-  "data_sync.dashboard.schedule.delete": "Remove schedule",
-  "data_sync.dashboard.schedule.deleteError": "Failed to remove recurring schedule",
-  "data_sync.dashboard.schedule.deleteSuccess": "Recurring schedule removed",
-  "data_sync.dashboard.schedule.deleting": "Removing...",
-  "data_sync.dashboard.schedule.description": "Save a repeating schedule for the selected integration, entity, and direction without leaving this dashboard.",
-  "data_sync.dashboard.schedule.enabled": "Schedule enabled",
-  "data_sync.dashboard.schedule.enabledHelp": "Pause the recurring job without deleting the schedule definition.",
-  "data_sync.dashboard.schedule.error": "Failed to save recurring schedule",
-  "data_sync.dashboard.schedule.fullSync": "Run scheduled jobs as full sync",
-  "data_sync.dashboard.schedule.fullSyncHelp": "When enabled, every recurring run starts from the beginning instead of the saved cursor.",
-  "data_sync.dashboard.schedule.interval": "Interval",
-  "data_sync.dashboard.schedule.intervalHelp": "Example: `1h`, `6h`, or `24h` for repeating intervals.",
-  "data_sync.dashboard.schedule.intervalValue": "Interval",
-  "data_sync.dashboard.schedule.invalidValue": "Provide a schedule value before saving.",
-  "data_sync.dashboard.schedule.lastRun": "Last scheduled run: {value}",
-  "data_sync.dashboard.schedule.neverRun": "Saved, but no scheduled execution has completed yet.",
-  "data_sync.dashboard.schedule.none": "No recurring schedule saved for this target yet.",
-  "data_sync.dashboard.schedule.save": "Save recurring schedule",
-  "data_sync.dashboard.schedule.saving": "Saving...",
-  "data_sync.dashboard.schedule.status.disabled": "Recurring schedule paused",
-  "data_sync.dashboard.schedule.status.enabled": "Recurring schedule active",
-  "data_sync.dashboard.schedule.status.none": "No recurring schedule",
-  "data_sync.dashboard.schedule.status.shortDisabled": "Paused",
-  "data_sync.dashboard.schedule.status.shortEnabled": "Scheduled",
-  "data_sync.dashboard.schedule.status.shortNone": "One-time only",
-  "data_sync.dashboard.schedule.success": "Recurring schedule saved",
-  "data_sync.dashboard.schedule.timezone": "Timezone",
-  "data_sync.dashboard.schedule.title": "Recurring schedule",
-  "data_sync.dashboard.schedule.type": "Schedule type",
+  "data_sync.dashboard.schedule.cronHelp": "Przykład: `0 * * * *` uruchamia zadanie na początku każdej godziny.",
+  "data_sync.dashboard.schedule.cronValue": "Wyrażenie cron",
+  "data_sync.dashboard.schedule.delete": "Usuń harmonogram",
+  "data_sync.dashboard.schedule.deleteError": "Nie udało się usunąć harmonogramu cyklicznego",
+  "data_sync.dashboard.schedule.deleteSuccess": "Usunięto harmonogram cykliczny",
+  "data_sync.dashboard.schedule.deleting": "Usuwanie...",
+  "data_sync.dashboard.schedule.description": "Zapisz powtarzalny harmonogram dla wybranej integracji, encji i kierunku bez opuszczania tego pulpitu.",
+  "data_sync.dashboard.schedule.enabled": "Harmonogram włączony",
+  "data_sync.dashboard.schedule.enabledHelp": "Wstrzymaj zadanie cykliczne bez usuwania definicji harmonogramu.",
+  "data_sync.dashboard.schedule.error": "Nie udało się zapisać harmonogramu cyklicznego",
+  "data_sync.dashboard.schedule.fullSync": "Uruchamiaj zaplanowane zadania jako pełną synchronizację",
+  "data_sync.dashboard.schedule.fullSyncHelp": "Gdy opcja jest włączona, każdy cykliczny przebieg zaczyna się od początku zamiast od zapisanego kursora.",
+  "data_sync.dashboard.schedule.interval": "Interwał",
+  "data_sync.dashboard.schedule.intervalHelp": "Przykład: `1h`, `6h` lub `24h` dla powtarzalnych interwałów.",
+  "data_sync.dashboard.schedule.intervalValue": "Interwał",
+  "data_sync.dashboard.schedule.invalidValue": "Podaj wartość harmonogramu przed zapisaniem.",
+  "data_sync.dashboard.schedule.lastRun": "Ostatni zaplanowany przebieg: {value}",
+  "data_sync.dashboard.schedule.neverRun": "Zapisano, ale żadne zaplanowane wykonanie jeszcze się nie zakończyło.",
+  "data_sync.dashboard.schedule.none": "Dla tego celu nie zapisano jeszcze harmonogramu cyklicznego.",
+  "data_sync.dashboard.schedule.save": "Zapisz harmonogram cykliczny",
+  "data_sync.dashboard.schedule.saving": "Zapisywanie...",
+  "data_sync.dashboard.schedule.status.disabled": "Harmonogram cykliczny wstrzymany",
+  "data_sync.dashboard.schedule.status.enabled": "Harmonogram cykliczny aktywny",
+  "data_sync.dashboard.schedule.status.none": "Brak harmonogramu cyklicznego",
+  "data_sync.dashboard.schedule.status.shortDisabled": "Wstrzymany",
+  "data_sync.dashboard.schedule.status.shortEnabled": "Zaplanowany",
+  "data_sync.dashboard.schedule.status.shortNone": "Tylko jednorazowo",
+  "data_sync.dashboard.schedule.success": "Zapisano harmonogram cykliczny",
+  "data_sync.dashboard.schedule.timezone": "Strefa czasowa",
+  "data_sync.dashboard.schedule.title": "Harmonogram cykliczny",
+  "data_sync.dashboard.schedule.type": "Typ harmonogramu",
   "data_sync.dashboard.searchPlaceholder": "Szukaj po integracji, typie encji, statusie lub ID przebiegu",
-  "data_sync.dashboard.start.batchSize": "Batch Size",
-  "data_sync.dashboard.start.description": "Pick a sync target, launch an ad-hoc run, or save a recurring schedule for the same entity and direction from this page.",
-  "data_sync.dashboard.start.error": "Failed to start sync run",
-  "data_sync.dashboard.start.eyebrow": "Run once or keep it recurring",
-  "data_sync.dashboard.start.fullSync": "Run as full sync",
-  "data_sync.dashboard.start.fullSyncHelp": "Ignore the saved cursor and process the entire source again for this run.",
-  "data_sync.dashboard.start.invalidBatchSize": "Batch size must be between 1 and 1000.",
+  "data_sync.dashboard.start.batchSize": "Rozmiar partii",
+  "data_sync.dashboard.start.description": "Wybierz cel synchronizacji, uruchom przebieg doraźny albo zapisz harmonogram cykliczny dla tej samej encji i kierunku z poziomu tej strony.",
+  "data_sync.dashboard.start.error": "Nie udało się uruchomić przebiegu synchronizacji",
+  "data_sync.dashboard.start.eyebrow": "Uruchom raz lub ustaw cyklicznie",
+  "data_sync.dashboard.start.fullSync": "Uruchom jako pełną synchronizację",
+  "data_sync.dashboard.start.fullSyncHelp": "Zignoruj zapisany kursor i przetwórz w tym przebiegu całe źródło od nowa.",
+  "data_sync.dashboard.start.invalidBatchSize": "Rozmiar partii musi mieścić się w zakresie od 1 do 1000.",
   "data_sync.dashboard.start.providerManaged": "Ta integracja uruchamia synchronizacje z własnego przepływu konfiguracji. Otwórz ustawienia integracji, aby kontynuować.",
-  "data_sync.dashboard.start.runNowDescription": "Use this for the next immediate sync. Batch size and full-sync mode apply only to this manual run.",
-  "data_sync.dashboard.start.runNowFootnote": "Manual runs show progress immediately and land on the run detail page after launch.",
-  "data_sync.dashboard.start.runNowTitle": "Run once now",
-  "data_sync.dashboard.start.status.credentialsMissing": "Credentials missing",
-  "data_sync.dashboard.start.status.credentialsReady": "Credentials ready",
-  "data_sync.dashboard.start.status.disabled": "Integration disabled",
-  "data_sync.dashboard.start.status.enabled": "Integration enabled",
-  "data_sync.dashboard.start.submit": "Start sync",
-  "data_sync.dashboard.start.success": "Sync run started",
-  "data_sync.dashboard.start.title": "Start or schedule a sync",
+  "data_sync.dashboard.start.runNowDescription": "Użyj tej opcji dla najbliższej natychmiastowej synchronizacji. Rozmiar partii i tryb pełnej synchronizacji dotyczą wyłącznie tego ręcznego przebiegu.",
+  "data_sync.dashboard.start.runNowFootnote": "Ręczne przebiegi od razu pokazują postęp, a po uruchomieniu przenoszą na stronę szczegółów przebiegu.",
+  "data_sync.dashboard.start.runNowTitle": "Uruchom teraz jednorazowo",
+  "data_sync.dashboard.start.status.credentialsMissing": "Brak poświadczeń",
+  "data_sync.dashboard.start.status.credentialsReady": "Poświadczenia gotowe",
+  "data_sync.dashboard.start.status.disabled": "Integracja wyłączona",
+  "data_sync.dashboard.start.status.enabled": "Integracja włączona",
+  "data_sync.dashboard.start.submit": "Uruchom synchronizację",
+  "data_sync.dashboard.start.success": "Uruchomiono przebieg synchronizacji",
+  "data_sync.dashboard.start.title": "Uruchom lub zaplanuj synchronizację",
   "data_sync.dashboard.status.cancelled": "Anulowany",
   "data_sync.dashboard.status.completed": "Zakończony",
   "data_sync.dashboard.status.failed": "Nieudany",
@@ -73,28 +73,28 @@
   "data_sync.dashboard.status.pending": "Oczekujący",
   "data_sync.dashboard.status.running": "W toku",
   "data_sync.dashboard.title": "Przebiegi synchronizacji",
-  "data_sync.integrationTab.columns.actions": "Actions",
-  "data_sync.integrationTab.columns.lastRun": "Last run",
-  "data_sync.integrationTab.columns.value": "Value",
-  "data_sync.integrationTab.credentialsMissing": "Configure credentials before starting a sync.",
-  "data_sync.integrationTab.credentialsMissingNotice": "Credentials are still missing. Save schedules first if you want, but manual and scheduled runs will fail until credentials are configured.",
-  "data_sync.integrationTab.description": "Run one-off syncs or save recurring schedules for every supported entity directly from the integration detail page.",
-  "data_sync.integrationTab.empty": "This provider does not expose any schedulable sync entities yet.",
-  "data_sync.integrationTab.fullSyncShort": "Full",
-  "data_sync.integrationTab.integrationDisabled": "Enable the integration before starting a sync.",
-  "data_sync.integrationTab.integrationDisabledNotice": "The integration is disabled. You can save schedules now, but runs will stay blocked until the integration is enabled.",
-  "data_sync.integrationTab.loadError": "Failed to load sync schedules.",
-  "data_sync.integrationTab.notAvailable": "This integration is not registered as a data sync provider.",
+  "data_sync.integrationTab.columns.actions": "Akcje",
+  "data_sync.integrationTab.columns.lastRun": "Ostatni przebieg",
+  "data_sync.integrationTab.columns.value": "Wartość",
+  "data_sync.integrationTab.credentialsMissing": "Skonfiguruj poświadczenia przed uruchomieniem synchronizacji.",
+  "data_sync.integrationTab.credentialsMissingNotice": "Wciąż brakuje poświadczeń. Możesz najpierw zapisać harmonogramy, ale ręczne i zaplanowane przebiegi będą kończyć się błędem, dopóki poświadczenia nie zostaną skonfigurowane.",
+  "data_sync.integrationTab.description": "Uruchamiaj jednorazowe synchronizacje albo zapisuj harmonogramy cykliczne dla każdej obsługiwanej encji bezpośrednio ze strony szczegółów integracji.",
+  "data_sync.integrationTab.empty": "Ten dostawca nie udostępnia jeszcze żadnych encji, które można zaplanować do synchronizacji.",
+  "data_sync.integrationTab.fullSyncShort": "Pełna",
+  "data_sync.integrationTab.integrationDisabled": "Włącz integrację przed uruchomieniem synchronizacji.",
+  "data_sync.integrationTab.integrationDisabledNotice": "Integracja jest wyłączona. Możesz teraz zapisać harmonogramy, ale przebiegi pozostaną zablokowane do czasu włączenia integracji.",
+  "data_sync.integrationTab.loadError": "Nie udało się załadować harmonogramów synchronizacji.",
+  "data_sync.integrationTab.notAvailable": "Ta integracja nie jest zarejestrowana jako dostawca synchronizacji danych.",
   "data_sync.integrationTab.providerManaged": "Uruchom tę integrację z jej przepływu konfiguracji dostawcy.",
   "data_sync.integrationTab.providerManagedNotice": "Ten dostawca wymaga własnego przepływu konfiguracji, zanim będzie można uruchomić synchronizację. Użyj karty dostawcy na tej stronie zamiast ogólnych harmonogramów.",
-  "data_sync.integrationTab.refresh": "Refresh",
-  "data_sync.integrationTab.runError": "Failed to start sync.",
-  "data_sync.integrationTab.runNowHelp": "Run now uses the full-sync checkbox from the same row and starts progress tracking immediately in Data Sync.",
-  "data_sync.integrationTab.runNowTitle": "Manual runs",
-  "data_sync.integrationTab.runStarted": "Sync run started.",
-  "data_sync.integrationTab.start": "Run now",
-  "data_sync.integrationTab.starting": "Starting...",
-  "data_sync.integrationTab.title": "Sync schedules",
+  "data_sync.integrationTab.refresh": "Odśwież",
+  "data_sync.integrationTab.runError": "Nie udało się uruchomić synchronizacji.",
+  "data_sync.integrationTab.runNowHelp": "Opcja Uruchom teraz korzysta z pola pełnej synchronizacji z tego samego wiersza i od razu rozpoczyna śledzenie postępu w Synchronizacji danych.",
+  "data_sync.integrationTab.runNowTitle": "Ręczne przebiegi",
+  "data_sync.integrationTab.runStarted": "Uruchomiono przebieg synchronizacji.",
+  "data_sync.integrationTab.start": "Uruchom teraz",
+  "data_sync.integrationTab.starting": "Uruchamianie...",
+  "data_sync.integrationTab.title": "Harmonogramy synchronizacji",
   "data_sync.nav.title": "Synchronizacja danych",
   "data_sync.runs.detail.back": "Powrót do przebiegów",
   "data_sync.runs.detail.cancel": "Anuluj",

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

@@ -2,11 +2,13 @@ export const metadata = {
   requireAuth: true,
   requireFeatures: ['directory.organizations.manage'],
   pageTitle: 'Edit Organization',
+  pageTitleKey: 'directory.organizations.form.title.edit',
   pageGroup: 'Directory',
+  pageGroupKey: 'directory.nav.group',
   navHidden: true,
   breadcrumb: [
-    { label: 'Organizations', href: '/backend/directory/organizations' },
-    { label: 'Edit' },
+    { label: 'Organizations', labelKey: 'directory.nav.organizations', href: '/backend/directory/organizations' },
+    { label: 'Edit', labelKey: 'common.edit' },
   ],
 }
 

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

@@ -2,11 +2,13 @@ export const metadata = {
   requireAuth: true,
   requireFeatures: ['directory.tenants.manage'],
   pageTitle: 'Edit Tenant',
+  pageTitleKey: 'directory.tenants.form.title.edit',
   pageGroup: 'Directory',
+  pageGroupKey: 'directory.nav.group',
   navHidden: true,
   breadcrumb: [
-    { label: 'Tenants', href: '/backend/directory/tenants' },
-    { label: 'Edit' },
+    { label: 'Tenants', labelKey: 'directory.nav.tenants', href: '/backend/directory/tenants' },
+    { label: 'Edit', labelKey: 'common.edit' },
   ],
 }
 

package/src/modules/integrations/api/[id]/credentials/route.ts

@@ -21,6 +21,7 @@ import {
   runIntegrationMutationGuardAfterSuccess,
   runIntegrationMutationGuards,
 } from '../../guards'
+import { resolveIntegrationsOrganizationId } from '../../../lib/organization-scope'
 
 const idParamsSchema = z.object({ id: z.string().min(1) })
 
@@ -44,7 +45,8 @@ function resolveParams(ctx: { params?: Promise<{ id?: string }> | { id?: string
 
 export async function GET(req: Request, ctx: { params?: Promise<{ id?: string }> | { id?: string } }) {
   const auth = await getAuthFromRequest(req)
-  if (!auth?.tenantId || !auth.orgId) {
+  const organizationId = resolveIntegrationsOrganizationId(auth)
+  if (!auth?.tenantId || !organizationId) {
     return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
   }
 
@@ -61,7 +63,7 @@ export async function GET(req: Request, ctx: { params?: Promise<{ id?: string }>
 
   const container = await createRequestContainer()
   const credentialsService = container.resolve('integrationCredentialsService') as CredentialsService
-  const scope = { organizationId: auth.orgId as string, tenantId: auth.tenantId }
+  const scope = { organizationId: organizationId, tenantId: auth.tenantId }
 
   let values: Record<string, unknown> | null
   let updatedAt: Date | null
@@ -89,7 +91,8 @@ export async function GET(req: Request, ctx: { params?: Promise<{ id?: string }>
 
 export async function PUT(req: Request, ctx: { params?: Promise<{ id?: string }> | { id?: string } }) {
   const auth = await getAuthFromRequest(req)
-  if (!auth?.tenantId || !auth.orgId) {
+  const organizationId = resolveIntegrationsOrganizationId(auth)
+  if (!auth?.tenantId || !organizationId) {
     return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
   }
 
@@ -115,7 +118,7 @@ export async function PUT(req: Request, ctx: { params?: Promise<{ id?: string }>
     container,
     {
     tenantId: auth.tenantId,
-    organizationId: auth.orgId,
+    organizationId,
     userId: auth.sub ?? '',
     resourceKind: 'integrations.integration',
     resourceId: integration.id,
@@ -141,7 +144,7 @@ export async function PUT(req: Request, ctx: { params?: Promise<{ id?: string }>
   }
 
   const credentialsService = container.resolve('integrationCredentialsService') as CredentialsService
-  const scope = { organizationId: auth.orgId as string, tenantId: auth.tenantId }
+  const scope = { organizationId: organizationId, tenantId: auth.tenantId }
   const schema = credentialsService.getSchema(integration.id)
 
   try {
@@ -190,13 +193,13 @@ export async function PUT(req: Request, ctx: { params?: Promise<{ id?: string }>
   await emitIntegrationsEvent('integrations.credentials.updated', {
     integrationId: integration.id,
     tenantId: auth.tenantId,
-    organizationId: auth.orgId,
+    organizationId,
     userId: auth.sub,
   })
 
   await runIntegrationMutationGuardAfterSuccess(guardResult.afterSuccessCallbacks, {
       tenantId: auth.tenantId,
-      organizationId: auth.orgId,
+      organizationId,
       userId: auth.sub ?? '',
       resourceKind: 'integrations.integration',
       resourceId: integration.id,