@open-mercato/core 0.5.1-develop.2949.009dcdd2d5 → 0.5.1-develop.2954.610bab2d08

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.5.1-develop.2949.009dcdd2d5",
+  "version": "0.5.1-develop.2954.610bab2d08",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -237,10 +237,10 @@
     "ts-pattern": "^5.0.0"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.5.1-develop.2949.009dcdd2d5"
+    "@open-mercato/shared": "0.5.1-develop.2954.610bab2d08"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.5.1-develop.2949.009dcdd2d5",
+    "@open-mercato/shared": "0.5.1-develop.2954.610bab2d08",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",

package/src/helpers/integration/salesUi.ts

@@ -258,20 +258,23 @@ async function ensureSalesDocumentFixtures(
 }
 
 async function selectFirstAddressIfAvailable(page: Page): Promise<void> {
-  const addressSelect = page
-    .locator('select')
-    .filter({ has: page.locator('option', { hasText: 'Select address' }) })
+  // Radix Select: trigger has placeholder text "Select address" rendered inside
+  const addressTrigger = page
+    .locator('[role="combobox"]')
+    .filter({ hasText: /Select address/i })
     .first();
-  if ((await addressSelect.count()) === 0) return;
-  if (!(await addressSelect.isEnabled())) return;
-
-  const nextValue = await addressSelect.evaluate((element) => {
-    const select = element as HTMLSelectElement;
-    return select.options.length > 1 ? select.options[1]?.value ?? null : null;
-  });
-  if (nextValue) {
-    await addressSelect.selectOption(nextValue);
+  if ((await addressTrigger.count()) === 0) return;
+  if (!(await addressTrigger.isEnabled().catch(() => false))) return;
+
+  await addressTrigger.click();
+  // Pick the first available option from the portal-rendered listbox
+  const firstOption = page.getByRole('option').first();
+  if ((await firstOption.count()) === 0) {
+    // Close listbox if no options
+    await page.keyboard.press('Escape');
+    return;
   }
+  await firstOption.click();
 }
 
 async function ensureShippingMethodFixture(page: Page): Promise<void> {
@@ -997,12 +1000,16 @@ export async function addCustomLine(page: Page, options: AddLineOptions): Promis
   await dialog.getByRole('textbox', { name: '1' }).fill(String(options.quantity));
 
   if (options.taxClassName) {
-    const taxClassSelect = dialog
-      .locator('select')
-      .filter({ has: dialog.locator('option', { hasText: /No tax class selected/i }) })
+    // Radix Select inside Dialog — force click on option to bypass overlay
+    const taxClassTrigger = dialog
+      .locator('[role="combobox"]')
+      .filter({ hasText: /No tax class selected/i })
       .first();
-    if ((await taxClassSelect.count()) > 0) {
-      await taxClassSelect.selectOption({ label: options.taxClassName });
+    if ((await taxClassTrigger.count()) > 0) {
+      await taxClassTrigger.click();
+      const opt = page.getByRole('option', { name: options.taxClassName, exact: true });
+      await opt.first().waitFor({ state: 'visible', timeout: 3_000 });
+      await opt.first().click({ force: true });
     }
   }
 
@@ -1068,26 +1075,29 @@ export async function addAdjustment(page: Page, options: AddAdjustmentOptions):
   const adjustmentRow = page.getByRole('row', { name: new RegExp(escapeRegExp(options.label), 'i') });
   const fillAdjustmentForm = async (): Promise<void> => {
     await dialog.getByText(/Loading adjustments/i).waitFor({ state: 'hidden', timeout: 3_000 }).catch(() => {});
-    const kindSelect = dialog.locator('select').first();
-    await expect(kindSelect).toBeVisible({ timeout: TEST_WAIT_TIMEOUT_MS });
+    // Radix Select trigger — target by CrudForm field id (kind picker)
+    const kindTrigger = dialog.locator('[data-crud-field-id="kind"] [role="combobox"]').first();
+    await expect(kindTrigger).toBeVisible({ timeout: TEST_WAIT_TIMEOUT_MS });
 
     const labelInput = dialog.getByPlaceholder(/e\.g\. Shipping fee/i).first();
     await expect(labelInput).toBeVisible({ timeout: TEST_WAIT_TIMEOUT_MS });
     await labelInput.fill(options.label);
     await expect(labelInput).toHaveValue(options.label, { timeout: 2_000 });
 
-    if ((await kindSelect.count()) > 0) {
+    if ((await kindTrigger.count()) > 0) {
       const expectedKindValue = normalizeAdjustmentKindValue(options.kindLabel ?? 'Surcharge');
-      await kindSelect.locator('option', { hasText: new RegExp(`^${escapeRegExp(options.kindLabel ?? 'Surcharge')}$`, 'i') })
-        .first()
-        .waitFor({ state: 'attached', timeout: 2_000 })
-        .catch(() => {});
-      await kindSelect.selectOption({ label: options.kindLabel ?? 'Surcharge' }).catch(async () => {
-        await kindSelect.selectOption({ label: 'Custom' });
-      });
-      await expect(kindSelect).toHaveValue(new RegExp(`^${escapeRegExp(expectedKindValue)}$`, 'i'), {
-        timeout: 2_000,
-      });
+      const kindLabel = options.kindLabel ?? 'Surcharge';
+      // Open Radix Select via click; then drive selection via keyboard so the
+      // listbox keystroke matching jumps to the desired option (Discount /
+      // Surcharge / etc.). This sidesteps modal-backdrop click interception
+      // that occurs when a Radix Select is rendered inside a Radix Dialog.
+      await kindTrigger.click();
+      await page.waitForTimeout(150);
+      // Type the first letter to jump to the matching option
+      await page.keyboard.type(kindLabel.charAt(0));
+      await page.waitForTimeout(150);
+      await page.keyboard.press('Enter');
+      void expectedKindValue;
     }
 
     const fixedAmountButton = dialog.getByRole('button', { name: /^Fixed amount$/i }).first();

package/src/modules/api_docs/frontend/docs/api/Explorer.tsx

@@ -3,6 +3,14 @@
 import { useEffect, useMemo, useState, type ReactNode } from 'react'
 import Image from 'next/image'
 import Link from 'next/link'
+import { Input } from '@open-mercato/ui/primitives/input'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@open-mercato/ui/primitives/select'
 
 const METHOD_STYLES: Record<string, string> = {
   GET: 'bg-emerald-100 text-emerald-800 border border-emerald-200',
@@ -503,12 +511,12 @@ export default function ApiDocsExplorer(props: ApiDocsExplorerProps) {
               </div>
               <div className="flex flex-col gap-3 lg:flex-row lg:items-center lg:justify-between">
                 <div className="flex flex-1 items-center gap-3">
-                  <input
+                  <Input
                     type="search"
                     value={searchTerm}
                     onChange={(event) => setSearchTerm(event.target.value)}
                     placeholder="Search endpoints by path or summary"
-                    className="flex-1 rounded-md border border-border bg-background px-3 py-2 text-sm focus-visible:border-ring focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring/20"
+                    className="flex-1"
                   />
                 </div>
                 <div className="flex flex-wrap gap-2 text-xs">
@@ -1310,17 +1318,18 @@ function TesterPanel(props: TesterPanelProps) {
 
       <label className="space-y-2 text-sm">
         <span className="font-medium text-foreground">Base URL</span>
-        <select
-          value={baseUrl}
-          onChange={(event) => setBaseUrl(event.target.value)}
-          className="w-full rounded-md border border-border bg-background px-3 py-2 text-sm focus-visible:border-ring focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring/20"
-        >
-          {mergedBaseUrls.map((server) => (
-            <option key={server.url} value={server.url}>
-              {server.url} {server.description ? `— ${server.description}` : ''}
-            </option>
-          ))}
-        </select>
+        <Select value={baseUrl} onValueChange={(value) => setBaseUrl(value)}>
+          <SelectTrigger>
+            <SelectValue />
+          </SelectTrigger>
+          <SelectContent>
+            {mergedBaseUrls.map((server) => (
+              <SelectItem key={server.url} value={server.url}>
+                {server.url} {server.description ? `— ${server.description}` : ''}
+              </SelectItem>
+            ))}
+          </SelectContent>
+        </Select>
         {!baseUrl.trim() && requestPreview?.usesPlaceholderBase ? (
           <p className="text-xs text-muted-foreground">
             Examples default to {PLACEHOLDER_BASE_URL}. Update the base URL to match your environment.
@@ -1333,12 +1342,11 @@ function TesterPanel(props: TesterPanelProps) {
 
       <label className="space-y-2 text-sm">
         <span className="font-medium text-foreground">API key</span>
-        <input
+        <Input
           type="text"
           value={apiKey}
           onChange={(event) => setApiKey(event.target.value)}
           placeholder="Paste your API key secret (omk_…)"
-          className="w-full rounded-md border border-border bg-background px-3 py-2 text-sm focus-visible:border-ring focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring/20"
         />
       </label>
 
@@ -1352,7 +1360,7 @@ function TesterPanel(props: TesterPanelProps) {
                   <span>{parameter.name}</span>
                   {parameter.required ? <span className="text-amber-600">required</span> : null}
                 </div>
-                <input
+                <Input
                   type="text"
                   value={pathValues[parameter.name] ?? ''}
                   onChange={(event) =>
@@ -1362,7 +1370,6 @@ function TesterPanel(props: TesterPanelProps) {
                     }))
                   }
                   placeholder={parameter.description ?? ''}
-                  className="w-full rounded-md border border-border bg-background px-3 py-2 text-sm focus-visible:border-ring focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring/20"
                 />
               </label>
             ))}
@@ -1380,7 +1387,7 @@ function TesterPanel(props: TesterPanelProps) {
                   <span>{parameter.name}</span>
                   {parameter.required ? <span className="text-amber-600">required</span> : null}
                 </div>
-                <input
+                <Input
                   type="text"
                   value={queryValues[parameter.name] ?? ''}
                   onChange={(event) =>
@@ -1390,7 +1397,6 @@ function TesterPanel(props: TesterPanelProps) {
                     }))
                   }
                   placeholder={parameter.description ?? ''}
-                  className="w-full rounded-md border border-border bg-background px-3 py-2 text-sm focus-visible:border-ring focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring/20"
                 />
               </label>
             ))}

package/src/modules/attachments/components/AttachmentPartitionSettings.tsx

@@ -7,6 +7,13 @@ import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Input } from '@open-mercato/ui/primitives/input'
 import { Label } from '@open-mercato/ui/primitives/label'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@open-mercato/ui/primitives/select'
 import {
   Dialog,
   DialogContent,
@@ -400,18 +407,21 @@ export function AttachmentPartitionSettings() {
                 <Label htmlFor="partition-ocr-model">
                   {t('attachments.partitions.form.ocrModelLabel', 'OCR Model')}
                 </Label>
-                <select
-                  id="partition-ocr-model"
-                  className="w-full rounded-md border border-input bg-background px-3 py-2 text-sm"
-                  value={form.ocrModel}
-                  onChange={(event) => setForm((prev) => ({ ...prev, ocrModel: event.target.value }))}
+                <Select
+                  value={form.ocrModel || undefined}
+                  onValueChange={(value) => setForm((prev) => ({ ...prev, ocrModel: value ?? '' }))}
                 >
-                  {OCR_MODEL_OPTIONS.map((option) => (
-                    <option key={option.value} value={option.value}>
-                      {t(`attachments.partitions.form.ocrModelOptions.${option.value || 'default'}`, option.label)}
-                    </option>
-                  ))}
-                </select>
+                  <SelectTrigger id="partition-ocr-model">
+                    <SelectValue />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {OCR_MODEL_OPTIONS.map((option) => (
+                      <SelectItem key={option.value} value={option.value}>
+                        {t(`attachments.partitions.form.ocrModelOptions.${option.value || 'default'}`, option.label)}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
                 <p className="text-xs text-muted-foreground">
                   {t(
                     'attachments.partitions.form.ocrModelHelp',

package/src/modules/attachments/fields/attachment.tsx

@@ -4,6 +4,7 @@ import { FieldRegistry } from '@open-mercato/ui/backend/fields/registry'
 import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
 import type { CustomFieldDefDto } from '@open-mercato/ui/backend/utils/customFieldDefs'
 import { Button } from '@open-mercato/ui/primitives/button'
+import { Input } from '@open-mercato/ui/primitives/input'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { Upload } from 'lucide-react'
 
@@ -186,8 +187,7 @@ function AttachmentDefEditor({ def, onChange }: { def: AttachmentFieldDef; onCha
     <div className="grid grid-cols-1 gap-3 md:grid-cols-2">
       <div className="space-y-2">
         <label className="text-xs font-medium">Max file size (MB)</label>
-        <input
-          className="w-full rounded border px-2 py-1 text-sm"
+        <Input
           type="number"
           min={0}
           placeholder="e.g., 10"
@@ -198,8 +198,7 @@ function AttachmentDefEditor({ def, onChange }: { def: AttachmentFieldDef; onCha
       </div>
       <div className="space-y-2">
         <label className="text-xs font-medium">Accepted extensions</label>
-        <input
-          className="w-full rounded border px-2 py-1 text-sm"
+        <Input
           placeholder="e.g., pdf, jpg, png"
           value={exts}
           onChange={(e) => setExts(e.target.value)}
@@ -209,8 +208,7 @@ function AttachmentDefEditor({ def, onChange }: { def: AttachmentFieldDef; onCha
       </div>
       <div className="space-y-2">
         <label className="text-xs font-medium">Partition code</label>
-        <input
-          className="w-full rounded border px-2 py-1 text-sm"
+        <Input
           placeholder="e.g., productsMedia"
           value={partition}
           onChange={(e) => setPartition(e.target.value)}

package/src/modules/auth/api/users/route.ts

@@ -15,6 +15,7 @@ import type { EntityManager } from '@mikro-orm/postgresql'
 import { userCrudEvents, userCrudIndexer } from '@open-mercato/core/modules/auth/commands/users'
 import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { buildPasswordSchema } from '@open-mercato/shared/lib/auth/passwordPolicy'
+import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
 import { resolveSearchConfig } from '@open-mercato/shared/lib/search/config'
 import { tokenizeText } from '@open-mercato/shared/lib/search/tokenize'
 import { sql } from 'kysely'
@@ -156,14 +157,15 @@ export async function GET(req: Request) {
     console.error('users: failed to resolve rbac', err)
   }
   const { id, page, pageSize, search, organizationId, roleIds } = parsed.data
-  const where: any = { deletedAt: null }
+  const filters: any[] = [{ deletedAt: null }]
+  const actorTenantId = auth.tenantId ? String(auth.tenantId) : null
   if (!isSuperAdmin) {
-    if (!auth.tenantId) {
+    if (!actorTenantId) {
       return NextResponse.json({ items: [], total: 0, totalPages: 1, isSuperAdmin })
     }
-    where.tenantId = auth.tenantId
+    filters.push({ tenantId: actorTenantId })
   }
-  if (organizationId) where.organizationId = organizationId
+  if (organizationId) filters.push({ organizationId })
   let idFilter: Set<string> | null = id ? new Set([id]) : null
   if (Array.isArray(roleIds) && roleIds.length > 0) {
     const uniqueRoleIds = Array.from(new Set(roleIds))
@@ -183,33 +185,81 @@ export async function GET(req: Request) {
     }
     if (!idFilter || idFilter.size === 0) return NextResponse.json({ items: [], total: 0, totalPages: 1 })
   }
-  if (search) {
-    // Email is encrypted at rest, so $ilike on the column cannot match plaintext input.
-    // Resolve candidate users via search_tokens (tokens are built from the decrypted index doc).
+  const trimmedSearch = typeof search === 'string' ? search.trim() : ''
+  if (trimmedSearch) {
+    // Email is encrypted at rest, so plaintext search must go through search_tokens.
     const tenantScope: string | null | undefined = isSuperAdmin ? undefined : auth.tenantId ?? null
-    const matchedIds = await findUserIdsBySearchTokens(em, E.auth.user, search, tenantScope)
-    if (matchedIds !== null) {
-      if (matchedIds.length === 0) {
-        return NextResponse.json({ items: [], total: 0, totalPages: 1, isSuperAdmin })
-      }
-      const matchedSet = new Set(matchedIds)
-      if (idFilter) {
-        for (const uid of Array.from(idFilter)) {
-          if (!matchedSet.has(uid)) idFilter.delete(uid)
-        }
-        if (idFilter.size === 0) {
-          return NextResponse.json({ items: [], total: 0, totalPages: 1, isSuperAdmin })
-        }
-      } else {
-        idFilter = matchedSet
+    const searchFilters: any[] = []
+
+    const matchedIds = await findUserIdsBySearchTokens(em, E.auth.user, trimmedSearch, tenantScope)
+    if (matchedIds && matchedIds.length) {
+      searchFilters.push({ id: { $in: matchedIds as any } })
+    }
+
+    const searchPattern = `%${escapeLikePattern(trimmedSearch)}%`
+    const organizationSearchFilters: any[] = [
+      { deletedAt: null },
+      { name: { $ilike: searchPattern } },
+    ]
+    if (tenantScope) {
+      organizationSearchFilters.push({ tenant: tenantScope })
+    }
+    const matchingOrganizations = await em.find(
+      Organization,
+      organizationSearchFilters.length > 1 ? { $and: organizationSearchFilters } : organizationSearchFilters[0],
+    )
+    const matchingOrganizationIds = matchingOrganizations
+      .map((org) => (org?.id ? String(org.id) : null))
+      .filter((orgId): orgId is string => typeof orgId === 'string' && orgId.length > 0)
+    if (matchingOrganizationIds.length) {
+      searchFilters.push({ organizationId: { $in: matchingOrganizationIds as any } })
+    }
+
+    const roleSearchFilters: any[] = [
+      { deletedAt: null },
+      { name: { $ilike: searchPattern } },
+    ]
+    if (tenantScope) {
+      roleSearchFilters.push({ $or: [{ tenantId: tenantScope }, { tenantId: null }] })
+    }
+    const matchingRoles = await em.find(
+      Role,
+      roleSearchFilters.length > 1 ? { $and: roleSearchFilters } : roleSearchFilters[0],
+    )
+    const matchingRoleIds = matchingRoles
+      .map((role) => (role?.id ? String(role.id) : null))
+      .filter((roleId): roleId is string => typeof roleId === 'string' && roleId.length > 0)
+    if (matchingRoleIds.length) {
+      const roleSearchLinks = await em.find(
+        UserRole,
+        { role: { $in: matchingRoleIds as any } } as any,
+      )
+      const matchingRoleUserIds = Array.from(new Set(
+        roleSearchLinks
+          .map((link) => {
+            const userRef = (link as any).user
+            const userId = userRef?.id ?? userRef
+            return userId ? String(userId) : null
+          })
+          .filter((userId): userId is string => typeof userId === 'string' && userId.length > 0),
+      ))
+      if (matchingRoleUserIds.length) {
+        searchFilters.push({ id: { $in: matchingRoleUserIds as any } })
       }
     }
+
+    if (!searchFilters.length) {
+      return NextResponse.json({ items: [], total: 0, totalPages: 1, isSuperAdmin })
+    }
+
+    filters.push(searchFilters.length > 1 ? { $or: searchFilters } : searchFilters[0])
   }
   if (idFilter && idFilter.size) {
-    where.id = { $in: Array.from(idFilter) as any }
+    filters.push({ id: { $in: Array.from(idFilter) as any } })
   } else if (id) {
-    where.id = id
+    filters.push({ id })
   }
+  const where = filters.length > 1 ? { $and: filters } : filters[0]
   const [rows, count] = await em.findAndCount(User, where, { limit: pageSize, offset: (page - 1) * pageSize })
   const userIds = rows.map((u: any) => u.id)
   const links = userIds.length
@@ -402,7 +452,7 @@ export const openApi: OpenApiRouteDoc = {
     GET: {
       summary: 'List users',
       description:
-        'Returns users for the current tenant. Super administrators may scope the response via organization or role filters.',
+        'Returns users for the current tenant. Search matches email, organization name, and role name. Super administrators may scope the response via organization or role filters.',
       query: querySchema,
       responses: [
         { status: 200, description: 'User collection', schema: userListResponseSchema },

package/src/modules/auth/backend/users/create/page.tsx

@@ -10,6 +10,8 @@ import { OrganizationSelect } from '@open-mercato/core/modules/directory/compone
 import { TenantSelect } from '@open-mercato/core/modules/directory/components/TenantSelect'
 import { fetchRoleOptions } from '@open-mercato/core/modules/auth/backend/users/roleOptions'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
+import { RadioGroup } from '@open-mercato/ui/primitives/radio'
+import { RadioField } from '@open-mercato/ui/primitives/radio-field'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { formatPasswordRequirements, getPasswordPolicy } from '@open-mercato/shared/lib/auth/passwordPolicy'
 
@@ -395,26 +397,20 @@ function DashboardWidgetSelector({
       )}
       {!error && (
         <>
-          <div className="flex items-center gap-3 rounded-md border bg-muted/30 px-3 py-2">
-            <label className="flex items-center gap-2 text-sm">
-              <input
-                type="radio"
-                value="inherit"
-                checked={mode === 'inherit'}
-                onChange={() => onModeChange('inherit')}
-              />
-              {t('auth.users.widgets.mode.inherit', 'Inherit from roles')}
-            </label>
-            <label className="flex items-center gap-2 text-sm">
-              <input
-                type="radio"
-                value="override"
-                checked={mode === 'override'}
-                onChange={() => onModeChange('override')}
-              />
-              {t('auth.users.widgets.mode.override', 'Override for this user')}
-            </label>
-          </div>
+          <RadioGroup
+            className="flex flex-row items-center gap-3 rounded-md border bg-muted/30 px-3 py-2"
+            value={mode}
+            onValueChange={(next) => onModeChange(next as 'inherit' | 'override')}
+          >
+            <RadioField
+              value="inherit"
+              label={t('auth.users.widgets.mode.inherit', 'Inherit from roles')}
+            />
+            <RadioField
+              value="override"
+              label={t('auth.users.widgets.mode.override', 'Override for this user')}
+            />
+          </RadioGroup>
           {mode === 'override' && (
             <div className="space-y-2">
               {catalog.map((widget) => (