Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(crm): map seeded stages back to their default stage id (#6273)
Panat Taranatd1285abfd5ee
diff --git a/.sqlx/query-40f4b298b8e963ca4c654ace4753c9bc1a684bd541ab59ac0e87e74c677b0d99.json b/.sqlx/query-40f4b298b8e963ca4c654ace4753c9bc1a684bd541ab59ac0e87e74c677b0d99.jsonnew file mode 100644index 0000000000..71dc4d8cf8--- /dev/null+++ b/.sqlx/query-40f4b298b8e963ca4c654ace4753c9bc1a684bd541ab59ac0e87e74c677b0d99.json@@ -0,0 +1,100 @@+{+ "db_name": "PostgreSQL",+ "query": "\n INSERT INTO team_crm_settings (\n team_id, edit_stages_role, move_closed_deals_role, delete_records_role,\n closed_stage_ids, team_views, default_team_view_id, legacy_stage_ids\n )\n VALUES (\n $1,\n COALESCE($2::text::team_role, 'admin'),\n COALESCE($3::text::team_role, 'admin'),\n COALESCE($4::text::team_role, 'admin'),\n CASE WHEN $5 THEN $6::uuid[] END,\n COALESCE($7, '[]'::jsonb),\n CASE WHEN $8 THEN $9 END,\n COALESCE($10, '{}'::jsonb)\n )\n ON CONFLICT (team_id) DO UPDATE SET\n edit_stages_role = COALESCE($2::text::team_role, team_crm_settings.edit_stages_role),\n move_closed_deals_role = COALESCE($3::text::team_role, team_crm_settings.move_closed_deals_role),\n delete_records_role = COALESCE($4::text::team_role, team_crm_settings.delete_records_role),\n closed_stage_ids = CASE WHEN $5 THEN $6::uuid[] ELSE team_crm_settings.closed_stage_ids END,\n team_views = COALESCE($7, team_crm_settings.team_views),\n default_team_view_id = CASE WHEN $8 THEN $9 ELSE team_crm_settings.default_team_view_id END,\n legacy_stage_ids = COALESCE($10, team_crm_settings.legacy_stage_ids),\n updated_at = now()\n RETURNING\n edit_stages_role AS \"edit_stages_role!: CrmPermissionRole\",\n move_closed_deals_role AS \"move_closed_deals_role!: CrmPermissionRole\",\n delete_records_role AS \"delete_records_role!: CrmPermissionRole\",\n closed_stage_ids,\n team_views AS \"team_views!\",\n default_team_view_id,\n legacy_stage_ids AS \"legacy_stage_ids!: sqlx::types::Json<BTreeMap<Uuid, Uuid>>\"\n ",+ "describe": {+ "columns": [+ {+ "ordinal": 0,+ "name": "edit_stages_role!: CrmPermissionRole",+ "type_info": {+ "Custom": {+ "name": "team_role",+ "kind": {+ "Enum": [+ "member",+ "admin",+ "owner"+ ]+ }+ }+ }+ },+ {+ "ordinal": 1,+ "name": "move_closed_deals_role!: CrmPermissionRole",+ "type_info": {+ "Custom": {+ "name": "team_role",+ "kind": {+ "Enum": [+ "member",+ "admin",+ "owner"+ ]+ }+ }+ }+ },+ {+ "ordinal": 2,+ "name": "delete_records_role!: CrmPermissionRole",+ "type_info": {+ "Custom": {+ "name": "team_role",+ "kind": {+ "Enum": [+ "member",+ "admin",+ "owner"+ ]+ }+ }+ }+ },+ {+ "ordinal": 3,+ "name": "closed_stage_ids",+ "type_info": "UuidArray"+ },+ {+ "ordinal": 4,+ "name": "team_views!",+ "type_info": "Jsonb"+ },+ {+ "ordinal": 5,+ "name": "default_team_view_id",+ "type_info": "Text"+ },+ {+ "ordinal": 6,+ "name": "legacy_stage_ids!: sqlx::types::Json<BTreeMap<Uuid, Uuid>>",+ "type_info": "Jsonb"+ }+ ],+ "parameters": {+ "Left": [+ "Uuid",+ "Text",+ "Text",+ "Text",+ "Bool",+ "UuidArray",+ "Jsonb",+ "Bool",+ "Text",+ "Jsonb"+ ]+ },+ "nullable": [+ false,+ false,+ false,+ true,+ false,+ true,+ false+ ]+ },+ "hash": "40f4b298b8e963ca4c654ace4753c9bc1a684bd541ab59ac0e87e74c677b0d99"+}diff --git a/.sqlx/query-eaa347f84f5dbdaaf4afa3056a618956aab6be2b682414dab0ba8e50dbf65f00.json b/.sqlx/query-961a8382bf6ff935ca54252592e1469d5ed9260f7bcaed4ae526e35d7ae7cde0.jsonsimilarity index 79%rename from .sqlx/query-eaa347f84f5dbdaaf4afa3056a618956aab6be2b682414dab0ba8e50dbf65f00.jsonrename to .sqlx/query-961a8382bf6ff935ca54252592e1469d5ed9260f7bcaed4ae526e35d7ae7cde0.jsonindex 5cc7c43d47..2c600e3a08 100644--- a/.sqlx/query-eaa347f84f5dbdaaf4afa3056a618956aab6be2b682414dab0ba8e50dbf65f00.json+++ b/.sqlx/query-961a8382bf6ff935ca54252592e1469d5ed9260f7bcaed4ae526e35d7ae7cde0.json@@ -1,6 +1,6 @@{"db_name": "PostgreSQL",- "query": "\n SELECT edit_stages_role AS \"edit_stages_role: CrmPermissionRole\",\n move_closed_deals_role AS \"move_closed_deals_role: CrmPermissionRole\",\n delete_records_role AS \"delete_records_role: CrmPermissionRole\",\n closed_stage_ids,\n team_views,\n default_team_view_id\n FROM team_crm_settings\n WHERE team_id = $1\n ",+ "query": "\n SELECT edit_stages_role AS \"edit_stages_role: CrmPermissionRole\",\n move_closed_deals_role AS \"move_closed_deals_role: CrmPermissionRole\",\n delete_records_role AS \"delete_records_role: CrmPermissionRole\",\n closed_stage_ids,\n legacy_stage_ids AS \"legacy_stage_ids: sqlx::types::Json<BTreeMap<Uuid, Uuid>>\",\n team_views,\n default_team_view_id\n FROM team_crm_settings\n WHERE team_id = $1\n ","describe": {"columns": [{@@ -58,11 +58,16 @@},{"ordinal": 4,- "name": "team_views",+ "name": "legacy_stage_ids: sqlx::types::Json<BTreeMap<Uuid, Uuid>>","type_info": "Jsonb"},{"ordinal": 5,+ "name": "team_views",+ "type_info": "Jsonb"+ },+ {+ "ordinal": 6,"name": "default_team_view_id","type_info": "Text"}@@ -78,8 +83,9 @@false,true,false,+ false,true]},- "hash": "eaa347f84f5dbdaaf4afa3056a618956aab6be2b682414dab0ba8e50dbf65f00"+ "hash": "961a8382bf6ff935ca54252592e1469d5ed9260f7bcaed4ae526e35d7ae7cde0"}diff --git a/.sqlx/query-ff405bc5e288a4914436b6811c883416459ce49e240e2eba19505303f06bec54.json b/.sqlx/query-ff405bc5e288a4914436b6811c883416459ce49e240e2eba19505303f06bec54.jsondeleted file mode 100644index fdada01d41..0000000000--- a/.sqlx/query-ff405bc5e288a4914436b6811c883416459ce49e240e2eba19505303f06bec54.json+++ /dev/null@@ -1,93 +0,0 @@-{- "db_name": "PostgreSQL",- "query": "\n INSERT INTO team_crm_settings (\n team_id, edit_stages_role, move_closed_deals_role, delete_records_role,\n closed_stage_ids, team_views, default_team_view_id\n )\n VALUES (\n $1,\n COALESCE($2::text::team_role, 'admin'),\n COALESCE($3::text::team_role, 'admin'),\n COALESCE($4::text::team_role, 'admin'),\n CASE WHEN $5 THEN $6::uuid[] END,\n COALESCE($7, '[]'::jsonb),\n CASE WHEN $8 THEN $9 END\n )\n ON CONFLICT (team_id) DO UPDATE SET\n edit_stages_role = COALESCE($2::text::team_role, team_crm_settings.edit_stages_role),\n move_closed_deals_role = COALESCE($3::text::team_role, team_crm_settings.move_closed_deals_role),\n delete_records_role = COALESCE($4::text::team_role, team_crm_settings.delete_records_role),\n closed_stage_ids = CASE WHEN $5 THEN $6::uuid[] ELSE team_crm_settings.closed_stage_ids END,\n team_views = COALESCE($7, team_crm_settings.team_views),\n default_team_view_id = CASE WHEN $8 THEN $9 ELSE team_crm_settings.default_team_view_id END,\n updated_at = now()\n RETURNING\n edit_stages_role AS \"edit_stages_role!: CrmPermissionRole\",\n move_closed_deals_role AS \"move_closed_deals_role!: CrmPermissionRole\",\n delete_records_role AS \"delete_records_role!: CrmPermissionRole\",\n closed_stage_ids,\n team_views AS \"team_views!\",\n default_team_view_id\n ",- "describe": {- "columns": [- {- "ordinal": 0,- "name": "edit_stages_role!: CrmPermissionRole",- "type_info": {- "Custom": {- "name": "team_role",- "kind": {- "Enum": [- "member",- "admin",- "owner"- ]- }- }- }- },- {- "ordinal": 1,- "name": "move_closed_deals_role!: CrmPermissionRole",- "type_info": {- "Custom": {- "name": "team_role",- "kind": {- "Enum": [- "member",- "admin",- "owner"- ]- }- }- }- },- {- "ordinal": 2,- "name": "delete_records_role!: CrmPermissionRole",- "type_info": {- "Custom": {- "name": "team_role",- "kind": {- "Enum": [- "member",- "admin",- "owner"- ]- }- }- }- },- {- "ordinal": 3,- "name": "closed_stage_ids",- "type_info": "UuidArray"- },- {- "ordinal": 4,- "name": "team_views!",- "type_info": "Jsonb"- },- {- "ordinal": 5,- "name": "default_team_view_id",- "type_info": "Text"- }- ],- "parameters": {- "Left": [- "Uuid",- "Text",- "Text",- "Text",- "Bool",- "UuidArray",- "Jsonb",- "Bool",- "Text"- ]- },- "nullable": [- false,- false,- false,- true,- false,- true- ]- },- "hash": "ff405bc5e288a4914436b6811c883416459ce49e240e2eba19505303f06bec54"-}diff --git a/apps/web/src/features/companies/crm/deal-stages.ts b/apps/web/src/features/companies/crm/deal-stages.tsindex 5ae7d0f878..5838b1d7d0 100644--- a/apps/web/src/features/companies/crm/deal-stages.ts+++ b/apps/web/src/features/companies/crm/deal-stages.ts@@ -32,6 +32,7 @@ import type { PropertyDefinitionResponse } from '@service-properties/generated/simport type { PropertyDefinitionWithOptions } from '@service-properties/generated/schemas/propertyDefinitionWithOptions';import type { PropertyOption } from '@service-properties/generated/schemas/propertyOption';import { type Accessor, createMemo } from 'solid-js';+import { useTeamCrmConfig } from './team-crm-config';// Canonical home is `@property/constants` (property pickers filter on it);// re-exported here for the CRM-side callers.@@ -64,8 +65,9 @@ export type DealStages = {/*** The company's stage within the active set. When the team has custom* stages, legacy values stored on the system Stage property are mapped- * onto the custom set by label so boards/lists don't blank out after- * customizing; moving a card writes the value to the team definition.+ * onto the custom set (recorded map first, then label) so boards/lists+ * don't blank out after customizing; moving a card writes the value to+ * the team definition.*/resolveStage: (entity: CompanyLike) => string | undefined;/** Label for an option id in the active set (legacy system ids included). */@@ -214,6 +216,7 @@ export function useDealStages(): DealStages {scope: 'team',includeOptions: true,}));+ const teamCrmConfig = useTeamCrmConfig();const teamStageDefinition = createMemo(() =>findTeamStageDefinition(teamDefinitionsQuery.data)@@ -268,12 +271,12 @@ export function useDealStages(): DealStages {if (direct && stageIds().has(direct)) return direct;if (stageDefinitionId() === SYSTEM_PROPERTY_IDS.STAGE) return direct;- // Legacy value on the system Stage property → map by label onto the- // custom set (the customize flow seeds the same labels).const legacy = getCompanyStageOptionId(entity as Parameters<typeof getCompanyStageOptionId>[0]);if (!legacy) return undefined;+ const mapped = teamCrmConfig.config().legacyStageIds?.[legacy];+ if (mapped && stageIds().has(mapped)) return mapped;const legacyLabel = getPropertyOptionLabel(legacy)?.toLowerCase();if (!legacyLabel) return undefined;return stages().find((stage) => stage.label.toLowerCase() === legacyLabel)@@ -291,6 +294,7 @@ export function useDealStages(): DealStages {stageProperty,resolveStage,stageLabel,- isLoading: () => teamDefinitionsQuery.isLoading,+ isLoading: () =>+ teamDefinitionsQuery.isLoading || teamCrmConfig.isLoading(),};}diff --git a/apps/web/src/features/companies/crm/team-crm-config.ts b/apps/web/src/features/companies/crm/team-crm-config.tsindex 1e0a61e59e..d1c6ad3e64 100644--- a/apps/web/src/features/companies/crm/team-crm-config.ts+++ b/apps/web/src/features/companies/crm/team-crm-config.ts@@ -56,6 +56,8 @@ export type TeamCrmConfig = {* closed/won/lost states are treated as closed.*/closedStageIds?: string[];+ /** System stage option id to team stage option id for seeded stages. */+ legacyStageIds?: Record<string, string>;teamViews?: TeamCrmSavedView[];/** Team view applied by default when a member opens the Customers view. */defaultTeamViewId?: string;@@ -107,6 +109,7 @@ export function useTeamCrmConfig() {deleteRecords: data.delete_records_role,},closedStageIds: data.closed_stage_ids ?? undefined,+ legacyStageIds: data.legacy_stage_ids ?? undefined,teamViews: (data.team_views as TeamCrmSavedView[]) ?? [],defaultTeamViewId: data.default_team_view_id ?? undefined,};diff --git a/apps/web/src/lib/service-clients/service-storage/generated/schemas/crmTeamSettingsResponse.ts b/apps/web/src/lib/service-clients/service-storage/generated/schemas/crmTeamSettingsResponse.tsindex 38c1278853..833e511bdf 100644--- a/apps/web/src/lib/service-clients/service-storage/generated/schemas/crmTeamSettingsResponse.ts+++ b/apps/web/src/lib/service-clients/service-storage/generated/schemas/crmTeamSettingsResponse.ts@@ -8,6 +8,7 @@import type { CrmPermissionRole } from './crmPermissionRole';import type { CrmTeamSettingsResponseClosedStageIds } from './crmTeamSettingsResponseClosedStageIds';import type { CrmTeamSettingsResponseDefaultTeamViewId } from './crmTeamSettingsResponseDefaultTeamViewId';+import type { CrmTeamSettingsResponseLegacyStageIds } from './crmTeamSettingsResponseLegacyStageIds';/*** The team's CRM configuration (everything on `team_crm_settings`@@ -24,6 +25,8 @@ falls back to its label heuristic. */delete_records_role: CrmPermissionRole;/** Who can change the deal stage set in CRM settings. */edit_stages_role: CrmPermissionRole;+ /** System stage option id to team stage option id for seeded stages. */+ legacy_stage_ids: CrmTeamSettingsResponseLegacyStageIds;/** Who can move deals out of a closed stage. */move_closed_deals_role: CrmPermissionRole;/** Team saved views — an opaque JSON array owned by the frontend. */diff --git a/apps/web/src/lib/service-clients/service-storage/generated/schemas/crmTeamSettingsResponseLegacyStageIds.ts b/apps/web/src/lib/service-clients/service-storage/generated/schemas/crmTeamSettingsResponseLegacyStageIds.tsnew file mode 100644index 0000000000..7f11ce1855--- /dev/null+++ b/apps/web/src/lib/service-clients/service-storage/generated/schemas/crmTeamSettingsResponseLegacyStageIds.ts@@ -0,0 +1,11 @@+/**+ * Generated by orval v7.21.0 🍺+ * Do not edit manually.+ * document_storage_service+ * OpenAPI spec version: 0.1.0+ */++/**+ * System stage option id to team stage option id for seeded stages.+ */+export type CrmTeamSettingsResponseLegacyStageIds = { [key: string]: string };diff --git a/apps/web/src/lib/service-clients/service-storage/generated/schemas/index.ts b/apps/web/src/lib/service-clients/service-storage/generated/schemas/index.tsindex d58ac5b692..c58d63fe55 100644--- a/apps/web/src/lib/service-clients/service-storage/generated/schemas/index.ts+++ b/apps/web/src/lib/service-clients/service-storage/generated/schemas/index.ts@@ -451,6 +451,7 @@ export * from './crmStagesResponse';export * from './crmTeamSettingsResponse';export * from './crmTeamSettingsResponseClosedStageIds';export * from './crmTeamSettingsResponseDefaultTeamViewId';+export * from './crmTeamSettingsResponseLegacyStageIds';export * from './crmThread';export * from './crmThreadDeletedAt';export * from './customSpeakerAssignment';diff --git a/apps/web/src/lib/service-clients/service-storage/generated/zod.ts b/apps/web/src/lib/service-clients/service-storage/generated/zod.tsindex c1a02363e0..ddb0711445 100644--- a/apps/web/src/lib/service-clients/service-storage/generated/zod.ts+++ b/apps/web/src/lib/service-clients/service-storage/generated/zod.ts@@ -4985,6 +4985,11 @@ export const getCrmTeamSettingsResponse = zod.describe('Minimum team role required for a CRM governance capability. Members\ncan edit visible CRM records (e.g. company properties), but the\ngovernance capabilities these settings gate stay restricted to\nadmin (default) vs owner. Maps to the `team_role` Postgres enum;\n`member` is deliberately not representable.'),+ legacy_stage_ids: zod+ .record(zod.string(), zod.uuid())+ .describe(+ 'System stage option id to team stage option id for seeded stages.'+ ),move_closed_deals_role: zod.enum(['admin', 'owner']).describe(@@ -5085,6 +5090,11 @@ export const putCrmTeamSettingsResponse = zod.describe('Minimum team role required for a CRM governance capability. Members\ncan edit visible CRM records (e.g. company properties), but the\ngovernance capabilities these settings gate stay restricted to\nadmin (default) vs owner. Maps to the `team_role` Postgres enum;\n`member` is deliberately not representable.'),+ legacy_stage_ids: zod+ .record(zod.string(), zod.uuid())+ .describe(+ 'System stage option id to team stage option id for seeded stages.'+ ),move_closed_deals_role: zod.enum(['admin', 'owner']).describe(diff --git a/apps/web/src/lib/service-clients/service-storage/openapi.json b/apps/web/src/lib/service-clients/service-storage/openapi.jsonindex 8281164e6d..6861a617f4 100644--- a/apps/web/src/lib/service-clients/service-storage/openapi.json+++ b/apps/web/src/lib/service-clients/service-storage/openapi.json@@ -18122,6 +18122,7 @@"edit_stages_role","move_closed_deals_role","delete_records_role",+ "legacy_stage_ids","team_views"],"properties": {@@ -18145,6 +18146,18 @@"$ref": "#/components/schemas/CrmPermissionRole","description": "Who can change the deal stage set in CRM settings."},+ "legacy_stage_ids": {+ "type": "object",+ "description": "System stage option id to team stage option id for seeded stages.",+ "additionalProperties": {+ "type": "string",+ "format": "uuid"+ },+ "propertyNames": {+ "type": "string",+ "format": "uuid"+ }+ },"move_closed_deals_role": {"$ref": "#/components/schemas/CrmPermissionRole","description": "Who can move deals out of a closed stage."diff --git a/crates/crm/src/domain/model.rs b/crates/crm/src/domain/model.rsindex 6e3e8de358..914cae2c12 100644--- a/crates/crm/src/domain/model.rs+++ b/crates/crm/src/domain/model.rs@@ -1,5 +1,7 @@//! Domain models for CRM companies and their related records.+use std::collections::BTreeMap;+use chrono::{DateTime, Utc};use serde_json::Value;@@ -315,6 +317,9 @@ pub struct CrmTeamSettings {/// Stage option ids counting as closed deals; `None` = the client/// falls back to its label heuristic.pub closed_stage_ids: Option<Vec<uuid::Uuid>>,+ /// System stage option id to team stage option id for seeded stages.+ /// Entries may outlive their stage; readers check membership in the set.+ pub legacy_stage_ids: BTreeMap<uuid::Uuid, uuid::Uuid>,/// Team saved views — an opaque JSON array owned by the frontend.pub team_views: Value,/// Team view applied by default when a member opens the CRM view.@@ -328,6 +333,7 @@ impl Default for CrmTeamSettings {move_closed_deals_role: CrmPermissionRole::Admin,delete_records_role: CrmPermissionRole::Admin,closed_stage_ids: None,+ legacy_stage_ids: BTreeMap::new(),team_views: Value::Array(Vec::new()),default_team_view_id: None,}@@ -347,6 +353,8 @@ pub struct CrmTeamSettingsPatch {pub delete_records_role: Option<CrmPermissionRole>,/// New `closed_stage_ids`; `Some(None)` clears to the heuristic.pub closed_stage_ids: Option<Option<Vec<uuid::Uuid>>>,+ /// Replacement `legacy_stage_ids` map.+ pub legacy_stage_ids: Option<BTreeMap<uuid::Uuid, uuid::Uuid>>,/// Replacement `team_views` array.pub team_views: Option<Value>,/// New `default_team_view_id`; `Some(None)` clears it.diff --git a/crates/crm/src/domain/stages.rs b/crates/crm/src/domain/stages.rsindex 12463e1f85..23f68e3f77 100644--- a/crates/crm/src/domain/stages.rs+++ b/crates/crm/src/domain/stages.rs@@ -1,8 +1,9 @@//! Team deal stages: the role-gated write path over the team's stage definition.-use std::collections::{HashMap, HashSet};+use std::collections::{BTreeMap, HashMap, HashSet};use entity_access::domain::models::MemberTeamRole;+use system_properties::StageOption;use uuid::Uuid;use crate::domain::{@@ -180,46 +181,44 @@ where}}+ /// Drop closed entries that point at stages no longer in `set`; write+ /// `legacy` when given.async fn prune_closed_stage_ids(&self,access: &CrmTeamReceipt<MemberTeamRole>,settings: &CrmTeamSettings,- live: &[Uuid],+ set: &TeamStageSet,+ legacy: Option<BTreeMap<Uuid, Uuid>>,) -> Result<(), CrmError> {- let Some(closed) = &settings.closed_stage_ids else {- return Ok(());- };- if closed.iter().all(|id| live.contains(id)) {- return Ok(());- }- let kept: Vec<Uuid> = closed- .iter()- .copied()- .filter(|id| live.contains(id))- .collect();- self.write_closed_stage_ids(access, Some(kept)).await+ let live: Vec<Uuid> = set.stages.iter().map(|stage| stage.id).collect();+ let closed = settings.closed_stage_ids.as_ref().map(|closed| {+ closed+ .iter()+ .copied()+ .filter(|id| live.contains(id))+ .collect()+ });+ self.write_stage_settings(access, settings, closed, legacy)+ .await}- async fn clear_closed_stage_ids(+ /// Patch `closed_stage_ids` and, when given, `legacy_stage_ids`, skipping+ /// fields that already match.+ async fn write_stage_settings(&self,access: &CrmTeamReceipt<MemberTeamRole>,settings: &CrmTeamSettings,- ) -> Result<(), CrmError> {- if settings.closed_stage_ids.is_none() {- return Ok(());- }- self.write_closed_stage_ids(access, None).await- }-- async fn write_closed_stage_ids(- &self,- access: &CrmTeamReceipt<MemberTeamRole>,closed: Option<Vec<Uuid>>,+ legacy: Option<BTreeMap<Uuid, Uuid>>,) -> Result<(), CrmError> {let patch = CrmTeamSettingsPatch {- closed_stage_ids: Some(closed),+ closed_stage_ids: (settings.closed_stage_ids != closed).then_some(closed),+ legacy_stage_ids: legacy.filter(|legacy| *legacy != settings.legacy_stage_ids),..Default::default()};+ if patch.closed_stage_ids.is_none() && patch.legacy_stage_ids.is_none() {+ return Ok(());+ }self.team_settings.patch_team_settings(&access.team_id(), &patch).await?;@@ -227,6 +226,18 @@ where}}+/// System stage id to team stage id for seeded stages named like a default.+fn legacy_stage_ids_for(set: &TeamStageSet) -> BTreeMap<Uuid, Uuid> {+ set.stages+ .iter()+ .filter_map(|stage| {+ StageOption::try_from(stage.label.to_lowercase().as_str())+ .ok()+ .map(|option| (option.uuid(), stage.id))+ })+ .collect()+}+fn validate_stage_inputs(stages: Vec<StageInput>) -> Result<Vec<StageInput>, CrmError> {if stages.is_empty() {return Err(CrmError::InvalidRequest(@@ -300,7 +311,8 @@ where.stage_definitions.create_team_stage_set(access, &labels).await?;- self.clear_closed_stage_ids(access, &settings).await?;+ self.write_stage_settings(access, &settings, None, Some(legacy_stage_ids_for(&set)))+ .await?;return Ok(set);};@@ -319,6 +331,12 @@ where)));}+ // Backfill a map the first settings write never landed, from the pre-edit labels.+ let legacy = settings+ .legacy_stage_ids+ .is_empty()+ .then(|| legacy_stage_ids_for(¤t));+let kept: HashSet<Uuid> = requested.iter().filter_map(|stage| stage.id).collect();let mut plan = StageReplacePlan {delete: current@@ -359,8 +377,7 @@ where.replace_stages(access, current.definition_id, plan).await?};- let live: Vec<Uuid> = set.stages.iter().map(|stage| stage.id).collect();- self.prune_closed_stage_ids(access, &settings, &live)+ self.prune_closed_stage_ids(access, &settings, &set, legacy).await?;Ok(set)}@@ -373,7 +390,8 @@ where.delete_team_stage_set(access, current.definition_id).await?;}- self.clear_closed_stage_ids(access, &settings).await+ self.write_stage_settings(access, &settings, None, Some(BTreeMap::new()))+ .await}}diff --git a/crates/crm/src/domain/stages/test.rs b/crates/crm/src/domain/stages/test.rsindex 267276877b..383b7998ac 100644--- a/crates/crm/src/domain/stages/test.rs+++ b/crates/crm/src/domain/stages/test.rs@@ -1,9 +1,11 @@+use std::collections::BTreeMap;use std::sync::{Arc, Mutex};use entity_access::domain::models::{Entity, EntityAccessReceipt, EntityPermission, EntityType, TeamRole,};use macro_user_id::{cowlike::CowLike, user_id::MacroUserIdStr};+use system_properties::StageOption;use super::*;use crate::domain::model::CrmPermissionRole;@@ -26,6 +28,15 @@ impl StubSettings {self}+ fn with_legacy(self, map: BTreeMap<Uuid, Uuid>) -> Self {+ self.settings.lock().unwrap().legacy_stage_ids = map;+ self+ }++ fn legacy(&self) -> BTreeMap<Uuid, Uuid> {+ self.settings.lock().unwrap().legacy_stage_ids.clone()+ }+fn patches(&self) -> Vec<CrmTeamSettingsPatch> {self.patches.lock().unwrap().clone()}@@ -46,6 +57,9 @@ impl TeamSettingsStore for StubSettings {if let Some(closed) = &patch.closed_stage_ids {settings.closed_stage_ids = closed.clone();}+ if let Some(legacy) = &patch.legacy_stage_ids {+ settings.legacy_stage_ids = legacy.clone();+ }Ok(settings.clone())}}@@ -463,12 +477,13 @@ async fn deleting_an_unclosed_stage_leaves_settings_alone() {let [lead, won] = store.stage_ids()[..] else {panic!("expected two seeded stages");};- let settings = StubSettings::requiring(CrmPermissionRole::Admin).with_closed(vec![won]);+ let settings = StubSettings::requiring(CrmPermissionRole::Admin)+ .with_closed(vec![won])+ .with_legacy(BTreeMap::from([(StageOption::LEAD_UUID, lead)]));CrmStageServiceImpl::new(settings.clone(), store).replace_stages(&receipt_with_role(TeamRole::Admin), vec![keep(won, "Won")]).await.unwrap();- let _ = lead;assert!(settings.patches().is_empty());}@@ -565,3 +580,116 @@ async fn reset_on_defaults_is_a_no_op() {.unwrap();assert!(store.writes().is_empty());}++#[tokio::test]+async fn customizing_records_where_each_default_stage_went() {+ let store = MemoryStore::default();+ let settings = StubSettings::requiring(CrmPermissionRole::Admin);+ let set = CrmStageServiceImpl::new(settings.clone(), store)+ .replace_stages(+ &receipt_with_role(TeamRole::Admin),+ vec![new_stage("Lead"), new_stage("customer"), new_stage("Won")],+ )+ .await+ .unwrap();+ let legacy = settings.legacy();+ assert_eq!(legacy.len(), 2);+ assert_eq!(legacy[&StageOption::LEAD_UUID], set.stages[0].id);+ assert_eq!(legacy[&StageOption::CUSTOMER_UUID], set.stages[1].id);+}++#[tokio::test]+async fn renaming_a_seeded_stage_keeps_its_legacy_entry() {+ let store = MemoryStore::customized(&["Lead", "Customer"]);+ let [lead, customer] = store.stage_ids()[..] else {+ panic!("expected two seeded stages");+ };+ let legacy = BTreeMap::from([(StageOption::CUSTOMER_UUID, customer)]);+ let settings = StubSettings::requiring(CrmPermissionRole::Admin).with_legacy(legacy.clone());+ CrmStageServiceImpl::new(settings.clone(), store)+ .replace_stages(+ &receipt_with_role(TeamRole::Admin),+ vec![keep(lead, "Lead"), keep(customer, "Client")],+ )+ .await+ .unwrap();+ assert!(settings.patches().is_empty());+ assert_eq!(settings.legacy(), legacy);+}++#[tokio::test]+async fn deleting_a_seeded_stage_leaves_the_map_alone() {+ let store = MemoryStore::customized(&["Lead", "Customer"]);+ let [lead, customer] = store.stage_ids()[..] else {+ panic!("expected two seeded stages");+ };+ let legacy = BTreeMap::from([+ (StageOption::LEAD_UUID, lead),+ (StageOption::CUSTOMER_UUID, customer),+ ]);+ let settings = StubSettings::requiring(CrmPermissionRole::Admin).with_legacy(legacy.clone());+ CrmStageServiceImpl::new(settings.clone(), store)+ .replace_stages(+ &receipt_with_role(TeamRole::Admin),+ vec![keep(lead, "Lead")],+ )+ .await+ .unwrap();+ assert!(settings.patches().is_empty());+ assert_eq!(settings.legacy(), legacy);+}++#[tokio::test]+async fn a_set_without_a_map_gets_one_on_the_next_edit() {+ let store = MemoryStore::customized(&["Lead", "Client"]);+ let [lead, client] = store.stage_ids()[..] else {+ panic!("expected two seeded stages");+ };+ let settings = StubSettings::requiring(CrmPermissionRole::Admin);+ CrmStageServiceImpl::new(settings.clone(), store)+ .replace_stages(+ &receipt_with_role(TeamRole::Admin),+ vec![keep(lead, "Lead"), keep(client, "Client")],+ )+ .await+ .unwrap();+ assert_eq!(+ settings.legacy(),+ BTreeMap::from([(StageOption::LEAD_UUID, lead)])+ );+}++#[tokio::test]+async fn a_backfilled_map_reads_labels_from_before_the_edit() {+ let store = MemoryStore::customized(&["Lead", "Client"]);+ let [lead, client] = store.stage_ids()[..] else {+ panic!("expected two seeded stages");+ };+ let settings = StubSettings::requiring(CrmPermissionRole::Admin);+ CrmStageServiceImpl::new(settings.clone(), store)+ .replace_stages(+ &receipt_with_role(TeamRole::Admin),+ vec![keep(lead, "Prospect"), keep(client, "Client")],+ )+ .await+ .unwrap();+ assert_eq!(+ settings.legacy(),+ BTreeMap::from([(StageOption::LEAD_UUID, lead)])+ );+}++#[tokio::test]+async fn reset_clears_legacy_ids() {+ let store = MemoryStore::customized(&["Lead"]);+ let [lead] = store.stage_ids()[..] else {+ panic!("expected one seeded stage");+ };+ let settings = StubSettings::requiring(CrmPermissionRole::Admin)+ .with_legacy(BTreeMap::from([(StageOption::LEAD_UUID, lead)]));+ CrmStageServiceImpl::new(settings.clone(), store)+ .reset_stages(&receipt_with_role(TeamRole::Admin))+ .await+ .unwrap();+ assert!(settings.legacy().is_empty());+}diff --git a/crates/crm/src/inbound/axum_router/team_settings.rs b/crates/crm/src/inbound/axum_router/team_settings.rsindex 1a85a6369d..ebaf936f05 100644--- a/crates/crm/src/inbound/axum_router/team_settings.rs+++ b/crates/crm/src/inbound/axum_router/team_settings.rs@@ -1,3 +1,5 @@+use std::collections::BTreeMap;+use axum::{Json, extract::State};use entity_access::{domain::{models::MemberTeamRole, ports::EntityAccessService},@@ -32,6 +34,8 @@ pub struct CrmTeamSettingsResponse {/// Stage option ids counting as closed deals; absent = the client/// falls back to its label heuristic.pub closed_stage_ids: Option<Vec<Uuid>>,+ /// System stage option id to team stage option id for seeded stages.+ pub legacy_stage_ids: BTreeMap<Uuid, Uuid>,/// Team saved views — an opaque JSON array owned by the frontend.pub team_views: Value,/// Team view applied by default when a member opens the CRM view.@@ -45,6 +49,7 @@ impl From<CrmTeamSettings> for CrmTeamSettingsResponse {move_closed_deals_role: settings.move_closed_deals_role,delete_records_role: settings.delete_records_role,closed_stage_ids: settings.closed_stage_ids,+ legacy_stage_ids: settings.legacy_stage_ids,team_views: settings.team_views,default_team_view_id: settings.default_team_view_id,}@@ -90,6 +95,7 @@ impl From<UpdateCrmTeamSettingsRequest> for CrmTeamSettingsPatch {move_closed_deals_role: req.move_closed_deals_role,delete_records_role: req.delete_records_role,closed_stage_ids: req.closed_stage_ids,+ legacy_stage_ids: None,team_views: req.team_views,default_team_view_id: req.default_team_view_id,}diff --git a/crates/crm/src/outbound/companies_repo.rs b/crates/crm/src/outbound/companies_repo.rsindex 0bcfd3f1d7..18a950fedc 100644--- a/crates/crm/src/outbound/companies_repo.rs+++ b/crates/crm/src/outbound/companies_repo.rs@@ -18,7 +18,7 @@ use crate::domain::{use chrono::{DateTime, Utc};use serde_json::Value;use sqlx::PgPool;-use std::collections::HashMap;+use std::collections::{BTreeMap, HashMap};use uuid::Uuid;/// PostgreSQL-backed [`CompaniesRepository`].@@ -2291,6 +2291,7 @@ impl CompaniesRepository for CompaniesRepositoryImpl {move_closed_deals_role AS "move_closed_deals_role: CrmPermissionRole",delete_records_role AS "delete_records_role: CrmPermissionRole",closed_stage_ids,+ legacy_stage_ids AS "legacy_stage_ids: sqlx::types::Json<BTreeMap<Uuid, Uuid>>",team_views,default_team_view_idFROM team_crm_settings@@ -2308,6 +2309,7 @@ impl CompaniesRepository for CompaniesRepositoryImpl {move_closed_deals_role: r.move_closed_deals_role,delete_records_role: r.delete_records_role,closed_stage_ids: r.closed_stage_ids,+ legacy_stage_ids: r.legacy_stage_ids.0,team_views: r.team_views,default_team_view_id: r.default_team_view_id,})@@ -2330,12 +2332,13 @@ impl CompaniesRepository for CompaniesRepositoryImpl {let closed_value: Option<Vec<Uuid>> = patch.closed_stage_ids.clone().flatten();let default_provided = patch.default_team_view_id.is_some();let default_value: Option<String> = patch.default_team_view_id.clone().flatten();+ let legacy_value = patch.legacy_stage_ids.as_ref().map(sqlx::types::Json);let row = sqlx::query!(r#"INSERT INTO team_crm_settings (team_id, edit_stages_role, move_closed_deals_role, delete_records_role,- closed_stage_ids, team_views, default_team_view_id+ closed_stage_ids, team_views, default_team_view_id, legacy_stage_ids)VALUES ($1,@@ -2344,7 +2347,8 @@ impl CompaniesRepository for CompaniesRepositoryImpl {COALESCE($4::text::team_role, 'admin'),CASE WHEN $5 THEN $6::uuid[] END,COALESCE($7, '[]'::jsonb),- CASE WHEN $8 THEN $9 END+ CASE WHEN $8 THEN $9 END,+ COALESCE($10, '{}'::jsonb))ON CONFLICT (team_id) DO UPDATE SETedit_stages_role = COALESCE($2::text::team_role, team_crm_settings.edit_stages_role),@@ -2353,6 +2357,7 @@ impl CompaniesRepository for CompaniesRepositoryImpl {closed_stage_ids = CASE WHEN $5 THEN $6::uuid[] ELSE team_crm_settings.closed_stage_ids END,team_views = COALESCE($7, team_crm_settings.team_views),default_team_view_id = CASE WHEN $8 THEN $9 ELSE team_crm_settings.default_team_view_id END,+ legacy_stage_ids = COALESCE($10, team_crm_settings.legacy_stage_ids),updated_at = now()RETURNINGedit_stages_role AS "edit_stages_role!: CrmPermissionRole",@@ -2360,7 +2365,8 @@ impl CompaniesRepository for CompaniesRepositoryImpl {delete_records_role AS "delete_records_role!: CrmPermissionRole",closed_stage_ids,team_views AS "team_views!",- default_team_view_id+ default_team_view_id,+ legacy_stage_ids AS "legacy_stage_ids!: sqlx::types::Json<BTreeMap<Uuid, Uuid>>""#,team_id,edit_stages as Option<&str>,@@ -2371,6 +2377,7 @@ impl CompaniesRepository for CompaniesRepositoryImpl {patch.team_views.as_ref(),default_provided,default_value.as_deref(),+ legacy_value as Option<sqlx::types::Json<&BTreeMap<Uuid, Uuid>>>,).fetch_one(&self.pool).await@@ -2381,6 +2388,7 @@ impl CompaniesRepository for CompaniesRepositoryImpl {move_closed_deals_role: row.move_closed_deals_role,delete_records_role: row.delete_records_role,closed_stage_ids: row.closed_stage_ids,+ legacy_stage_ids: row.legacy_stage_ids.0,team_views: row.team_views,default_team_view_id: row.default_team_view_id,})diff --git a/crates/crm/src/outbound/companies_repo/test/team_settings.rs b/crates/crm/src/outbound/companies_repo/test/team_settings.rsindex f42f4fbd10..d3106de04f 100644--- a/crates/crm/src/outbound/companies_repo/test/team_settings.rs+++ b/crates/crm/src/outbound/companies_repo/test/team_settings.rs@@ -19,11 +19,48 @@ async fn get_team_settings_missing_row_returns_defaults(pool: PgPool) -> anyhow:assert_eq!(settings.move_closed_deals_role, CrmPermissionRole::Admin);assert_eq!(settings.delete_records_role, CrmPermissionRole::Admin);assert_eq!(settings.closed_stage_ids, None);+ assert!(settings.legacy_stage_ids.is_empty());assert_eq!(settings.team_views, json!([]));assert_eq!(settings.default_team_view_id, None);Ok(())}+#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]+async fn update_team_settings_round_trips_legacy_stage_ids(pool: PgPool) -> anyhow::Result<()> {+ let team_id = Uuid::now_v7();+ seed_team(&pool, team_id, "macro|[email protected]").await?;+ let repo = CompaniesRepositoryImpl::new(pool.clone());++ let legacy = std::collections::BTreeMap::from([(Uuid::now_v7(), Uuid::now_v7())]);+ let patch = CrmTeamSettingsPatch {+ legacy_stage_ids: Some(legacy.clone()),+ ..Default::default()+ };+ assert_eq!(+ repo.update_team_settings(&team_id, &patch)+ .await?+ .legacy_stage_ids,+ legacy+ );+ assert_eq!(+ repo.get_team_settings(&team_id).await?.legacy_stage_ids,+ legacy+ );++ // Other patches leave it alone.+ let patch = CrmTeamSettingsPatch {+ edit_stages_role: Some(CrmPermissionRole::Owner),+ ..Default::default()+ };+ assert_eq!(+ repo.update_team_settings(&team_id, &patch)+ .await?+ .legacy_stage_ids,+ legacy+ );+ Ok(())+}+#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]async fn get_team_settings_row_from_enable_flow_returns_defaults(pool: PgPool,@@ -88,6 +125,10 @@ async fn update_team_settings_partial_changes_only_provided_fields(move_closed_deals_role: Some(CrmPermissionRole::Owner),delete_records_role: Some(CrmPermissionRole::Owner),closed_stage_ids: Some(Some(vec![stage_id])),+ legacy_stage_ids: Some(std::collections::BTreeMap::from([(+ Uuid::now_v7(),+ stage_id,+ )])),team_views: Some(json!([{ "id": "v1", "name": "My view" }])),default_team_view_id: Some(Some("v1".to_string())),};diff --git a/crates/macro_db_client/migrations/20260908210000_crm_legacy_stage_ids.down.sql b/crates/macro_db_client/migrations/20260908210000_crm_legacy_stage_ids.down.sqlnew file mode 100644index 0000000000..e00bc94c3f--- /dev/null+++ b/crates/macro_db_client/migrations/20260908210000_crm_legacy_stage_ids.down.sql@@ -0,0 +1 @@+ALTER TABLE team_crm_settings DROP COLUMN IF EXISTS legacy_stage_ids;diff --git a/crates/macro_db_client/migrations/20260908210000_crm_legacy_stage_ids.up.sql b/crates/macro_db_client/migrations/20260908210000_crm_legacy_stage_ids.up.sqlnew file mode 100644index 0000000000..575877851a--- /dev/null+++ b/crates/macro_db_client/migrations/20260908210000_crm_legacy_stage_ids.up.sql@@ -0,0 +1,5 @@+ALTER TABLE team_crm_settings+ ADD COLUMN IF NOT EXISTS legacy_stage_ids jsonb NOT NULL DEFAULT '{}'::jsonb;++COMMENT ON COLUMN team_crm_settings.legacy_stage_ids IS+ 'System stage option id -> team stage option id, recorded when the team set is seeded';diff --git a/packages/sdk/generated/storage/types.gen.ts b/packages/sdk/generated/storage/types.gen.tsindex 60159c0f7f..73d03dced9 100644--- a/packages/sdk/generated/storage/types.gen.ts+++ b/packages/sdk/generated/storage/types.gen.ts@@ -3933,6 +3933,12 @@ export type CrmTeamSettingsResponse = {* Who can change the deal stage set in CRM settings.*/edit_stages_role: CrmPermissionRole;+ /**+ * System stage option id to team stage option id for seeded stages.+ */+ legacy_stage_ids: {+ [key: string]: string;+ };/*** Who can move deals out of a closed stage.*/diff --git a/packages/sdk/specs/storage.json b/packages/sdk/specs/storage.jsonindex 8281164e6d..6861a617f4 100644--- a/packages/sdk/specs/storage.json+++ b/packages/sdk/specs/storage.json@@ -18122,6 +18122,7 @@"edit_stages_role","move_closed_deals_role","delete_records_role",+ "legacy_stage_ids","team_views"],"properties": {@@ -18145,6 +18146,18 @@"$ref": "#/components/schemas/CrmPermissionRole","description": "Who can change the deal stage set in CRM settings."},+ "legacy_stage_ids": {+ "type": "object",+ "description": "System stage option id to team stage option id for seeded stages.",+ "additionalProperties": {+ "type": "string",+ "format": "uuid"+ },+ "propertyNames": {+ "type": "string",+ "format": "uuid"+ }+ },"move_closed_deals_role": {"$ref": "#/components/schemas/CrmPermissionRole","description": "Who can move deals out of a closed stage."