@open-mercato/core 0.8.1-develop.7452.1.5e211edd51 → 0.8.1-develop.7455.1.8f7e53badb

package/src/modules/customers/api/activity-types/route.ts

@@ -0,0 +1,154 @@
+import { NextResponse } from 'next/server'
+import { z } from 'zod'
+import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
+import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
+import type { OrganizationHierarchyService } from '@open-mercato/shared/lib/auth/principal-service'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getTelemetryRuntime } from '@open-mercato/shared/lib/telemetry/runtime'
+import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
+import { resolveDictionaryRouteContext } from '../dictionaries/context'
+import { createDictionaryCacheTags, DICTIONARY_CACHE_TTL_MS } from '../dictionaries/cache'
+import { getInjectionRegistryVersion } from '@open-mercato/shared/modules/widgets/injection-loader'
+import {
+  resolveScopedCalendarEventTypes,
+} from '../../lib/calendar/eventTypeResolver'
+import { calendarEventTypeBehaviorSchema } from '../../calendar-event-types'
+import { getCalendarEventTypeRegistryVersion } from '../../calendar-event-types'
+
+const logger = createLogger('customers')
+
+function reportActivityTypeError(error: unknown, code: string, attributes?: Record<string, string>): void {
+  try {
+    getTelemetryRuntime()?.reportError(error, { module: 'customers', code, attributes })
+  } catch {}
+}
+
+const querySchema = z.object({ organizationId: z.string().uuid().optional() })
+const responseSchema = z.object({
+  fallbackKey: z.literal('meeting'),
+  items: z.array(z.object({
+    key: z.string(),
+    label: z.string(),
+    labelKey: z.string().optional(),
+    icon: z.string().nullable().optional(),
+    color: z.string().nullable().optional(),
+    behavior: calendarEventTypeBehaviorSchema,
+    selectable: z.boolean(),
+    panelKey: z.string().optional(),
+    source: z.string(),
+    provenance: z.record(z.string(), z.unknown()),
+    historical: z.boolean(),
+    fallbackReason: z.enum(['tombstoned', 'module-unavailable', 'unknown']).optional(),
+    adminConfigurable: z.boolean(),
+    isInherited: z.boolean(),
+    isLocalOverride: z.boolean(),
+    updatedAt: z.string().nullable(),
+    missingCustomFieldsetIds: z.array(z.string()),
+    inactiveDictionaryOverride: z.boolean().optional(),
+  })),
+})
+
+export const metadata = {
+  GET: { requireAuth: true },
+}
+
+export async function GET(req: Request) {
+  try {
+    const url = new URL(req.url)
+    const query = querySchema.parse({ organizationId: url.searchParams.get('organizationId') ?? undefined })
+    const context = await resolveDictionaryRouteContext(req, { selectedId: query.organizationId })
+    if (!context.organizationId) {
+      return NextResponse.json({ error: context.translate('customers.errors.organization_required', 'Organization context is required') }, { status: 400 })
+    }
+    const organizationId = context.organizationId
+    const rbac = context.container.resolve('rbacService') as RbacService | undefined
+    const actorId = context.auth?.sub
+    if (!rbac || !actorId) {
+      throw new CrudHttpError(403, { error: context.translate('customers.calendar.activityTypes.errors.forbidden', 'You do not have permission to view activity types.') })
+    }
+    const permissionScope = { tenantId: context.tenantId, organizationId }
+    const canViewInteractions = await rbac.userHasAllFeatures(actorId, ['customers.interactions.view'], permissionScope)
+    const canManageSettings = canViewInteractions || await rbac.userHasAllFeatures(actorId, ['customers.settings.manage'], permissionScope)
+    if (!canManageSettings) {
+      throw new CrudHttpError(403, { error: context.translate('customers.calendar.activityTypes.errors.forbidden', 'You do not have permission to view activity types.') })
+    }
+    const hierarchy = context.container.resolve('organizationHierarchyService') as OrganizationHierarchyService
+    const ancestors = await hierarchy.resolveAncestorIds({ tenantId: context.tenantId, organizationId })
+    if (ancestors === null) {
+      throw new CrudHttpError(403, { error: context.translate('customers.errors.organization_forbidden', 'Organization not accessible') })
+    }
+    const scopeIds = Array.from(new Set([organizationId, ...ancestors.slice().reverse()]))
+    const cacheKey = `customers:activity-types:${context.tenantId}:org=${organizationId}:scope=${scopeIds.join('|')}:widgets=${getInjectionRegistryVersion()}:registry=${getCalendarEventTypeRegistryVersion()}`
+    const cached = await context.cache?.get(cacheKey)
+    if (cached) return NextResponse.json(cached)
+
+    let catalog
+    try {
+      catalog = await resolveScopedCalendarEventTypes({
+        em: context.em,
+        tenantId: context.tenantId,
+        organizationId,
+        readableOrganizationIds: scopeIds,
+      })
+    } catch (err) {
+      logger.error('customers.activity_types.resolve failed', {
+        err,
+        tenantId: context.tenantId,
+        organizationId,
+      })
+      reportActivityTypeError(err, 'customers.activity_type_catalog_resolution_failed', {
+        tenantId: context.tenantId,
+        organizationId,
+      })
+      return NextResponse.json({
+        error: context.translate('customers.calendar.activityTypes.errors.loadFailed', 'Failed to load activity types'),
+        code: 'activity_type_catalog_unavailable',
+      }, { status: 503 })
+    }
+    if (context.cache) {
+      await context.cache.set(cacheKey, catalog, {
+        ttl: DICTIONARY_CACHE_TTL_MS,
+        tags: createDictionaryCacheTags({
+          tenantId: context.tenantId,
+          mappedKind: 'activity_type',
+          organizationIds: scopeIds,
+        }),
+      }).catch((err) => {
+        logger.warn('customers.activity_types cache write failed', { err })
+        reportActivityTypeError(err, 'customers.activity_type_catalog_cache_write_failed', {
+          tenantId: context.tenantId,
+          organizationId,
+        })
+      })
+    }
+    return NextResponse.json(catalog)
+  } catch (err) {
+    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
+    logger.error('customers.activity_types request failed', { err })
+    reportActivityTypeError(err, 'customers.activity_type_catalog_request_failed')
+    const { translate } = await resolveTranslations()
+    return NextResponse.json({
+      error: translate('customers.calendar.activityTypes.errors.loadFailed', 'Failed to load activity types'),
+    }, { status: err instanceof z.ZodError ? 400 : 500 })
+  }
+}
+
+export const openApi: OpenApiRouteDoc = {
+  tag: 'Customers',
+  summary: 'Effective calendar activity types',
+  methods: {
+    GET: {
+      summary: 'List effective calendar activity types',
+      description: 'Returns the tenant and organization scoped calendar activity-type catalog. Requires customers.interactions.view or customers.settings.manage.',
+      responses: [{ status: 200, description: 'Effective activity-type catalog', schema: responseSchema }],
+      errors: [
+        { status: 400, description: 'Organization scope is required', schema: z.object({ error: z.string() }) },
+        { status: 401, description: 'Unauthorized', schema: z.object({ error: z.string() }) },
+        { status: 403, description: 'Forbidden', schema: z.object({ error: z.string() }) },
+        { status: 500, description: 'Unexpected server error', schema: z.object({ error: z.string() }) },
+      ],
+    },
+  },
+}

