@open-mercato/core 0.6.6-develop.6515.1.01911d00e2 → 0.6.6-develop.6519.1.bdc91fb755

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

@@ -836,6 +836,8 @@
   "customers.config.dictionaries.sections.dealStatuses.title": "Deal statuses",
   "customers.config.dictionaries.sections.industries.description": "Manage the industries used by companies.",
   "customers.config.dictionaries.sections.industries.title": "Industries",
+  "customers.config.dictionaries.sections.interactionStatuses.description": "Manage the statuses available for tasks and logged interactions.",
+  "customers.config.dictionaries.sections.interactionStatuses.title": "Interaction statuses",
   "customers.config.dictionaries.sections.jobTitles.description": "Configure job titles with their appearance.",
   "customers.config.dictionaries.sections.jobTitles.title": "Job titles",
   "customers.config.dictionaries.sections.lifecycle.description": "Configure lifecycle stages to track customer progress.",
@@ -861,6 +863,10 @@
   "customers.config.nav.customers": "Customers",
   "customers.config.pipelineStages.deletePipelineDesc": "This pipeline and all its stages will be permanently removed. Deals assigned to it will lose their pipeline assignment.",
   "customers.config.pipelineStages.deleteStageDesc": "This stage will be permanently removed. Deals assigned to it will lose their stage assignment.",
+  "customers.config.upgradeActions.interactionStatuses.cta": "Seed interaction statuses",
+  "customers.config.upgradeActions.interactionStatuses.loading": "Seeding interaction statuses…",
+  "customers.config.upgradeActions.interactionStatuses.message": "Seed the interaction-statuses dictionary so CRM tasks and logged interactions can use the configurable status list.",
+  "customers.config.upgradeActions.interactionStatuses.success": "Interaction statuses are ready.",
   "customers.countries.ca": "Canada",
   "customers.countries.de": "Germany",
   "customers.countries.es": "Spain",
@@ -1609,7 +1615,9 @@
   "customers.interactions.load.error": "Failed to load interactions.",
   "customers.interactions.status.canceled": "Canceled",
   "customers.interactions.status.done": "Done",
+  "customers.interactions.status.in_progress": "In progress",
   "customers.interactions.status.planned": "Planned",
+  "customers.interactions.status.waiting": "Waiting / blocked",
   "customers.interactions.update.error": "Failed to update interaction.",
   "customers.interactions.update.success": "Interaction updated.",
   "customers.linking.actions.cancel": "Cancel",
@@ -2126,6 +2134,8 @@
   "customers.people.detail.tasks.fields.priorityPlaceholder": "0-100",
   "customers.people.detail.tasks.fields.scheduledAt": "Scheduled for",
   "customers.people.detail.tasks.fields.scheduledAtPlaceholder": "Choose a date and time",
+  "customers.people.detail.tasks.fields.status": "Status",
+  "customers.people.detail.tasks.fields.statusPlaceholder": "Select a status",
   "customers.people.detail.tasks.fields.title": "Title",
   "customers.people.detail.tasks.fields.titlePlaceholder": "Task title",
   "customers.people.detail.tasks.form.customFields": "Task attributes",

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

@@ -836,6 +836,8 @@
   "customers.config.dictionaries.sections.dealStatuses.title": "Estados de oportunidades",
   "customers.config.dictionaries.sections.industries.description": "Gestiona las industrias utilizadas por las empresas.",
   "customers.config.dictionaries.sections.industries.title": "Industrias",
+  "customers.config.dictionaries.sections.interactionStatuses.description": "Manage the statuses available for tasks and logged interactions.",
+  "customers.config.dictionaries.sections.interactionStatuses.title": "Interaction statuses",
   "customers.config.dictionaries.sections.jobTitles.description": "Configura los cargos y su apariencia.",
   "customers.config.dictionaries.sections.jobTitles.title": "Cargos",
   "customers.config.dictionaries.sections.lifecycle.description": "Configura las etapas del ciclo de vida para seguir el progreso de los clientes.",
@@ -861,6 +863,10 @@
   "customers.config.nav.customers": "Clientes",
   "customers.config.pipelineStages.deletePipelineDesc": "This pipeline and all its stages will be permanently removed. Deals assigned to it will lose their pipeline assignment.",
   "customers.config.pipelineStages.deleteStageDesc": "This stage will be permanently removed. Deals assigned to it will lose their stage assignment.",
