@open-mercato/core 0.6.4-develop.3996.1.430e257cfc → 0.6.4-develop.4011.1.4f3ed9ae3e

package/src/modules/customers/acl.ts

@@ -1,23 +1,83 @@
 export const features = [
   { id: 'customers.people.view', title: 'View people', module: 'customers' },
-  { id: 'customers.people.manage', title: 'Manage people', module: 'customers' },
+  {
+    id: 'customers.people.manage',
+    title: 'Manage people',
+    module: 'customers',
+    dependsOn: ['customers.people.view'],
+  },
   { id: 'customers.companies.view', title: 'View companies', module: 'customers' },
-  { id: 'customers.companies.manage', title: 'Manage companies', module: 'customers' },
-  { id: 'customers.deals.view', title: 'View deals', module: 'customers' },
-  { id: 'customers.deals.manage', title: 'Manage deals', module: 'customers' },
+  {
+    id: 'customers.companies.manage',
+    title: 'Manage companies',
+    module: 'customers',
+    dependsOn: ['customers.companies.view'],
+  },
+  {
+    id: 'customers.deals.view',
+    title: 'View deals',
+    module: 'customers',
+    dependsOn: ['customers.people.view'],
+  },
+  {
+    id: 'customers.deals.manage',
+    title: 'Manage deals',
+    module: 'customers',
+    dependsOn: ['customers.deals.view'],
+  },
   { id: 'customers.activities.view', title: 'View activities', module: 'customers' },
-  { id: 'customers.activities.manage', title: 'Manage activities', module: 'customers' },
+  {
+    id: 'customers.activities.manage',
+    title: 'Manage activities',
+    module: 'customers',
+    dependsOn: ['customers.activities.view'],
+  },
   { id: 'customers.settings.manage', title: 'Manage customer settings', module: 'customers' },
   { id: 'customers.pipelines.view', title: 'View pipelines', module: 'customers' },
-  { id: 'customers.pipelines.manage', title: 'Manage pipelines', module: 'customers' },
-  { id: 'customers.widgets.todos', title: 'Use customer todos widget', module: 'customers' },
-  { id: 'customers.widgets.next-interactions', title: 'Use customer next interactions widget', module: 'customers' },
-  { id: 'customers.widgets.new-customers', title: 'Use customer new customers widget', module: 'customers' },
-  { id: 'customers.widgets.new-deals', title: 'Use customer new deals widget', module: 'customers' },
+  {
+    id: 'customers.pipelines.manage',
+    title: 'Manage pipelines',
+    module: 'customers',
+    dependsOn: ['customers.pipelines.view'],
+  },
+  {
+    id: 'customers.widgets.todos',
+    title: 'Use customer todos widget',
+    module: 'customers',
+    dependsOn: ['customers.activities.view'],
+  },
+  {
+    id: 'customers.widgets.next-interactions',
+    title: 'Use customer next interactions widget',
+    module: 'customers',
+    dependsOn: ['customers.interactions.view'],
+  },
+  {
+    id: 'customers.widgets.new-customers',
+    title: 'Use customer new customers widget',
+    module: 'customers',
+    dependsOn: ['customers.people.view'],
+  },
+  {
+    id: 'customers.widgets.new-deals',
+    title: 'Use customer new deals widget',
+    module: 'customers',
+    dependsOn: ['customers.deals.view'],
+  },
   { id: 'customers.interactions.view', title: 'View interactions', module: 'customers' },
-  { id: 'customers.interactions.manage', title: 'Manage interactions', module: 'customers' },
+  {
+    id: 'customers.interactions.manage',
+    title: 'Manage interactions',
+    module: 'customers',
+    dependsOn: ['customers.interactions.view'],
+  },
   { id: 'customers.roles.view', title: 'View entity roles', module: 'customers' },
-  { id: 'customers.roles.manage', title: 'Manage entity roles', module: 'customers' },
+  {
+    id: 'customers.roles.manage',
+    title: 'Manage entity roles',
+    module: 'customers',
+    dependsOn: ['customers.roles.view'],
+  },
 ]
 
 export default features

