@open-mercato/core 0.4.6-develop-f7d3079656 → 0.4.6-develop-0861f05ea9

package/src/modules/sales/api/shipment-statuses/route.ts

@@ -1,214 +1,21 @@
-import { z } from 'zod'
-import { makeCrudRoute } from '@open-mercato/shared/lib/crud/factory'
-import type { EntityManager } from '@mikro-orm/postgresql'
-import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
-import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
-import { Dictionary, DictionaryEntry } from '@open-mercato/core/modules/dictionaries/data/entities'
 import { E } from '#generated/entities.ids.generated'
 import * as F from '#generated/entities/dictionary_entry'
-import { statusDictionaryCreateSchema, statusDictionaryUpdateSchema } from '../../data/validators'
-import { getSalesDictionaryDefinition, ensureSalesDictionary, type SalesDictionaryKind } from '../../lib/dictionaries'
-import { parseScopedCommandInput, resolveCrudRecordId } from '../utils'
-import {
-  createPagedListResponseSchema,
-  createSalesCrudOpenApi,
-  defaultDeleteRequestSchema,
-} from '../openapi'
-import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
-
-const rawBodySchema = z.object({}).passthrough()
-
-const listSchema = z
-  .object({
-    page: z.coerce.number().min(1).default(1),
-    pageSize: z.coerce.number().min(1).max(100).default(50),
-    search: z.string().optional(),
-    sortField: z.string().optional(),
-    sortDir: z.enum(['asc', 'desc']).optional(),
-  })
-  .passthrough()
-
-const kind: SalesDictionaryKind = 'shipment-status'
-const definition = getSalesDictionaryDefinition(kind)
-
-export const metadata = {
-  GET: { requireAuth: true, requireFeatures: ['sales.settings.manage'] },
-  POST: { requireAuth: true, requireFeatures: ['sales.settings.manage'] },
-  PUT: { requireAuth: true, requireFeatures: ['sales.settings.manage'] },
-  DELETE: { requireAuth: true, requireFeatures: ['sales.settings.manage'] },
-}
-
-const dictionaryItemSchema = z.object({
-  id: z.string().uuid(),
-  value: z.string(),
-  label: z.string().nullable(),
-  color: z.string().nullable(),
-  icon: z.string().nullable(),
-  organizationId: z.string().uuid().nullable(),
-  tenantId: z.string().uuid().nullable(),
-  createdAt: z.string(),
-  updatedAt: z.string(),
-})
-
-const dictionaryListResponseSchema = createPagedListResponseSchema(dictionaryItemSchema)
-
-const normalizeId = (value: unknown): string | null => {
-  if (typeof value !== 'string') return null
-  const trimmed = value.trim()
-  return trimmed.length > 0 ? trimmed : null
-}
-
-async function resolveDictionaryContext(ctx: any): Promise<{ dictionaryId: string; organizationId: string | null }> {
-  if (!ctx.auth || !ctx.auth.tenantId) {
-    throw new CrudHttpError(401, { error: 'Tenant context is required.' })
-  }
-  const em = ctx.container.resolve('em') as EntityManager
-  const tenantId: string = ctx.auth.tenantId
-  const candidateOrgIds = new Set<string>()
-  const pushCandidate = (value: unknown) => {
-    const normalized = normalizeId(value)
-    if (normalized) candidateOrgIds.add(normalized)
-  }
-  pushCandidate(ctx.selectedOrganizationId)
-  pushCandidate(ctx.auth.orgId ?? null)
-  const scope = ctx.organizationScope
-  if (scope) {
-    if (Array.isArray(scope.filterIds)) {
-      for (const id of scope.filterIds) pushCandidate(id)
-    }
-    if (Array.isArray(scope.allowedIds)) {
-      for (const id of scope.allowedIds) pushCandidate(id)
-    }
-  }
-
-  for (const orgId of candidateOrgIds) {
-    const dictionary = await ensureSalesDictionary({
-      em,
-      tenantId,
-      organizationId: orgId,
-      kind,
-    })
-    if (dictionary) {
-      return { dictionaryId: dictionary.id, organizationId: orgId }
-    }
-  }
-
-  const fallback = await em.findOne(
-    Dictionary,
-    {
-      tenantId,
-      key: definition.key,
-      deletedAt: null,
-    },
-    { orderBy: { createdAt: 'asc' } },
-  )
-  if (fallback) {
-    return { dictionaryId: fallback.id, organizationId: fallback.organizationId }
-  }
-  throw new CrudHttpError(400, { error: 'Organization context is required.' })
-}
-
-const crud = makeCrudRoute({
-  metadata,
-  orm: {
-    entity: DictionaryEntry,
-    idField: 'id',
-    orgField: 'organizationId',
-    tenantField: 'tenantId',
-    softDeleteField: null,
+import { makeStatusDictionaryRoute } from '../../lib/makeStatusDictionaryRoute'
+
+const route = makeStatusDictionaryRoute({
+  kind: 'shipment-status',
+  entityId: E.dictionaries.dictionary_entry,
+  fieldConstants: F,
+  openApi: {
+    resourceName: 'Shipment status',
+    pluralName: 'Shipment statuses',
+    description: 'Manage the lifecycle states available for shipments.',
   },
-  list: {
-    schema: listSchema,
-    entityId: E.dictionaries.dictionary_entry,
-    fields: [
-      F.id,
-      F.value,
-      F.label,
-      F.color,
-      F.icon,
-      F.organization_id,
-      F.tenant_id,
-      F.created_at,
-      F.updated_at,
-    ],
-    sortFieldMap: {
-      id: F.id,
-      value: F.value,
-      label: F.label,
-      createdAt: F.created_at,
-      updatedAt: F.updated_at,
-    },
-    buildFilters: async (query, ctx) => {
-      const { dictionaryId } = await resolveDictionaryContext(ctx)
-      const filters: Record<string, unknown> = {
-        dictionary_id: dictionaryId,
-      }
-      if (query.search && query.search.trim().length > 0) {
-        const term = `%${escapeLikePattern(query.search.trim())}%`
-        filters.$or = [
-          { [F.value]: { $ilike: term } },
-          { [F.label]: { $ilike: term } },
-        ]
-      }
-      return filters
-    },
-    transformItem: (item: any) => ({
-      id: item.id,
-      value: item.value,
-      label: item.label,
-      color: item.color ?? null,
-      icon: item.icon ?? null,
-      organizationId: item.organization_id ?? null,
-      tenantId: item.tenant_id ?? null,
-      createdAt: item.created_at,
-      updatedAt: item.updated_at,
-    }),
-  },
-  actions: {
-    create: {
-      commandId: `${definition.commandPrefix}.create`,
-      schema: rawBodySchema,
-      mapInput: async ({ raw, ctx }) => {
-        const { translate } = await resolveTranslations()
-        return parseScopedCommandInput(statusDictionaryCreateSchema, raw ?? {}, ctx, translate)
-      },
-      response: ({ result }) => ({ id: result?.entryId ?? null }),
-      status: 201,
-    },
-    update: {
-      commandId: `${definition.commandPrefix}.update`,
-      schema: rawBodySchema,
-      mapInput: async ({ raw, ctx }) => {
-        const { translate } = await resolveTranslations()
-        return parseScopedCommandInput(statusDictionaryUpdateSchema, raw ?? {}, ctx, translate)
-      },
-      response: () => ({ ok: true }),
-    },
-    delete: {
-      commandId: `${definition.commandPrefix}.delete`,
-      schema: rawBodySchema,
-      mapInput: async ({ parsed, ctx }) => {
-        const { translate } = await resolveTranslations()
-        const id = resolveCrudRecordId(parsed, ctx, translate)
-        return { id }
-      },
-      response: () => ({ ok: true }),
-    },
-  },
-})
-
-export const openApi = createSalesCrudOpenApi({
-  resourceName: 'Shipment status',
-  pluralName: 'Shipment statuses',
-  description: 'Manage the lifecycle states available for shipments.',
-  querySchema: listSchema,
-  listResponseSchema: dictionaryListResponseSchema,
-  create: { schema: statusDictionaryCreateSchema },
-  update: { schema: statusDictionaryUpdateSchema },
-  del: { schema: defaultDeleteRequestSchema },
 })
 
-export const GET = crud.GET
-export const POST = crud.POST
-export const PUT = crud.PUT
-export const DELETE = crud.DELETE
+export const metadata = route.metadata
+export const openApi = route.openApi
+export const GET = route.GET
+export const POST = route.POST
+export const PUT = route.PUT
+export const DELETE = route.DELETE

package/src/modules/sales/components/PaymentMethodsSettings.tsx

@@ -12,10 +12,7 @@ import {
   DialogHeader,
   DialogTitle,
 } from '@open-mercato/ui/primitives/dialog'
-import { Input } from '@open-mercato/ui/primitives/input'
 import { Label } from '@open-mercato/ui/primitives/label'
-import { Switch } from '@open-mercato/ui/primitives/switch'
-import { Textarea } from '@open-mercato/ui/primitives/textarea'
 import { CrudForm, type CrudField, type CrudCustomFieldRenderProps } from '@open-mercato/ui/backend/CrudForm'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { apiCall, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
@@ -26,8 +23,9 @@ import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import {
   listPaymentProviders,
   type PaymentProvider,
-  type ProviderSettingField,
 } from '../lib/providers'
+import { isRecord } from '@open-mercato/shared/lib/utils'
+import { renderProviderFieldInput } from './ProviderFieldInput'
 
 type PaymentMethodRow = {
   id: string
@@ -68,89 +66,6 @@ const DEFAULT_FORM: PaymentFormValues = {
   providerSettings: {},
 }
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return !!value && typeof value === 'object' && !Array.isArray(value)
-}
-
-function renderFieldInput(opts: {
-  field: ProviderSettingField
-  value: unknown
-  onChange: (next: unknown) => void
-}) {
-  const { field, value, onChange } = opts
-  const common = { id: field.key, 'data-provider-setting': field.key }
-  switch (field.type) {
-    case 'textarea':
-      return (
-        <Textarea
-          {...common}
-          value={typeof value === 'string' ? value : ''}
-          onChange={(evt) => onChange(evt.target.value)}
-          placeholder={field.placeholder}
-        />
-      )
-    case 'number':
-      return (
-        <Input
-          {...common}
-          type="number"
-          value={typeof value === 'number' || typeof value === 'string' ? String(value) : ''}
-          onChange={(evt) => onChange(evt.target.value === '' ? '' : Number(evt.target.value))}
-          placeholder={field.placeholder}
-        />
-      )
-    case 'boolean':
-      return (
-        <div className="flex items-center gap-2 py-1">
-          <Switch
-            id={field.key}
-            checked={Boolean(value)}
-            onCheckedChange={(checked) => onChange(checked)}
-          />
-          <Label htmlFor={field.key}>{field.placeholder ?? ''}</Label>
-        </div>
-      )
-    case 'select':
-      return (
-        <select
-          {...common}
-          className="w-full rounded-md border border-input bg-background px-3 py-2 text-sm"
-          value={typeof value === 'string' ? value : ''}
-          onChange={(evt) => onChange(evt.target.value)}
-        >
-          <option value="">—</option>
-          {(field.options ?? []).map((opt) => (
-            <option key={opt.value} value={opt.value}>
-              {opt.label}
-            </option>
-          ))}
-        </select>
-      )
-    case 'secret':
-      return (
-        <Input
-          {...common}
-          type="password"
-          value={typeof value === 'string' ? value : ''}
-          onChange={(evt) => onChange(evt.target.value)}
-          placeholder={field.placeholder}
-        />
-      )
-    case 'url':
-    case 'text':
-    default:
-      return (
-        <Input
-          {...common}
-          type={field.type === 'url' ? 'url' : 'text'}
-          value={typeof value === 'string' ? value : ''}
-          onChange={(evt) => onChange(evt.target.value)}
-          placeholder={field.placeholder}
-        />
-      )
-  }
-}
-
 function createPaymentProviderSettingsRenderer(params: {
   providers: PaymentProvider[]
   selectPrompt: string
@@ -200,7 +115,7 @@ function createPaymentProviderSettingsRenderer(params: {
               {field.description ? (
                 <p className="text-xs text-muted-foreground">{field.description}</p>
               ) : null}
-              {renderFieldInput({
+              {renderProviderFieldInput({
                 field,
                 value: fieldValue,
                 onChange: (next) => setValue({ ...settings, [field.key]: next }),

package/src/modules/sales/components/ProviderFieldInput.tsx

@@ -0,0 +1,85 @@
+import { Input } from '@open-mercato/ui/primitives/input'
+import { Label } from '@open-mercato/ui/primitives/label'
+import { Switch } from '@open-mercato/ui/primitives/switch'
+import { Textarea } from '@open-mercato/ui/primitives/textarea'
+import { isRecord } from '@open-mercato/shared/lib/utils'
+import type { ProviderSettingField } from '../lib/providers'
+
+export function renderProviderFieldInput(opts: {
+  field: ProviderSettingField
+  value: unknown
+  onChange: (next: unknown) => void
+}) {
+  const { field, value, onChange } = opts
+  const common = { id: field.key, 'data-provider-setting': field.key }
+  switch (field.type) {
+    case 'textarea':
+      return (
+        <Textarea
+          {...common}
+          value={typeof value === 'string' ? value : ''}
+          onChange={(evt) => onChange(evt.target.value)}
+          placeholder={field.placeholder}
+        />
+      )
+    case 'number':
+      return (
+        <Input
+          {...common}
+          type="number"
+          value={typeof value === 'number' || typeof value === 'string' ? String(value) : ''}
+          onChange={(evt) => onChange(evt.target.value === '' ? '' : Number(evt.target.value))}
+          placeholder={field.placeholder}
+        />
+      )
+    case 'boolean':
+      return (
+        <div className="flex items-center gap-2 py-1">
+          <Switch
+            id={field.key}
+            checked={Boolean(value)}
+            onCheckedChange={(checked) => onChange(checked)}
+          />
+          <Label htmlFor={field.key}>{field.placeholder ?? ''}</Label>
+        </div>
+      )
+    case 'select':
+      return (
+        <select
+          {...common}
+          className="w-full rounded-md border border-input bg-background px-3 py-2 text-sm"
+          value={typeof value === 'string' ? value : ''}
+          onChange={(evt) => onChange(evt.target.value)}
+        >
+          <option value="">—</option>
+          {(field.options ?? []).map((opt) => (
+            <option key={opt.value} value={opt.value}>
+              {opt.label}
+            </option>
+          ))}
+        </select>
+      )
+    case 'secret':
+      return (
+        <Input
+          {...common}
+          type="password"
+          value={typeof value === 'string' ? value : ''}
+          onChange={(evt) => onChange(evt.target.value)}
+          placeholder={field.placeholder}
+        />
+      )
+    case 'url':
+    case 'text':
+    default:
+      return (
+        <Input
+          {...common}
+          type={field.type === 'url' ? 'url' : 'text'}
+          value={typeof value === 'string' ? value : ''}
+          onChange={(evt) => onChange(evt.target.value)}
+          placeholder={field.placeholder}
+        />
+      )
+  }
+}

package/src/modules/sales/components/ShippingMethodsSettings.tsx

@@ -15,7 +15,6 @@ import {
 import { Input } from '@open-mercato/ui/primitives/input'
 import { Label } from '@open-mercato/ui/primitives/label'
 import { Switch } from '@open-mercato/ui/primitives/switch'
-import { Textarea } from '@open-mercato/ui/primitives/textarea'
 import { CrudForm, type CrudCustomFieldRenderProps, type CrudField } from '@open-mercato/ui/backend/CrudForm'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { apiCall, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
@@ -25,9 +24,10 @@ import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import {
   listShippingProviders,
-  type ProviderSettingField,
   type ShippingProvider,
 } from '../lib/providers'
+import { isRecord } from '@open-mercato/shared/lib/utils'
+import { renderProviderFieldInput } from './ProviderFieldInput'
 
 type ShippingMethodRow = {
   id: string
@@ -83,89 +83,6 @@ const DEFAULT_FORM: ShippingFormValues = {
   providerSettings: {},
 }
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return !!value && typeof value === 'object' && !Array.isArray(value)
-}
-
-function renderFieldInput(opts: {
-  field: ProviderSettingField
-  value: unknown
-  onChange: (next: unknown) => void
-}) {
-  const { field, value, onChange } = opts
-  const common = { id: field.key, 'data-provider-setting': field.key }
-  switch (field.type) {
-    case 'textarea':
-      return (
-        <Textarea
-          {...common}
-          value={typeof value === 'string' ? value : ''}
-          onChange={(evt) => onChange(evt.target.value)}
-          placeholder={field.placeholder}
-        />
-      )
-    case 'number':
-      return (
-        <Input
-          {...common}
-          type="number"
-          value={typeof value === 'number' || typeof value === 'string' ? String(value) : ''}
-          onChange={(evt) => onChange(evt.target.value === '' ? '' : Number(evt.target.value))}
-          placeholder={field.placeholder}
-        />
-      )
-    case 'boolean':
-      return (
-        <div className="flex items-center gap-2 py-1">
-          <Switch
-            id={field.key}
-            checked={Boolean(value)}
-            onCheckedChange={(checked) => onChange(checked)}
-          />
-          <Label htmlFor={field.key}>{field.placeholder ?? ''}</Label>
-        </div>
-      )
-    case 'select':
-      return (
-        <select
-          {...common}
-          className="w-full rounded-md border border-input bg-background px-3 py-2 text-sm"
-          value={typeof value === 'string' ? value : ''}
-          onChange={(evt) => onChange(evt.target.value)}
-        >
-          <option value="">—</option>
-          {(field.options ?? []).map((opt) => (
-            <option key={opt.value} value={opt.value}>
-              {opt.label}
-            </option>
-          ))}
-        </select>
-      )
-    case 'secret':
-      return (
-        <Input
-          {...common}
-          type="password"
-          value={typeof value === 'string' ? value : ''}
-          onChange={(evt) => onChange(evt.target.value)}
-          placeholder={field.placeholder}
-        />
-      )
-    case 'url':
-    case 'text':
-    default:
-      return (
-        <Input
-          {...common}
-          type={field.type === 'url' ? 'url' : 'text'}
-          value={typeof value === 'string' ? value : ''}
-          onChange={(evt) => onChange(evt.target.value)}
-          placeholder={field.placeholder}
-        />
-      )
-  }
-}
-
 type RateRule = {
   id?: string
   name?: string
@@ -395,7 +312,7 @@ function createShippingProviderSettingsRenderer(params: {
               {field.description ? (
                 <p className="text-xs text-muted-foreground">{field.description}</p>
               ) : null}
-              {renderFieldInput({
+              {renderProviderFieldInput({
                 field,
                 value: fieldValue,
                 onChange: (next) => setValue({ ...settings, [field.key]: next }),