+  "customers.config.upgradeActions.interactionStatuses.cta": "Seed interaction statuses",
+  "customers.config.upgradeActions.interactionStatuses.loading": "Seeding interaction statuses…",
+  "customers.config.upgradeActions.interactionStatuses.message": "Seed the interaction-statuses dictionary so CRM tasks and logged interactions can use the configurable status list.",
+  "customers.config.upgradeActions.interactionStatuses.success": "Interaction statuses are ready.",
   "customers.countries.ca": "Canadá",
   "customers.countries.de": "Alemania",
   "customers.countries.es": "España",
@@ -1609,7 +1615,9 @@
   "customers.interactions.load.error": "Failed to load interactions.",
   "customers.interactions.status.canceled": "Canceled",
   "customers.interactions.status.done": "Done",
+  "customers.interactions.status.in_progress": "In progress",
   "customers.interactions.status.planned": "Planned",
+  "customers.interactions.status.waiting": "Waiting / blocked",
   "customers.interactions.update.error": "Failed to update interaction.",
   "customers.interactions.update.success": "Interaction updated.",
   "customers.linking.actions.cancel": "Cancelar",
@@ -2126,6 +2134,8 @@
   "customers.people.detail.tasks.fields.priorityPlaceholder": "0-100",
   "customers.people.detail.tasks.fields.scheduledAt": "Programada para",
   "customers.people.detail.tasks.fields.scheduledAtPlaceholder": "Elige una fecha y hora",
+  "customers.people.detail.tasks.fields.status": "Status",
+  "customers.people.detail.tasks.fields.statusPlaceholder": "Selecciona un estado",
   "customers.people.detail.tasks.fields.title": "Título",
   "customers.people.detail.tasks.fields.titlePlaceholder": "Título de la tarea",
   "customers.people.detail.tasks.form.customFields": "Atributos de tarea",

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

@@ -836,6 +836,8 @@
   "customers.config.dictionaries.sections.dealStatuses.title": "Statusy szans sprzedaży",
   "customers.config.dictionaries.sections.industries.description": "Zarządzaj branżami używanymi przez firmy.",
   "customers.config.dictionaries.sections.industries.title": "Branże",
+  "customers.config.dictionaries.sections.interactionStatuses.description": "Manage the statuses available for tasks and logged interactions.",
+  "customers.config.dictionaries.sections.interactionStatuses.title": "Interaction statuses",
   "customers.config.dictionaries.sections.jobTitles.description": "Skonfiguruj stanowiska i ich wygląd.",
   "customers.config.dictionaries.sections.jobTitles.title": "Stanowiska",
   "customers.config.dictionaries.sections.lifecycle.description": "Skonfiguruj etapy cyklu życia do śledzenia postępu klientów.",
@@ -861,6 +863,10 @@
   "customers.config.nav.customers": "Klienci",
   "customers.config.pipelineStages.deletePipelineDesc": "This pipeline and all its stages will be permanently removed. Deals assigned to it will lose their pipeline assignment.",
   "customers.config.pipelineStages.deleteStageDesc": "This stage will be permanently removed. Deals assigned to it will lose their stage assignment.",
+  "customers.config.upgradeActions.interactionStatuses.cta": "Seed interaction statuses",
+  "customers.config.upgradeActions.interactionStatuses.loading": "Seeding interaction statuses…",
+  "customers.config.upgradeActions.interactionStatuses.message": "Seed the interaction-statuses dictionary so CRM tasks and logged interactions can use the configurable status list.",
+  "customers.config.upgradeActions.interactionStatuses.success": "Interaction statuses are ready.",
   "customers.countries.ca": "Kanada",
   "customers.countries.de": "Niemcy",
   "customers.countries.es": "Hiszpania",
@@ -1609,7 +1615,9 @@
   "customers.interactions.load.error": "Failed to load interactions.",
   "customers.interactions.status.canceled": "Canceled",
   "customers.interactions.status.done": "Done",
+  "customers.interactions.status.in_progress": "In progress",
   "customers.interactions.status.planned": "Planned",
