@open-mercato/core 0.9.0 → 0.9.1-develop.7459.1.99e3accd30

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' },

package/src/modules/customers/backend/customers/deals/[id]/hooks/useDealAssociations.ts

@@ -42,7 +42,6 @@ type UseDealAssociationsResult = {
   companiesSaving: boolean
   handlePeopleAssociationsChange: (nextIds: string[]) => Promise<void>
   handleCompaniesAssociationsChange: (nextIds: string[]) => Promise<void>
-  loadLinkedPeoplePage: (page: number, query: string) => Promise<LinkedPageResult>
   loadLinkedCompaniesPage: (page: number, query: string) => Promise<LinkedPageResult>
 }
 
@@ -64,33 +63,6 @@ export function useDealAssociations({
     setCompaniesEditorIds(data?.linkedCompanyIds ?? [])
   }, [data?.linkedCompanyIds, data?.linkedPersonIds])
 
-  const loadLinkedPeoplePage = React.useCallback(
-    async (page: number, query: string): Promise<LinkedPageResult> => {
-      if (!currentDealId) {
-        return { items: [], totalPages: 1, total: 0 }
-      }
-      const params = new URLSearchParams({
-        page: String(page),
-        pageSize: '20',
-        sort: 'name-asc',
-      })
-      if (query.trim().length > 0) {
-        params.set('search', query.trim())
-      }
-      const payload = await readApiResultOrThrow<{
-        items?: DealAssociation[]
-        total?: number
-        totalPages?: number
-      }>(`/api/customers/deals/${encodeURIComponent(currentDealId)}/people?${params.toString()}`)
-      return {
-        items: Array.isArray(payload.items) ? payload.items : [],
-        totalPages: typeof payload.totalPages === 'number' ? payload.totalPages : 1,
-        total: typeof payload.total === 'number' ? payload.total : 0,
-      }
-    },
-    [currentDealId],
-  )
-
   const loadLinkedCompaniesPage = React.useCallback(
     async (page: number, query: string): Promise<LinkedPageResult> => {
       if (!currentDealId) {
@@ -220,7 +192,6 @@ export function useDealAssociations({
     companiesSaving,
     handlePeopleAssociationsChange,
     handleCompaniesAssociationsChange,
-    loadLinkedPeoplePage,
     loadLinkedCompaniesPage,
   }
 }

package/src/modules/customers/backend/customers/deals/[id]/page.tsx

@@ -3,7 +3,7 @@
 import * as React from 'react'
 import { extensionPoints } from '@open-mercato/core/modules/customers/extension-points'
 import Link from 'next/link'
-import { Building2, FileText, Hash, UserSearch, Users } from 'lucide-react'
+import { Building2, FileText, Hash, UserSearch } from 'lucide-react'
 import { EmptyState } from '@open-mercato/ui/primitives/empty-state'
 import { useRouter, useSearchParams, usePathname } from 'next/navigation'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
@@ -24,6 +24,7 @@ import { DealDetailHeader } from '../../../../components/detail/DealDetailHeader
 import { DealDetailTabs, resolveLegacyTab, type DealTabId } from '../../../../components/detail/DealDetailTabs'
 import { DealForm, useDealAssociationLookups } from '../../../../components/detail/DealForm'
 import { DealLinkedEntitiesTab } from '../../../../components/detail/DealLinkedEntitiesTab'
+import { DealPeopleSection } from '../../../../components/detail/DealPeopleSection'
 import { ConfirmDealLostDialog } from '../../../../components/detail/ConfirmDealLostDialog'
 import { DealLostSummaryDialog } from '../../../../components/detail/DealLostSummaryDialog'
 import { DealWonPopup } from '../../../../components/detail/DealWonPopup'
@@ -116,7 +117,7 @@ export default function DealDetailPage({ params }: { params?: { id?: string } })
     setActiveTab(initialTab)
   }, [initialTab])
 
-  const { searchPeoplePage, fetchPeopleByIds, searchCompaniesPage, fetchCompaniesByIds } = useDealAssociationLookups({
+  const { searchCompaniesPage, fetchCompaniesByIds } = useDealAssociationLookups({
     excludeLinkedDealId: data?.deal.id ?? null,
   })
 
@@ -191,7 +192,6 @@ export default function DealDetailPage({ params }: { params?: { id?: string } })
     companiesSaving,
     handlePeopleAssociationsChange,
     handleCompaniesAssociationsChange,
-    loadLinkedPeoplePage,
     loadLinkedCompaniesPage,
   } = useDealAssociations({
     currentDealId,
@@ -534,22 +534,20 @@ export default function DealDetailPage({ params }: { params?: { id?: string } })
 
         if (activeTab === 'people') {
           return (
-            <DealLinkedEntitiesTab
-              entityLabel={t('customers.deals.detail.tabs.peopleSingular', 'Person')}
-              entityLabelPlural={t('customers.deals.detail.tabs.people', 'People')}
-              manageLabel={t('customers.deals.detail.peopleEditorTitle', 'Manage linked people')}
-              searchPlaceholder={t('customers.deals.detail.peopleSearch', 'Search linked people…')}
-              linkedItems={data.people}
-              linkedCount={data.counts.people}
+            <DealPeopleSection
+              dealId={data.deal.id}
+              dealName={dealName}
               selectedIds={peopleEditorIds}
-              disabled={peopleSaving || isSaving}
-              savePending={peopleSaving}
-              hrefBuilder={(personId) => `/backend/customers/people-v2/${encodeURIComponent(personId)}`}
               onSaveSelection={(next) => handlePeopleAssociationsChange(next)}
-              loadLinkedPage={loadLinkedPeoplePage}
-              searchEntities={searchPeoplePage}
-              fetchEntitiesByIds={fetchPeopleByIds}
-              icon={<Users className="size-4" />}
+              addActionLabel={t('customers.deals.detail.peopleAdd', 'Add person')}
+              disabled={peopleSaving || isSaving}
+              emptyLabel={t('customers.deals.detail.peopleEmpty', 'No people linked to this deal yet.')}
+              emptyState={{
+                title: t('customers.deals.detail.peopleEmptyTitle', 'Link the people involved'),
+                actionLabel: t('customers.deals.detail.peopleEmptyAction', 'Add person'),
+              }}
+              translator={detailTranslator}
+              runGuardedMutation={runMutationWithContext}
             />
           )
         }