package/src/modules/resources/backend/resources/resources/[id]/page.tsx

@@ -10,7 +10,7 @@ import { collectCustomFieldValues } from '@open-mercato/ui/backend/utils/customF
 import { createCrudFormError } from '@open-mercato/ui/backend/utils/serverErrors'
 import { updateCrud, deleteCrud } from '@open-mercato/ui/backend/utils/crud'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
-import { ActivitiesSection, NotesSection, type SectionAction, type TagOption } from '@open-mercato/ui/backend/detail'
+import { ActivitiesSection, NotesSection, RecordNotFoundState, type SectionAction, type TagOption } from '@open-mercato/ui/backend/detail'
 import { VersionHistoryAction } from '@open-mercato/ui/backend/version-history'
 import { SendObjectMessageDialog } from '@open-mercato/ui/backend/messages'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -83,6 +83,7 @@ export default function ResourcesResourceDetailPage({ params }: { params?: { id?
   const router = useRouter()
   const searchParams = useSearchParams()
   const [initialValues, setInitialValues] = React.useState<Record<string, unknown> | null>(null)
+  const [isNotFound, setIsNotFound] = React.useState(false)
   const [tags, setTags] = React.useState<TagOption[]>([])
   const [activeTab, setActiveTab] = React.useState<'details' | 'availability'>('details')
   const [activeDetailTab, setActiveDetailTab] = React.useState<'notes' | 'activities'>('notes')
@@ -411,6 +412,7 @@ export default function ResourcesResourceDetailPage({ params }: { params?: { id?
 
   React.useEffect(() => {
     if (!resourceId || !resourceTypesLoaded) return
+    setIsNotFound(false)
     let cancelled = false
     async function loadResource() {
       try {
@@ -421,7 +423,10 @@ export default function ResourcesResourceDetailPage({ params }: { params?: { id?
         const record = await readApiResultOrThrow<ResourceResponse>(`/api/resources/resources?${params.toString()}`)
         const resourceRaw = Array.isArray(record?.items) ? record.items[0] : null
         const resource = resourceRaw ? normalizeResourceRecord(resourceRaw) : null
-        if (!resource) throw new Error(t('resources.resources.form.errors.notFound', 'Resource not found.'))
+        if (!resource) {
+          if (!cancelled) setIsNotFound(true)
+          return
+        }
         if (!cancelled) {
           const customValues = extractCustomFieldEntries(resource)
           setTags(Array.isArray(resource.tags) ? resource.tags : [])
@@ -479,6 +484,20 @@ export default function ResourcesResourceDetailPage({ params }: { params?: { id?
       ? initialValues.name.trim()
       : t('resources.resources.detail.untitled', 'Unnamed resource')
 
+  if (isNotFound) {
+    return (
+      <Page>
+        <PageBody>
+          <RecordNotFoundState
+            label={t('resources.resources.form.errors.notFound', 'Resource not found.')}
+            backHref="/backend/resources/resources"
+            backLabel={t('resources.resources.detail.back', 'Back to resources')}
+          />
+        </PageBody>
+      </Page>
+    )
+  }
+
   return (
     <Page>
       <PageBody>

package/src/modules/sales/acl.ts

@@ -1,20 +1,113 @@
 export const features = [
-  { id: 'sales.orders.view', title: 'View sales orders', module: 'sales' },
-  { id: 'sales.orders.manage', title: 'Manage sales orders', module: 'sales' },
-  { id: 'sales.orders.approve', title: 'Approve sales orders', module: 'sales' },
-  { id: 'sales.widgets.new-orders', title: 'View new orders widget', module: 'sales' },
-  { id: 'sales.widgets.new-quotes', title: 'View new quotes widget', module: 'sales' },
-  { id: 'sales.quotes.view', title: 'View sales quotes', module: 'sales' },
-  { id: 'sales.quotes.manage', title: 'Manage sales quotes', module: 'sales' },
-  { id: 'sales.documents.number.edit', title: 'Edit sales document numbers', module: 'sales' },
-  { id: 'sales.shipments.manage', title: 'Manage order shipments', module: 'sales' },
-  { id: 'sales.payments.manage', title: 'Manage order payments', module: 'sales' },
-  { id: 'sales.returns.view', title: 'View order returns', module: 'sales' },
-  { id: 'sales.returns.create', title: 'Create order returns', module: 'sales' },
-  { id: 'sales.invoices.manage', title: 'Manage sales invoices', module: 'sales' },
-  { id: 'sales.credit_memos.manage', title: 'Manage credit memos', module: 'sales' },
-  { id: 'sales.channels.manage', title: 'Manage sales channels', module: 'sales' },
-  { id: 'sales.settings.manage', title: 'Manage sales configuration', module: 'sales' },
+  {
+    id: 'sales.orders.view',
+    title: 'View sales orders',
+    module: 'sales',
+    dependsOn: [
+      'sales.channels.view',
+      'sales.settings.view',
+      'customers.people.view',
+      'catalog.products.view',
+      'currencies.view',
+    ],
+  },
+  {
+    id: 'sales.orders.manage',
+    title: 'Manage sales orders',
+    module: 'sales',
+    dependsOn: ['sales.orders.view'],
+  },
+  {
+    id: 'sales.orders.approve',
+    title: 'Approve sales orders',
+    module: 'sales',
+    dependsOn: ['sales.orders.view'],
+  },
+  {
+    id: 'sales.widgets.new-orders',
+    title: 'View new orders widget',
+    module: 'sales',
+    dependsOn: ['sales.orders.view'],
+  },
+  {
+    id: 'sales.widgets.new-quotes',
+    title: 'View new quotes widget',
+    module: 'sales',
+    dependsOn: ['sales.quotes.view'],
+  },
+  {
+    id: 'sales.quotes.view',
+    title: 'View sales quotes',
+    module: 'sales',
+    dependsOn: [
+      'sales.channels.view',
+      'sales.settings.view',
+      'customers.people.view',
+      'catalog.products.view',
+    ],
+  },
+  {
+    id: 'sales.quotes.manage',
+    title: 'Manage sales quotes',
+    module: 'sales',
+    dependsOn: ['sales.quotes.view'],
+  },
+  {
+    id: 'sales.documents.number.edit',
+    title: 'Edit sales document numbers',
+    module: 'sales',
+    dependsOn: ['sales.orders.view'],
+  },
+  {
+    id: 'sales.shipments.manage',
+    title: 'Manage order shipments',
+    module: 'sales',
+    dependsOn: ['sales.orders.view', 'shipping_carriers.view'],
+  },
+  {
+    id: 'sales.payments.manage',
+    title: 'Manage order payments',
+    module: 'sales',
+    dependsOn: ['sales.orders.view', 'payment_gateways.view'],
+  },
+  {
+    id: 'sales.returns.view',
+    title: 'View order returns',
+    module: 'sales',
+    dependsOn: ['sales.orders.view'],
+  },
+  {
+    id: 'sales.returns.create',
+    title: 'Create order returns',
+    module: 'sales',
+    dependsOn: ['sales.returns.view', 'sales.orders.manage'],
+  },
+  {
+    id: 'sales.invoices.manage',
+    title: 'Manage sales invoices',
+    module: 'sales',
+    dependsOn: ['sales.orders.view'],
+  },
+  {
+    id: 'sales.credit_memos.manage',
+    title: 'Manage credit memos',
+    module: 'sales',
+    dependsOn: ['sales.invoices.manage'],
+  },
+  { id: 'sales.channels.view', title: 'View sales channels', module: 'sales' },
+  {
+    id: 'sales.channels.manage',
+    title: 'Manage sales channels',
+    module: 'sales',
+    dependsOn: ['sales.channels.view'],
+  },
+  { id: 'sales.settings.view', title: 'View sales configuration', module: 'sales' },
+  {
+    id: 'sales.settings.manage',
+    title: 'Manage sales configuration',
+    module: 'sales',
+    dependsOn: ['sales.settings.view'],
+  },
 ]
 
 export default features

package/src/modules/sales/backend/sales/documents/[id]/page.tsx

@@ -11,6 +11,7 @@ import {
   ErrorMessage,
   InlineTextEditor,
   LoadingMessage,
+  RecordNotFoundState,
   TabEmptyState,
   TagsSection,
   type TagOption,
@@ -1876,6 +1877,7 @@ export default function SalesDocumentDetailPage({
   const searchParams = useSearchParams()
   const { confirm, ConfirmDialogElement } = useConfirmDialog()
   const [loading, setLoading] = React.useState(true)
+  const [isNotFound, setIsNotFound] = React.useState(false)
   const [record, setRecord] = React.useState<DocumentRecord | null>(null)
   const [tags, setTags] = React.useState<TagOption[]>([])
   const [kind, setKind] = React.useState<'order' | 'quote'>('quote')
@@ -2483,6 +2485,7 @@ export default function SalesDocumentDetailPage({
     async function load() {
       setLoading(true)
       setError(null)
+      setIsNotFound(false)
       const requestedKind = searchParams.get('kind')
       const preferredKind = requestedKind === 'order' ? 'order' : requestedKind === 'quote' ? 'quote' : initialKind ?? null
       const kindsToTry: Array<'order' | 'quote'> = preferredKind
@@ -2505,7 +2508,11 @@ export default function SalesDocumentDetailPage({
       }
       if (!cancelled) {
         setLoading(false)
-        setError(lastError ?? loadErrorMessage)
+        if (lastError) {
+          setError(lastError)
+        } else {
+          setIsNotFound(true)
+        }
       }
     }
     load().catch((err) => {
@@ -4435,6 +4442,26 @@ export default function SalesDocumentDetailPage({
     )
   }
 
+  if (isNotFound) {
+    const backHref = (searchParams.get('kind') === 'order' || initialKind === 'order')
+      ? '/backend/sales/orders'
+      : '/backend/sales/quotes'
+    const backLabel = (searchParams.get('kind') === 'order' || initialKind === 'order')
+      ? t('sales.documents.detail.backToOrders', 'Back to orders')
+      : t('sales.documents.detail.backToQuotes', 'Back to quotes')
+    return (
+      <Page>
+        <PageBody>
+          <RecordNotFoundState
+            label={t('sales.documents.detail.notFound', 'Document not found.')}
+            backHref={backHref}
+            backLabel={backLabel}
+          />
+        </PageBody>
+      </Page>
+    )
+  }
+
   if (error) {
     return (
       <Page>

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

@@ -552,6 +552,8 @@
   "sales.documents.detail.adjustments.updated": "Anpassung aktualisiert.",
   "sales.documents.detail.back": "Zurück zu Sales",
   "sales.documents.detail.backToCreate": "Neues Dokument erstellen",
+  "sales.documents.detail.backToOrders": "Zurück zu Bestellungen",
+  "sales.documents.detail.backToQuotes": "Zurück zu Angeboten",
   "sales.documents.detail.billing": "Rechnungsadresse",
   "sales.documents.detail.channel": "Kanal",
   "sales.documents.detail.channelInvalid": "Ausgewählter Kanal wurde nicht gefunden.",
@@ -679,6 +681,7 @@
   "sales.documents.detail.items.variant": "Variante",
   "sales.documents.detail.items.variantSearch": "Variante suchen",
   "sales.documents.detail.loading": "Dokument wird geladen…",
+  "sales.documents.detail.notFound": "Dokument nicht gefunden.",
   "sales.documents.detail.number": "Dokumentnummer",
   "sales.documents.detail.numberEditForbidden": "Dokumentennummer kann nicht bearbeitet werden.",
   "sales.documents.detail.numberEmpty": "Noch keine Nummer",

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

@@ -552,6 +552,8 @@
   "sales.documents.detail.adjustments.updated": "Adjustment updated.",
   "sales.documents.detail.back": "Back to Sales",
   "sales.documents.detail.backToCreate": "Create a new document",
+  "sales.documents.detail.backToOrders": "Back to orders",
+  "sales.documents.detail.backToQuotes": "Back to quotes",
   "sales.documents.detail.billing": "Billing address",
   "sales.documents.detail.channel": "Channel",
   "sales.documents.detail.channelInvalid": "Selected channel could not be found.",
@@ -679,6 +681,7 @@
   "sales.documents.detail.items.variant": "Variant",
   "sales.documents.detail.items.variantSearch": "Search variant",
   "sales.documents.detail.loading": "Loading document…",
+  "sales.documents.detail.notFound": "Document not found.",
   "sales.documents.detail.number": "Document number",
   "sales.documents.detail.numberEditForbidden": "Document number cannot be edited.",
   "sales.documents.detail.numberEmpty": "No number yet",

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

@@ -552,6 +552,8 @@
   "sales.documents.detail.adjustments.updated": "Ajuste actualizado.",
   "sales.documents.detail.back": "Volver a Ventas",
   "sales.documents.detail.backToCreate": "Crear un nuevo documento",
+  "sales.documents.detail.backToOrders": "Volver a pedidos",
+  "sales.documents.detail.backToQuotes": "Volver a cotizaciones",
   "sales.documents.detail.billing": "Dirección de facturación",
   "sales.documents.detail.channel": "Canal",
   "sales.documents.detail.channelInvalid": "No se pudo encontrar el canal seleccionado.",
@@ -679,6 +681,7 @@
   "sales.documents.detail.items.variant": "Variante",
   "sales.documents.detail.items.variantSearch": "Buscar variante",
   "sales.documents.detail.loading": "Cargando documento…",
+  "sales.documents.detail.notFound": "Documento no encontrado.",
   "sales.documents.detail.number": "Número de documento",
   "sales.documents.detail.numberEditForbidden": "El número de documento no se puede editar.",
   "sales.documents.detail.numberEmpty": "Sin número aún",

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

@@ -552,6 +552,8 @@
   "sales.documents.detail.adjustments.updated": "Korekta zaktualizowana.",
   "sales.documents.detail.back": "Wróć do sprzedaży",
   "sales.documents.detail.backToCreate": "Utwórz nowy dokument",
+  "sales.documents.detail.backToOrders": "Powrót do zamówień",
+  "sales.documents.detail.backToQuotes": "Powrót do ofert",
   "sales.documents.detail.billing": "Adres rozliczeniowy",
   "sales.documents.detail.channel": "Kanał",
   "sales.documents.detail.channelInvalid": "Nie znaleziono wybranego kanału.",
@@ -679,6 +681,7 @@
   "sales.documents.detail.items.variant": "Wariant",
   "sales.documents.detail.items.variantSearch": "Szukaj wariantu",
   "sales.documents.detail.loading": "Ładowanie dokumentu…",
+  "sales.documents.detail.notFound": "Nie znaleziono dokumentu.",
   "sales.documents.detail.number": "Numer dokumentu",
   "sales.documents.detail.numberEditForbidden": "Numer dokumentu nie może być edytowany.",
   "sales.documents.detail.numberEmpty": "Brak numeru",

package/src/modules/sales/setup.ts

@@ -50,6 +50,8 @@ export const setup: ModuleSetupConfig = {
   defaultRoleFeatures: {
     admin: ['sales.*', 'sales.documents.number.edit'],
     employee: [
+      'sales.channels.view',
+      'sales.settings.view',
       'sales.orders.view',
       'sales.orders.manage',
       'sales.orders.approve',