@open-mercato/core 0.4.2-canary-f075c3eb92 → 0.4.2-canary-8a04af8836

package/src/modules/dashboards/widgets/dashboard/new-customers-kpi/widget.ts

@@ -1,6 +1,6 @@
-import type { DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
-import NewCustomersKpiWidget from './widget.client'
+import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
 import { DEFAULT_SETTINGS, hydrateSettings, type NewCustomersKpiSettings } from './config'
+const NewCustomersKpiWidget = lazyDashboardWidget(() => import('./widget.client'))
 
 const widget: DashboardWidgetModule<NewCustomersKpiSettings> = {
   metadata: {

package/src/modules/dashboards/widgets/dashboard/orders-by-status/widget.ts

@@ -1,6 +1,6 @@
-import type { DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
-import OrdersByStatusWidget from './widget.client'
+import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
 import { DEFAULT_SETTINGS, hydrateSettings, type OrdersByStatusSettings } from './config'
+const OrdersByStatusWidget = lazyDashboardWidget(() => import('./widget.client'))
 
 const widget: DashboardWidgetModule<OrdersByStatusSettings> = {
   metadata: {

package/src/modules/dashboards/widgets/dashboard/orders-kpi/widget.ts

@@ -1,6 +1,6 @@
-import type { DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
-import OrdersKpiWidget from './widget.client'
+import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
 import { DEFAULT_SETTINGS, hydrateSettings, type OrdersKpiSettings } from './config'
+const OrdersKpiWidget = lazyDashboardWidget(() => import('./widget.client'))
 
 const widget: DashboardWidgetModule<OrdersKpiSettings> = {
   metadata: {

package/src/modules/dashboards/widgets/dashboard/pipeline-summary/widget.ts

@@ -1,6 +1,6 @@
-import type { DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
-import PipelineSummaryWidget from './widget.client'
+import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
 import { DEFAULT_SETTINGS, hydrateSettings, type PipelineSummarySettings } from './config'
+const PipelineSummaryWidget = lazyDashboardWidget(() => import('./widget.client'))
 
 const widget: DashboardWidgetModule<PipelineSummarySettings> = {
   metadata: {

package/src/modules/dashboards/widgets/dashboard/revenue-kpi/widget.ts

@@ -1,6 +1,6 @@
-import type { DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
-import RevenueKpiWidget from './widget.client'
+import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
 import { DEFAULT_SETTINGS, hydrateSettings, type RevenueKpiSettings } from './config'
+const RevenueKpiWidget = lazyDashboardWidget(() => import('./widget.client'))
 
 const widget: DashboardWidgetModule<RevenueKpiSettings> = {
   metadata: {

package/src/modules/dashboards/widgets/dashboard/revenue-trend/widget.ts

@@ -1,6 +1,6 @@
-import type { DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
-import RevenueTrendWidget from './widget.client'
+import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
 import { DEFAULT_SETTINGS, hydrateSettings, type RevenueTrendSettings } from './config'
+const RevenueTrendWidget = lazyDashboardWidget(() => import('./widget.client'))
 
 const widget: DashboardWidgetModule<RevenueTrendSettings> = {
   metadata: {

package/src/modules/dashboards/widgets/dashboard/sales-by-region/widget.ts

@@ -1,6 +1,6 @@
-import type { DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
-import SalesByRegionWidget from './widget.client'
+import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
 import { DEFAULT_SETTINGS, hydrateSettings, type SalesByRegionSettings } from './config'
+const SalesByRegionWidget = lazyDashboardWidget(() => import('./widget.client'))
 
 const widget: DashboardWidgetModule<SalesByRegionSettings> = {
   metadata: {

package/src/modules/dashboards/widgets/dashboard/top-customers/widget.ts

@@ -1,6 +1,6 @@
-import type { DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
-import TopCustomersWidget from './widget.client'
+import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
 import { DEFAULT_SETTINGS, hydrateSettings, type TopCustomersSettings } from './config'
+const TopCustomersWidget = lazyDashboardWidget(() => import('./widget.client'))
 
 const widget: DashboardWidgetModule<TopCustomersSettings> = {
   metadata: {

package/src/modules/dashboards/widgets/dashboard/top-products/widget.ts

@@ -1,6 +1,6 @@
-import type { DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
-import TopProductsWidget from './widget.client'
+import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
 import { DEFAULT_SETTINGS, hydrateSettings, type TopProductsSettings } from './config'
+const TopProductsWidget = lazyDashboardWidget(() => import('./widget.client'))
 
 const widget: DashboardWidgetModule<TopProductsSettings> = {
   metadata: {

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

@@ -171,12 +171,14 @@ export function DictionaryTable({
               const items: RowActionItem[] = []
               if (onEdit) {
                 items.push({
+                  id: 'edit',
                   label: translations.editLabel,
                   onSelect: () => onEdit(entry),
                 })
               }
               if (onDelete) {
                 items.push({
+                  id: 'delete',
                   label: translations.deleteLabel,
                   onSelect: () => onDelete(entry),
                   destructive: true,

package/src/modules/directory/api/get/tenants/lookup.ts

@@ -0,0 +1,75 @@
+import { NextResponse } from 'next/server'
+import { z } from 'zod'
+import type { EntityManager } from '@mikro-orm/postgresql'
+import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
+import { Tenant } from '@open-mercato/core/modules/directory/data/entities'
+import type { OpenApiMethodDoc, OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
+
+export const metadata = {
+  GET: {
+    requireAuth: false,
+  },
+}
+
+const tenantLookupQuerySchema = z.object({
+  tenantId: z.string().uuid(),
+})
+
+export async function GET(req: Request) {
+  const url = new URL(req.url)
+  const tenantId = url.searchParams.get('tenantId') || url.searchParams.get('tenant') || ''
+  const parsed = tenantLookupQuerySchema.safeParse({ tenantId })
+  if (!parsed.success) {
+    return NextResponse.json({ ok: false, error: 'Invalid tenant id.' }, { status: 400 })
+  }
+
+  const container = await createRequestContainer()
+  const em = (container.resolve('em') as EntityManager)
+  const tenant = await em.findOne(Tenant, { id: parsed.data.tenantId, deletedAt: null })
+  if (!tenant) {
+    return NextResponse.json({ ok: false, error: 'Tenant not found.' }, { status: 404 })
+  }
+  return NextResponse.json({
+    ok: true,
+    tenant: { id: String(tenant.id), name: tenant.name },
+  })
+}
+
+const lookupTag = 'Directory'
+
+const tenantLookupSuccessSchema = z.object({
+  ok: z.literal(true),
+  tenant: z.object({
+    id: z.string().uuid(),
+    name: z.string(),
+  }),
+})
+
+const tenantLookupErrorSchema = z.object({
+  ok: z.literal(false),
+  error: z.string(),
+})
+
+const tenantLookupDoc: OpenApiMethodDoc = {
+  summary: 'Public tenant lookup',
+  description: 'Resolves tenant metadata for login/activation flows.',
+  tags: [lookupTag],
+  query: tenantLookupQuerySchema,
+  responses: [
+    { status: 200, description: 'Tenant resolved.', schema: tenantLookupSuccessSchema },
+  ],
+  errors: [
+    { status: 400, description: 'Invalid tenant id', schema: tenantLookupErrorSchema },
+    { status: 404, description: 'Tenant not found', schema: tenantLookupErrorSchema },
+  ],
+}
+
+export const openApi: OpenApiRouteDoc = {
+  tag: lookupTag,
+  summary: 'Public tenant lookup',
+  methods: {
+    GET: tenantLookupDoc,
+  },
+}
+
+export default GET

package/src/modules/directory/backend/directory/organizations/page.tsx

@@ -235,8 +235,8 @@ export default function DirectoryOrganizationsPage() {
             canManage ? (
               <RowActions
                 items={[
-                  { label: t('directory.organizations.list.actions.edit', 'Edit'), href: `/backend/directory/organizations/${row.id}/edit` },
-                  { label: t('directory.organizations.list.actions.delete', 'Delete'), destructive: true, onSelect: () => handleDelete(row) },
+                  { id: 'edit', label: t('directory.organizations.list.actions.edit', 'Edit'), href: `/backend/directory/organizations/${row.id}/edit` },
+                  { id: 'delete', label: t('directory.organizations.list.actions.delete', 'Delete'), destructive: true, onSelect: () => handleDelete(row) },
                 ]}
               />
             ) : null

package/src/modules/directory/backend/directory/tenants/page.tsx

@@ -160,8 +160,8 @@ export default function DirectoryTenantsPage() {
             canManage ? (
               <RowActions
                 items={[
-                  { label: t('common.edit', 'Edit'), href: `/backend/directory/tenants/${row.id}/edit` },
-                  { label: t('common.delete', 'Delete'), destructive: true, onSelect: () => handleDelete(row) },
+                  { id: 'edit', label: t('common.edit', 'Edit'), href: `/backend/directory/tenants/${row.id}/edit` },
+                  { id: 'delete', label: t('common.delete', 'Delete'), destructive: true, onSelect: () => handleDelete(row) },
                 ]}
               />
             ) : null

package/src/modules/entities/backend/entities/user/[entityId]/records/page.tsx

@@ -338,8 +338,8 @@ export RECORD_ID="<record uuid>"`}</code></pre>
           rowActions={(row) => (
             <RowActions
               items={[
-                { label: 'Edit', href: `/backend/entities/user/${encodeURIComponent(entityId)}/records/${encodeURIComponent(String((row as any).id))}` },
-                { label: 'Delete', destructive: true, onSelect: async () => {
+                { id: 'edit', label: 'Edit', href: `/backend/entities/user/${encodeURIComponent(entityId)}/records/${encodeURIComponent(String((row as any).id))}` },
+                { id: 'delete', label: 'Delete', destructive: true, onSelect: async () => {
                   try {
                     if (typeof window !== 'undefined') {
                       const ok = window.confirm('Delete this record?')

package/src/modules/entities/components/SystemEntitiesTable.tsx

@@ -88,7 +88,7 @@ export default function SystemEntitiesTable() {
       rowActions={(row) => (
         <RowActions
           items={[
-            { label: 'Edit', href: `/backend/entities/system/${encodeURIComponent(row.entityId)}` },
+            { id: 'edit', label: 'Edit', href: `/backend/entities/system/${encodeURIComponent(row.entityId)}` },
           ]}
         />
       )}

package/src/modules/entities/components/UserEntitiesTable.tsx

@@ -110,8 +110,8 @@ export default function UserEntitiesTable() {
       rowActions={(row) => (
         <RowActions
           items={[
-            { label: t('common.edit', 'Edit'), href: `/backend/entities/user/${encodeURIComponent(row.entityId)}` },
-            { label: t('entities.user.table.actions.showRecords', 'Show records'), href: `/backend/entities/user/${encodeURIComponent(row.entityId)}/records` },
+            { id: 'edit', label: t('common.edit', 'Edit'), href: `/backend/entities/user/${encodeURIComponent(row.entityId)}` },
+            { id: 'show-records', label: t('entities.user.table.actions.showRecords', 'Show records'), href: `/backend/entities/user/${encodeURIComponent(row.entityId)}/records` },
           ]}
         />
       )}

package/src/modules/feature_toggles/components/FeatureTogglesTable.tsx

@@ -205,12 +205,11 @@ export function FeatureTogglesTable() {
       }}
       rowActions={(row) => (
         <RowActions items={[
-          { label: t('common.edit', 'Edit'), href: `/backend/feature-toggles/global/${row.id}/edit` },
-          { label: t('common.view', 'Overrides'), href: `/backend/feature-toggles/global/${row.id}` },
-          { label: t('common.delete', 'Delete'), destructive: true, onSelect: () => { void handleDelete(row) } },
+          { id: 'edit', label: t('common.edit', 'Edit'), href: `/backend/feature-toggles/global/${row.id}/edit` },
+          { id: 'view', label: t('common.view', 'Overrides'), href: `/backend/feature-toggles/global/${row.id}` },
+          { id: 'delete', label: t('common.delete', 'Delete'), destructive: true, onSelect: () => { void handleDelete(row) } },
         ]} />
       )}
     />
   )
 }
-

package/src/modules/feature_toggles/components/OverridesTable.tsx

@@ -161,7 +161,7 @@ export default function OverridesTable() {
             }}
             rowActions={(row) => (
                 <RowActions items={[
-                    { label: t('common.edit', 'Edit'), href: `/backend/feature-toggles/global/${row.toggleId}` },
+                    { id: 'edit', label: t('common.edit', 'Edit'), href: `/backend/feature-toggles/global/${row.toggleId}` },
                 ]} />
             )}
             error={error ? error.message : undefined}

package/src/modules/notifications/__tests__/deliver-notification.test.ts

@@ -0,0 +1,195 @@
+import type { Notification } from '../data/entities'
+import type { NotificationDeliveryConfig } from '../lib/deliveryConfig'
+import type { NotificationDeliveryStrategy } from '../lib/deliveryStrategies'
+
+const sendEmail = jest.fn()
+const getNotificationDeliveryStrategies = jest.fn()
+const resolveNotificationDeliveryConfig = jest.fn()
+const resolveNotificationPanelUrl = jest.fn()
+const findOneWithDecryption = jest.fn()
+const NotificationEmail = jest.fn(() => 'notification-email')
+
+jest.mock('@open-mercato/shared/lib/email/send', () => ({
+  sendEmail: (...args: unknown[]) => sendEmail(...args),
+}))
+
+jest.mock('../lib/deliveryStrategies', () => ({
+  getNotificationDeliveryStrategies: (...args: unknown[]) => getNotificationDeliveryStrategies(...args),
+}))
+
+jest.mock('../lib/deliveryConfig', () => ({
+  DEFAULT_NOTIFICATION_DELIVERY_CONFIG: {
+    panelPath: '/backend/notifications',
+    strategies: {
+      database: { enabled: true },
+      email: { enabled: true },
+      custom: {},
+    },
+  },
+  resolveNotificationDeliveryConfig: (...args: unknown[]) => resolveNotificationDeliveryConfig(...args),
+  resolveNotificationPanelUrl: (...args: unknown[]) => resolveNotificationPanelUrl(...args),
+}))
+
+jest.mock('@open-mercato/shared/lib/i18n/server', () => ({
+  loadDictionary: jest.fn().mockResolvedValue({}),
+}))
+
+jest.mock('@open-mercato/shared/lib/i18n/translate', () => ({
+  createFallbackTranslator: () => (key: string, fallback?: string) => fallback ?? key,
+}))
+
+jest.mock('@open-mercato/shared/lib/encryption/find', () => ({
+  findOneWithDecryption: (...args: unknown[]) => findOneWithDecryption(...args),
+}))
+
+jest.mock('../emails/NotificationEmail', () => ({
+  __esModule: true,
+  default: (...args: unknown[]) => NotificationEmail(...args),
+}))
+
+describe('deliver notification subscriber', () => {
+  const notification: Notification = {
+    id: '32e22a6e-7aa9-4f3b-8a7b-42c2d1223a5f',
+    recipientUserId: '3eae68bb-1e4c-4b21-85c7-b8f5b2c22b01',
+    tenantId: 'c33b6f78-8c4b-4ef4-9c54-2b64b5f5d0d0',
+    organizationId: null,
+    type: 'system',
+    title: 'New notification',
+    body: 'Check details',
+    titleKey: null,
+    bodyKey: null,
+    titleVariables: null,
+    bodyVariables: null,
+    icon: null,
+    severity: 'info',
+    actionData: {
+      actions: [{ id: 'action-1', label: 'Review' }],
+      primaryActionId: 'action-1',
+    },
+    sourceModule: null,
+    sourceEntityType: null,
+    sourceEntityId: null,
+    linkHref: null,
+    groupKey: null,
+    status: 'unread',
+    readAt: null,
+    actionedAt: null,
+    dismissedAt: null,
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    expiresAt: null,
+    actionTaken: null,
+    actionResult: null,
+  } as Notification
+
+  const baseConfig: NotificationDeliveryConfig = {
+    appUrl: 'https://app.example.com',
+    panelPath: '/backend/notifications',
+    strategies: {
+      database: { enabled: true },
+      email: {
+        enabled: true,
+        from: 'notifications@example.com',
+        replyTo: 'reply@example.com',
+        subjectPrefix: '[OM]',
+      },
+      custom: {},
+    },
+  }
+
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('sends email notifications when enabled', async () => {
+    resolveNotificationDeliveryConfig.mockResolvedValue(baseConfig)
+    resolveNotificationPanelUrl.mockReturnValue('https://app.example.com/backend/notifications')
+    getNotificationDeliveryStrategies.mockReturnValue([])
+    findOneWithDecryption.mockResolvedValue({ email: 'user@example.com', name: 'User' })
+
+    const em = {
+      findOne: jest.fn().mockResolvedValue(notification),
+    }
+
+    const { default: handle } = await import('../subscribers/deliver-notification')
+
+    await handle(
+      {
+        notificationId: notification.id,
+        recipientUserId: notification.recipientUserId,
+        tenantId: notification.tenantId,
+        organizationId: null,
+      },
+      {
+        resolve: (name: string) => {
+          if (name === 'em') return em
+          throw new Error(`Missing dependency: ${name}`)
+        },
+      }
+    )
+
+    expect(NotificationEmail).toHaveBeenCalledWith(
+      expect.objectContaining({
+        title: notification.title,
+        panelUrl: `https://app.example.com/backend/notifications?notificationId=${notification.id}`,
+      })
+    )
+    expect(sendEmail).toHaveBeenCalledWith(
+      expect.objectContaining({
+        to: 'user@example.com',
+        from: baseConfig.strategies.email.from,
+        replyTo: baseConfig.strategies.email.replyTo,
+        subject: `${baseConfig.strategies.email.subjectPrefix} ${notification.title}`,
+      })
+    )
+  })
+
+  it('executes enabled custom delivery strategies', async () => {
+    const customStrategy: NotificationDeliveryStrategy = {
+      id: 'webhook',
+      deliver: jest.fn(),
+    }
+    resolveNotificationDeliveryConfig.mockResolvedValue({
+      ...baseConfig,
+      strategies: {
+        ...baseConfig.strategies,
+        email: { enabled: false },
+        custom: {
+          webhook: { enabled: true, config: { url: 'https://hooks.example.com' } },
+        },
+      },
+    })
+    resolveNotificationPanelUrl.mockReturnValue('/backend/notifications')
+    getNotificationDeliveryStrategies.mockReturnValue([customStrategy])
+    findOneWithDecryption.mockResolvedValue({ email: 'user@example.com', name: 'User' })
+
+    const em = {
+      findOne: jest.fn().mockResolvedValue(notification),
+    }
+
+    const { default: handle } = await import('../subscribers/deliver-notification')
+
+    await handle(
+      {
+        notificationId: notification.id,
+        recipientUserId: notification.recipientUserId,
+        tenantId: notification.tenantId,
+        organizationId: null,
+      },
+      {
+        resolve: (name: string) => {
+          if (name === 'em') return em
+          throw new Error(`Missing dependency: ${name}`)
+        },
+      }
+    )
+
+    expect(customStrategy.deliver).toHaveBeenCalledWith(
+      expect.objectContaining({
+        config: { enabled: true, config: { url: 'https://hooks.example.com' } },
+        panelLink: `/backend/notifications?notificationId=${notification.id}`,
+      })
+    )
+    expect(sendEmail).not.toHaveBeenCalled()
+  })
+})

package/src/modules/notifications/__tests__/deliveryStrategies.test.ts

@@ -0,0 +1,19 @@
+import { type NotificationDeliveryStrategy } from '../lib/deliveryStrategies'
+
+describe('notification delivery strategies', () => {
+  it('orders strategies by priority', async () => {
+    jest.resetModules()
+    const { registerNotificationDeliveryStrategy, getNotificationDeliveryStrategies } = await import('../lib/deliveryStrategies')
+
+    const first: NotificationDeliveryStrategy = { id: 'first', deliver: jest.fn() }
+    const second: NotificationDeliveryStrategy = { id: 'second', deliver: jest.fn() }
+    const third: NotificationDeliveryStrategy = { id: 'third', deliver: jest.fn() }
+
+    registerNotificationDeliveryStrategy(first, { priority: 1 })
+    registerNotificationDeliveryStrategy(second, { priority: 10 })
+    registerNotificationDeliveryStrategy(third, { priority: 5 })
+
+    const ids = getNotificationDeliveryStrategies().map((strategy) => strategy.id)
+    expect(ids).toEqual(['second', 'third', 'first'])
+  })
+})