@open-mercato/core 0.4.2-canary-ed15f2e753 → 0.4.2-canary-e2aeb1a7bf

package/src/modules/notifications/workers/create-notification.worker.ts

@@ -0,0 +1,122 @@
+import type { EntityManager } from '@mikro-orm/core'
+import type { Knex } from 'knex'
+import { Notification } from '../data/entities'
+import type { CreateNotificationInput, CreateRoleNotificationInput, CreateFeatureNotificationInput } from '../data/validators'
+import { buildNotificationEntity, emitNotificationCreated, emitNotificationCreatedBatch } from '../lib/notificationFactory'
+import { getRecipientUserIdsForFeature, getRecipientUserIdsForRole } from '../lib/notificationRecipients'
+
+function getKnex(em: EntityManager): Knex {
+  return (em.getConnection() as unknown as { getKnex: () => Knex }).getKnex()
+}
+
+export const NOTIFICATIONS_QUEUE_NAME = 'notifications'
+
+export type CreateNotificationJob = {
+  type: 'create'
+  input: CreateNotificationInput
+  tenantId: string
+  organizationId?: string | null
+}
+
+export type CreateRoleNotificationJob = {
+  type: 'create-role'
+  input: CreateRoleNotificationInput
+  tenantId: string
+  organizationId?: string | null
+}
+
+export type CreateFeatureNotificationJob = {
+  type: 'create-feature'
+  input: CreateFeatureNotificationInput
+  tenantId: string
+  organizationId?: string | null
+}
+
+export type CleanupExpiredJob = {
+  type: 'cleanup-expired'
+}
+
+export type NotificationJob = CreateNotificationJob | CreateRoleNotificationJob | CreateFeatureNotificationJob | CleanupExpiredJob
+
+export const metadata = {
+  queue: NOTIFICATIONS_QUEUE_NAME,
+  id: 'notifications:create',
+  concurrency: 5,
+}
+
+type HandlerContext = {
+  resolve: <T = unknown>(name: string) => T
+}
+
+export default async function handle(
+  job: { payload: NotificationJob },
+  ctx: HandlerContext
+): Promise<void> {
+  const { payload } = job
+
+  if (payload.type === 'create') {
+    const em = (ctx.resolve('em') as EntityManager).fork()
+    const eventBus = ctx.resolve('eventBus') as { emit: (event: string, payload: unknown) => Promise<void> }
+    const { input, tenantId, organizationId } = payload
+    const { recipientUserId, ...content } = input
+    const notification = buildNotificationEntity(em, content, recipientUserId, { tenantId, organizationId })
+
+    await em.persistAndFlush(notification)
+
+    await emitNotificationCreated(eventBus, notification, { tenantId, organizationId })
+  } else if (payload.type === 'create-role') {
+    const em = (ctx.resolve('em') as EntityManager).fork()
+    const eventBus = ctx.resolve('eventBus') as { emit: (event: string, payload: unknown) => Promise<void> }
+    const { input, tenantId, organizationId } = payload
+
+    const knex = getKnex(em)
+    const recipientUserIds = await getRecipientUserIdsForRole(knex, tenantId, input.roleId)
+    if (recipientUserIds.length === 0) {
+      return
+    }
+
+    const { roleId: _roleId, ...content } = input
+    const notifications: Notification[] = []
+    for (const recipientUserId of recipientUserIds) {
+      const notification = buildNotificationEntity(em, content, recipientUserId, { tenantId, organizationId })
+      notifications.push(notification)
+    }
+
+    await em.persistAndFlush(notifications)
+
+    await emitNotificationCreatedBatch(eventBus, notifications, { tenantId, organizationId })
+  } else if (payload.type === 'create-feature') {
+    const em = (ctx.resolve('em') as EntityManager).fork()
+    const eventBus = ctx.resolve('eventBus') as { emit: (event: string, payload: unknown) => Promise<void> }
+    const { input, tenantId, organizationId } = payload
+
+    const knex = getKnex(em)
+    const recipientUserIds = await getRecipientUserIdsForFeature(knex, tenantId, input.requiredFeature)
+
+    if (recipientUserIds.length === 0) {
+      return
+    }
+
+    const notifications: Notification[] = []
+    const { requiredFeature: _requiredFeature, ...content } = input
+    for (const recipientUserId of recipientUserIds) {
+      const notification = buildNotificationEntity(em, content, recipientUserId, { tenantId, organizationId })
+      notifications.push(notification)
+    }
+
+    await em.persistAndFlush(notifications)
+
+    await emitNotificationCreatedBatch(eventBus, notifications, { tenantId, organizationId })
+  } else if (payload.type === 'cleanup-expired') {
+    const em = (ctx.resolve('em') as EntityManager).fork()
+    const knex = getKnex(em)
+
+    await knex('notifications')
+      .where('expires_at', '<', knex.fn.now())
+      .whereNotIn('status', ['actioned', 'dismissed'])
+      .update({
+        status: 'dismissed',
+        dismissed_at: knex.fn.now(),
+      })
+  }
+}