+  "customers.interactions.status.waiting": "Waiting / blocked",
   "customers.interactions.update.error": "Failed to update interaction.",
   "customers.interactions.update.success": "Interaction updated.",
   "customers.linking.actions.cancel": "Anuluj",
@@ -2126,6 +2134,8 @@
   "customers.people.detail.tasks.fields.priorityPlaceholder": "0-100",
   "customers.people.detail.tasks.fields.scheduledAt": "Zaplanowano na",
   "customers.people.detail.tasks.fields.scheduledAtPlaceholder": "Wybierz datę i godzinę",
+  "customers.people.detail.tasks.fields.status": "Status",
+  "customers.people.detail.tasks.fields.statusPlaceholder": "Wybierz status",
   "customers.people.detail.tasks.fields.title": "Tytuł",
   "customers.people.detail.tasks.fields.titlePlaceholder": "Tytuł zadania",
   "customers.people.detail.tasks.form.customFields": "Atrybuty zadania",

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

@@ -24,6 +24,7 @@ export const CUSTOMER_DICTIONARY_KINDS = [
   'temperature',
   'renewal-quarters',
   'person-company-roles',
+  'interaction-statuses',
 ] as const
 
 export type CustomerDictionaryKind = typeof CUSTOMER_DICTIONARY_KINDS[number]

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

