@open-mercato/core 0.6.8-develop.7100.1.fbf66fca35 → 0.7.0

package/src/modules/currencies/backend/exchange-rates/page.tsx

@@ -42,7 +42,6 @@ type ResponsePayload = {
   total: number
   page: number
   totalPages: number
-  totalIsCapped?: boolean
 }
 
 export default function ExchangeRatesPage() {
@@ -52,7 +51,6 @@ export default function ExchangeRatesPage() {
   const [page, setPage] = React.useState(1)
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
-  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const [search, setSearch] = React.useState('')
   const [filters, setFilters] = React.useState<FilterValues>({})
   const [isLoading, setIsLoading] = React.useState(true)
@@ -102,7 +100,6 @@ export default function ExchangeRatesPage() {
           setRows(Array.isArray(payload.items) ? payload.items : [])
           setTotal(payload.total || 0)
           setTotalPages(payload.totalPages || 1)
-          setTotalIsCapped(payload?.totalIsCapped === true)
         }
       } catch (error) {
         if (!cancelled) {
@@ -335,7 +332,7 @@ export default function ExchangeRatesPage() {
               createLabel={t('exchangeRates.list.actions.create')}
             />
           )}
-          pagination={{ page, pageSize: 50, total, totalPages, totalIsCapped, onPageChange: setPage }}
+          pagination={{ page, pageSize: 50, total, totalPages, onPageChange: setPage }}
           isLoading={isLoading}
           perspective={{ tableId: extensionPoints.hosts.exchangeRatesTable.tableId }}
         />

package/src/modules/customer_accounts/api/admin/domain-mappings.ts

@@ -14,7 +14,6 @@ import {
 import { registerDomainSchema } from '@open-mercato/core/modules/customer_accounts/data/validators'
 import {
   DomainMappingService,
-  DomainMappingOrgScopeError,
   type ResolveResult,
 } from '@open-mercato/core/modules/customer_accounts/services/domainMappingService'
 import { DomainMapping } from '@open-mercato/core/modules/customer_accounts/data/entities'
@@ -143,12 +142,6 @@ export async function POST(req: Request) {
         { status: 409 },
       )
     }
-    if (err instanceof DomainMappingOrgScopeError) {
-      return NextResponse.json(
-        { ok: false, error: 'Organization was not found in the current tenant.' },
-        { status: 400 },
-      )
-    }
     const message = err instanceof Error ? err.message : 'Failed to register domain'
     return NextResponse.json({ ok: false, error: message }, { status: 500 })
   }

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

@@ -34,7 +34,6 @@ type RolesResponse = {
   items?: RoleRow[]
   total?: number
   totalPages?: number
-  totalIsCapped?: boolean
 }
 
 export default function CustomerRolesPage() {
@@ -46,7 +45,6 @@ export default function CustomerRolesPage() {
   const [pageSize] = React.useState(50)
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
-  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const [search, setSearch] = React.useState('')
   const [isLoading, setIsLoading] = React.useState(true)
   const [reloadToken, setReloadToken] = React.useState(0)
@@ -90,7 +88,6 @@ export default function CustomerRolesPage() {
         setRows(items)
         setTotal(typeof payload?.total === 'number' ? payload.total : items.length)
         setTotalPages(typeof payload?.totalPages === 'number' ? payload.totalPages : 1)
-        setTotalIsCapped(payload?.totalIsCapped === true)
       } catch (err) {
         if (!cancelled) {
           const message = err instanceof Error ? err.message : t('customer_accounts.admin.roles.error.load', 'Failed to load roles')
@@ -243,7 +240,7 @@ export default function CustomerRolesPage() {
               ]}
             />
           )}
-          pagination={{ page, pageSize, total, totalPages, totalIsCapped, onPageChange: setPage }}
+          pagination={{ page, pageSize, total, totalPages, onPageChange: setPage }}
           isLoading={isLoading}
         />
       </PageBody>

package/src/modules/customer_accounts/backend/customer_accounts/settings/CustomerAccountsSettingsPageClient.tsx

@@ -0,0 +1,138 @@
+"use client"
+
+import { useMemo } from 'react'
+import Link from 'next/link'
+import { FormHeader } from '@open-mercato/ui/backend/forms'
+import { Button } from '@open-mercato/ui/primitives/button'
+import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { buildPortalRootUrl, buildPortalUrlPattern } from '../../../lib/portalUrl'
+
+const DEMO_CREDENTIALS = [
+  { email: 'alice.johnson@example.com', password: 'Password123!', role: 'Portal Admin' },
+  { email: 'bob.smith@example.com', password: 'Password123!', role: 'Buyer' },
+  { email: 'carol.white@example.com', password: 'Password123!', role: 'Viewer' },
+] as const
+
+export type CustomerAccountsSettingsPageClientProps = {
+  portalOrigin: string
+}
+
+export function CustomerAccountsSettingsPageClient({ portalOrigin }: CustomerAccountsSettingsPageClientProps) {
+  const t = useT()
+
+  const portalUrl = useMemo(() => buildPortalUrlPattern(portalOrigin), [portalOrigin])
+  const portalRootUrl = useMemo(() => buildPortalRootUrl(portalOrigin), [portalOrigin])
+
+  return (
+    <>
+      <div className="px-3 py-3 md:px-6 md:py-4">
+        <FormHeader
+          mode="detail"
+          title={t('customer_accounts.settings.title', 'Portal Settings')}
+          backHref="/backend/customer_accounts/users"
+          backLabel={t('customer_accounts.settings.back', 'Customer Users')}
+        />
+      </div>
+
+      <div className="max-w-2xl space-y-6">
+        <div className="rounded-lg border p-4 space-y-3">
+          <h3 className="text-sm font-semibold">
+            {t('customer_accounts.settings.portal_access.title', 'Portal Access')}
+          </h3>
+          <div>
+            <p className="text-sm text-muted-foreground">
+              {t('customer_accounts.settings.portal_access.url_label', 'Portal URL pattern:')}
+            </p>
+            <code className="mt-1 block rounded bg-muted px-3 py-2 text-sm font-mono">
+              {portalUrl}
+            </code>
+          </div>
+          <div>
+            <Button type="button" variant="outline" size="sm" asChild>
+              <a href={portalRootUrl} target="_blank" rel="noopener noreferrer">
+                {t('customer_accounts.settings.portal_access.open_portal', 'Open Portal')}
+              </a>
+            </Button>
+          </div>
+          <p className="text-xs text-muted-foreground">
+            {t(
+              'customer_accounts.settings.portal_access.slug_note',
+              'The organization slug is auto-generated from the organization name. You can view and manage organizations in Directory \u2192 Organizations.',
+            )}
+          </p>
+          <p className="text-xs text-muted-foreground">
+            <Link href="/backend/directory/organizations" className="text-primary underline underline-offset-4 hover:text-primary/80">
+              {t('customer_accounts.settings.portal_access.manage_orgs', 'Manage Organizations')}
+            </Link>
+          </p>
+        </div>
+
+        <div className="rounded-lg border p-4 space-y-3">
+          <h3 className="text-sm font-semibold">
+            {t('customer_accounts.settings.demo_credentials.title', 'Demo Credentials')}
+          </h3>
+          <div className="overflow-x-auto">
+            <table className="w-full text-sm">
+              <thead>
+                <tr className="border-b text-left">
+                  <th className="pb-2 pr-4 font-medium text-muted-foreground">
+                    {t('customer_accounts.settings.demo_credentials.email', 'Email')}
+                  </th>
+                  <th className="pb-2 pr-4 font-medium text-muted-foreground">
+                    {t('customer_accounts.settings.demo_credentials.password', 'Password')}
+                  </th>
+                  <th className="pb-2 font-medium text-muted-foreground">
+                    {t('customer_accounts.settings.demo_credentials.role', 'Role')}
+                  </th>
+                </tr>
+              </thead>
+              <tbody>
+                {DEMO_CREDENTIALS.map((cred) => (
+                  <tr key={cred.email} className="border-b last:border-0">
+                    <td className="py-2 pr-4 font-mono text-xs">{cred.email}</td>
+                    <td className="py-2 pr-4 font-mono text-xs">{cred.password}</td>
+                    <td className="py-2 text-xs">{cred.role}</td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+          <p className="text-xs text-muted-foreground">
+            {t(
+              'customer_accounts.settings.demo_credentials.note',
+              'These credentials are only available if example data was seeded during setup.',
+            )}
+          </p>
+        </div>
+
+        <div className="rounded-lg border p-4 space-y-3">
+          <h3 className="text-sm font-semibold">
+            {t('customer_accounts.settings.quick_links.title', 'Quick Links')}
+          </h3>
+          <ul className="space-y-2">
+            <li>
+              <Link href="/backend/customer_accounts/users" className="text-sm text-primary underline underline-offset-4 hover:text-primary/80">
+                {t('customer_accounts.settings.quick_links.manage_users', 'Manage customer users')}
+              </Link>
+            </li>
+            <li>
+              <Link href="/backend/customer_accounts/roles" className="text-sm text-primary underline underline-offset-4 hover:text-primary/80">
+                {t('customer_accounts.settings.quick_links.manage_roles', 'Manage customer roles')}
+              </Link>
+            </li>
+            <li>
+              <a
+                href="https://docs.open-mercato.com/framework/modules/customer-portal"
+                target="_blank"
+                rel="noopener noreferrer"
+                className="text-sm text-primary underline underline-offset-4 hover:text-primary/80"
+              >
+                {t('customer_accounts.settings.quick_links.portal_docs', 'Portal documentation')}
+              </a>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </>
+  )
+}

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

@@ -1,139 +1,15 @@
-"use client"
-
-import { useMemo } from 'react'
-import Link from 'next/link'
+import { headers } from 'next/headers'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
-import { FormHeader } from '@open-mercato/ui/backend/forms'
-import { Button } from '@open-mercato/ui/primitives/button'
-import { useT } from '@open-mercato/shared/lib/i18n/context'
-
-function useOrigin() {
-  return typeof window !== 'undefined' ? window.location.origin : ''
-}
-
-const DEMO_CREDENTIALS = [
-  { email: 'alice.johnson@example.com', password: 'Password123!', role: 'Portal Admin' },
-  { email: 'bob.smith@example.com', password: 'Password123!', role: 'Buyer' },
-  { email: 'carol.white@example.com', password: 'Password123!', role: 'Viewer' },
-] as const
-
-export default function CustomerAccountsSettingsPage() {
-  const t = useT()
-  const origin = useOrigin()
-
-  const portalUrl = useMemo(() => `${origin}/[org-slug]/portal`, [origin])
+import { resolvePortalRequestOrigin } from '../../../lib/portalUrl'
+import { CustomerAccountsSettingsPageClient } from './CustomerAccountsSettingsPageClient'
 
+export default async function CustomerAccountsSettingsPage() {
+  const portalOrigin = resolvePortalRequestOrigin(await headers())
   return (
     <Page>
-      <div className="px-3 py-3 md:px-6 md:py-4">
-        <FormHeader
-          mode="detail"
-          title={t('customer_accounts.settings.title', 'Portal Settings')}
-          backHref="/backend/customer_accounts/users"
-          backLabel={t('customer_accounts.settings.back', 'Customer Users')}
-        />
-      </div>
-
-      <PageBody>
-        <div className="max-w-2xl space-y-6">
-          <div className="rounded-lg border p-4 space-y-3">
-            <h3 className="text-sm font-semibold">
-              {t('customer_accounts.settings.portal_access.title', 'Portal Access')}
-            </h3>
-            <div>
-              <p className="text-sm text-muted-foreground">
-                {t('customer_accounts.settings.portal_access.url_label', 'Portal URL pattern:')}
-              </p>
-              <code className="mt-1 block rounded bg-muted px-3 py-2 text-sm font-mono">
-                {portalUrl}
-              </code>
-            </div>
-            <div>
-              <Button type="button" variant="outline" size="sm" asChild>
-                <a href={`${origin}/portal`} target="_blank" rel="noopener noreferrer">
-                  {t('customer_accounts.settings.portal_access.open_portal', 'Open Portal')}
-                </a>
-              </Button>
-            </div>
-            <p className="text-xs text-muted-foreground">
-              {t(
-                'customer_accounts.settings.portal_access.slug_note',
-                'The organization slug is auto-generated from the organization name. You can view and manage organizations in Directory \u2192 Organizations.',
-              )}
-            </p>
-            <p className="text-xs text-muted-foreground">
-              <Link href="/backend/directory/organizations" className="text-primary underline underline-offset-4 hover:text-primary/80">
-                {t('customer_accounts.settings.portal_access.manage_orgs', 'Manage Organizations')}
-              </Link>
-            </p>
-          </div>
-
-          <div className="rounded-lg border p-4 space-y-3">
-            <h3 className="text-sm font-semibold">
-              {t('customer_accounts.settings.demo_credentials.title', 'Demo Credentials')}
-            </h3>
-            <div className="overflow-x-auto">
-              <table className="w-full text-sm">
-                <thead>
-                  <tr className="border-b text-left">
-                    <th className="pb-2 pr-4 font-medium text-muted-foreground">
-                      {t('customer_accounts.settings.demo_credentials.email', 'Email')}
-                    </th>
-                    <th className="pb-2 pr-4 font-medium text-muted-foreground">
-                      {t('customer_accounts.settings.demo_credentials.password', 'Password')}
-                    </th>
-                    <th className="pb-2 font-medium text-muted-foreground">
-                      {t('customer_accounts.settings.demo_credentials.role', 'Role')}
-                    </th>
-                  </tr>
-                </thead>
-                <tbody>
-                  {DEMO_CREDENTIALS.map((cred) => (
-                    <tr key={cred.email} className="border-b last:border-0">
-                      <td className="py-2 pr-4 font-mono text-xs">{cred.email}</td>
-                      <td className="py-2 pr-4 font-mono text-xs">{cred.password}</td>
-                      <td className="py-2 text-xs">{cred.role}</td>
-                    </tr>
-                  ))}
-                </tbody>
-              </table>
-            </div>
-            <p className="text-xs text-muted-foreground">
-              {t(
-                'customer_accounts.settings.demo_credentials.note',
-                'These credentials are only available if example data was seeded during setup.',
-              )}
-            </p>
-          </div>
-
-          <div className="rounded-lg border p-4 space-y-3">
-            <h3 className="text-sm font-semibold">
-              {t('customer_accounts.settings.quick_links.title', 'Quick Links')}
-            </h3>
-            <ul className="space-y-2">
-              <li>
-                <Link href="/backend/customer_accounts/users" className="text-sm text-primary underline underline-offset-4 hover:text-primary/80">
-                  {t('customer_accounts.settings.quick_links.manage_users', 'Manage customer users')}
-                </Link>
-              </li>
-              <li>
-                <Link href="/backend/customer_accounts/roles" className="text-sm text-primary underline underline-offset-4 hover:text-primary/80">
-                  {t('customer_accounts.settings.quick_links.manage_roles', 'Manage customer roles')}
-                </Link>
-              </li>
-              <li>
-                <a
-                  href="https://docs.open-mercato.com/framework/modules/customer-portal"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="text-sm text-primary underline underline-offset-4 hover:text-primary/80"
-                >
-                  {t('customer_accounts.settings.quick_links.portal_docs', 'Portal documentation')}
-                </a>
-              </li>
-            </ul>
-          </div>
-        </div>
+      {/* space-y-6 preserves the gap the page header previously got as a direct <Page> child. */}
+      <PageBody className="space-y-6">
+        <CustomerAccountsSettingsPageClient portalOrigin={portalOrigin} />
       </PageBody>
     </Page>
   )