@open-mercato/core 0.6.6-develop.6094.1.28b081ea16 → 0.6.6-develop.6126.1.0b9392fdae

package/src/modules/configs/components/CachePanel.tsx

@@ -4,11 +4,13 @@ import * as React from 'react'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 
 const API_PATH = '/api/configs/cache'
+const CACHE_MUTATION_CONTEXT_ID = 'configs-cache-panel'
 
 type CrudCacheSegment = {
   segment: string
@@ -39,6 +41,23 @@ export function CachePanel() {
   const [purgingAll, setPurgingAll] = React.useState(false)
   const [segmentPurges, setSegmentPurges] = React.useState<Record<string, boolean>>({})
 
+  const { runMutation, retryLastMutation } = useGuardedMutation<{
+    formId: string
+    resourceKind: string
+    retryLastMutation: () => Promise<boolean>
+  }>({
+    contextId: CACHE_MUTATION_CONTEXT_ID,
+    blockedMessage: t('ui.forms.flash.saveBlocked', 'Save blocked by validation'),
+  })
+  const cacheMutationContext = React.useMemo(
+    () => ({
+      formId: CACHE_MUTATION_CONTEXT_ID,
+      resourceKind: 'configs.cache',
+      retryLastMutation,
+    }),
+    [retryLastMutation],
+  )
+
   const loadStats = React.useCallback(async () => {
     setState((current) => ({ ...current, loading: true, error: null }))
     try {
@@ -106,18 +125,23 @@ export function CachePanel() {
     if (!confirmed) return
     setPurgingAll(true)
     try {
-      const payload = await readApiResultOrThrow<{ stats?: CrudCacheStats }>(
-        API_PATH,
-        {
-          method: 'POST',
-          headers: { 'content-type': 'application/json' },
-          body: JSON.stringify({ action: 'purgeAll' }),
-        },
-        {
-          errorMessage: t('configs.cache.purgeError', 'Failed to purge cache segment.'),
-          allowNullResult: true,
-        },
-      )
+      const payload = await runMutation({
+        operation: () =>
+          readApiResultOrThrow<{ stats?: CrudCacheStats }>(
+            API_PATH,
+            {
+              method: 'POST',
+              headers: { 'content-type': 'application/json' },
+              body: JSON.stringify({ action: 'purgeAll' }),
+            },
+            {
+              errorMessage: t('configs.cache.purgeError', 'Failed to purge cache segment.'),
+              allowNullResult: true,
+            },
+          ),
+        context: cacheMutationContext,
+        mutationPayload: { action: 'purgeAll' },
+      })
       const stats = payload?.stats
       if (stats) {
         setState({ loading: false, error: null, stats })
@@ -135,7 +159,7 @@ export function CachePanel() {
     } finally {
       setPurgingAll(false)
     }
-  }, [canManage, confirm, purgingAll, t, handleRefresh]);
+  }, [canManage, confirm, purgingAll, t, handleRefresh, runMutation, cacheMutationContext]);
 
 
   const handlePurgeSegment = React.useCallback(async (segment: string) => {
@@ -147,18 +171,23 @@ export function CachePanel() {
     if (!confirmed) return
     setSegmentPurges((prev) => ({ ...prev, [segment]: true }))
     try {
-      const payload = await readApiResultOrThrow<{ stats?: CrudCacheStats; deleted?: number }>(
-        API_PATH,
-        {
-          method: 'POST',
-          headers: { 'content-type': 'application/json' },
-          body: JSON.stringify({ action: 'purgeSegment', segment }),
-        },
-        {
-          errorMessage: t('configs.cache.purgeError', 'Failed to purge cache segment.'),
-          allowNullResult: true,
-        },
-      )
+      const payload = await runMutation({
+        operation: () =>
+          readApiResultOrThrow<{ stats?: CrudCacheStats; deleted?: number }>(
+            API_PATH,
+            {
+              method: 'POST',
+              headers: { 'content-type': 'application/json' },
+              body: JSON.stringify({ action: 'purgeSegment', segment }),
+            },
+            {
+              errorMessage: t('configs.cache.purgeError', 'Failed to purge cache segment.'),
+              allowNullResult: true,
+            },
+          ),
+        context: cacheMutationContext,
+        mutationPayload: { action: 'purgeSegment', segment },
+      })
       const stats = payload?.stats
       if (stats) {
         setState({ loading: false, error: null, stats })
@@ -186,7 +215,7 @@ export function CachePanel() {
         return next
       })
     }
-  }, [canManage, confirm, segmentPurges, t, handleRefresh]);
+  }, [canManage, confirm, segmentPurges, t, handleRefresh, runMutation, cacheMutationContext]);
 
   if (state.loading) {
     return (
@@ -220,7 +249,7 @@ export function CachePanel() {
           {state.error}
         </div>
         <div className="flex flex-wrap gap-2">
-          <Button variant="outline" onClick={handleRefresh}>
+          <Button variant="outline" type="button" onClick={handleRefresh}>
             {t('configs.cache.retry', 'Retry')}
           </Button>
         </div>
@@ -259,11 +288,11 @@ export function CachePanel() {
           ) : null}
         </div>
         <div className="flex items-center gap-2">
-          <Button variant="outline" onClick={handleRefresh}>
+          <Button variant="outline" type="button" onClick={handleRefresh}>
             {t('configs.cache.refresh', 'Refresh')}
           </Button>
           {canShowActions ? (
-            <Button variant="destructive" disabled={purgingAll} onClick={() => { void handlePurgeAll() }}>
+            <Button variant="destructive" type="button" disabled={purgingAll} onClick={() => { void handlePurgeAll() }}>
               {purgingAll
                 ? t('configs.cache.purgeAllLoading', 'Purging…')
                 : t('configs.cache.purgeAll', 'Purge all cache')}
@@ -327,6 +356,7 @@ export function CachePanel() {
                           <Button
                             variant="outline"
                             size="sm"
+                            type="button"
                             disabled={isPurging}
                             onClick={() => { void handlePurgeSegment(segment.segment) }}
                           >

package/src/modules/currencies/api/currencies/options/route.ts

@@ -7,6 +7,7 @@ import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
 import {
   buildCollectionTags,
+  debugCrudCache,
   isCrudCacheEnabled,
   resolveCrudCache,
 } from '@open-mercato/shared/lib/crud/cache'
@@ -78,9 +79,18 @@ export async function GET(req: Request) {
     : null
 
   if (cache && cacheKey) {
-    const cached = await runWithCacheTenant(tenantId, () => cache.get(cacheKey))
-    if (cached) {
-      return NextResponse.json(cached)
+    try {
+      const cached = await runWithCacheTenant(tenantId, () => cache.get(cacheKey))
+      if (cached) {
+        return NextResponse.json(cached)
+      }
+    } catch (err) {
+      // A cache-backend read error must degrade to a fresh DB read, never a 500.
+      debugCrudCache('get', {
+        resource: CURRENCY_OPTIONS_RESOURCE,
+        key: cacheKey,
+        error: err instanceof Error ? err.message : String(err),
+      })
     }
   }
 
@@ -124,7 +134,15 @@ export async function GET(req: Request) {
           tags: buildCollectionTags(CURRENCY_OPTIONS_RESOURCE, tenantId, [orgId]),
         }),
       )
-    } catch {}
+    } catch (err) {
+      // A cache write must never break the request; log it for observability
+      // instead of swallowing the failure silently (matches the CRUD factory).
+      debugCrudCache('store', {
+        resource: CURRENCY_OPTIONS_RESOURCE,
+        key: cacheKey,
+        error: err instanceof Error ? err.message : String(err),
+      })
+    }
   }
 
   return NextResponse.json(payload)

package/src/modules/currencies/services/rateFetchingService.ts

@@ -13,6 +13,11 @@ export interface FetchOptions {
   forceUpdate?: boolean
 }
 
+type ProviderFetchOutcome =
+  | { kind: 'skipped'; providerSource: string; error: string }
+  | { kind: 'failed'; providerSource: string; error: string }
+  | { kind: 'fetched'; providerSource: string; rates: RateProviderResult[] }
+
 const exchangeRateKey = (
   fromCurrencyCode: string,
   toCurrencyCode: string,
@@ -54,46 +59,78 @@ export class RateFetchingService {
       ? options.providers
       : Array.from(this.providers.keys())
 
-    for (const providerSource of providerList) {
-      const provider = this.providers.get(providerSource)
-
-      if (!provider) {
-        result.errors.push(`Unknown provider: ${providerSource}`)
+    // Fetch every provider concurrently: provider calls are independent network I/O,
+    // so overlapping them caps total latency at the slowest provider instead of the sum
+    // of all provider timeouts. Each provider is isolated in its own try/catch so a
+    // single failure never rejects the batch.
+    const outcomes = await Promise.all(
+      providerList.map((providerSource) =>
+        this.fetchFromProvider(providerSource, date, scope, currencyCodeSet)
+      )
+    )
+
+    // Persist sequentially in provider order: a single EntityManager is not safe for
+    // concurrent transactions, and stable ordering keeps DB writes and the byProvider
+    // response shape deterministic regardless of which fetch resolved first.
+    for (const outcome of outcomes) {
+      if (outcome.kind === 'skipped') {
+        result.errors.push(outcome.error)
         continue
       }
 
-      if (!provider.isAvailable()) {
-        result.errors.push(`Provider not available: ${providerSource}`)
+      if (outcome.kind === 'failed') {
+        result.errors.push(`${outcome.providerSource}: ${outcome.error}`)
+        result.byProvider[outcome.providerSource] = { count: 0, errors: [outcome.error] }
         continue
       }
 
       try {
-        const rates = await provider.fetchRates(date, scope, currencyCodeSet)
-
-        // Filter: only currencies that exist in both directions
-        const validRates = rates.filter(
-          (r) =>
-            currencyCodeSet.has(r.fromCurrencyCode) &&
-            currencyCodeSet.has(r.toCurrencyCode)
-        )
-
-        const stored = await this.storeRates(validRates, scope)
-
-        result.byProvider[providerSource] = { count: stored }
+        const stored = await this.storeRates(outcome.rates, scope)
+        result.byProvider[outcome.providerSource] = { count: stored }
         result.totalFetched += stored
-      } catch (err: any) {
-        const errorMsg = `${providerSource}: ${err.message}`
-        result.errors.push(errorMsg)
-        result.byProvider[providerSource] = {
-          count: 0,
-          errors: [err.message],
-        }
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err)
+        result.errors.push(`${outcome.providerSource}: ${message}`)
+        result.byProvider[outcome.providerSource] = { count: 0, errors: [message] }
       }
     }
 
     return result
   }
 
+  private async fetchFromProvider(
+    providerSource: string,
+    date: Date,
+    scope: { tenantId: string; organizationId: string },
+    currencyCodeSet: Set<string>
+  ): Promise<ProviderFetchOutcome> {
+    const provider = this.providers.get(providerSource)
+
+    if (!provider) {
+      return { kind: 'skipped', providerSource, error: `Unknown provider: ${providerSource}` }
+    }
+
+    if (!provider.isAvailable()) {
+      return { kind: 'skipped', providerSource, error: `Provider not available: ${providerSource}` }
+    }
+
+    try {
+      const rates = await provider.fetchRates(date, scope, currencyCodeSet)
+
+      // Filter: only currencies that exist in both directions
+      const validRates = rates.filter(
+        (r) =>
+          currencyCodeSet.has(r.fromCurrencyCode) &&
+          currencyCodeSet.has(r.toCurrencyCode)
+      )
+
+      return { kind: 'fetched', providerSource, rates: validRates }
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err)
+      return { kind: 'failed', providerSource, error: message }
+    }
+  }
+
   private async getExistingCurrencies(scope: {
     tenantId: string
     organizationId: string

package/src/modules/customer_accounts/backend/customer_accounts/users/[id]/page.tsx

@@ -251,25 +251,25 @@ export default function CustomerUserDetailPage({ params }: { params?: { id?: str
   React.useEffect(() => {
     if (!data) return
     let cancelled = false
-    async function loadCrmNames() {
-      if (data!.personEntityId) {
-        try {
-          const call = await apiCall<{ id?: string; firstName?: string; lastName?: string }>(`/api/customers/people/${encodeURIComponent(data!.personEntityId)}`)
-          if (!cancelled && call.ok && call.result) {
-            setPersonName([call.result.firstName, call.result.lastName].filter(Boolean).join(' ') || call.result.id || null)
-          }
-        } catch { /* ignore */ }
-      }
-      if (data!.customerEntityId) {
-        try {
-          const call = await apiCall<{ id?: string; name?: string }>(`/api/customers/${encodeURIComponent(data!.customerEntityId)}`)
-          if (!cancelled && call.ok && call.result) {
-            setCompanyName(call.result.name || call.result.id || null)
-          }
-        } catch { /* ignore */ }
-      }
+    async function loadPersonName() {
+      if (!data!.personEntityId) return
+      try {
+        const call = await apiCall<{ id?: string; firstName?: string; lastName?: string }>(`/api/customers/people/${encodeURIComponent(data!.personEntityId)}`)
+        if (!cancelled && call.ok && call.result) {
+          setPersonName([call.result.firstName, call.result.lastName].filter(Boolean).join(' ') || call.result.id || null)
+        }
+      } catch { /* ignore */ }
+    }
+    async function loadCompanyName() {
+      if (!data!.customerEntityId) return
+      try {
+        const call = await apiCall<{ id?: string; name?: string }>(`/api/customers/${encodeURIComponent(data!.customerEntityId)}`)
+        if (!cancelled && call.ok && call.result) {
+          setCompanyName(call.result.name || call.result.id || null)
+        }
+      } catch { /* ignore */ }
     }
-    loadCrmNames()
+    void Promise.all([loadPersonName(), loadCompanyName()])
     return () => { cancelled = true }
   }, [data])
 

package/src/modules/customer_accounts/backend/customer_accounts/users/page.tsx

@@ -500,7 +500,7 @@ export default function CustomerAccountsPage() {
                 })}
               </p>
               <p className="mt-0.5 text-xs text-status-info-text">
-                {t('customer_accounts.admin.portalInfo.credentials', 'Demo credentials: alice.johnson@example.com / password123')}
+                {t('customer_accounts.admin.portalInfo.credentials', 'Demo credentials: alice.johnson@example.com / Password123!')}
               </p>
             </div>
             <div className="flex shrink-0 flex-col gap-2">

package/src/modules/customer_accounts/i18n/de.json

@@ -121,7 +121,7 @@
   "customer_accounts.admin.portalFeatures.users.invite": "Invite team members",
   "customer_accounts.admin.portalFeatures.users.manage": "Manage team members",
   "customer_accounts.admin.portalFeatures.users.view": "View team members",
-  "customer_accounts.admin.portalInfo.credentials": "Demo credentials: alice.johnson@example.com / password123",
+  "customer_accounts.admin.portalInfo.credentials": "Demo credentials: alice.johnson@example.com / Password123!",
   "customer_accounts.admin.portalInfo.description": "Manage customer portal accounts. Customers can self-register, log in, and access orders, quotes, and invoices through the portal.",
   "customer_accounts.admin.portalInfo.open": "Open Portal",
   "customer_accounts.admin.portalInfo.openConfiguration": "Open Configuration",

package/src/modules/customer_accounts/i18n/en.json

@@ -121,7 +121,7 @@
   "customer_accounts.admin.portalFeatures.users.invite": "Invite team members",
   "customer_accounts.admin.portalFeatures.users.manage": "Manage team members",
   "customer_accounts.admin.portalFeatures.users.view": "View team members",
-  "customer_accounts.admin.portalInfo.credentials": "Demo credentials: alice.johnson@example.com / password123",
+  "customer_accounts.admin.portalInfo.credentials": "Demo credentials: alice.johnson@example.com / Password123!",
   "customer_accounts.admin.portalInfo.description": "Manage customer portal accounts. Customers can self-register, log in, and access orders, quotes, and invoices through the portal.",
   "customer_accounts.admin.portalInfo.open": "Open Portal",
   "customer_accounts.admin.portalInfo.openConfiguration": "Open Configuration",

package/src/modules/customer_accounts/i18n/es.json

@@ -121,7 +121,7 @@
   "customer_accounts.admin.portalFeatures.users.invite": "Invite team members",
   "customer_accounts.admin.portalFeatures.users.manage": "Manage team members",
   "customer_accounts.admin.portalFeatures.users.view": "View team members",
-  "customer_accounts.admin.portalInfo.credentials": "Demo credentials: alice.johnson@example.com / password123",
+  "customer_accounts.admin.portalInfo.credentials": "Demo credentials: alice.johnson@example.com / Password123!",
   "customer_accounts.admin.portalInfo.description": "Manage customer portal accounts. Customers can self-register, log in, and access orders, quotes, and invoices through the portal.",
   "customer_accounts.admin.portalInfo.open": "Open Portal",
   "customer_accounts.admin.portalInfo.openConfiguration": "Open Configuration",

package/src/modules/customer_accounts/i18n/pl.json

@@ -121,7 +121,7 @@
   "customer_accounts.admin.portalFeatures.users.invite": "Invite team members",
   "customer_accounts.admin.portalFeatures.users.manage": "Manage team members",
   "customer_accounts.admin.portalFeatures.users.view": "View team members",
-  "customer_accounts.admin.portalInfo.credentials": "Demo credentials: alice.johnson@example.com / password123",
+  "customer_accounts.admin.portalInfo.credentials": "Demo credentials: alice.johnson@example.com / Password123!",
   "customer_accounts.admin.portalInfo.description": "Manage customer portal accounts. Customers can self-register, log in, and access orders, quotes, and invoices through the portal.",
   "customer_accounts.admin.portalInfo.open": "Open Portal",
   "customer_accounts.admin.portalInfo.openConfiguration": "Open Configuration",

package/src/modules/customers/backend/calendar/page.meta.ts

@@ -0,0 +1,23 @@
+import React from 'react'
+
+const calendarIcon = React.createElement(
+  'svg',
+  { width: 16, height: 16, viewBox: '0 0 24 24', fill: 'none', stroke: 'currentColor', strokeWidth: 2 },
+  React.createElement('rect', { x: 3, y: 4, width: 18, height: 18, rx: 2 }),
+  React.createElement('path', { d: 'M16 2v4' }),
+  React.createElement('path', { d: 'M8 2v4' }),
+  React.createElement('path', { d: 'M3 10h18' }),
+)
+
+export const metadata = {
+  requireAuth: true,
+  requireFeatures: ['customers.interactions.view'],
+  pageTitle: 'Calendar',
+  pageTitleKey: 'customers.calendar.nav.title',
+  pageGroup: 'Customers',
+  pageGroupKey: 'customers.nav.group',
+  pagePriority: 10,
+  pageOrder: 50,
+  icon: calendarIcon,
+  breadcrumb: [{ label: 'Calendar', labelKey: 'customers.calendar.nav.title' }],
+}

package/src/modules/customers/backend/calendar/page.tsx

@@ -0,0 +1,12 @@
+import { Page, PageBody } from '@open-mercato/ui/backend/Page'
+import { CalendarScreen } from '../../components/calendar/CalendarScreen'
+
+export default function CustomersCalendarPage() {
+  return (
+    <Page>
+      <PageBody>
+        <CalendarScreen />
+      </PageBody>
+    </Page>
+  )
+}

package/src/modules/customers/cli.ts

@@ -113,6 +113,7 @@ const ADDRESS_TYPE_DEFAULTS: DictionaryDefault[] = [
 const ACTIVITY_TYPE_DEFAULTS: DictionaryDefault[] = [
   { value: 'call', label: 'Call', color: '#2563eb', icon: 'lucide:phone-call' },
   { value: 'email', label: 'Email', color: '#16a34a', icon: 'lucide:mail' },
+  { value: 'event', label: 'Event', color: '#6366f1', icon: 'lucide:calendar' },
   { value: 'meeting', label: 'Meeting', color: '#f59e0b', icon: 'lucide:users' },
   { value: 'note', label: 'Note', color: '#a855f7', icon: 'lucide:notebook' },
   { value: 'task', label: 'Task', color: '#ef4444', icon: 'lucide:check-square' },