@open-mercato/core 0.5.1-develop.2996.ce62fd491c → 0.5.1-develop.3032.01699048cb

package/dist/modules/customers/components/detail/schedule/useScheduleFormState.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/modules/customers/components/detail/schedule/useScheduleFormState.ts"],
-  "sourcesContent": ["import * as React from 'react'\nimport type { ActivityType } from './fieldConfig'\n\nexport type RsvpStatus = 'pending' | 'accepted' | 'declined' | 'tentative'\n\nexport type Participant = {\n  userId: string\n  name: string\n  email?: string\n  color?: string\n  status?: RsvpStatus\n}\n\nexport type LinkedEntity = {\n  id: string\n  type: 'company' | 'deal' | 'offer'\n  label: string\n}\n\nexport type ScheduleActivityEditData = {\n  id: string\n  interactionType?: string\n  title?: string | null\n  body?: string | null\n  scheduledAt?: string | null\n  durationMinutes?: number | null\n  location?: string | null\n  allDay?: boolean | null\n  recurrenceRule?: string | null\n  recurrenceEnd?: string | null\n  participants?: Array<{ userId: string; name?: string; email?: string; status?: string }> | null\n  reminderMinutes?: number | null\n  visibility?: string | null\n  linkedEntities?: Array<{ id: string; type: string; label: string }> | null\n  guestPermissions?: { canInviteOthers?: boolean; canModify?: boolean; canSeeList?: boolean } | null\n}\n\nexport const PARTICIPANT_COLORS = [\n  'bg-chart-emerald',\n  'bg-chart-blue',\n  'bg-chart-orange',\n  'bg-chart-violet',\n  'bg-chart-pink',\n  'bg-chart-teal',\n]\n\ninterface UseScheduleFormStateParams {\n  open: boolean\n  editData: ScheduleActivityEditData | null | undefined\n}\n\nexport function useScheduleFormState({ open, editData }: UseScheduleFormStateParams) {\n  const [activityType, setActivityType] = React.useState<ActivityType>('meeting')\n  const [title, setTitle] = React.useState('')\n  const [date, setDate] = React.useState(() => new Date().toISOString().slice(0, 10))\n  const [startTime, setStartTime] = React.useState('10:00')\n  const [duration, setDuration] = React.useState(30)\n  const [allDay, setAllDay] = React.useState(false)\n  const [description, setDescription] = React.useState('')\n  const [markdownEnabled, setMarkdownEnabled] = React.useState(true)\n  const [location, setLocation] = React.useState('')\n  const [reminderMinutes, setReminderMinutes] = React.useState(15)\n  const [visibility, setVisibility] = React.useState('team')\n  const [participants, setParticipants] = React.useState<Participant[]>([])\n  const [linkedEntities, setLinkedEntities] = React.useState<LinkedEntity[]>([])\n  const [recurrenceEnabled, setRecurrenceEnabled] = React.useState(false)\n  const [recurrenceDays, setRecurrenceDays] = React.useState<boolean[]>([true, false, true, false, false, false, false])\n  const [recurrenceEndType, setRecurrenceEndType] = React.useState<'never' | 'count' | 'date'>('never')\n  const [recurrenceCount, setRecurrenceCount] = React.useState(8)\n  const [recurrenceEndDate, setRecurrenceEndDate] = React.useState('')\n  const [conflict, setConflict] = React.useState<string | null>(null)\n  const [saving, setSaving] = React.useState(false)\n  const [guestPermissions, setGuestPermissions] = React.useState({ canInviteOthers: true, canModify: false, canSeeList: true })\n\n  React.useEffect(() => {\n    if (open) {\n      if (editData) {\n        // Edit mode: populate from existing interaction\n        setActivityType((editData.interactionType as ActivityType) ?? 'meeting')\n        setTitle(editData.title ?? '')\n        const scheduledDate = editData.scheduledAt ? new Date(editData.scheduledAt) : new Date()\n        setDate(scheduledDate.toISOString().slice(0, 10))\n        setStartTime(scheduledDate.toLocaleTimeString('en-GB', { hour: '2-digit', minute: '2-digit' }))\n        setDuration(editData.durationMinutes ?? 30)\n        setAllDay(editData.allDay ?? false)\n        setDescription(editData.body ?? '')\n        setLocation(editData.location ?? '')\n        setReminderMinutes(editData.reminderMinutes ?? 15)\n        setVisibility(editData.visibility ?? 'team')\n        setParticipants(\n          Array.isArray(editData.participants)\n            ? editData.participants.map((p, i) => ({\n                userId: p.userId,\n                name: p.name ?? p.userId,\n                email: p.email,\n                color: PARTICIPANT_COLORS[i % PARTICIPANT_COLORS.length],\n                status: (p.status ?? 'pending') as RsvpStatus,\n              }))\n            : [],\n        )\n        setLinkedEntities(\n          Array.isArray(editData.linkedEntities)\n            ? editData.linkedEntities.map((e) => ({ id: e.id, type: e.type as LinkedEntity['type'], label: e.label }))\n            : [],\n        )\n        if (editData.recurrenceRule) {\n          setRecurrenceEnabled(true)\n          // Parse RRULE to set days and end type\n          const rule = editData.recurrenceRule\n          const byDayMatch = rule.match(/BYDAY=([A-Z,]+)/)\n          if (byDayMatch) {\n            const dayNames = ['MO', 'TU', 'WE', 'TH', 'FR', 'SA', 'SU']\n            const activeDays = byDayMatch[1].split(',')\n            setRecurrenceDays(dayNames.map((d) => activeDays.includes(d)))\n          }\n          const countMatch = rule.match(/COUNT=(\\d+)/)\n          const untilMatch = rule.match(/UNTIL=(\\d{8})/)\n          if (countMatch) {\n            setRecurrenceEndType('count')\n            setRecurrenceCount(Number(countMatch[1]))\n          } else if (untilMatch) {\n            setRecurrenceEndType('date')\n            const raw = untilMatch[1]\n            setRecurrenceEndDate(`${raw.slice(0, 4)}-${raw.slice(4, 6)}-${raw.slice(6, 8)}`)\n          } else {\n            setRecurrenceEndType('never')\n          }\n        } else {\n          setRecurrenceEnabled(false)\n        }\n        if (editData.guestPermissions) {\n          setGuestPermissions({\n            canInviteOthers: editData.guestPermissions.canInviteOthers ?? true,\n            canModify: editData.guestPermissions.canModify ?? false,\n            canSeeList: editData.guestPermissions.canSeeList ?? true,\n          })\n        }\n      } else {\n        // Create mode: reset all fields\n        setActivityType('meeting')\n        setTitle('')\n        setDate(new Date().toISOString().slice(0, 10))\n        setStartTime('10:00')\n        setDuration(30)\n        setAllDay(false)\n        setDescription('')\n        setLocation('')\n        setReminderMinutes(15)\n        setVisibility('team')\n        setParticipants([])\n        setLinkedEntities([])\n        setRecurrenceEnabled(false)\n      }\n      setConflict(null)\n    }\n    return () => {\n      // Safety net: restore body scroll if Radix Dialog fails to clean up\n      document.body.style.removeProperty('overflow')\n      document.body.style.removeProperty('pointer-events')\n    }\n  }, [open, editData])\n\n  const removeParticipant = React.useCallback((userId: string) => {\n    setParticipants((prev) => prev.filter((p) => p.userId !== userId))\n  }, [])\n\n  const toggleRecurrenceDay = React.useCallback((index: number) => {\n    setRecurrenceDays((prev) => {\n      const next = [...prev]\n      next[index] = !next[index]\n      return next\n    })\n  }, [])\n\n  return {\n    activityType,\n    setActivityType,\n    title,\n    setTitle,\n    date,\n    setDate,\n    startTime,\n    setStartTime,\n    duration,\n    setDuration,\n    allDay,\n    setAllDay,\n    description,\n    setDescription,\n    markdownEnabled,\n    setMarkdownEnabled,\n    location,\n    setLocation,\n    reminderMinutes,\n    setReminderMinutes,\n    visibility,\n    setVisibility,\n    participants,\n    setParticipants,\n    linkedEntities,\n    setLinkedEntities,\n    recurrenceEnabled,\n    setRecurrenceEnabled,\n    recurrenceDays,\n    setRecurrenceDays,\n    recurrenceEndType,\n    setRecurrenceEndType,\n    recurrenceCount,\n    setRecurrenceCount,\n    recurrenceEndDate,\n    setRecurrenceEndDate,\n    conflict,\n    setConflict,\n    saving,\n    setSaving,\n    guestPermissions,\n    setGuestPermissions,\n    removeParticipant,\n    toggleRecurrenceDay,\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import * as React from 'react'\nimport type { ActivityType } from './fieldConfig'\n\nexport type RsvpStatus = 'pending' | 'accepted' | 'declined' | 'tentative'\n\nexport type Participant = {\n  userId: string\n  name: string\n  email?: string\n  color?: string\n  status?: RsvpStatus\n}\n\nexport type LinkedEntity = {\n  id: string\n  type: 'company' | 'deal' | 'offer'\n  label: string\n}\n\nexport type ScheduleActivityEditData = {\n  id: string\n  interactionType?: string\n  title?: string | null\n  body?: string | null\n  scheduledAt?: string | null\n  durationMinutes?: number | null\n  location?: string | null\n  allDay?: boolean | null\n  recurrenceRule?: string | null\n  recurrenceEnd?: string | null\n  participants?: Array<{ userId: string; name?: string; email?: string; status?: string }> | null\n  reminderMinutes?: number | null\n  visibility?: string | null\n  linkedEntities?: Array<{ id: string; type: string; label: string }> | null\n  guestPermissions?: { canInviteOthers?: boolean; canModify?: boolean; canSeeList?: boolean } | null\n}\n\nexport const PARTICIPANT_COLORS = [\n  'bg-chart-emerald',\n  'bg-chart-blue',\n  'bg-chart-orange',\n  'bg-chart-violet',\n  'bg-chart-pink',\n  'bg-chart-teal',\n]\n\n// Per-Figma defaults for the Reminder dropdown when the user picks an activity\n// type. Meeting/email keep the standard 15 min; tasks default to 1 day (1440 min)\n// because they're plan-ahead artefacts; calls default to 5 min as a stand-in for\n// the Figma \"After call ends\" treatment (which would need a non-numeric sentinel\n// in the API contract \u2014 tracked as a follow-up).\nconst DEFAULT_REMINDER_MINUTES: Record<ActivityType, number> = {\n  meeting: 15,\n  call: 5,\n  task: 1440,\n  email: 15,\n}\n\ninterface UseScheduleFormStateParams {\n  open: boolean\n  editData: ScheduleActivityEditData | null | undefined\n}\n\nexport function useScheduleFormState({ open, editData }: UseScheduleFormStateParams) {\n  const [activityType, setActivityType] = React.useState<ActivityType>('meeting')\n  const [title, setTitle] = React.useState('')\n  const [date, setDate] = React.useState(() => new Date().toISOString().slice(0, 10))\n  const [startTime, setStartTime] = React.useState('10:00')\n  const [duration, setDuration] = React.useState(30)\n  const [allDay, setAllDay] = React.useState(false)\n  const [description, setDescription] = React.useState('')\n  const [markdownEnabled, setMarkdownEnabled] = React.useState(true)\n  const [location, setLocation] = React.useState('')\n  const [reminderMinutes, setReminderMinutes] = React.useState(15)\n  const [visibility, setVisibility] = React.useState('team')\n  const [participants, setParticipants] = React.useState<Participant[]>([])\n  const [linkedEntities, setLinkedEntities] = React.useState<LinkedEntity[]>([])\n  const [recurrenceEnabled, setRecurrenceEnabled] = React.useState(false)\n  const [recurrenceDays, setRecurrenceDays] = React.useState<boolean[]>([true, false, true, false, false, false, false])\n  const [recurrenceEndType, setRecurrenceEndType] = React.useState<'never' | 'count' | 'date'>('never')\n  const [recurrenceCount, setRecurrenceCount] = React.useState(8)\n  const [recurrenceEndDate, setRecurrenceEndDate] = React.useState('')\n  const [conflict, setConflict] = React.useState<string | null>(null)\n  const [saving, setSaving] = React.useState(false)\n  const [guestPermissions, setGuestPermissions] = React.useState({ canInviteOthers: true, canModify: false, canSeeList: true })\n\n  React.useEffect(() => {\n    if (open) {\n      if (editData) {\n        // Edit mode: populate from existing interaction\n        const resolvedType = (editData.interactionType as ActivityType) ?? 'meeting'\n        setActivityType(resolvedType)\n        setTitle(editData.title ?? '')\n        const scheduledDate = editData.scheduledAt ? new Date(editData.scheduledAt) : new Date()\n        setDate(scheduledDate.toISOString().slice(0, 10))\n        setStartTime(scheduledDate.toLocaleTimeString('en-GB', { hour: '2-digit', minute: '2-digit' }))\n        setDuration(editData.durationMinutes ?? 30)\n        setAllDay(editData.allDay ?? false)\n        setDescription(editData.body ?? '')\n        setLocation(editData.location ?? '')\n        // Use per-type default when the editData omits an explicit reminder\n        // (the menu-driven \"New X\" flow opens the dialog with `reminderMinutes: null`).\n        setReminderMinutes(editData.reminderMinutes ?? DEFAULT_REMINDER_MINUTES[resolvedType])\n        setVisibility(editData.visibility ?? 'team')\n        setParticipants(\n          Array.isArray(editData.participants)\n            ? editData.participants.map((p, i) => ({\n                userId: p.userId,\n                name: p.name ?? p.userId,\n                email: p.email,\n                color: PARTICIPANT_COLORS[i % PARTICIPANT_COLORS.length],\n                status: (p.status ?? 'pending') as RsvpStatus,\n              }))\n            : [],\n        )\n        setLinkedEntities(\n          Array.isArray(editData.linkedEntities)\n            ? editData.linkedEntities.map((e) => ({ id: e.id, type: e.type as LinkedEntity['type'], label: e.label }))\n            : [],\n        )\n        if (editData.recurrenceRule) {\n          setRecurrenceEnabled(true)\n          // Parse RRULE to set days and end type\n          const rule = editData.recurrenceRule\n          const byDayMatch = rule.match(/BYDAY=([A-Z,]+)/)\n          if (byDayMatch) {\n            const dayNames = ['MO', 'TU', 'WE', 'TH', 'FR', 'SA', 'SU']\n            const activeDays = byDayMatch[1].split(',')\n            setRecurrenceDays(dayNames.map((d) => activeDays.includes(d)))\n          }\n          const countMatch = rule.match(/COUNT=(\\d+)/)\n          const untilMatch = rule.match(/UNTIL=(\\d{8})/)\n          if (countMatch) {\n            setRecurrenceEndType('count')\n            setRecurrenceCount(Number(countMatch[1]))\n          } else if (untilMatch) {\n            setRecurrenceEndType('date')\n            const raw = untilMatch[1]\n            setRecurrenceEndDate(`${raw.slice(0, 4)}-${raw.slice(4, 6)}-${raw.slice(6, 8)}`)\n          } else {\n            setRecurrenceEndType('never')\n          }\n        } else {\n          setRecurrenceEnabled(false)\n        }\n        if (editData.guestPermissions) {\n          setGuestPermissions({\n            canInviteOthers: editData.guestPermissions.canInviteOthers ?? true,\n            canModify: editData.guestPermissions.canModify ?? false,\n            canSeeList: editData.guestPermissions.canSeeList ?? true,\n          })\n        }\n      } else {\n        // Create mode: reset all fields\n        setActivityType('meeting')\n        setTitle('')\n        setDate(new Date().toISOString().slice(0, 10))\n        setStartTime('10:00')\n        setDuration(30)\n        setAllDay(false)\n        setDescription('')\n        setLocation('')\n        setReminderMinutes(DEFAULT_REMINDER_MINUTES.meeting)\n        setVisibility('team')\n        setParticipants([])\n        setLinkedEntities([])\n        setRecurrenceEnabled(false)\n      }\n      setConflict(null)\n    }\n    return () => {\n      // Safety net: restore body scroll if Radix Dialog fails to clean up\n      document.body.style.removeProperty('overflow')\n      document.body.style.removeProperty('pointer-events')\n    }\n  }, [open, editData])\n\n  // Update the Reminder default when the activity type changes in create mode.\n  // Skipped in edit mode (the persisted value wins), and gated by `open` to\n  // avoid flipping the default in a closed-but-mounted dialog.\n  const lastReminderTypeRef = React.useRef<ActivityType>('meeting')\n  React.useEffect(() => {\n    if (!open || editData) {\n      lastReminderTypeRef.current = activityType\n      return\n    }\n    if (lastReminderTypeRef.current === activityType) return\n    lastReminderTypeRef.current = activityType\n    setReminderMinutes(DEFAULT_REMINDER_MINUTES[activityType])\n  }, [activityType, editData, open])\n\n  const removeParticipant = React.useCallback((userId: string) => {\n    setParticipants((prev) => prev.filter((p) => p.userId !== userId))\n  }, [])\n\n  const toggleRecurrenceDay = React.useCallback((index: number) => {\n    setRecurrenceDays((prev) => {\n      const next = [...prev]\n      next[index] = !next[index]\n      return next\n    })\n  }, [])\n\n  return {\n    activityType,\n    setActivityType,\n    title,\n    setTitle,\n    date,\n    setDate,\n    startTime,\n    setStartTime,\n    duration,\n    setDuration,\n    allDay,\n    setAllDay,\n    description,\n    setDescription,\n    markdownEnabled,\n    setMarkdownEnabled,\n    location,\n    setLocation,\n    reminderMinutes,\n    setReminderMinutes,\n    visibility,\n    setVisibility,\n    participants,\n    setParticipants,\n    linkedEntities,\n    setLinkedEntities,\n    recurrenceEnabled,\n    setRecurrenceEnabled,\n    recurrenceDays,\n    setRecurrenceDays,\n    recurrenceEndType,\n    setRecurrenceEndType,\n    recurrenceCount,\n    setRecurrenceCount,\n    recurrenceEndDate,\n    setRecurrenceEndDate,\n    conflict,\n    setConflict,\n    saving,\n    setSaving,\n    guestPermissions,\n    setGuestPermissions,\n    removeParticipant,\n    toggleRecurrenceDay,\n  }\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.5.1-develop.2996.ce62fd491c",
+  "version": "0.5.1-develop.3032.01699048cb",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -237,10 +237,10 @@
     "ts-pattern": "^5.0.0"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.5.1-develop.2996.ce62fd491c"
+    "@open-mercato/shared": "0.5.1-develop.3032.01699048cb"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.5.1-develop.2996.ce62fd491c",
+    "@open-mercato/shared": "0.5.1-develop.3032.01699048cb",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",

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

@@ -42,7 +42,10 @@ import type { EntityId } from '@open-mercato/shared/modules/entities'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { parseBooleanFromUnknown } from '@open-mercato/shared/lib/boolean'
-import { withActiveCustomerPersonCompanyLinkFilter } from '../../../lib/personCompanyLinkTable'
+import {
+  filterActivePersonCompanyLinks,
+  withActiveCustomerPersonCompanyLinkFilter,
+} from '../../../lib/personCompanyLinkTable'
 import { normalizeCustomerDetailCustomFields } from '../../detailCustomFields'
 
 export const metadata = {
@@ -703,15 +706,17 @@ export async function GET(_req: Request, ctx: { params?: { id?: string } }) {
       },
       'customers.companies.GET',
     )
-    const companyLinks = await findWithDecryption(
-      em,
-      CustomerPersonCompanyLink,
-      companyLinkWhere,
-      {
-        populate: ['person', 'person.personProfile'],
-        orderBy: { isPrimary: 'desc', createdAt: 'asc' },
-      },
-      peopleDecryptionScope,
+    const companyLinks = filterActivePersonCompanyLinks(
+      await findWithDecryption(
+        em,
+        CustomerPersonCompanyLink,
+        companyLinkWhere,
+        {
+          populate: ['person', 'person.personProfile'],
+          orderBy: { isPrimary: 'desc', createdAt: 'asc' },
+        },
+        peopleDecryptionScope,
+      ),
     )
     companyLinks.forEach((link) => {
       const entity = typeof link.person === 'string' ? null : link.person
@@ -829,18 +834,23 @@ export async function GET(_req: Request, ctx: { params?: { id?: string } }) {
       })
   const peopleCount = includePeople
     ? relatedPeople.length
-    : await em.count(
-        CustomerPersonCompanyLink,
-        await withActiveCustomerPersonCompanyLinkFilter(
+    : filterActivePersonCompanyLinks(
+        await findWithDecryption(
           em,
-          {
-            company: company.id,
-            organizationId: company.organizationId,
-            tenantId: company.tenantId,
-          },
-          'customers.companies.GET',
+          CustomerPersonCompanyLink,
+          await withActiveCustomerPersonCompanyLinkFilter(
+            em,
+            {
+              company: company.id,
+              organizationId: company.organizationId,
+              tenantId: company.tenantId,
+            },
+            'customers.companies.GET',
+          ),
+          {},
+          { tenantId: company.tenantId, organizationId: company.organizationId },
         ),
-      )
+      ).length
   const kpiInteractionRows = canonicalActiveInteractions.length
     ? canonicalActiveInteractions
     : await findWithDecryption(

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

@@ -33,7 +33,10 @@ import {
   createPagedListResponseSchema,
   defaultOkResponseSchema,
 } from '../openapi'
-import { withActiveCustomerPersonCompanyLinkFilter } from '../../lib/personCompanyLinkTable'
+import {
+  filterActivePersonCompanyLinks,
+  withActiveCustomerPersonCompanyLinkFilter,
+} from '../../lib/personCompanyLinkTable'
 import { normalizeCompanyProfilePayload } from './payload'
 
 const rawBodySchema = z.object({}).passthrough()
@@ -217,12 +220,14 @@ const crud = makeCrudRoute({
             { person: query.excludeLinkedPersonId },
             'customers.companies.GET',
           )
-          const links = await findWithDecryption(
-            em,
-            CustomerPersonCompanyLink,
-            linkWhere,
-            { populate: ['company'] },
-            decryptionScope,
+          const links = filterActivePersonCompanyLinks(
+            await findWithDecryption(
+              em,
+              CustomerPersonCompanyLink,
+              linkWhere,
+              { populate: ['company'] },
+              decryptionScope,
+            ),
           )
           links.forEach((link) => {
             const companyId = link.company?.id

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

@@ -20,7 +20,10 @@ import {
   CustomerDeal,
   CustomerInteraction,
 } from '../../../../../data/entities'
-import { withActiveCustomerPersonCompanyLinkFilter } from '../../../../../lib/personCompanyLinkTable'
+import {
+  filterActivePersonCompanyLinks,
+  withActiveCustomerPersonCompanyLinkFilter,
+} from '../../../../../lib/personCompanyLinkTable'
 
 const paramsSchema = z.object({
   id: z.string().uuid(),
@@ -187,12 +190,14 @@ export async function GET(req: Request, ctx: { params?: { id?: string } }) {
       },
       'customers.people.companiesEnriched.GET',
     )
-    const links = await findWithDecryption(
-      em,
-      CustomerPersonCompanyLink,
-      linkWhere,
-      { populate: ['company'] },
-      entityScope,
+    const links = filterActivePersonCompanyLinks(
+      await findWithDecryption(
+        em,
+        CustomerPersonCompanyLink,
+        linkWhere,
+        { populate: ['company'] },
+        entityScope,
+      ),
     )
 
     const companyIds = links.map((link) => (link.company as CustomerEntity).id)

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

@@ -29,7 +29,10 @@ import {
   createPagedListResponseSchema,
   defaultOkResponseSchema,
 } from '../openapi'
-import { withActiveCustomerPersonCompanyLinkFilter } from '../../lib/personCompanyLinkTable'
+import {
+  filterActivePersonCompanyLinks,
+  withActiveCustomerPersonCompanyLinkFilter,
+} from '../../lib/personCompanyLinkTable'
 import { normalizeProfilePayload } from './payload'
 
 const rawBodySchema = z.object({}).passthrough()
@@ -221,12 +224,14 @@ const crud = makeCrudRoute({
             { company: query.excludeLinkedCompanyId },
             'customers.people.GET',
           )
-          const links = await findWithDecryption(
-            em,
-            CustomerPersonCompanyLink,
-            linkWhere,
-            { populate: ['person'] },
-            decryptionScope,
+          const links = filterActivePersonCompanyLinks(
+            await findWithDecryption(
+              em,
+              CustomerPersonCompanyLink,
+              linkWhere,
+              { populate: ['person'] },
+              decryptionScope,
+            ),
           )
           links.forEach((link) => {
             const personId = link.person?.id

package/src/modules/customers/backend/customers/companies-v2/[id]/page.tsx

@@ -219,6 +219,27 @@ export default function CompanyDetailV2Page({ params }: { params?: { id?: string
     setScheduleDialogOpen(true)
   }, [])
 
+  const handleAddActivity = React.useCallback((kind: 'meeting' | 'call' | 'task' | 'email') => {
+    setScheduleEditData({
+      id: '',
+      interactionType: kind,
+      title: null,
+      body: null,
+      scheduledAt: null,
+      durationMinutes: null,
+      location: null,
+      allDay: null,
+      recurrenceRule: null,
+      recurrenceEnd: null,
+      participants: null,
+      reminderMinutes: null,
+      visibility: null,
+      linkedEntities: null,
+      guestPermissions: null,
+    })
+    setScheduleDialogOpen(true)
+  }, [])
+
   // Injected tabs from UMES
   const { widgets: injectedTabWidgets } = useInjectionWidgets('detail:customers.company:tabs', {
     context: injectionContext,
@@ -473,6 +494,7 @@ export default function CompanyDetailV2Page({ params }: { params?: { id?: string
                     plannedActivities={plannedActivities}
                     onActivityCreated={handleActivityCreated}
                     onScheduleRequested={openNewScheduleDialog}
+                    onAddActivity={handleAddActivity}
                     onMarkDone={handleMarkDone}
                     onEditActivity={handleEditActivity}
                     onCancelActivity={handleCancelActivity}

package/src/modules/customers/backend/customers/people-v2/[id]/page.tsx

@@ -23,18 +23,17 @@ import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuarde
 import { createTranslatorWithFallback } from '@open-mercato/shared/lib/i18n/translate'
 
 import { ActivitiesSection } from '../../../../components/detail/ActivitiesSection'
+import { ActivitiesCard } from '../../../../components/detail/ActivitiesCard'
+import type { ActivityKind } from '../../../../components/detail/ActivitiesAddNewMenu'
 import { DealsSection } from '../../../../components/detail/DealsSection'
 import { TasksSection } from '../../../../components/detail/TasksSection'
 import type { TagSummary } from '../../../../components/detail/types'
-import { InlineActivityComposer } from '../../../../components/detail/InlineActivityComposer'
-import { PlannedActivitiesSection } from '../../../../components/detail/PlannedActivitiesSection'
 import { ScheduleActivityDialog, type ScheduleActivityEditData } from '../../../../components/detail/ScheduleActivityDialog'
 import { PersonDetailHeader } from '../../../../components/detail/PersonDetailHeader'
 import { ChangelogTab } from '../../../../components/detail/ChangelogTab'
 import { PersonDetailTabs, resolveLegacyTab, type PersonTabId } from '../../../../components/detail/PersonDetailTabs'
 import { PersonCompaniesSection } from '../../../../components/detail/PersonCompaniesSection'
 import { MobilePersonDetail } from '../../../../components/detail/MobilePersonDetail'
-import { useInteractionMutations } from '../../../../components/detail/hooks/useInteractionMutations'
 import type { TagsSectionController } from '@open-mercato/ui/backend/detail'
 import {
   buildPersonEditPayload,
@@ -190,11 +189,26 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
     [injectionContext, runMutation],
   )
 
-  const { completeInteraction: handleMarkDone, cancelInteraction: handleCancelActivity } = useInteractionMutations({
-    runMutationWithContext,
-    onAfterChange: handleActivityCreated,
-    logContext: 'customers.people-v2',
-  })
+  const handleAddActivity = React.useCallback((kind: ActivityKind) => {
+    setScheduleEditData({
+      id: '',
+      interactionType: kind,
+      title: null,
+      body: null,
+      scheduledAt: null,
+      durationMinutes: null,
+      location: null,
+      allDay: null,
+      recurrenceRule: null,
+      recurrenceEnd: null,
+      participants: null,
+      reminderMinutes: null,
+      visibility: null,
+      linkedEntities: null,
+      guestPermissions: null,
+    })
+    setScheduleDialogOpen(true)
+  }, [])
 
   const handleEditActivity = React.useCallback((activity: { id: string; interactionType?: string; title?: string | null; body?: string | null; scheduledAt?: string | null; [key: string]: unknown }) => {
     const raw = activity as Record<string, unknown>
@@ -448,20 +462,13 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
                   if (activeTab === 'activities') {
                     return (
                       <div className="space-y-4">
-                        <InlineActivityComposer
-                          entityType="person"
+                        <ActivitiesCard
                           entityId={personId}
-                          onActivityCreated={handleActivityCreated}
-                          runGuardedMutation={runMutationWithContext}
-                          onScheduleRequested={() => { setScheduleEditData(null); setScheduleDialogOpen(true) }}
-                          useCanonicalInteractions={useCanonicalInteractions}
-                        />
-                        <PlannedActivitiesSection
-                          activities={plannedActivities}
-                          onComplete={handleMarkDone}
-                          onSchedule={() => { setScheduleEditData(null); setScheduleDialogOpen(true) }}
-                          onEdit={handleEditActivity}
-                          onCancel={handleCancelActivity}
+                          plannedActivities={plannedActivities}
+                          refreshKey={activityRefreshKey}
+                          onAddNew={handleAddActivity}
+                          onEditActivity={handleEditActivity}
+                          entityCompanyName={data.company?.displayName ?? data.companies?.[0]?.displayName ?? null}
                         />
                         <ActivitiesSection
                           entityId={personId}

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

@@ -0,0 +1,67 @@
+'use client'
+
+import * as React from 'react'
+import { Check, Phone, Mail, Users, CheckSquare } from 'lucide-react'
+import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { Popover, PopoverContent, PopoverTrigger } from '@open-mercato/ui/primitives/popover'
+
+export type ActivityKind = 'meeting' | 'call' | 'task' | 'email'
+
+interface ActivitiesAddNewMenuProps {
+  onSelect: (kind: ActivityKind) => void
+  disabled?: boolean
+}
+
+const MENU_ITEMS: ReadonlyArray<{ kind: ActivityKind; icon: React.ComponentType<{ className?: string }>; key: string; fallback: string }> = [
+  { kind: 'meeting', icon: Users, key: 'customers.activities.add.meeting', fallback: 'New meeting' },
+  { kind: 'call', icon: Phone, key: 'customers.activities.add.call', fallback: 'Log call' },
+  { kind: 'task', icon: CheckSquare, key: 'customers.activities.add.task', fallback: 'New task' },
+  { kind: 'email', icon: Mail, key: 'customers.activities.add.email', fallback: 'Compose email' },
+]
+
+export function ActivitiesAddNewMenu({ onSelect, disabled }: ActivitiesAddNewMenuProps) {
+  const t = useT()
+  const [open, setOpen] = React.useState(false)
+
+  const handleSelect = React.useCallback(
+    (kind: ActivityKind) => {
+      setOpen(false)
+      onSelect(kind)
+    },
+    [onSelect],
+  )
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild>
+        <button
+          type="button"
+          disabled={disabled}
+          aria-label={t('customers.activities.addNew', 'Add new')}
+          className="inline-flex items-center gap-1.5 overflow-hidden rounded-md bg-foreground pl-3 pr-3.5 py-2 text-xs font-semibold text-background transition-colors hover:bg-foreground/90 disabled:opacity-60"
+        >
+          <Check className="size-3.5" />
+          {t('customers.activities.addNew', 'Add new')}
+        </button>
+      </PopoverTrigger>
+      <PopoverContent align="end" className="w-[180px] p-1">
+        <ul className="flex flex-col">
+          {MENU_ITEMS.map(({ kind, icon: Icon, key, fallback }) => (
+            <li key={kind}>
+              <button
+                type="button"
+                onClick={() => handleSelect(kind)}
+                className="flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-sm text-foreground hover:bg-accent/40"
+              >
+                <Icon className="size-4 text-muted-foreground" />
+                {t(key, fallback)}
+              </button>
+            </li>
+          ))}
+        </ul>
+      </PopoverContent>
+    </Popover>
+  )
+}
+
+export default ActivitiesAddNewMenu