@open-mercato/core 0.9.0 → 0.9.1-develop.7459.1.99e3accd30

package/src/modules/sales/components/documents/lineItemUtils.ts

@@ -9,6 +9,24 @@ export function normalizeNumber(value: unknown, fallback = 0): number {
   return fallback
 }
 
+/**
+ * A catalog price is only usable on a line when it carries a positive amount, because line
+ * submission rejects a unit price of zero. Returns the amount for the requested mode, falling
+ * back to the other mode only when the requested amount is missing, or `null` when the price
+ * has no positive amount to use.
+ */
+export function resolveCatalogPriceAmount(
+  amountNet: number | null | undefined,
+  amountGross: number | null | undefined,
+  mode: 'net' | 'gross',
+): number | null {
+  const isPresent = (value: number | null | undefined): value is number =>
+    typeof value === 'number' && Number.isFinite(value)
+  const [preferred, fallback] = mode === 'net' ? [amountNet, amountGross] : [amountGross, amountNet]
+  const amount = isPresent(preferred) ? preferred : isPresent(fallback) ? fallback : null
+  return amount !== null && amount > 0 ? amount : null
+}
+
 /**
  * Pass `locale` to format in the application locale (`useLocale()` in client components).
  * Omitting it keeps the runtime default, which varies per machine and is therefore not

package/src/modules/staff/backend/staff/time-tracking/projects/[id]/page.tsx

@@ -177,7 +177,13 @@ export default function TimesheetProjectDetailPage({ params }: { params?: { id?:
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
   const [isNotFound, setIsNotFound] = React.useState(false)
-  const [accessDenied, setAccessDenied] = React.useState(false)
+  // Keyed by project id so a route change to another project never shows the
+  // previous project's guard (with a live request button) while the new one loads.
+  const [accessDeniedProjectId, setAccessDeniedProjectId] = React.useState<string | null>(null)
+  const accessDenied = accessDeniedProjectId !== null && accessDeniedProjectId === projectId
+  // The id the last finished load was for. Until it matches the route, the page
+  // is still loading — never the previous project's error or empty state.
+  const [settledProjectId, setSettledProjectId] = React.useState<string | null>(null)
 
   const [employees, setEmployees] = React.useState<EmployeeAssignment[]>([])
   const [employeesLoading, setEmployeesLoading] = React.useState(false)
@@ -387,7 +393,6 @@ export default function TimesheetProjectDetailPage({ params }: { params?: { id?:
       setLoading(true)
       setError(null)
       setIsNotFound(false)
-      setAccessDenied(false)
       try {
         const queryParams = new URLSearchParams({ page: '1', pageSize: '1', ids: projectId! })
         const call = await apiCall<ProjectResponse>(
@@ -396,9 +401,10 @@ export default function TimesheetProjectDetailPage({ params }: { params?: { id?:
         // Screen 17: the route answers 404 with this discriminator for a project
         // the caller is not a member of, without naming it.
         if (call.status === 404 && readDenialReason(call.result) === NO_PROJECT_ACCESS_REASON) {
-          if (!cancelled) setAccessDenied(true)
+          if (!cancelled) setAccessDeniedProjectId(projectId ?? null)
           return
         }
+        if (!cancelled) setAccessDeniedProjectId(null)
         if (!call.ok) {
           throw new Error(t('staff.timesheets.projects.errors.load', 'Failed to load project.'))
         }
@@ -414,7 +420,10 @@ export default function TimesheetProjectDetailPage({ params }: { params?: { id?:
           setError(loadError instanceof Error ? loadError.message : t('staff.timesheets.projects.errors.load', 'Failed to load project.'))
         }
       } finally {
-        if (!cancelled) setLoading(false)
+        if (!cancelled) {
+          setLoading(false)
+          setSettledProjectId(projectId ?? null)
+        }
       }
     }
     loadProject()
@@ -649,7 +658,18 @@ export default function TimesheetProjectDetailPage({ params }: { params?: { id?:
   }, [handleAddEmployee])
 
   // --- Render ---
-  if (loading) {
+  // Screen 17 — the caller may not open this project. The guard state names
+  // neither the customer nor the project (note 1), and the surrounding shell
+  // (sidebar, topbar) is untouched because the caller still has other projects
+  // (note 3). It is checked before `loading` and only cleared by a response that
+  // grants access, so a background reload (e.g. the organization scope
+  // resolving late) keeps the guard mounted instead of resetting a request the
+  // user has just sent.
+  if (accessDenied) {
+    return <NoProjectAccess timeProjectId={projectId} />
+  }
+
+  if (loading || settledProjectId !== (projectId ?? null)) {
     return (
       <Page>
         <PageBody>
@@ -659,14 +679,6 @@ export default function TimesheetProjectDetailPage({ params }: { params?: { id?:
     )
   }
 
-  // Screen 17 — the caller may not open this project. The guard state names
-  // neither the customer nor the project (note 1), and the surrounding shell
-  // (sidebar, topbar) is untouched because the caller still has other projects
-  // (note 3).
-  if (accessDenied) {
-    return <NoProjectAccess timeProjectId={projectId} />
-  }
-
   if (isNotFound) {
     return (
       <Page>

package/src/modules/sync_excel/lib/adapters/customers.ts

@@ -764,7 +764,19 @@ async function resolveUpload(em: EntityManager, runId: string | undefined, curso
   return null
 }
 
+async function personExists(em: EntityManager, personId: string, scope: TenantScope): Promise<boolean> {
+  const matches = await em.count(CustomerEntity, {
+    id: personId,
+    kind: 'person',
+    organizationId: scope.organizationId,
+    tenantId: scope.tenantId,
+    deletedAt: null,
+  })
+  return matches > 0
+}
+
 async function resolveExistingPersonId(params: {
+  em: EntityManager
   externalIdMappingService: ExternalIdMappingService
   externalId: string | null | undefined
   email: string | null | undefined
@@ -778,7 +790,7 @@ async function resolveExistingPersonId(params: {
       params.externalId,
       params.scope,
     )
-    if (mappedLocalId) return mappedLocalId
+    if (mappedLocalId && await personExists(params.em, mappedLocalId, params.scope)) return mappedLocalId
   }
 
   if (!params.email) return null
@@ -866,6 +878,7 @@ async function processRow(params: {
     }
   }
   const existingId = await resolveExistingPersonId({
+    em: params.em,
     externalIdMappingService: params.externalIdMappingService,
     externalId,
     email: payload.values.primaryEmail,
@@ -885,6 +898,21 @@ async function processRow(params: {
     }
   }
 
+  const rememberPersonIdentity = async (personId: string): Promise<void> => {
+    if (externalId) {
+      await params.externalIdMappingService.storeExternalIdMapping(
+        'sync_excel',
+        'customers.person',
+        personId,
+        externalId,
+        params.scope,
+      )
+    }
+    if (payload.values.primaryEmail && !params.emailDedupeIndex.has(payload.values.primaryEmail)) {
+      params.emailDedupeIndex.set(payload.values.primaryEmail, personId)
+    }
+  }
+
   try {
     if (existingId) {
       const updateInput = {
@@ -897,6 +925,8 @@ async function processRow(params: {
         ctx: params.commandContext,
       })
 
+      await rememberPersonIdentity(existingId)
+
       await upsertPrimaryAddress({
         entityId: existingId,
         addressValues: payload.addressValues,
@@ -906,19 +936,6 @@ async function processRow(params: {
         em: params.em,
       })
 
-      if (externalId) {
-        await params.externalIdMappingService.storeExternalIdMapping(
-          'sync_excel',
-          'customers.person',
-          existingId,
-          externalId,
-          params.scope,
-        )
-      }
-      if (payload.values.primaryEmail && !params.emailDedupeIndex.has(payload.values.primaryEmail)) {
-        params.emailDedupeIndex.set(payload.values.primaryEmail, existingId)
-      }
-
       return {
         externalId: externalId ?? sourceIdentifier,
         action: 'update',
@@ -941,6 +958,8 @@ async function processRow(params: {
       ctx: params.commandContext,
     })
 
+    await rememberPersonIdentity(commandResult.result.entityId)
+
     await upsertPrimaryAddress({
       entityId: commandResult.result.entityId,
       addressValues: payload.addressValues,
@@ -950,19 +969,6 @@ async function processRow(params: {
       em: params.em,
     })
 
-    if (externalId) {
-      await params.externalIdMappingService.storeExternalIdMapping(
-        'sync_excel',
-        'customers.person',
-        commandResult.result.entityId,
-        externalId,
-        params.scope,
-      )
-    }
-    if (payload.values.primaryEmail && !params.emailDedupeIndex.has(payload.values.primaryEmail)) {
-      params.emailDedupeIndex.set(payload.values.primaryEmail, commandResult.result.entityId)
-    }
-
     return {
       externalId: externalId ?? sourceIdentifier,
       action: 'create',