package/src/modules/perspectives/setup.ts

@@ -0,0 +1,10 @@
+import type { ModuleSetupConfig } from '@open-mercato/shared/modules/setup'
+
+export const setup: ModuleSetupConfig = {
+  defaultRoleFeatures: {
+    admin: ['perspectives.use', 'perspectives.role_defaults'],
+    employee: ['perspectives.use'],
+  },
+}
+
+export default setup

package/src/modules/planner/backend/planner/availability-rulesets/page.tsx

@@ -202,8 +202,8 @@ export default function PlannerAvailabilityRuleSetsPage() {
           rowActions={(row) => (
             <RowActions
               items={[
-                { label: labels.actions.edit, href: `/backend/planner/availability-rulesets/${row.id}` },
-                { label: labels.actions.delete, destructive: true, onSelect: () => { void handleDelete(row) } },
+                { id: 'edit', label: labels.actions.edit, href: `/backend/planner/availability-rulesets/${row.id}` },
+                { id: 'delete', label: labels.actions.delete, destructive: true, onSelect: () => { void handleDelete(row) } },
               ]}
             />
           )}

package/src/modules/planner/setup.ts

@@ -0,0 +1,21 @@
+import type { ModuleSetupConfig } from '@open-mercato/shared/modules/setup'
+import { seedPlannerUnavailabilityReasons, seedPlannerAvailabilityRuleSetDefaults } from './lib/seeds'
+
+export const setup: ModuleSetupConfig = {
+  seedDefaults: async (ctx) => {
+    const scope = { tenantId: ctx.tenantId, organizationId: ctx.organizationId }
+    await seedPlannerUnavailabilityReasons(ctx.em, scope)
+  },
+
+  seedExamples: async (ctx) => {
+    const scope = { tenantId: ctx.tenantId, organizationId: ctx.organizationId }
+    await seedPlannerAvailabilityRuleSetDefaults(ctx.em, scope)
+  },
+
+  defaultRoleFeatures: {
+    admin: ['planner.*'],
+    employee: ['planner.view'],
+  },
+}
+
+export default setup

package/src/modules/query_index/cli.ts

@@ -22,6 +22,50 @@ import type { VectorIndexService } from '@open-mercato/search/vector'
 
 type ParsedArgs = Record<string, string | boolean>
 
+type PartitionProgressInfo = { processed: number; total: number }
+
+function isIndexerVerbose(): boolean {
+  const parsed = parseBooleanToken(process.env.OM_INDEXER_VERBOSE ?? '')
+  return parsed === true
+}
+
+function createGroupedProgress(label: string, partitionTargets: number[]) {
+  const totals = new Map<number, number>()
+  const processed = new Map<number, number>()
+  let bar: ProgressBarHandle | null = null
+
+  const getTotals = () => {
+    let total = 0
+    let done = 0
+    for (const value of totals.values()) total += value
+    for (const value of processed.values()) done += value
+    return { total, done }
+  }
+
+  const tryInitBar = () => {
+    if (bar) return
+    if (totals.size < partitionTargets.length) return
+    const { total } = getTotals()
+    if (total <= 0) return
+    bar = createProgressBar(label, total) as ProgressBarHandle
+  }
+
+  return {
+    onProgress(partition: number, info: PartitionProgressInfo) {
+      processed.set(partition, info.processed)
+      if (!totals.has(partition)) totals.set(partition, info.total)
+      tryInitBar()
+      if (!bar) return
+      const { done } = getTotals()
+      bar.update(done)
+    },
+    complete() {
+      if (bar) bar.complete()
+    },
+    getTotals,
+  }
+}
+
 function parseArgs(rest: string[]): ParsedArgs {
   const args: ParsedArgs = {}
   for (let i = 0; i < rest.length; i += 1) {
@@ -550,8 +594,14 @@ const reindex: ModuleCli = {
           await purgeIndexScope(baseEm, { entityType: entity, organizationId: orgId, tenantId })
         }
         console.log(`Reindexing ${entity}${force ? ' (forced)' : ''} in ${partitionTargets.length} partition(s)...`)
-        const progressState = new Map<number, { last: number }>()
-        const renderProgress = (part: number, entityId: string, info: { processed: number; total: number }) => {
+        const verbose = isIndexerVerbose()
+        const progressState = verbose ? new Map<number, { last: number }>() : null
+        const groupedProgress =
+          !verbose && partitionTargets.length > 1
+            ? createGroupedProgress(`Reindexing ${entity}`, partitionTargets)
+            : null
+        const renderProgress = (part: number, entityId: string, info: PartitionProgressInfo) => {
+          if (!progressState) return
           const state = progressState.get(part) ?? { last: 0 }
           const now = Date.now()
           if (now - state.last < 1000 && info.processed < info.total) return
@@ -568,7 +618,7 @@ const reindex: ModuleCli = {
             const label = partitionTargets.length > 1 ? ` [partition ${part + 1}/${partitionCount}]` : ''
             if (partitionTargets.length === 1) {
               console.log(`  -> processing${label}`)
-            } else if (idx === 0) {
+            } else if (verbose && idx === 0) {
               console.log(`  -> processing partitions in parallel (count=${partitionTargets.length})`)
             }
             const partitionContainer = await createRequestContainer()
@@ -596,9 +646,14 @@ const reindex: ModuleCli = {
                 onProgress(info) {
                   if (useBar) {
                     if (info.total > 0 && !progressBar) {
-                    progressBar = createProgressBar(`Reindexing ${entity}${label}`, info.total) as ProgressBarHandle
+                      progressBar = createProgressBar(
+                        `Reindexing ${entity}${label}`,
+                        info.total,
+                      ) as ProgressBarHandle
                     }
                     progressBar?.update(info.processed)
+                  } else if (groupedProgress) {
+                    groupedProgress.onProgress(part, info)
                   } else {
                     renderProgress(part, entity, info)
                   }
@@ -607,7 +662,9 @@ const reindex: ModuleCli = {
               if (progressBar) {
                 (progressBar as ProgressBarHandle).complete()
               }
-              if (!useBar) {
+              if (!useBar && groupedProgress) {
+                groupedProgress.onProgress(part, { processed: partitionStats.processed, total: partitionStats.total })
+              } else if (!useBar) {
                 renderProgress(part, entity, { processed: partitionStats.processed, total: partitionStats.total })
               } else {
                 console.log(
@@ -622,6 +679,7 @@ const reindex: ModuleCli = {
             }
           }),
         )
+        groupedProgress?.complete()
         const totalProcessed = stats.reduce((acc, value) => acc + value, 0)
         console.log(`Finished ${entity}: processed ${totalProcessed} row(s) across ${partitionTargets.length} partition(s)`)
         await recordIndexerLog(
@@ -677,8 +735,14 @@ const reindex: ModuleCli = {
         console.log(
           `[${idx + 1}/${entityIds.length}] Reindexing ${id}${force ? ' (forced)' : ''} in ${partitionTargets.length} partition(s)...`,
         )
-        const progressState = new Map<number, { last: number }>()
-        const renderProgress = (part: number, entityId: string, info: { processed: number; total: number }) => {
+        const verbose = isIndexerVerbose()
+        const progressState = verbose ? new Map<number, { last: number }>() : null
+        const groupedProgress =
+          !verbose && partitionTargets.length > 1
+            ? createGroupedProgress(`Reindexing ${id}`, partitionTargets)
+            : null
+        const renderProgress = (part: number, entityId: string, info: PartitionProgressInfo) => {
+          if (!progressState) return
           const state = progressState.get(part) ?? { last: 0 }
           const now = Date.now()
           if (now - state.last < 1000 && info.processed < info.total) return
@@ -695,7 +759,7 @@ const reindex: ModuleCli = {
             const label = partitionTargets.length > 1 ? ` [partition ${part + 1}/${partitionCount}]` : ''
             if (partitionTargets.length === 1) {
               console.log(`  -> processing${label}`)
-            } else if (partitionIdx === 0) {
+            } else if (verbose && partitionIdx === 0) {
               console.log(`  -> processing partitions in parallel (count=${partitionTargets.length})`)
             }
             const partitionContainer = await createRequestContainer()
@@ -723,18 +787,22 @@ const reindex: ModuleCli = {
                 onProgress(info) {
                   if (useBar) {
                     if (info.total > 0 && !progressBar) {
-                    progressBar = createProgressBar(`Reindexing ${id}${label}`, info.total) as ProgressBarHandle
+                      progressBar = createProgressBar(`Reindexing ${id}${label}`, info.total) as ProgressBarHandle
                     }
                     progressBar?.update(info.processed)
+                  } else if (groupedProgress) {
+                    groupedProgress.onProgress(part, info)
                   } else {
                     renderProgress(part, id, info)
                   }
                 },
               })
-            if (progressBar) {
-              (progressBar as ProgressBarHandle).complete()
-            }
-              if (!useBar) {
+              if (progressBar) {
+                (progressBar as ProgressBarHandle).complete()
+              }
+              if (!useBar && groupedProgress) {
+                groupedProgress.onProgress(part, { processed: result.processed, total: result.total })
+              } else if (!useBar) {
                 renderProgress(part, id, { processed: result.processed, total: result.total })
               } else {
                 console.log(
@@ -749,6 +817,7 @@ const reindex: ModuleCli = {
             }
           }),
         )
+        groupedProgress?.complete()
         const totalProcessed = partitionResults.reduce((acc, value) => acc + value, 0)
         console.log(`  -> ${id} complete: processed ${totalProcessed} row(s) across ${partitionTargets.length} partition(s)`)
         await recordIndexerLog(

package/src/modules/query_index/components/QueryIndexesTable.tsx

@@ -366,13 +366,15 @@ export default function QueryIndexesTable() {
       onSortingChange={setSorting}
       perspective={{ tableId: 'query_index.status.list' }}
       rowActions={(row) => {
-        const items: Array<{ label: string; onSelect: () => void; destructive?: boolean }> = [
-          { label: t('query_index.table.actions.reindex'), onSelect: () => trigger('reindex', row.entityId) },
+        const items: Array<{ id: string; label: string; onSelect: () => void; destructive?: boolean }> = [
+          { id: 'reindex', label: t('query_index.table.actions.reindex'), onSelect: () => trigger('reindex', row.entityId) },
           {
+            id: 'reindex-force',
             label: t('query_index.table.actions.reindexForce'),
             onSelect: () => trigger('reindex', row.entityId, { force: true }),
           },
           {
+            id: 'purge',
             label: t('query_index.table.actions.purge'),
             destructive: true,
             onSelect: () => trigger('purge', row.entityId),
@@ -382,10 +384,12 @@ export default function QueryIndexesTable() {
         if (row.vectorEnabled) {
           items.push(
             {
+              id: 'vector-reindex',
               label: t('query_index.table.actions.vectorReindex'),
               onSelect: () => triggerVector('reindex', row.entityId),
             },
             {
+              id: 'vector-purge',
               label: t('query_index.table.actions.vectorPurge'),
               destructive: true,
               onSelect: () => triggerVector('purge', row.entityId),
@@ -396,10 +400,12 @@ export default function QueryIndexesTable() {
         if (row.fulltextEnabled) {
           items.push(
             {
+              id: 'fulltext-reindex',
               label: t('query_index.table.actions.fulltextReindex'),
               onSelect: () => triggerFulltext('reindex', row.entityId),
             },
             {
+              id: 'fulltext-purge',
               label: t('query_index.table.actions.fulltextPurge'),
               destructive: true,
               onSelect: () => triggerFulltext('purge', row.entityId),

package/src/modules/query_index/setup.ts

@@ -0,0 +1,9 @@
+import type { ModuleSetupConfig } from '@open-mercato/shared/modules/setup'
+
+export const setup: ModuleSetupConfig = {
+  defaultRoleFeatures: {
+    admin: ['query_index.*'],
+  },
+}
+
+export default setup

package/src/modules/resources/backend/resources/resource-types/page.tsx

@@ -266,10 +266,10 @@ export default function ResourcesResourceTypesPage() {
           rowActions={(row) => (
             <RowActions
               items={[
-                { label: translations.actions.edit, href: `/backend/resources/resource-types/${row.id}/edit` },
+                { id: 'edit', label: translations.actions.edit, href: `/backend/resources/resource-types/${row.id}/edit` },
                 ...(row.resourceCount > 0
                   ? []
-                  : [{ label: translations.actions.delete, destructive: true, onSelect: () => handleDelete(row) }]),
+                  : [{ id: 'delete', label: translations.actions.delete, destructive: true, onSelect: () => handleDelete(row) }]),
               ]}
             />
           )}

package/src/modules/resources/backend/resources/resources/page.tsx

@@ -481,8 +481,8 @@ export default function ResourcesResourcesPage() {
             if (!canManage || row.rowKind !== 'resource') return null
             return (
               <RowActions items={[
-                { label: t('common.edit', 'Edit'), href: `/backend/resources/resources/${encodeURIComponent(row.id)}` },
-                { label: t('common.delete', 'Delete'), destructive: true, onSelect: () => { void handleDelete(row) } },
+                { id: 'edit', label: t('common.edit', 'Edit'), href: `/backend/resources/resources/${encodeURIComponent(row.id)}` },
+                { id: 'delete', label: t('common.delete', 'Delete'), destructive: true, onSelect: () => { void handleDelete(row) } },
               ]} />
             )
           }}

package/src/modules/resources/setup.ts

@@ -0,0 +1,21 @@
+import type { ModuleSetupConfig } from '@open-mercato/shared/modules/setup'
+import { seedResourcesAddressTypes, seedResourcesCapacityUnits, seedResourcesResourceExamples } from './lib/seeds'
+
+export const setup: ModuleSetupConfig = {
+  seedDefaults: async (ctx) => {
+    const scope = { tenantId: ctx.tenantId, organizationId: ctx.organizationId }
+    await seedResourcesAddressTypes(ctx.em, scope)
+  },
+
+  seedExamples: async (ctx) => {
+    const scope = { tenantId: ctx.tenantId, organizationId: ctx.organizationId }
+    await seedResourcesCapacityUnits(ctx.em, scope)
+    await seedResourcesResourceExamples(ctx.em, scope)
+  },
+
+  defaultRoleFeatures: {
+    admin: ['resources.*'],
+  },
+}
+
+export default setup

package/src/modules/sales/acl.ts

@@ -1,7 +1,6 @@
 export const features = [
   { id: 'sales.orders.view', title: 'View sales orders', module: 'sales' },
   { id: 'sales.orders.manage', title: 'Manage sales orders', module: 'sales' },
-  { id: 'sales.orders.approve', title: 'Approve sales orders', module: 'sales' },
   { id: 'sales.quotes.view', title: 'View sales quotes', module: 'sales' },
   { id: 'sales.quotes.manage', title: 'Manage sales quotes', module: 'sales' },
   { id: 'sales.shipments.manage', title: 'Manage order shipments', module: 'sales' },

package/src/modules/sales/backend/sales/channels/offers/page.tsx

@@ -334,10 +334,12 @@ export default function SalesChannelOffersListPage() {
               <RowActions
                 items={[
                   {
+                    id: 'edit',
                     label: t('sales.channels.offers.actions.edit', 'Edit'),
                     href: `/backend/sales/channels/${row.channelId}/offers/${row.id}/edit`,
                   },
                   {
+                    id: 'delete',
                     label: t('sales.channels.offers.actions.delete', 'Delete'),
                     onSelect: () => handleDelete(row),
                     destructive: true,

package/src/modules/sales/backend/sales/channels/page.tsx

@@ -191,10 +191,12 @@ export default function SalesChannelsPage() {
             <RowActions
               items={[
                 {
+                  id: 'edit',
                   label: t('sales.channels.table.actions.edit', 'Edit'),
                   href: `/backend/sales/channels/${row.id}/edit`,
                 },
                 {
+                  id: 'delete',
                   label: t('sales.channels.table.actions.delete', 'Delete'),
                   onSelect: () => handleDelete(row),
                 },

package/src/modules/sales/backend/sales/documents/[id]/page.tsx

@@ -50,9 +50,6 @@ import {
   emitSalesDocumentTotalsRefresh,
   subscribeSalesDocumentTotalsRefresh,
 } from '@open-mercato/core/modules/sales/lib/frontend/documentTotalsEvents'
-import {
-  subscribeSalesDocumentDataRefresh,
-} from '@open-mercato/core/modules/sales/lib/frontend/documentDataEvents'
 import type { CommentSummary, SectionAction } from '@open-mercato/ui/backend/detail'
 import { ICON_SUGGESTIONS } from '@open-mercato/core/modules/customers/lib/dictionaries'
 import { readMarkdownPreferenceCookie, writeMarkdownPreferenceCookie } from '@open-mercato/core/modules/customers/lib/markdownPreference'
@@ -2604,19 +2601,6 @@ export default function SalesDocumentDetailPage({
     [kind, record?.id, refreshDocumentTotals],
   )
 
-  // Subscribe to document data refresh events (e.g., from workflow status updates)
-  React.useEffect(
-    () =>
-      subscribeSalesDocumentDataRefresh((detail) => {
-        if (!record?.id) return
-        if (detail.documentId !== record.id) return
-        if (detail.kind && detail.kind !== kind) return
-        // Increment reloadKey to trigger a full document reload
-        setReloadKey((prev) => prev + 1)
-      }),
-    [kind, record?.id],
-  )
-
   const statusDictionaryMap = React.useMemo(
     () =>
       createDictionaryMap(

package/src/modules/sales/cli.ts

@@ -1,16 +1,11 @@
 import type { ModuleCli } from '@open-mercato/shared/modules/registry'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import type { EntityManager } from '@mikro-orm/postgresql'
-import { SalesTaxRate } from './data/entities'
 import { seedSalesAdjustmentKinds, seedSalesStatusDictionaries } from './lib/dictionaries'
+import { seedSalesTaxRates } from './lib/seeds'
 import { ensureExamplePaymentMethods, ensureExampleShippingMethods } from './seed/examples-data'
 import { seedSalesExamples } from './seed/examples'
 
-const DEFAULT_TAX_RATES = [
-  { code: 'vat-23', name: '23% VAT', rate: '23' },
-  { code: 'vat-0', name: '0% VAT', rate: '0' },
-] as const
-
 function parseArgs(rest: string[]) {
   const args: Record<string, string> = {}
   for (let i = 0; i < rest.length; i += 1) {
@@ -42,43 +37,7 @@ const seedTaxRatesCommand: ModuleCli = {
     const em = container.resolve('em') as EntityManager
     try {
       await em.transactional(async (tem) => {
-        const existing = await tem.find(SalesTaxRate, {
-          tenantId,
-          organizationId,
-          deletedAt: null,
-        })
-        const existingCodes = new Set(existing.map((entry) => entry.code.toLowerCase()))
-        const hasDefault = existing.some((entry) => entry.isDefault)
-        let assignedDefault = hasDefault
-        const now = new Date()
-        for (const def of DEFAULT_TAX_RATES) {
-          if (existingCodes.has(def.code)) continue
-          const shouldSetDefault = !assignedDefault
-          const record = tem.create(SalesTaxRate, {
-            organizationId,
-            tenantId,
-            name: def.name,
-            code: def.code,
-            rate: def.rate,
-            countryCode: null,
-            regionCode: null,
-            postalCode: null,
-            city: null,
-            customerGroupId: null,
-            productCategoryId: null,
-            channelId: null,
-            priority: 0,
-            isCompound: false,
-            isDefault: shouldSetDefault,
-            metadata: null,
-            startsAt: null,
-            endsAt: null,
-            createdAt: now,
-            updatedAt: now,
-          })
-          if (shouldSetDefault) assignedDefault = true
-          tem.persist(record)
-        }
+        await seedSalesTaxRates(tem, { tenantId, organizationId })
       })
       console.log('🧾 Tax rates seeded for organization', organizationId)
     } finally {