@open-mercato/core 0.6.6-develop.6551.1.1511bfa890 → 0.6.6

package/src/modules/customers/components/detail/DealDetailTabs.tsx

@@ -2,8 +2,9 @@
 
 import * as React from 'react'
 import { Activity, Building2, History, NotebookPen, Paperclip, Users } from 'lucide-react'
+import { cn } from '@open-mercato/shared/lib/utils'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
-import { Tabs, TabsList, TabsTrigger } from '@open-mercato/ui/primitives/tabs'
+import { Button } from '@open-mercato/ui/primitives/button'
 
 export type DealTabId =
   | 'activities'
@@ -18,7 +19,7 @@ type TabDef = {
   id: DealTabId
   label: string
   icon?: React.ReactNode
-  count?: React.ReactNode
+  badge?: React.ReactNode
 }
 
 type DealDetailTabsProps = {
@@ -37,9 +38,21 @@ export function resolveLegacyTab(tab: string | null | undefined): DealTabId {
   return SUPPORTED_TAB_IDS.has(tab as DealTabId) ? (tab as DealTabId) : 'activities'
 }
 
-function formatTabCount(count: number): string | number | undefined {
-  if (count <= 0) return undefined
-  return count > 999 ? '999+' : count
+function CountBadge({ count }: { count: number }) {
+  if (count <= 0) return null
+  return (
+    <span className="ml-1.5 rounded-sm bg-muted px-1.5 py-px text-xs font-semibold leading-none text-muted-foreground">
+      {count > 999 ? '999+' : count}
+    </span>
+  )
+}
+
+function NewBadge() {
+  return (
+    <span className="ml-1.5 rounded-sm bg-muted px-1.5 py-px text-xs font-semibold leading-none text-muted-foreground">
+      NEW
+    </span>
+  )
 }
 
 export function DealDetailTabs({
@@ -63,13 +76,13 @@ export function DealDetailTabs({
         id: 'people',
         label: t('customers.deals.detail.tabs.people', 'People'),
         icon: <Users className="size-4" />,
-        count: formatTabCount(peopleCount),
+        badge: <CountBadge count={peopleCount} />,
       },
       {
         id: 'companies',
         label: t('customers.deals.detail.tabs.companies', 'Companies'),
         icon: <Building2 className="size-4" />,
-        count: formatTabCount(companiesCount),
+        badge: <CountBadge count={companiesCount} />,
       },
       {
         id: 'notes',
@@ -85,7 +98,7 @@ export function DealDetailTabs({
         id: 'changelog',
         label: t('customers.deals.detail.tabs.changelog', 'Changelog'),
         icon: <History className="size-4" />,
-        count: 'NEW',
+        badge: <NewBadge />,
       },
     ],
     [companiesCount, peopleCount, t],
@@ -104,22 +117,34 @@ export function DealDetailTabs({
 
   return (
     <div>
-      <Tabs
-        value={activeTab}
-        onValueChange={(value) => onTabChange(value as DealTabId)}
-        variant="underline"
-      >
-        <TabsList
-          aria-label={t('customers.deals.detail.tabs.label', 'Deal detail sections')}
-          className="w-full overflow-x-auto"
-        >
-          {allTabs.map((tab) => (
-            <TabsTrigger key={tab.id} value={tab.id} leading={tab.icon} count={tab.count}>
-              {tab.label}
-            </TabsTrigger>
-          ))}
-        </TabsList>
-      </Tabs>
+      <div className="border-b border-border" role="tablist" aria-label={t('customers.deals.detail.tabs.label', 'Deal detail sections')}>
+        <nav className="-mb-px flex gap-7 overflow-x-auto" role="presentation">
+          {allTabs.map((tab) => {
+            const isActive = activeTab === tab.id
+            return (
+              <Button
+                key={tab.id}
+                type="button"
+                variant="ghost"
+                size="sm"
+                role="tab"
+                aria-selected={isActive}
+                onClick={() => onTabChange(tab.id)}
+                className={cn(
+                  'h-auto shrink-0 rounded-none border-b-2 px-3 py-2.5 hover:bg-transparent',
+                  isActive
+                    ? 'border-foreground text-foreground font-semibold'
+                    : 'border-transparent text-muted-foreground hover:text-foreground',
+                )}
+              >
+                {tab.icon ? <span className="mr-1.5">{tab.icon}</span> : null}
+                {tab.label}
+                {tab.badge}
+              </Button>
+            )
+          })}
+        </nav>
+      </div>
 
       <div className="pt-5" role="tabpanel">
         {children}

package/src/modules/customers/components/detail/DetailTabsLayout.tsx

@@ -3,7 +3,6 @@
 import * as React from 'react'
 import type { SectionAction } from '@open-mercato/ui/backend/detail'
 import { Button } from '@open-mercato/ui/primitives/button'
-import { Tabs, TabsList, TabsTrigger } from '@open-mercato/ui/primitives/tabs'
 import { cn } from '@open-mercato/shared/lib/utils'
 import { Plus } from 'lucide-react'
 
@@ -47,19 +46,31 @@ export function DetailTabsLayout<TId extends string = string>({
   return (
     <div className={cn('space-y-4', className)}>
       <div className={cn('flex flex-wrap items-center justify-between gap-3', headerClassName)}>
-        <Tabs
-          value={activeTab}
-          onValueChange={(value) => handleTabChange(value as TId)}
-          variant="underline"
+        <nav
+          className={cn('flex flex-wrap items-center gap-3 text-sm', navClassName)}
+          role="tablist"
+          aria-label={navAriaLabel}
         >
-          <TabsList className={cn('h-auto flex-wrap border-b-0', navClassName)} aria-label={navAriaLabel}>
-            {tabs.map((tab) => (
-              <TabsTrigger key={tab.id} value={tab.id}>
-                {tab.label}
-              </TabsTrigger>
-            ))}
-          </TabsList>
-        </Tabs>
+          {tabs.map((tab) => (
+            <Button
+              key={tab.id}
+              type="button"
+              variant="ghost"
+              size="sm"
+              role="tab"
+              aria-selected={activeTab === tab.id}
+              onClick={() => handleTabChange(tab.id)}
+              className={cn(
+                'h-auto rounded-none border-b-2 px-0 py-1',
+                activeTab === tab.id
+                  ? 'border-accent-indigo text-foreground hover:bg-transparent'
+                  : 'border-transparent text-muted-foreground hover:text-foreground hover:bg-transparent'
+              )}
+            >
+              {tab.label}
+            </Button>
+          ))}
+        </nav>
         {sectionAction ? (
           <Button
             type="button"

package/src/modules/customers/components/detail/MobilePersonDetail.tsx

@@ -3,7 +3,8 @@
 import * as React from 'react'
 import { useRouter, useSearchParams } from 'next/navigation'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
-import { Tabs, TabsList, TabsTrigger } from '@open-mercato/ui/primitives/tabs'
+import { cn } from '@open-mercato/shared/lib/utils'
+import { Button } from '@open-mercato/ui/primitives/button'
 
 export type MobilePersonZone = 'details' | 'activity'
 
@@ -79,30 +80,35 @@ export function MobilePersonDetail({
 
   return (
     <div className="space-y-4">
-      <div onKeyDown={handleKeyDown}>
-        <Tabs
-          value={zone}
-          onValueChange={(value) => handleZoneChange(value as MobilePersonZone)}
-          variant="underline"
-        >
-          <TabsList
-            aria-label={t(
-              'customers.people.mobile.zoneSwitcher.ariaLabel',
-              'Zone selector',
-            )}
-            className="w-full"
-          >
-            {ZONES.map((entry) => (
-              <TabsTrigger
-                key={entry.id}
-                value={entry.id}
-                className="flex-1 justify-center"
-              >
-                {t(entry.labelKey, entry.fallback)}
-              </TabsTrigger>
-            ))}
-          </TabsList>
-        </Tabs>
+      <div
+        role="tablist"
+        aria-label={t(
+          'customers.people.mobile.zoneSwitcher.ariaLabel',
+          'Zone selector',
+        )}
+        className="grid grid-cols-2 gap-1 rounded-lg border border-border/70 bg-muted/20 p-1"
+        onKeyDown={handleKeyDown}
+      >
+        {ZONES.map((entry) => {
+          const isActive = zone === entry.id
+          return (
+            <Button
+              key={entry.id}
+              type="button"
+              role="tab"
+              aria-selected={isActive}
+              aria-controls={`mobile-person-zone-${entry.id}`}
+              variant={isActive ? 'default' : 'ghost'}
+              className={cn(
+                'h-11 rounded-lg text-sm font-semibold',
+                isActive ? '' : 'text-muted-foreground',
+              )}
+              onClick={() => handleZoneChange(entry.id)}
+            >
+              {t(entry.labelKey, entry.fallback)}
+            </Button>
+          )
+        })}
       </div>
       <div
         id={`mobile-person-zone-${zone}`}

package/src/modules/customers/components/detail/PersonDetailTabs.tsx

@@ -1,9 +1,9 @@
 "use client"
 
 import * as React from 'react'
+import { cn } from '@open-mercato/shared/lib/utils'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { Button } from '@open-mercato/ui/primitives/button'
-import { Tabs, TabsList, TabsTrigger } from '@open-mercato/ui/primitives/tabs'
 import {
   SquareCheckBig,
   Mail,
@@ -32,7 +32,7 @@ type TabDef = {
   id: PersonTabId
   label: string
   icon?: React.ReactNode
-  count?: React.ReactNode
+  badge?: React.ReactNode
 }
 
 type PersonDetailTabsProps = {
@@ -56,9 +56,21 @@ export function resolveLegacyTab(tab: string | null | undefined): PersonTabId {
   return SUPPORTED_TAB_IDS.has(tab as PersonTabId) ? (tab as PersonTabId) : 'activities'
 }
 
-function formatTabCount(count: number): string | number | undefined {
-  if (count <= 0) return undefined
-  return count > 999 ? '999+' : count
+function CountBadge({ count }: { count: number }) {
+  if (count <= 0) return null
+  return (
+    <span className="ml-1 rounded-full bg-muted px-1.5 py-0.5 text-xs font-medium leading-none text-muted-foreground">
+      {count > 999 ? '999+' : count}
+    </span>
+  )
+}
+
+function NewBadge() {
+  return (
+    <span className="ml-1.5 rounded bg-foreground px-1.5 py-0.5 text-overline font-semibold leading-none text-background">
+      NEW
+    </span>
+  )
 }
 
 export function PersonDetailTabs({
@@ -82,7 +94,7 @@ export function PersonDetailTabs({
         id: 'activities',
         label: t('customers.people.detail.tabs.activities', 'Activities'),
         icon: <SquareCheckBig className="size-4" />,
-        count: formatTabCount(activitiesCount),
+        badge: <CountBadge count={activitiesCount} />,
       },
       {
         id: 'emails',
@@ -93,37 +105,37 @@ export function PersonDetailTabs({
         id: 'deals',
         label: t('customers.people.detail.tabs.deals', 'Deals'),
         icon: <Briefcase className="size-4" />,
-        count: formatTabCount(dealsCount),
+        badge: <CountBadge count={dealsCount} />,
       },
       {
         id: 'companies',
         label: t('customers.people.detail.tabs.companies', 'Companies'),
         icon: <Building2 className="size-4" />,
-        count: formatTabCount(companiesCount),
+        badge: <CountBadge count={companiesCount} />,
       },
       {
         id: 'addresses',
         label: t('customers.people.detail.tabs.addresses', 'Addresses'),
         icon: <MapPin className="size-4" />,
-        count: formatTabCount(addressesCount),
+        badge: <CountBadge count={addressesCount} />,
       },
       {
         id: 'tasks',
         label: t('customers.people.detail.tabs.tasks', 'Tasks'),
         icon: <Check className="size-4" />,
-        count: formatTabCount(tasksCount),
+        badge: <CountBadge count={tasksCount} />,
       },
       {
         id: 'changelog',
         label: t('customers.people.detail.tabs.changelog', 'Change log'),
         icon: <History className="size-4" />,
-        count: 'NEW',
+        badge: <NewBadge />,
       },
       {
         id: 'files',
         label: t('customers.people.detail.tabs.files', 'Files'),
         icon: <Paperclip className="size-4" />,
-        count: formatTabCount(filesCount),
+        badge: <CountBadge count={filesCount} />,
       },
     ],
     [t, activitiesCount, dealsCount, companiesCount, addressesCount, tasksCount, filesCount],
@@ -143,24 +155,33 @@ export function PersonDetailTabs({
   return (
     <div>
       {/* Tab navigation — full width above both zones */}
-      <div className="flex items-end justify-between gap-2 border-b">
-        <Tabs
-          value={activeTab}
-          onValueChange={(value) => onTabChange(value as PersonTabId)}
-          variant="underline"
-          className="min-w-0 flex-1"
-        >
-          <TabsList
-            aria-label={t('customers.people.detail.tabs.label', 'Person detail sections')}
-            className="-mb-px w-full overflow-x-auto border-b-0 px-1"
-          >
-            {allTabs.map((tab) => (
-              <TabsTrigger key={tab.id} value={tab.id} leading={tab.icon} count={tab.count}>
+      <div className="flex items-end justify-between gap-2 border-b" role="tablist" aria-label={t('customers.people.detail.tabs.label', 'Person detail sections')}>
+        <nav className="-mb-px flex flex-1 gap-1 overflow-x-auto px-1">
+          {allTabs.map((tab) => {
+            const isActive = activeTab === tab.id
+            return (
+              <Button
+                key={tab.id}
+                type="button"
+                variant="ghost"
+                size="sm"
+                role="tab"
+                aria-selected={isActive}
+                onClick={() => onTabChange(tab.id)}
+                className={cn(
+                  'h-auto shrink-0 rounded-none border-b-2 px-3 py-2.5 hover:bg-transparent',
+                  isActive
+                    ? 'border-foreground text-foreground font-semibold'
+                    : 'border-transparent text-muted-foreground hover:text-foreground',
+                )}
+              >
+                {tab.icon && <span className="mr-1.5">{tab.icon}</span>}
                 {tab.label}
-              </TabsTrigger>
-            ))}
-          </TabsList>
-        </Tabs>
+                {tab.badge}
+              </Button>
+            )
+          })}
+        </nav>
         {sectionAction ? (
           <Button
             type="button"

package/src/modules/dashboards/api/roles/widgets/route.ts

@@ -6,10 +6,7 @@ import { DashboardRoleWidgets } from '@open-mercato/core/modules/dashboards/data
 import { Role } from '@open-mercato/core/modules/auth/data/entities'
 import { roleWidgetSettingsSchema } from '@open-mercato/core/modules/dashboards/data/validators'
 import { loadAllWidgets } from '@open-mercato/core/modules/dashboards/lib/widgets'
-import {
-  resolveWidgetAssignmentReadScope,
-  resolveWidgetAssignmentTargetAccess,
-} from '@open-mercato/core/modules/dashboards/lib/widgetAssignmentScope'
+import { resolveWidgetAssignmentReadScope } from '@open-mercato/core/modules/dashboards/lib/widgetAssignmentScope'
 import { hasFeature } from '@open-mercato/shared/security/features'
 import {
   runCrudMutationGuardAfterSuccess,
@@ -73,15 +70,7 @@ export async function GET(req: Request) {
   })
 
   const role = await em.findOne(Role, { id: roleId, deletedAt: null })
-  const access = resolveWidgetAssignmentTargetAccess({
-    isSuperAdmin: !!acl.isSuperAdmin,
-    scopeTenantId: tenantId,
-    target: role,
-  })
-  if (access === 'forbidden') {
-    return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
-  }
-  if (access === 'not-found') {
+  if (!role || (tenantId && role.tenantId !== tenantId)) {
     return NextResponse.json({ error: 'Role not found' }, { status: 404 })
   }
 
@@ -132,15 +121,7 @@ export async function PUT(req: Request) {
   const organizationId = auth.orgId ?? null
 
   const role = await em.findOne(Role, { id: parsed.data.roleId, deletedAt: null })
-  const access = resolveWidgetAssignmentTargetAccess({
-    isSuperAdmin: !!acl.isSuperAdmin,
-    scopeTenantId: tenantId,
-    target: role,
-  })
-  if (access === 'forbidden') {
-    return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
-  }
-  if (access === 'not-found') {
+  if (!role || (tenantId && role.tenantId !== tenantId)) {
     return NextResponse.json({ error: 'Role not found' }, { status: 404 })
   }
 

package/src/modules/dashboards/api/users/widgets/route.ts

@@ -7,10 +7,7 @@ import { User } from '@open-mercato/core/modules/auth/data/entities'
 import { userWidgetSettingsSchema } from '@open-mercato/core/modules/dashboards/data/validators'
 import { loadAllWidgets } from '@open-mercato/core/modules/dashboards/lib/widgets'
 import { resolveAllowedWidgetIds } from '@open-mercato/core/modules/dashboards/lib/access'
-import {
-  resolveWidgetAssignmentReadScope,
-  resolveWidgetAssignmentTargetAccess,
-} from '@open-mercato/core/modules/dashboards/lib/widgetAssignmentScope'
+import { resolveWidgetAssignmentReadScope } from '@open-mercato/core/modules/dashboards/lib/widgetAssignmentScope'
 import { hasFeature } from '@open-mercato/shared/security/features'
 import {
   runCrudMutationGuardAfterSuccess,
@@ -56,15 +53,7 @@ export async function GET(req: Request) {
   })
 
   const targetUserForRead = await em.findOne(User, { id: userId, deletedAt: null })
-  const readAccess = resolveWidgetAssignmentTargetAccess({
-    isSuperAdmin: !!acl.isSuperAdmin,
-    scopeTenantId: tenantId,
-    target: targetUserForRead,
-  })
-  if (readAccess === 'forbidden') {
-    return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
-  }
-  if (readAccess === 'not-found') {
+  if (!targetUserForRead || (tenantId && (targetUserForRead.tenantId ?? null) !== tenantId)) {
     return NextResponse.json({ error: 'User not found' }, { status: 404 })
   }
 
@@ -132,15 +121,7 @@ export async function PUT(req: Request) {
   const organizationId = auth.orgId ?? null
 
   const targetUser = await em.findOne(User, { id: parsed.data.userId, deletedAt: null })
-  const writeAccess = resolveWidgetAssignmentTargetAccess({
-    isSuperAdmin: !!acl.isSuperAdmin,
-    scopeTenantId: tenantId,
-    target: targetUser,
-  })
-  if (writeAccess === 'forbidden') {
-    return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
-  }
-  if (writeAccess === 'not-found') {
+  if (!targetUser || (tenantId && (targetUser.tenantId ?? null) !== tenantId)) {
     return NextResponse.json({ error: 'User not found' }, { status: 404 })
   }
 

package/src/modules/dashboards/cli.ts

@@ -6,7 +6,6 @@ import { Role } from '@open-mercato/core/modules/auth/data/entities'
 import { loadAllWidgets } from '@open-mercato/core/modules/dashboards/lib/widgets'
 import { appendWidgetsToRoles, resolveAnalyticsWidgetIds } from '@open-mercato/core/modules/dashboards/lib/role-widgets'
 import { seedAnalyticsData } from './seed/analytics'
-import { parseCommaSeparatedList } from '@open-mercato/shared/lib/string'
 
 type Args = Record<string, string>
 
@@ -109,7 +108,10 @@ const seedDefaults: ModuleCli = {
       return
     }
 
-    const roleNames = parseCommaSeparatedList(roleCsv)
+    const roleNames = roleCsv
+      .split(',')
+      .map((name) => name.trim())
+      .filter(Boolean)
 
     if (!roleNames.length) {
       console.log('No roles provided, nothing to seed.')
@@ -123,7 +125,7 @@ const seedDefaults: ModuleCli = {
       tenantId,
       organizationId,
       roleNames,
-      widgetIds: widgetCsv ? parseCommaSeparatedList(widgetCsv) : undefined,
+      widgetIds: widgetCsv ? widgetCsv.split(',').map((id) => id.trim()).filter(Boolean) : undefined,
       logger: (message) => console.log(message),
     })
   },
@@ -141,7 +143,10 @@ const enableAnalyticsWidgets: ModuleCli = {
       return
     }
 
-    const roleNames = parseCommaSeparatedList(roleCsv)
+    const roleNames = roleCsv
+      .split(',')
+      .map((name) => name.trim())
+      .filter(Boolean)
 
     if (!roleNames.length) {
       console.log('No roles provided, nothing to update.')

package/src/modules/dashboards/lib/widgetAssignmentScope.ts

@@ -8,24 +8,6 @@ export type ResolvedAssignmentScope = {
   organizationId: string | null
 }
 
-export type WidgetAssignmentTarget = {
-  tenantId?: string | null
-}
-
-export type WidgetAssignmentTargetAccess = 'allowed' | 'forbidden' | 'not-found'
-
-export function resolveWidgetAssignmentTargetAccess(params: {
-  isSuperAdmin: boolean
-  scopeTenantId: string | null
-  target: WidgetAssignmentTarget | null | undefined
-}): WidgetAssignmentTargetAccess {
-  const { isSuperAdmin, scopeTenantId, target } = params
-  if (!isSuperAdmin && !scopeTenantId) return 'forbidden'
-  if (!target) return 'not-found'
-  if (scopeTenantId && (target.tenantId ?? null) !== scopeTenantId) return 'not-found'
-  return 'allowed'
-}
-
 export function resolveWidgetAssignmentReadScope(params: {
   auth: AuthScopeInput
   isSuperAdmin: boolean

package/src/modules/dictionaries/commands/entries.ts

@@ -4,13 +4,22 @@ import {
   dictionaryEntryCommandCreateSchema,
   dictionaryEntryCommandUpdateSchema,
 } from '@open-mercato/core/modules/dictionaries/data/validators'
-import {
-  ensureDictionaryEntryScope,
-  registerDictionaryEntryCommands,
-} from '@open-mercato/core/modules/dictionaries/commands/factory'
+import { registerDictionaryEntryCommands } from '@open-mercato/core/modules/dictionaries/commands/factory'
+import type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 
+function ensureScope(ctx: CommandRuntimeContext, scope: { tenantId: string; organizationId: string }): void {
+  const tenantId = ctx.auth?.tenantId ?? null
+  if (tenantId && tenantId !== scope.tenantId) {
+    throw new CrudHttpError(403, { error: 'Forbidden' })
+  }
+  const organizationId = ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null
+  if (organizationId && organizationId !== scope.organizationId) {
+    throw new CrudHttpError(403, { error: 'Forbidden' })
+  }
+}
+
 async function ensureDictionary(em: EntityManager, id: string): Promise<Dictionary> {
   const dictionary = await em.findOne(Dictionary, {
     id,
@@ -28,12 +37,12 @@ registerDictionaryEntryCommands({
   translationKeyPrefix: 'dictionaries.entries',
   createSchema: dictionaryEntryCommandCreateSchema,
   updateSchema: dictionaryEntryCommandUpdateSchema,
-  ensureScope: ensureDictionaryEntryScope,
+  ensureScope,
   duplicateError: 'An entry with this value already exists.',
   resolveDictionaryForCreate: async ({ em, ctx, parsed }) => {
     const dictionary = await ensureDictionary(em, parsed.dictionaryId)
     const scope = { tenantId: dictionary.tenantId, organizationId: dictionary.organizationId }
-    ensureDictionaryEntryScope(ctx, scope)
+    ensureScope(ctx, scope)
     return { dictionary, scope }
   },
   resolveEntry: async ({ em, ctx, id }) => {
@@ -45,7 +54,7 @@ registerDictionaryEntryCommands({
       throw new CrudHttpError(404, { error: 'Dictionary not found' })
     }
     const scope = { tenantId: entry.tenantId, organizationId: entry.organizationId }
-    ensureDictionaryEntryScope(ctx, scope)
+    ensureScope(ctx, scope)
     return { entry, dictionary: entry.dictionary, scope }
   },
   ensureDictionaryForUndo: async ({ em, snapshot }) => {