package/src/modules/customers/api/dictionaries/[kind]/[id]/route.ts

@@ -17,6 +17,7 @@ import {
 } from '@open-mercato/shared/lib/crud/mutation-guard'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
+import { calendarEventTypeBehaviorSchema } from '../../../../calendar-event-types'
 
 const logger = createLogger('customers')
 
@@ -30,8 +31,9 @@ const patchSchema = z
     label: z.string().trim().max(150).optional(),
     color: z.union([z.string().trim(), z.null()]).optional(),
     icon: z.union([z.string().trim(), z.null()]).optional(),
+    behavior: calendarEventTypeBehaviorSchema.nullable().optional(),
   })
-  .refine((input) => input.value !== undefined || input.label !== undefined || input.color !== undefined || input.icon !== undefined, {
+  .refine((input) => input.value !== undefined || input.label !== undefined || input.color !== undefined || input.icon !== undefined || input.behavior !== undefined, {
     message: 'No changes provided',
   })
 
@@ -81,6 +83,7 @@ export async function PATCH(req: Request, ctx: { params?: { kind?: string; id?:
           label: payload.label,
           color: payload.color,
           icon: payload.icon,
+          behavior: payload.behavior,
         },
         ctx: routeContext.ctx,
       })) as CommandExecuteResult<{ entryId: string; changed: boolean }>
@@ -103,6 +106,7 @@ export async function PATCH(req: Request, ctx: { params?: { kind?: string; id?:
               ),
             })
           }