@@ -1,5 +1,6 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { sql } from 'kysely'
+import { TERMINAL_INTERACTION_STATUS_LIST } from './interactionStatus'
 
 export type NextInteractionProjectionResult = {
   nextInteractionId: string | null
@@ -9,7 +10,10 @@ export type NextInteractionProjectionResult = {
  * Recomputes the next-interaction projection fields on a CustomerEntity.
  *
  * Algorithm:
- * 1. Find all interactions for entityId where status = 'planned', scheduled_at IS NOT NULL, deleted_at IS NULL
+ * 1. Find all OPEN interactions for entityId (status NOT IN terminal — see lib/interactionStatus.ts),
+ *    scheduled_at IS NOT NULL, deleted_at IS NULL. A scheduled task that moves planned -> in_progress
+ *    stays the next step; this projection only tracks scheduled next-steps, so undated open tasks are
+ *    deliberately excluded (next_interaction_at must stay a real date for grid sort / search index).
  * 2. Sort by scheduled_at ASC, priority DESC NULLS LAST, created_at ASC, id ASC
  * 3. Take the first row and project its fields onto the CustomerEntity
  * 4. If no candidates, set all projection fields to NULL
@@ -32,7 +36,7 @@ export async function recomputeNextInteraction(
       'appearance_color',
     ])
     .where('entity_id', '=', entityId)
-    .where('status', '=', 'planned')
+    .where('status', 'not in', [...TERMINAL_INTERACTION_STATUS_LIST])
     .where('scheduled_at', 'is not', null)
     .where('deleted_at', 'is', null)
   if (organizationId) {

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

@@ -0,0 +1,30 @@
+// Single source of truth for interaction (CRM task) open/terminal semantics.
+//
+// The editable list of statuses lives in the `interaction-statuses` dictionary and
+// is configurable per tenant. The behaviorally-significant question — does a status
+// mean the task is still open, or is it closed/terminal — stays in code here so every
+// call site agrees. A status not known to code counts as OPEN (non-terminal): it shows
+// in the open-activities badge and is never auto-treated as completed. That is the safe
+// default and matches the deal open-activities enricher's `status NOT IN (terminal)` filter.
+
+export const INTERACTION_STATUS_COMPLETED = 'done' as const
+export const INTERACTION_STATUS_CANCELED = 'canceled' as const
+export const INTERACTION_STATUS_PLANNED = 'planned' as const
+
+// `completed` is a legacy spelling accepted defensively; `done` is the canonical
+// terminal-success value persisted by the complete action and the email logger.
+export const TERMINAL_INTERACTION_STATUS_LIST: readonly string[] = [
+  INTERACTION_STATUS_COMPLETED,
+  INTERACTION_STATUS_CANCELED,
+  'completed',
+]
+
+const TERMINAL_INTERACTION_STATUSES = new Set<string>(TERMINAL_INTERACTION_STATUS_LIST)
+
+export function isTerminalInteractionStatus(value: string | null | undefined): boolean {
+  return value != null && TERMINAL_INTERACTION_STATUSES.has(value)
+}
+
+export function isOpenInteractionStatus(value: string | null | undefined): boolean {
+  return !isTerminalInteractionStatus(value)
+}

package/src/modules/customers/lib/link-channel-message-handler.ts

@@ -3,6 +3,7 @@ import { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/
 import { CustomerEntity, CustomerInteraction } from '../data/entities'
 import { findPeopleByAddresses, normalizeAddresses } from './findPeopleByAddresses'
 import { emitCustomersEvent } from '../events'
+import { INTERACTION_STATUS_COMPLETED } from './interactionStatus'
 
 /**
  * Shared implementation for the link-channel-message subscribers.
@@ -481,11 +482,9 @@ async function persistInteractions(
       // scheduled work. Without an explicit status the entity default
       // ('planned') combined with a past `occurredAt` makes the activity
       // timeline render the email as "overdue", which is the wrong UX.
-      // The canonical "completed" value is `'done'` per
-      // `validators.ts:interactionStatusValues = ['planned', 'done', 'canceled']`
-      // — `'completed'` is a legacy spelling that the enricher accepts
-      // defensively but the activity timeline `isOverdue` predicate does NOT.
-      status: 'done',
+      // The canonical terminal-success value is `INTERACTION_STATUS_COMPLETED`
+      // ('done'); see `lib/interactionStatus.ts` for the open/terminal semantics.
+      status: INTERACTION_STATUS_COMPLETED,
       externalMessageId: data.linkId,
       visibility: data.visibility,
       channelProviderKey: data.channelProviderKey,

package/src/modules/dictionaries/components/AppearanceSelector.tsx

@@ -31,6 +31,11 @@ type AppearanceSelectorProps = {
   iconSuggestions?: IconOption[]
   iconLibrary?: IconOption[]
   className?: string
+  /**
+   * Title/value shown alongside the icon and color swatch in the preview, so the entry
+   * previews the way it renders elsewhere (icon + color + label). Omit to preview appearance only.
+   */
+  previewLabel?: string | null
 }
 
 const ICON_PICKER_LIMIT = 240
@@ -45,10 +50,13 @@ export function AppearanceSelector({
   iconSuggestions = ICON_SUGGESTIONS,
   iconLibrary,
   className,
+  previewLabel,
 }: AppearanceSelectorProps) {
   const normalizedIcon = icon ?? ''
   const normalizedColor = color ?? '#000000'
   const hasAppearance = Boolean(icon) || Boolean(color)
+  const trimmedPreviewLabel = typeof previewLabel === 'string' ? previewLabel.trim() : ''
+  const hasPreviewContent = hasAppearance || trimmedPreviewLabel.length > 0
   const iconOptions = React.useMemo(() => (iconLibrary && iconLibrary.length ? iconLibrary : ICON_LIBRARY), [iconLibrary])
   const [pickerOpen, setPickerOpen] = React.useState(false)
   const [iconSearch, setIconSearch] = React.useState('')
@@ -240,10 +248,11 @@ export function AppearanceSelector({
       <div>
         <label className="text-sm font-medium">Preview</label>
         <div className="flex items-center gap-3 rounded border border-dashed border-border px-3 py-2">
-          {hasAppearance ? (
+          {hasPreviewContent ? (
             <>
               {renderDictionaryIcon(icon, 'h-5 w-5')}
               {renderDictionaryColor(color, 'h-4 w-4 rounded-full')}
+              {trimmedPreviewLabel ? <span className="text-sm">{trimmedPreviewLabel}</span> : null}
             </>
           ) : (
             <span className="text-sm text-muted-foreground">{labels.previewEmptyLabel}</span>

package/src/modules/dictionaries/components/DictionaryEntriesEditor.tsx

@@ -471,6 +471,7 @@ export function DictionaryEntriesEditor({ dictionaryId, dictionaryName, readOnly
             <AppearanceSelector
               icon={appearance.icon}
               color={appearance.color}
+              previewLabel={formState.label.trim() || formState.value.trim()}
               onIconChange={(next) => {
                 appearance.setIcon(next)
                 setFormState((prev) => ({ ...prev, icon: next }))