@open-mercato/core 0.6.8-develop.6918.1.7b3f32b0c8 → 0.6.8-develop.6925.1.cefa200fa4

package/src/modules/catalog/search.ts

@@ -279,6 +279,7 @@ export const searchConfig: SearchModuleConfig = {
   entities: [
     {
       entityId: 'catalog:catalog_product',
+      aclFeatures: ['catalog.products.view'],
       enabled: true,
       priority: 10,
       buildSource: async (ctx) => {
@@ -335,6 +336,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'catalog:catalog_product_variant',
+      aclFeatures: ['catalog.products.view'],
       enabled: true,
       priority: 8,
       buildSource: async (ctx) => {
@@ -363,6 +365,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'catalog:catalog_product_category',
+      aclFeatures: ['catalog.categories.view'],
       enabled: true,
       priority: 7,
       buildSource: async (ctx) => {
@@ -387,6 +390,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'catalog:catalog_offer',
+      aclFeatures: ['sales.channels.manage'],
       enabled: true,
       priority: 7,
       buildSource: async (ctx) => {
@@ -413,6 +417,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'catalog:catalog_product_tag',
+      aclFeatures: ['catalog.products.view'],
       enabled: true,
       priority: 5,
       buildSource: async (ctx) => {
@@ -434,6 +439,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'catalog:catalog_price_kind',
+      aclFeatures: ['catalog.settings.manage'],
       enabled: true,
       priority: 4,
       buildSource: async (ctx) => {
@@ -457,6 +463,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'catalog:catalog_product_unit_conversion',
+      aclFeatures: ['catalog.products.view'],
       enabled: true,
       priority: 3,
       buildSource: async (ctx) => {
@@ -485,6 +492,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'catalog:catalog_option_schema_template',
+      aclFeatures: ['catalog.products.view'],
       enabled: true,
       priority: 4,
       buildSource: async (ctx) => {

package/src/modules/customer_accounts/search.ts

@@ -56,6 +56,7 @@ export const searchConfig: SearchModuleConfig = {
   entities: [
     {
       entityId: 'customer_accounts:customer_user',
+      aclFeatures: ['customer_accounts.view'],
       enabled: true,
       priority: 6,
       buildSource: async (ctx) => {
@@ -93,6 +94,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'customer_accounts:customer_role',
+      aclFeatures: ['customer_accounts.view'],
       enabled: true,
       priority: 6,
       buildSource: async (ctx) => {

package/src/modules/customers/commands/deals.ts

@@ -72,6 +72,13 @@ type PipelineStageSnapshot = {
   order: number
 }
 
+type DealClosureOutcome = 'won' | 'lost'
+
+const TERMINAL_PIPELINE_STAGE_LABELS: Record<DealClosureOutcome, ReadonlySet<string>> = {
+  won: new Set(['won', 'win', 'closed won', 'closed win']),
+  lost: new Set(['lost', 'loose', 'closed lost', 'closed loose']),
+}
+
 type DealStageTransitionSnapshot = {
   id: string
   pipelineId: string
@@ -116,6 +123,56 @@ async function loadPipelineStageSnapshot(
   }
 }
 
+function normalizePipelineStageLabel(value: string): string {
+  return value
+    .trim()
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, ' ')
+    .trim()
+}
+
+function resolveRequestedClosureOutcome(input: DealUpdateInput): DealClosureOutcome | null {
+  if (input.closureOutcome === 'won' || input.closureOutcome === 'lost') {
+    return input.closureOutcome
+  }
+  if (input.status === 'win') return 'won'
+  if (input.status === 'loose') return 'lost'
+  return null
+}
+
+async function loadClosurePipelineStageSnapshot(
+  em: EntityManager,
+  input: {
+    pipelineId: string | null
+    closureOutcome: DealClosureOutcome
+    tenantId: string
+    organizationId: string
+  },
+): Promise<PipelineStageSnapshot | null> {
+  if (!input.pipelineId) return null
+
+  const stages = await findWithDecryption(
+    em,
+    CustomerPipelineStage,
+    {
+      pipelineId: input.pipelineId,
+      tenantId: input.tenantId,
+      organizationId: input.organizationId,
+    },
+    { orderBy: { order: 'ASC' } },
+    { tenantId: input.tenantId, organizationId: input.organizationId },
+  )
+  const aliases = TERMINAL_PIPELINE_STAGE_LABELS[input.closureOutcome]
+  const stage = stages.find((candidate) => aliases.has(normalizePipelineStageLabel(candidate.label)))
+  if (!stage) return null
+  return {
+    id: stage.id,
+    pipelineId: stage.pipelineId,
+    label: stage.label,
+    order: stage.order,
+  }
+}
+
 async function resolvePipelineStageValue(
   em: EntityManager,
   pipelineStageId: string,
@@ -681,6 +738,7 @@ const updateDealCommand: CommandHandler<DealUpdateInput, { dealId: string }> = {
     }
     let nextPipelineStageLabel: string | null = null
     let resolvedCurrentPipelineStageLabel: string | null = null
+    let pipelineStageAssignmentChanged = false
 
     await runCrudCommandWrite({
       ctx,
@@ -701,18 +759,32 @@ const updateDealCommand: CommandHandler<DealUpdateInput, { dealId: string }> = {
       }),
       phases: [
         async () => {
+          const requestedClosureOutcome = resolveRequestedClosureOutcome(parsed)
+          const requestedPipelineId =
+            parsed.pipelineId !== undefined ? parsed.pipelineId ?? null : record.pipelineId ?? null
+          const closureStageSnapshot =
+            parsed.pipelineStageId === undefined && requestedClosureOutcome
+              ? await loadClosurePipelineStageSnapshot(em, {
+                pipelineId: requestedPipelineId,
+                closureOutcome: requestedClosureOutcome,
+                tenantId: record.tenantId,
+                organizationId: record.organizationId,
+              })
+              : null
+          pipelineStageAssignmentChanged =
+            parsed.pipelineStageId !== undefined || closureStageSnapshot !== null
           const pipelineAssignmentChanged =
-            parsed.pipelineId !== undefined || parsed.pipelineStageId !== undefined
+            parsed.pipelineId !== undefined || pipelineStageAssignmentChanged
           const requestedPipelineStageId =
             parsed.pipelineStageId !== undefined
               ? parsed.pipelineStageId ?? null
-              : record.pipelineStageId ?? null
-          const requestedPipelineId =
-            parsed.pipelineId !== undefined ? parsed.pipelineId ?? null : record.pipelineId ?? null
+              : closureStageSnapshot?.id ?? record.pipelineStageId ?? null
 
-          nextStageSnapshot = requestedPipelineStageId && (pipelineAssignmentChanged || !record.pipelineStage)
-            ? await loadPipelineStageSnapshot(em, requestedPipelineStageId, record.tenantId, record.organizationId)
-            : null
+          nextStageSnapshot = closureStageSnapshot ?? (
+            requestedPipelineStageId && (pipelineAssignmentChanged || !record.pipelineStage)
+              ? await loadPipelineStageSnapshot(em, requestedPipelineStageId, record.tenantId, record.organizationId)
+              : null
+          )
           if (pipelineAssignmentChanged) {
             nextPipelineAssignment = resolvePipelineAssignment({
               pipelineId: requestedPipelineId,
@@ -738,14 +810,14 @@ const updateDealCommand: CommandHandler<DealUpdateInput, { dealId: string }> = {
           if (parsed.description !== undefined) record.description = parsed.description ?? null
           if (parsed.status !== undefined) record.status = parsed.status ?? record.status
           if (parsed.pipelineStage !== undefined) record.pipelineStage = parsed.pipelineStage ?? null
-          if (parsed.pipelineId !== undefined || (parsed.pipelineStageId !== undefined && nextStageSnapshot)) {
+          if (parsed.pipelineId !== undefined || (pipelineStageAssignmentChanged && nextStageSnapshot)) {
             record.pipelineId = nextPipelineAssignment.pipelineId
           }
-          if (parsed.pipelineStageId !== undefined) record.pipelineStageId = nextPipelineAssignment.pipelineStageId
+          if (pipelineStageAssignmentChanged) record.pipelineStageId = nextPipelineAssignment.pipelineStageId
 
-          if (nextPipelineStageLabel && (parsed.pipelineStageId !== undefined || !record.pipelineStage)) {
+          if (nextPipelineStageLabel && (pipelineStageAssignmentChanged || !record.pipelineStage)) {
             record.pipelineStage = nextPipelineStageLabel
-          } else if (resolvedCurrentPipelineStageLabel && (parsed.pipelineStageId !== undefined || !record.pipelineStage)) {
+          } else if (resolvedCurrentPipelineStageLabel && (pipelineStageAssignmentChanged || !record.pipelineStage)) {
             record.pipelineStage = resolvedCurrentPipelineStageLabel
           }
 
@@ -774,9 +846,9 @@ const updateDealCommand: CommandHandler<DealUpdateInput, { dealId: string }> = {
           const snapshot = nextStageSnapshot
           if (!snapshot) return
           const shouldRecord =
-            parsed.pipelineStageId !== undefined &&
-            parsed.pipelineStageId !== null &&
-            parsed.pipelineStageId !== previousPipelineStageId
+            pipelineStageAssignmentChanged &&
+            nextPipelineAssignment.pipelineStageId !== null &&
+            nextPipelineAssignment.pipelineStageId !== previousPipelineStageId
           if (!shouldRecord) return
           await upsertDealStageTransition(em, {
             deal: record,

package/src/modules/customers/components/detail/create/dealCustomFieldControl.tsx

@@ -133,7 +133,7 @@ export function DealCustomFieldControl({
         label={field.label}
         required={field.required}
         description={field.description}
-        error={error}
+        error={field.rendersOwnError ? undefined : error}
       >
         {field.component({
           id: field.id,

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

@@ -422,6 +422,7 @@ const createPrimaryPhoneField = (t: Translator, defaultCountryIso2?: string): Cr
   id: 'primaryPhone',
   label: t('customers.people.form.primaryPhone'),
   type: 'custom',
+  rendersOwnError: true,
   component: function PrimaryPhoneField({ value, setValue, error, autoFocus, disabled, recordId }: CrudCustomFieldRenderProps) {
     const currentRecordId = React.useMemo(() => (typeof recordId === 'string' ? recordId : null), [recordId])
 
@@ -1262,6 +1263,7 @@ export const createCompanyFormFields = (t: Translator, options?: { defaultCountr
       id: 'primaryPhone',
       label: t('customers.companies.detail.highlights.primaryPhone', 'Primary phone'),
       type: 'custom',
+      rendersOwnError: true,
       layout: 'half',
       component: ({ value, setValue, error, disabled, autoFocus }: CrudCustomFieldRenderProps) => (
         <PhoneNumberField

package/src/modules/inbox_ops/search.ts

@@ -20,6 +20,7 @@ export const searchConfig: SearchModuleConfig = {
   entities: [
     {
       entityId: 'inbox_ops:inbox_proposal',
+      aclFeatures: ['inbox_ops.proposals.view'],
       enabled: true,
       priority: 6,
       fieldPolicy: {

package/src/modules/messages/search.ts

@@ -50,7 +50,8 @@ export const searchConfig: SearchModuleConfig = {
   entities: [
     {
       entityId: 'messages:message',
-      enabled: true,
+      aclFeatures: ['messages.view'],
+      enabled: false,
       priority: 5,
       buildSource: async (ctx: SearchBuildContext): Promise<SearchIndexSource | null> => {
         const { t } = await resolveTranslations()

package/src/modules/planner/search.ts

@@ -86,6 +86,7 @@ export const searchConfig: SearchModuleConfig = {
   entities: [
     {
       entityId: 'planner:planner_availability_rule_set',
+      aclFeatures: ['planner.view'],
       enabled: true,
       priority: 6,
       buildSource: async (ctx) => {

package/src/modules/resources/search.ts

@@ -106,6 +106,7 @@ export const searchConfig: SearchModuleConfig = {
   entities: [
     {
       entityId: 'resources:resources_resource',
+      aclFeatures: ['resources.view'],
       enabled: true,
       priority: 8,
       buildSource: async (ctx) => {
@@ -131,6 +132,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'resources:resources_resource_type',
+      aclFeatures: ['resources.view'],
       enabled: true,
       priority: 7,
       buildSource: async (ctx) => {

package/src/modules/sales/search.ts

@@ -400,6 +400,7 @@ export const searchConfig: SearchModuleConfig = {
   entities: [
     {
       entityId: 'sales:sales_channel',
+      aclFeatures: ['sales.channels.manage'],
       enabled: true,
       priority: 7,
       buildSource: async (ctx) => {
@@ -426,6 +427,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_order',
+      aclFeatures: ['sales.orders.view'],
       enabled: true,
       priority: 10,
       buildSource: async (ctx) => {
@@ -449,6 +451,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_quote',
+      aclFeatures: ['sales.quotes.view'],
       enabled: true,
       priority: 10,
       buildSource: async (ctx) => {
@@ -471,6 +474,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_order_line',
+      aclFeatures: ['sales.orders.view'],
       enabled: true,
       priority: 7,
       fieldPolicy: {
@@ -499,6 +503,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_quote_line',
+      aclFeatures: ['sales.quotes.view'],
       enabled: true,
       priority: 7,
       fieldPolicy: {
@@ -527,6 +532,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_order_adjustment',
+      aclFeatures: ['sales.orders.view'],
       enabled: true,
       priority: 6,
       buildSource: async (ctx) => {
@@ -547,6 +553,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_quote_adjustment',
+      aclFeatures: ['sales.quotes.view'],
       enabled: true,
       priority: 6,
       buildSource: async (ctx) => {
@@ -567,6 +574,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_shipment',
+      aclFeatures: ['sales.orders.view'],
       enabled: true,
       priority: 6,
       buildSource: async (ctx) => {
@@ -587,6 +595,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_shipment_item',
+      aclFeatures: ['sales.orders.view'],
       enabled: true,
       priority: 5,
       buildSource: async (ctx) => {
@@ -605,6 +614,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_invoice',
+      aclFeatures: ['sales.invoices.manage'],
       enabled: true,
       priority: 6,
       buildSource: async (ctx) => {
@@ -625,6 +635,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_invoice_line',
+      aclFeatures: ['sales.invoices.manage'],
       enabled: true,
       priority: 5,
       fieldPolicy: {
@@ -651,6 +662,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_credit_memo',
+      aclFeatures: ['sales.credit_memos.manage'],
       enabled: true,
       priority: 6,
       buildSource: async (ctx) => {
@@ -671,6 +683,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_credit_memo_line',
+      aclFeatures: ['sales.credit_memos.manage'],
       enabled: true,
       priority: 5,
       fieldPolicy: {
@@ -697,6 +710,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_payment',
+      aclFeatures: ['sales.orders.view'],
       enabled: true,
       priority: 8,
       buildSource: async (ctx) => {
@@ -717,6 +731,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_payment_allocation',
+      aclFeatures: ['sales.orders.view'],
       enabled: true,
       priority: 5,
       buildSource: async (ctx) => {
@@ -737,7 +752,8 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_note',
-      enabled: true,
+      aclFeatures: ['sales.orders.view'],
+      enabled: false,
       priority: 7,
       buildSource: async (ctx) => {
         const { t: translate } = await resolveTranslations()
@@ -760,7 +776,8 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_document_address',
-      enabled: true,
+      aclFeatures: ['sales.orders.view'],
+      enabled: false,
       priority: 7,
       buildSource: async (ctx) => {
         const { t: translate } = await resolveTranslations()
@@ -786,6 +803,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_shipping_method',
+      aclFeatures: ['sales.settings.manage'],
       enabled: true,
       priority: 4,
       buildSource: async (ctx) => {
@@ -806,6 +824,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_delivery_window',
+      aclFeatures: ['sales.settings.manage'],
       enabled: true,
       priority: 4,
       buildSource: async (ctx) => {
@@ -826,6 +845,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_payment_method',
+      aclFeatures: ['sales.settings.manage'],
       enabled: true,
       priority: 4,
       buildSource: async (ctx) => {
@@ -846,6 +866,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_tax_rate',
+      aclFeatures: ['sales.settings.manage'],
       enabled: true,
       priority: 4,
       buildSource: async (ctx) => {
@@ -866,6 +887,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'sales:sales_document_tag',
+      aclFeatures: ['sales.orders.view'],
       enabled: true,
       priority: 3,
       buildSource: async (ctx) => {

package/src/modules/staff/search.ts

@@ -122,6 +122,7 @@ export const searchConfig: SearchModuleConfig = {
   entities: [
     {
       entityId: 'staff:staff_team',
+      aclFeatures: ['staff.view'],
       enabled: true,
       priority: 7,
       buildSource: async (ctx) => {
@@ -144,6 +145,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'staff:staff_team_member',
+      aclFeatures: ['staff.view'],
       enabled: true,
       priority: 7,
       buildSource: async (ctx) => {
@@ -167,6 +169,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'staff:staff_team_role',
+      aclFeatures: ['staff.view'],
       enabled: true,
       priority: 7,
       buildSource: async (ctx) => {
@@ -190,6 +193,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: 'staff:staff_time_project',
+      aclFeatures: ['staff.timesheets.projects.view'],
       enabled: true,
       priority: 7,
       buildSource: async (ctx) => {

package/src/modules/wms/search.ts

@@ -106,6 +106,7 @@ export const searchConfig: SearchModuleConfig = {
   entities: [
     {
       entityId: E.wms.warehouse,
+      aclFeatures: ['wms.view'],
       enabled: true,
       priority: 8,
       buildSource: async (ctx) => {
@@ -130,6 +131,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: E.wms.warehouse_location,
+      aclFeatures: ['wms.view'],
       enabled: true,
       priority: 7,
       buildSource: async (ctx) => {
@@ -155,6 +157,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: E.wms.product_inventory_profile,
+      aclFeatures: ['wms.view'],
       enabled: true,
       priority: 8,
       buildSource: async (ctx) => {
@@ -195,6 +198,7 @@ export const searchConfig: SearchModuleConfig = {
     },
     {
       entityId: E.wms.inventory_lot,
+      aclFeatures: ['wms.view'],
       enabled: true,
       priority: 6,
       buildSource: async (ctx) => {