+          if (typeof err.body.code === 'string') throw err
           throw new CrudHttpError(409, { error: routeContext.translate('customers.config.dictionaries.errors.duplicate', 'An entry with this value already exists') })
         }
         if (err.status === 400) {
@@ -141,8 +145,10 @@ export async function PATCH(req: Request, ctx: { params?: { kind?: string; id?:
       label: entry.label,
       color: entry.color,
       icon: entry.icon,
+      ...(mappedKind === 'activity_type' ? { behavior: entry.activityTypeBehavior ?? null } : {}),
       organizationId: entry.organizationId,
       isInherited: false,
+      updatedAt: entry.updatedAt,
     })
     if (logEntry?.undoToken && logEntry?.id && logEntry?.commandId) {
       response.headers.set(
@@ -297,8 +303,10 @@ const dictionaryEntrySchema = z.object({
   label: z.string().nullable().optional(),
   color: z.string().nullable().optional(),
   icon: z.string().nullable().optional(),
+  behavior: calendarEventTypeBehaviorSchema.nullable().optional(),
   organizationId: z.string().uuid().nullable().optional(),
   isInherited: z.boolean().optional(),
+  updatedAt: z.date().or(z.string()).optional(),
 })
 
 const dictionaryDeleteResponseSchema = z.object({

package/src/modules/customers/api/dictionaries/[kind]/route.ts

@@ -24,6 +24,8 @@ import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 import { CUSTOMER_DICTIONARY_ORGANIZATION_REQUIRED_CODE } from '../../../lib/dictionaries'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
+import { calendarEventTypeBehaviorSchema } from '../../../calendar-event-types'
+import type { OrganizationHierarchyService } from '@open-mercato/shared/lib/auth/principal-service'
 
 const logger = createLogger('customers')
 
@@ -35,6 +37,7 @@ const postSchema = z.object({
   label: z.string().trim().max(150).optional(),
   color: colorSchema.or(z.null()).optional(),
   icon: iconSchema.or(z.null()).optional(),
+  behavior: calendarEventTypeBehaviorSchema.nullable().optional(),
 })
 
 const querySchema = z.object({
@@ -52,7 +55,7 @@ export async function GET(req: Request, ctx: { params?: { kind?: string } }) {
     const query = querySchema.parse({
       organizationId: url.searchParams.get('organizationId') ?? undefined,
     })
-    const { translate, em, organizationId, readableOrganizationIds, tenantId, cache } = await resolveDictionaryRouteContext(req, {
+    const { translate, em, organizationId, readableOrganizationIds, tenantId, cache, container } = await resolveDictionaryRouteContext(req, {
       selectedId: query.organizationId ?? undefined,
     })
     const { kind, mappedKind } = mapDictionaryKind(ctx.params?.kind)
@@ -64,7 +67,15 @@ export async function GET(req: Request, ctx: { params?: { kind?: string } }) {
     }
     const settings = await loadCustomerSettings(em, { tenantId, organizationId })
     const sortMode = resolveDictionaryEntrySortMode(settings?.dictionarySortModes?.[kind])
-    const scopedOrganizationIds = readableOrganizationIds.length > 0 ? readableOrganizationIds : [organizationId]
+    let scopedOrganizationIds = readableOrganizationIds.length > 0 ? readableOrganizationIds : [organizationId]
+    if (mappedKind === 'activity_type') {
+      const hierarchy = container.resolve('organizationHierarchyService') as OrganizationHierarchyService
+      const ancestors = await hierarchy.resolveAncestorIds({ tenantId, organizationId })
+      if (ancestors === null) {
+        throw new CrudHttpError(403, { error: translate('customers.errors.organization_forbidden', 'Organization not accessible') })
+      }
+      scopedOrganizationIds = Array.from(new Set([organizationId, ...ancestors.slice().reverse()]))
+    }
     const canUseCache = Boolean(cache) && mappedKind !== 'person_company_role'
 
     let cacheKey: string | null = null
@@ -133,6 +144,7 @@ export async function GET(req: Request, ctx: { params?: { kind?: string } }) {
           label: entry.label,
           color: entry.color,
           icon: entry.icon,
+          ...(mappedKind === 'activity_type' ? { behavior: entry.activityTypeBehavior ?? null } : {}),
           organizationId: entry.organizationId,
           isInherited: entry.organizationId !== organizationId,
           createdAt: entry.createdAt,
@@ -213,6 +225,7 @@ export async function POST(req: Request, ctx: { params?: { kind?: string } }) {
           label: body.label,
           color: body.color,
           icon: body.icon,
+          behavior: body.behavior,
         },
         ctx: context.ctx,
       })) as CommandExecuteResult<{ entryId: string; mode: 'created' | 'updated' | 'unchanged' }>
@@ -248,8 +261,10 @@ export async function POST(req: Request, ctx: { params?: { kind?: string } }) {
         label: entry.label,
         color: entry.color,
         icon: entry.icon,
+        ...(mappedKind === 'activity_type' ? { behavior: entry.activityTypeBehavior ?? null } : {}),
         organizationId: entry.organizationId,
         isInherited: false,
+        updatedAt: entry.updatedAt,
       },
       { status: result.mode === 'created' ? 201 : 200 }
     )
@@ -288,6 +303,7 @@ const dictionaryEntrySchema = z.object({
   label: z.string().nullable().optional(),
   color: z.string().nullable().optional(),
   icon: z.string().nullable().optional(),
+  behavior: calendarEventTypeBehaviorSchema.nullable().optional(),
   organizationId: z.string().uuid().nullable().optional(),
   isInherited: z.boolean().optional(),
   createdAt: z.date().or(z.string()).optional(),

package/src/modules/customers/api/interactions/route.ts

@@ -179,6 +179,7 @@ type InteractionListRow = {
   appearance_icon: string | null
   appearance_color: string | null
   source: string | null
+  timezone: string | null
   duration_minutes: number | null
   location: string | null
   all_day: boolean | null
@@ -314,6 +315,7 @@ const INTERACTION_LIST_COLUMNS = [
   'appearance_icon',
   'appearance_color',
   'source',
+  'timezone',
   'duration_minutes',
   'location',
   'all_day',
@@ -713,6 +715,7 @@ export async function GET(req: Request) {
       source: row.source ?? null,
       duration: row.duration_minutes ?? null,
       durationMinutes: row.duration_minutes ?? null,
+      timezone: row.timezone ?? null,
       location: row.location ?? null,
       allDay: row.all_day ?? null,
       recurrenceRule: row.recurrence_rule ?? null,
@@ -794,6 +797,7 @@ const interactionListItemSchema = z
     source: z.string().nullable().optional(),
     duration: z.number().nullable().optional(),
     durationMinutes: z.number().nullable().optional(),
+    timezone: z.string().nullable().optional(),
     location: z.string().nullable().optional(),
     allDay: z.boolean().nullable().optional(),
     recurrenceRule: z.string().nullable().optional(),

package/src/modules/customers/api/interactions/tasks/route.ts

@@ -153,6 +153,7 @@ const todoItemSchema = z.object({
   todoSeverity: z.string().nullable().optional(),
   todoDescription: z.string().nullable().optional(),
   todoDueAt: z.string().nullable().optional(),
+  todoTimezone: z.string().nullable().optional(),
   todoCustomValues: z.record(z.string(), z.unknown()).nullable().optional(),
   todoOrganizationId: z.string().nullable(),
   organizationId: z.string(),

package/src/modules/customers/backend/config/customers/pipeline-stages/page.meta.ts

@@ -1,3 +1,22 @@
+import React from 'react'
+
+const pipelineIcon = React.createElement(
+  'svg',
+  {
+    width: 16,
+    height: 16,
+    viewBox: '0 0 24 24',
+    fill: 'none',
+    stroke: 'currentColor',
+    strokeWidth: 2,
+    strokeLinecap: 'round',
+    strokeLinejoin: 'round',
+  },
+  React.createElement('rect', { x: 3, y: 4, width: 5, height: 16, rx: 1 }),
+  React.createElement('rect', { x: 10, y: 4, width: 5, height: 16, rx: 1 }),
+  React.createElement('rect', { x: 17, y: 4, width: 4, height: 16, rx: 1 })
+)
+
 export const metadata = {
   requireAuth: true,
   requireFeatures: ['customers.pipelines.manage'],
@@ -6,6 +25,7 @@ export const metadata = {
   pageGroup: 'Module Configs',
   pageGroupKey: 'settings.sections.moduleConfigs',
   pageOrder: 4,
+  icon: pipelineIcon,
   pageContext: 'settings' as const,
   breadcrumb: [
     { label: 'Pipeline stages', labelKey: 'customers.config.nav.pipelineStages' },