@open-mercato/core 0.6.6-develop.6313.1.618a49a6b4 → 0.6.6-develop.6317.1.b3be10ab84

package/src/modules/customers/ai-tools/people-pack.ts

@@ -17,7 +17,6 @@
  * documented aggregate detail route). Tool name, schema, requiredFeatures,
  * and output shape are unchanged.
  */
-import type { EntityManager } from '@mikro-orm/postgresql'
 import { z } from 'zod'
 import { defineApiBackedAiTool } from '@open-mercato/ai-assistant/modules/ai_assistant/lib/api-backed-tool'
 import {
@@ -30,20 +29,17 @@ import {
   CustomerPersonProfile,
 } from '../data/entities'
 import { assertTenantScope, type CustomersAiToolDefinition, type CustomersToolContext } from './types'
+import {
+  buildRelatedRecords,
+  buildScope,
+  resolveEm,
+  toCustomerListSummary,
+  toIso,
+  type CustomerRelatedRecords,
+} from './_shared'
 
 const NIL_UUID = '00000000-0000-0000-0000-000000000000'
 
-function resolveEm(ctx: CustomersToolContext | AiToolExecutionContext): EntityManager {
-  return ctx.container.resolve<EntityManager>('em')
-}
-
-function buildScope(ctx: CustomersToolContext | AiToolExecutionContext, tenantId: string) {
-  return {
-    tenantId,
-    organizationId: ctx.organizationId,
-  }
-}
-
 const listPeopleInput = z
   .object({
     q: z.string().trim().optional().describe('Optional search text matched against display name / email / phone. Omit or leave empty to list all.'),
@@ -146,23 +142,7 @@ const listPeopleTool = defineApiBackedAiTool<ListPeopleInput, ListPeopleApiRespo
     const data = (response.data ?? {}) as ListPeopleApiResponse
     const rawItems: ListPeopleApiItem[] = Array.isArray(data.items) ? data.items : []
     return {
-      items: rawItems.map((row) => {
-        const createdAtRaw = row.created_at ?? row.createdAt ?? null
-        const createdAt = createdAtRaw ? new Date(String(createdAtRaw)).toISOString() : null
-        return {
-          id: row.id,
-          displayName: row.display_name ?? row.displayName ?? null,
-          primaryEmail: row.primary_email ?? row.primaryEmail ?? null,
-          primaryPhone: row.primary_phone ?? row.primaryPhone ?? null,
-          status: row.status ?? null,
-          lifecycleStage: row.lifecycle_stage ?? row.lifecycleStage ?? null,
-          source: row.source ?? null,
-          ownerUserId: row.owner_user_id ?? row.ownerUserId ?? null,
-          organizationId: row.organization_id ?? row.organizationId ?? null,
-          tenantId: row.tenant_id ?? row.tenantId ?? null,
-          createdAt,
-        }
-      }),
+      items: rawItems.map((row) => toCustomerListSummary(row)),
       total: typeof data.total === 'number' ? data.total : 0,
       limit,
       offset,
@@ -182,13 +162,6 @@ type GetPersonInput = z.infer<typeof getPersonInput>
 
 type ApiPersonDetailRow = Record<string, unknown> | null | undefined
 
-function toIso(value: unknown): string | null {
-  if (!value) return null
-  const dt = value instanceof Date ? value : new Date(String(value))
-  if (Number.isNaN(dt.getTime())) return null
-  return dt.toISOString()
-}
-
 const getPersonTool: CustomersAiToolDefinition = {
   name: 'customers.get_person',
   displayName: 'Get person',
@@ -226,104 +199,9 @@ const getPersonTool: CustomersAiToolDefinition = {
     const profileRow = (data.profile ?? null) as ApiPersonDetailRow
     const customFields = (data.customFields ?? {}) as Record<string, unknown>
 
-    let related: Record<string, unknown> | null = null
+    let related: CustomerRelatedRecords | null = null
     if (includeRelated) {
-      const addresses = Array.isArray(data.addresses) ? (data.addresses as Array<Record<string, unknown>>) : []
-      const activities = Array.isArray(data.activities) ? (data.activities as Array<Record<string, unknown>>) : []
-      const notes = Array.isArray(data.comments) ? (data.comments as Array<Record<string, unknown>>) : []
-      const todos = Array.isArray(data.todos) ? (data.todos as Array<Record<string, unknown>>) : []
-      const interactions = Array.isArray(data.interactions) ? (data.interactions as Array<Record<string, unknown>>) : []
-      const tagsRows = Array.isArray(data.tags) ? (data.tags as Array<Record<string, unknown>>) : []
-      const dealsRows = Array.isArray(data.deals) ? (data.deals as Array<Record<string, unknown>>) : []
-      related = {
-        addresses: addresses.map((address) => ({
-          id: address.id,
-          name: address.name ?? null,
-          purpose: address.purpose ?? null,
-          addressLine1: address.addressLine1 ?? null,
-          addressLine2: address.addressLine2 ?? null,
-          city: address.city ?? null,
-          region: address.region ?? null,
-          postalCode: address.postalCode ?? null,
-          country: address.country ?? null,
-          isPrimary: !!address.isPrimary,
-        })),
-        activities: activities.map((activity) => ({
-          id: activity.id,
-          activityType: activity.activityType,
-          subject: activity.subject ?? null,
-          body: activity.body ?? null,
-          occurredAt: toIso(activity.occurredAt),
-          createdAt: toIso(activity.createdAt),
-        })),
-        notes: notes.map((comment) => ({
-          id: comment.id,
-          body: comment.body,
-          authorUserId: comment.authorUserId ?? null,
-          createdAt: toIso(comment.createdAt),
-        })),
-        tasks: todos.map((task) => ({
-          id: task.id,
-          todoId: task.todoId ?? task.id,
-          todoSource: task.todoSource ?? null,
-          createdAt: toIso(task.createdAt),
-        })),
-        interactions: interactions.map((interaction) => ({
-          id: interaction.id,
-          interactionType: interaction.interactionType,
-          title: interaction.title ?? null,
-          status: interaction.status,
-          scheduledAt: toIso(interaction.scheduledAt),
-          occurredAt: toIso(interaction.occurredAt),
-        })),
-        tags: tagsRows
-          .map((tag) => {
-            if (!tag || typeof tag !== 'object') return null
-            const id = typeof tag.id === 'string' ? tag.id : null
-            const label = typeof tag.label === 'string' ? tag.label : null
-            if (!id || !label) return null
-            const slug = typeof tag.slug === 'string' ? tag.slug : label
-            const color = typeof tag.color === 'string' ? tag.color : null
-            return { id, slug, label, color }
-          })
-          .filter(
-            (entry): entry is { id: string; slug: string; label: string; color: string | null } =>
-              entry !== null,
-          ),
-        deals: dealsRows
-          .map((deal) => {
-            if (!deal || typeof deal !== 'object') return null
-            const id = typeof deal.id === 'string' ? deal.id : null
-            if (!id) return null
-            return {
-              id,
-              title: typeof deal.title === 'string' ? deal.title : '',
-              status: typeof deal.status === 'string' ? deal.status : null,
-              pipelineStageId:
-                typeof deal.pipelineStageId === 'string' ? deal.pipelineStageId : null,
-              valueAmount:
-                typeof deal.valueAmount === 'string'
-                  ? deal.valueAmount
-                  : deal.valueAmount === null || deal.valueAmount === undefined
-                    ? null
-                    : String(deal.valueAmount),
-              valueCurrency:
-                typeof deal.valueCurrency === 'string' ? deal.valueCurrency : null,
-            }
-          })
-          .filter(
-            (
-              value,
-            ): value is {
-              id: string
-              title: string
-              status: string | null
-              pipelineStageId: string | null
-              valueAmount: string | null
-              valueCurrency: string | null
-            } => value !== null,
-          ),
-      }
+      related = buildRelatedRecords(data)
     }
 
     return {

package/src/modules/customers/components/DictionarySettings.tsx

@@ -14,7 +14,10 @@ import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuarde
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
-import type { CustomerDictionaryKind } from '../lib/dictionaries'
+import {
+  getCustomerDictionarySettingsSectionId,
+  type CustomerDictionaryKind,
+} from '../lib/dictionaries'
 import { ICON_SUGGESTIONS } from '@open-mercato/core/modules/dictionaries/components/dictionaryAppearance'
 import {
   DictionaryForm,
@@ -47,6 +50,19 @@ const DEFAULT_FORM_VALUES: DictionaryFormValues = {
   icon: null,
 }
 
+const DICTIONARY_HASH_SCROLL_RETRY_DELAYS_MS = [100, 350, 1000] as const
+
+function getCurrentDictionaryHashTarget(): HTMLElement | null {
+  if (typeof window === 'undefined') return null
+  const hash = window.location.hash
+  if (!hash.startsWith('#customer-dictionary-')) return null
+  try {
+    return document.getElementById(decodeURIComponent(hash.slice(1)))
+  } catch {
+    return document.getElementById(hash.slice(1))
+  }
+}
+
 export default function DictionarySettings() {
   const t = useT()
 
@@ -98,6 +114,45 @@ export default function DictionarySettings() {
     },
   ], [t])
 
+  React.useEffect(() => {
+    const timeoutIds: number[] = []
+    let frameId: number | null = null
+
+    const clearScheduledScrolls = () => {
+      if (frameId !== null) {
+        window.cancelAnimationFrame(frameId)
+        frameId = null
+      }
+      while (timeoutIds.length > 0) {
+        const timeoutId = timeoutIds.pop()
+        if (timeoutId !== undefined) window.clearTimeout(timeoutId)
+      }
+    }
+
+    const scrollToHashTarget = () => {
+      getCurrentDictionaryHashTarget()?.scrollIntoView({ block: 'start' })
+    }
+
+    const scheduleHashScroll = () => {
+      clearScheduledScrolls()
+      if (!window.location.hash.startsWith('#customer-dictionary-')) return
+      scrollToHashTarget()
+      if (typeof window.requestAnimationFrame === 'function') {
+        frameId = window.requestAnimationFrame(scrollToHashTarget)
+      }
+      DICTIONARY_HASH_SCROLL_RETRY_DELAYS_MS.forEach((delay) => {
+        timeoutIds.push(window.setTimeout(scrollToHashTarget, delay))
+      })
+    }
+
+    scheduleHashScroll()
+    window.addEventListener('hashchange', scheduleHashScroll)
+    return () => {
+      window.removeEventListener('hashchange', scheduleHashScroll)
+      clearScheduledScrolls()
+    }
+  }, [])
+
   return (
     <div className="space-y-8">
       <header className="space-y-2">
@@ -393,7 +448,10 @@ function CustomerDictionarySection({ kind, title, description }: CustomerDiction
   }), [dialog, t])
 
   return (
-    <section className="rounded border bg-card text-card-foreground shadow-sm">
+    <section
+      id={getCustomerDictionarySettingsSectionId(kind)}
+      className="scroll-mt-24 rounded border bg-card text-card-foreground shadow-sm"
+    >
       <div className="border-b px-6 py-4 space-y-1">
         <h2 className="text-lg font-medium">{title}</h2>
         <p className="text-sm text-muted-foreground">{description}</p>

package/src/modules/customers/components/calendar/CalendarScreen.tsx

@@ -499,6 +499,7 @@ export function CalendarScreen() {
         showWeekends={preferences.showWeekends}
         showConflicts={preferences.conflictWarnings}
         aiSummaries={preferences.aiSummaries}
+        canManage={canManage}
         highlightItemId={highlightItemId}
         onItemClick={openEditEditor}
         onJoin={handleJoin}

package/src/modules/customers/components/calendar/EventPeekPopover.tsx

@@ -5,6 +5,7 @@ import { Sparkles } from 'lucide-react'
 import { useLocale, useT } from '@open-mercato/shared/lib/i18n/context'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Popover, PopoverContent, PopoverTrigger } from '@open-mercato/ui/primitives/popover'
+import { SimpleTooltip } from '@open-mercato/ui/primitives/tooltip'
 import { formatTimeRange } from './EventBlock'
 import type { CalendarItem, CalendarPlatform } from './types'
 
@@ -20,6 +21,7 @@ export type EventPeekPopoverProps = {
   open: boolean
   joinUrl: string | null
   aiSummaries: boolean
+  canManage?: boolean
   onOpenChange(open: boolean): void
   onJoin(item: CalendarItem): void
   onEdit(item: CalendarItem): void
@@ -31,6 +33,7 @@ export function EventPeekPopover({
   open,
   joinUrl,
   aiSummaries,
+  canManage = true,
   onOpenChange,
   onJoin,
   onEdit,
@@ -81,17 +84,32 @@ export function EventPeekPopover({
                 {t('customers.calendar.peek.join', 'Join')}
               </Button>
             ) : null}
-            <Button
-              type="button"
-              size="sm"
-              variant="secondary"
-              onClick={() => {
-                onOpenChange(false)
-                onEdit(item)
-              }}
-            >
-              {t('customers.calendar.peek.edit', 'Edit')}
-            </Button>
+            {canManage ? (
+              <Button
+                type="button"
+                size="sm"
+                variant="secondary"
+                onClick={() => {
+                  onOpenChange(false)
+                  onEdit(item)
+                }}
+              >
+                {t('customers.calendar.peek.edit', 'Edit')}
+              </Button>
+            ) : (
+              <SimpleTooltip
+                content={t(
+                  'customers.calendar.peek.editForbidden',
+                  "You don't have permission to edit events",
+                )}
+              >
+                <span className="inline-flex">
+                  <Button type="button" size="sm" variant="secondary" disabled className="pointer-events-none">
+                    {t('customers.calendar.peek.edit', 'Edit')}
+                  </Button>
+                </span>
+              </SimpleTooltip>
+            )}
           </div>
         </div>
       </PopoverContent>

package/src/modules/customers/components/calendar/TimeGrid.tsx

@@ -160,6 +160,7 @@ export function TimeGrid({
   showWeekends,
   showConflicts,
   aiSummaries,
+  canManage = true,
   highlightItemId,
   onItemClick,
   onJoin,
@@ -351,6 +352,7 @@ export function TimeGrid({
                       open={selectedId === item.id}
                       joinUrl={resolveJoinUrl(item.location)}
                       aiSummaries={aiSummaries}
+                      canManage={canManage}
                       onOpenChange={(open) => setSelectedId(open ? item.id : null)}
                       onJoin={onJoin}
                       onEdit={onItemClick}
@@ -462,6 +464,7 @@ export function TimeGrid({
                       open={selectedId === block.item.id}
                       joinUrl={resolveJoinUrl(block.item.location)}
                       aiSummaries={aiSummaries}
+                      canManage={canManage}
                       onOpenChange={(open) => setSelectedId(open ? block.item.id : null)}
                       onJoin={onJoin}
                       onEdit={onItemClick}

package/src/modules/customers/components/calendar/types.ts

@@ -87,6 +87,7 @@ export interface TimeGridProps {
   showWeekends: boolean
   showConflicts: boolean
   aiSummaries: boolean
+  canManage?: boolean
   highlightItemId?: string | null
   onItemClick(item: CalendarItem): void
   onJoin(item: CalendarItem): void

package/src/modules/customers/components/formConfig.tsx

@@ -51,7 +51,11 @@ import {
   ensureCustomerDictionary,
   invalidateCustomerDictionary,
 } from './detail/hooks/useCustomerDictionary'
-import type { CustomerDictionaryKind } from '../lib/dictionaries'
+import {
+  CUSTOMER_DICTIONARIES_MANAGE_HREF,
+  getCustomerDictionaryManageHref,
+  type CustomerDictionaryKind,
+} from '../lib/dictionaries'
 import { normalizeCustomFieldSubmitValue } from './detail/customFieldUtils'
 import { CUSTOMER_PHONE_INVALID_MESSAGE_KEY } from '../data/validators'
 
@@ -116,6 +120,8 @@ type DictionarySelectFieldProps = {
   showActiveAppearance?: boolean
 }
 
+export { CUSTOMER_DICTIONARIES_MANAGE_HREF, getCustomerDictionaryManageHref }
+
 const emailValidationSchema = z.string().email()
 const EMAIL_CHECK_DEBOUNCE_MS = 350
 
@@ -233,7 +239,7 @@ export function DictionarySelectField({
       fetchOptions={fetchOptions}
       createOption={createOption}
       labels={labels}
-      manageHref={manageHref}
+      manageHref={manageHref ?? getCustomerDictionaryManageHref(kind)}
       selectClassName={selectClassName}
       allowInlineCreate={allowInlineCreate}
       allowAppearance={allowAppearance}

package/src/modules/customers/i18n/de.json

@@ -312,6 +312,7 @@
   "customers.calendar.peek.attendee": "1 Teilnehmer",
   "customers.calendar.peek.attendees": "{count} Teilnehmer",
   "customers.calendar.peek.edit": "Bearbeiten",
+  "customers.calendar.peek.editForbidden": "Sie haben keine Berechtigung, Termine zu bearbeiten",
   "customers.calendar.peek.join": "Beitreten",
   "customers.calendar.platform.meet": "Meet",
   "customers.calendar.platform.slack": "Slack",

package/src/modules/customers/i18n/en.json

@@ -312,6 +312,7 @@
   "customers.calendar.peek.attendee": "1 attendee",
   "customers.calendar.peek.attendees": "{count} attendees",
   "customers.calendar.peek.edit": "Edit",
+  "customers.calendar.peek.editForbidden": "You don't have permission to edit events",
   "customers.calendar.peek.join": "Join",
   "customers.calendar.platform.meet": "Meet",
   "customers.calendar.platform.slack": "Slack",

package/src/modules/customers/i18n/es.json

@@ -312,6 +312,7 @@
   "customers.calendar.peek.attendee": "1 asistente",
   "customers.calendar.peek.attendees": "{count} asistentes",
   "customers.calendar.peek.edit": "Editar",
+  "customers.calendar.peek.editForbidden": "No tienes permiso para editar eventos",
   "customers.calendar.peek.join": "Unirse",
   "customers.calendar.platform.meet": "Meet",
   "customers.calendar.platform.slack": "Slack",

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

@@ -312,6 +312,7 @@
   "customers.calendar.peek.attendee": "1 uczestnik",
   "customers.calendar.peek.attendees": "{count} uczestników",
   "customers.calendar.peek.edit": "Edytuj",
+  "customers.calendar.peek.editForbidden": "Nie masz uprawnień do edycji wydarzeń",
   "customers.calendar.peek.join": "Dołącz",
   "customers.calendar.platform.meet": "Meet",
   "customers.calendar.platform.slack": "Slack",

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

@@ -30,6 +30,16 @@ export type CustomerDictionaryKind = typeof CUSTOMER_DICTIONARY_KINDS[number]
 export type CustomerDictionaryDisplayEntry = DictionaryDisplayEntry
 export type CustomerDictionaryMap = DictionaryMap
 
+export const CUSTOMER_DICTIONARIES_MANAGE_HREF = '/backend/config/customers'
+
+export function getCustomerDictionarySettingsSectionId(kind: CustomerDictionaryKind) {
+  return `customer-dictionary-${kind}`
+}
+
+export function getCustomerDictionaryManageHref(kind: CustomerDictionaryKind) {
+  return `${CUSTOMER_DICTIONARIES_MANAGE_HREF}#${getCustomerDictionarySettingsSectionId(kind)}`
+}
+
 export function createEmptyCustomerDictionaryMaps(): Record<CustomerDictionaryKind, CustomerDictionaryMap> {
   return CUSTOMER_DICTIONARY_KINDS.reduce<Record<CustomerDictionaryKind, CustomerDictionaryMap>>(
     (acc, kind) => {