@open-mercato/core 0.10.1-develop.7922.1.417ebe275c → 0.10.1-develop.7925.1.ec40f75262

package/src/modules/staff/api/timesheets/time-entries/route.ts

@@ -31,7 +31,11 @@ import { makeCrudRoute, type CrudCtx } from '@open-mercato/shared/lib/crud/facto
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { resolveCrudRecordId, parseScopedCommandInput } from '@open-mercato/shared/lib/api/scoped'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getTelemetryRuntime } from '@open-mercato/shared/lib/telemetry/runtime'
 import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
+import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
+import { isIdsParamProvided, mergeIdFilter, parseIdsParam } from '@open-mercato/shared/lib/crud/ids'
+import { mergeAdvancedFiltersFromQuery } from '@open-mercato/shared/lib/crud/advanced-filter-integration'
 import { sanitizeSearchTerm } from '../../helpers'
 import type { ModuleConfigService } from '@open-mercato/core/modules/configs/lib/module-config-service'
 import { StaffTimeEntry, StaffTimeEntryTag, StaffTimeProject } from '../../../data/entities'
@@ -42,6 +46,7 @@ import { resolveFeatureAccess } from '../../../lib/time-tracking/featureAccess'
 import { MANAGE_PROJECTS_FEATURE, resolveProjectAccess, type ProjectAccess } from '../../../lib/time-tracking/access'
 import { readTimeTrackingSettings } from '../../../lib/time-tracking/settings'
 import { decorateTimeEntryRows } from '../../../lib/timesheets/timeEntryDecoration'
+import { computeTimeEntryTotals } from '../../../lib/timesheets/timeEntryTotals'
 import { createStaffCrudOpenApi, createPagedListResponseSchema, defaultOkResponseSchema } from '../../openapi'
 
 const logger = createLogger('staff').child({ component: 'api/timesheets/time-entries' })
@@ -120,6 +125,11 @@ const listSchema = z
     tagIds: z.string().optional(),
     sortField: z.string().optional(),
     sortDir: z.enum(['asc', 'desc']).optional(),
+    /**
+     * `true` adds a `totals` object computed over the WHOLE filtered set (not the
+     * page). Opt-in so callers that only need rows pay for no aggregate query.
+     */
+    includeTotals: z.string().optional(),
   })
   .passthrough()
 
@@ -306,7 +316,7 @@ export async function buildScopedTimeEntryListFilters(
   }
 
   const access = await resolveListProjectAccess(ctx)
-  if (access.canManageAll) return filters
+  if (access.canManageAll) return mergeAdvancedFiltersFromQuery(filters, query as Record<string, unknown>)
 
   const branches: Record<string, unknown>[] = []
   if (access.projectIds.length > 0) {
@@ -319,10 +329,10 @@ export async function buildScopedTimeEntryListFilters(
     // A caller with no membership and no staff record gets no row at all — not a
     // redacted one — so an entry's note and its project never leave the server.
     filters[F.id] = { $in: [IMPOSSIBLE_ID] }
-    return filters
+    return mergeAdvancedFiltersFromQuery(filters, query as Record<string, unknown>)
   }
   filters.$or = branches
-  return filters
+  return mergeAdvancedFiltersFromQuery(filters, query as Record<string, unknown>)
 }
 
 /**
@@ -398,6 +408,53 @@ export async function decorateTimeEntryList(payload: unknown, ctx: CrudCtx): Pro
   })
 }
 
+function resolveListOrganizationIds(ctx: CrudCtx): string[] {
+  if (Array.isArray(ctx.organizationIds)) return Array.from(new Set(ctx.organizationIds))
+  const fallback = ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null
+  return fallback ? [fallback] : []
+}
+
+/**
+ * Adds `totals` for the whole filtered set when the caller asked for them with
+ * `?includeTotals=true`. Reuses the list's scoped filters and merges them the
+ * way the CRUD factory does (advanced filters, then `?ids=`, then `withDeleted`),
+ * so the totals never count a row the list would not return. A failure leaves
+ * the list intact and omits `totals`. The aggregate runs on every request that
+ * asks for it, list-cache hits included, because totals are not cached.
+ */
+export async function attachTimeEntryTotals(
+  payload: unknown,
+  ctx: CrudCtx & { query: EntryListQuery },
+): Promise<void> {
+  if (parseBooleanToken(ctx.query?.includeTotals ?? null) !== true) return
+  if (!payload || typeof payload !== 'object' || !Array.isArray((payload as { items?: unknown }).items)) return
+  delete (payload as Record<string, unknown>).totals
+  const tenantId = ctx.auth?.tenantId ?? null
+  if (!tenantId) return
+  try {
+    const { organizationId } = resolveCtxScope(ctx)
+    const query = ctx.query as Record<string, unknown>
+    const scopedFilters = await buildScopedTimeEntryListFilters(ctx.query, ctx)
+    const filters = mergeIdFilter(scopedFilters, parseIdsParam(query.ids), {
+      idsParamProvided: isIdsParamProvided(query.ids),
+    }) as Record<string, unknown>
+    const rates = await resolveFeatureAccess(ctx.container, ctx.auth?.sub ?? null, [RATES_FEATURE], {
+      tenantId,
+      organizationId,
+    })
+    const em = ctx.container.resolve('em') as EntityManager
+    ;(payload as Record<string, unknown>).totals = await computeTimeEntryTotals(em.getKysely(), filters, {
+      tenantId,
+      organizationIds: resolveListOrganizationIds(ctx),
+      canSeeRates: rates.allowed,
+      includeDeleted: parseBooleanToken(typeof query.withDeleted === 'string' ? query.withDeleted : null) === true,
+    })
+  } catch (err) {
+    logger.error('staff.timesheets.time-entries totals failed', { err })
+    getTelemetryRuntime()?.reportError(err, { module: 'staff', code: 'staff.time_entry_totals_failed' })
+  }
+}
+
 const crud = makeCrudRoute({
   metadata: routeMetadata,
   orm: {
@@ -423,6 +480,9 @@ const crud = makeCrudRoute({
     },
     buildFilters: buildScopedTimeEntryListFilters,
   },
+  hooks: {
+    afterList: attachTimeEntryTotals,
+  },
   actions: {
     create: {
       commandId: staffTimeEntryCommandIds.create,
@@ -507,11 +567,24 @@ const timeEntryListItemSchema = z.object({
   currencyCode: z.string().nullable().optional(),
 })
 
+const timeEntryTotalsSchema = z.object({
+  entryCount: z.number(),
+  /** Sum of `duration_minutes` across the whole filtered set. */
+  durationMinutes: z.number(),
+  /** Sum of `rounded_minutes` across the whole filtered set. */
+  roundedMinutes: z.number(),
+  /** Present only for a caller holding `staff.timesheets.rates.view`; one entry per currency, never added together. */
+  money: z.array(z.object({ currencyCode: z.string().nullable(), amount: z.number() })).optional(),
+})
+
 export const openApi = createStaffCrudOpenApi({
   resourceName: 'TimeEntry',
   pluralName: 'TimeEntries',
   querySchema: listSchema,
-  listResponseSchema: createPagedListResponseSchema(timeEntryListItemSchema),
+  listResponseSchema: createPagedListResponseSchema(timeEntryListItemSchema).extend({
+    /** Present only when the request sends `includeTotals=true`; covers every row matching the filters, not just the page. */
+    totals: timeEntryTotalsSchema.optional(),
+  }),
   create: {
     schema: staffTimeEntryCreateSchema,
     description:

package/src/modules/staff/backend/staff/time-tracking/entries/page.tsx

@@ -83,7 +83,8 @@ import { createLogger } from '@open-mercato/shared/lib/logger'
 import { TimeEntryDialog } from '../../../../lib/time-tracking-ui/TimeEntryDialog'
 import { REPORTS_PATH, reportDetailHref } from '../../../../lib/time-tracking-ui/reportLinks'
 import { TimeEntryDurationCell } from '../../../../lib/time-tracking-ui/TimeEntryDurationCell'
-import { TimeEntriesSummaryFooter } from '../../../../lib/time-tracking-ui/TimeEntriesSummaryFooter'
+import type { TimeEntriesTableInjectionContext } from '../../../../widgets/injection/time-entries-summary-footer/widget'
+import type { TimeEntryTotals } from '../../../../lib/timesheets/timeEntryTotals'
 import {
   collectDirectoryIds,
   currentWeekRange,
@@ -91,6 +92,7 @@ import {
   formatEntryDay,
   isEntryLockedError,
   readCopyDayTargetConflict,
+  readTimeEntryTotals,
   summarizeTimeEntries,
   toTimeEntryListRow,
   type TimeEntryDirectory,
@@ -129,6 +131,7 @@ type EntriesResponse = {
   total?: number
   totalIsCapped?: boolean
   totalPages?: number
+  totals?: unknown
 }
 
 type CopyDayResponse = {
@@ -240,6 +243,7 @@ export default function TimeTrackingEntriesPage() {
   const [rows, setRows] = React.useState<TimeEntryListRow[]>([])
   const [total, setTotal] = React.useState(0)
   const [totalIsCapped, setTotalIsCapped] = React.useState(false)
+  const [filteredTotals, setFilteredTotals] = React.useState<TimeEntryTotals | null>(null)
   const [totalPages, setTotalPages] = React.useState(1)
   const [isLoading, setIsLoading] = React.useState(true)
   const [isRefreshing, setIsRefreshing] = React.useState(false)
@@ -514,7 +518,11 @@ export default function TimeTrackingEntriesPage() {
     if (hasLoadedOnceRef.current) setIsRefreshing(true)
     else setIsLoading(true)
     try {
-      const params = new URLSearchParams({ page: String(page), pageSize: String(PAGE_SIZE) })
+      const params = new URLSearchParams({
+        page: String(page),
+        pageSize: String(PAGE_SIZE),
+        includeTotals: 'true',
+      })
       const sort = sorting[0]
       params.set('sortField', sort?.id ?? 'date')
       params.set('sortDir', sort?.desc === false ? 'asc' : 'desc')
@@ -563,6 +571,7 @@ export default function TimeTrackingEntriesPage() {
       )
       setTotal(typeof listPayload.total === 'number' ? listPayload.total : items.length)
       setTotalIsCapped(listPayload.totalIsCapped === true)
+      setFilteredTotals(readTimeEntryTotals(listPayload.totals))
       setTotalPages(
         typeof listPayload.totalPages === 'number'
           ? listPayload.totalPages
@@ -672,13 +681,14 @@ export default function TimeTrackingEntriesPage() {
           }),
           'success',
         )
+        handleRefresh()
       } catch (error) {
         setRows(previousRows)
         setTotal((current) => current + 1)
         reportFailure(error, labels.errors.delete, 'staff.time_tracking.entries delete failed')
       }
     },
-    [labels.errors.delete, labels.noTask, mutationContext, reportFailure, rows, runMutation, t],
+    [handleRefresh, labels.errors.delete, labels.noTask, mutationContext, reportFailure, rows, runMutation, t],
   )
 
   const handleDuplicate = React.useCallback(
@@ -1089,12 +1099,22 @@ export default function TimeTrackingEntriesPage() {
   ])
 
   const summary = React.useMemo(() => summarizeTimeEntries(rows), [rows])
+  const tableId = extensionPoints.hosts.timeEntriesTable.tableId
+  const tableInjectionContext = React.useMemo<TimeEntriesTableInjectionContext>(
+    () => ({
+      tableId,
+      title: labels.title,
+      entriesSummary: { summary, totalCount: total, canSeeMoney, totals: filteredTotals },
+    }),
+    [tableId, labels.title, summary, total, canSeeMoney, filteredTotals],
+  )
 
   return (
     <Page>
       <PageBody>
         <DataTable<TimeEntryListRow>
-          extensionTableId={extensionPoints.hosts.timeEntriesTable.tableId}
+          extensionTableId={tableId}
+          injectionContext={tableInjectionContext}
           title={labels.title}
           titleHeadingLevel={1}
           data={rows}
@@ -1110,8 +1130,12 @@ export default function TimeTrackingEntriesPage() {
             dropDeepLinkParams(DEEP_LINK_PARAMS.filter((id) => !values[id]))
           }}
           onFiltersClear={clearAllFilters}
+          showActiveFilterChips={false}
           activeFilterChips={
-            <div className="flex flex-col gap-2">
+            <div
+              className="flex flex-col gap-2 border-b border-border px-4 py-3"
+              data-staff-entries-filter-chips=""
+            >
               <EntryFilterPresets
                 presets={presets}
                 activePresetId={activePresetId}
@@ -1210,8 +1234,6 @@ export default function TimeTrackingEntriesPage() {
           }}
         />
 
-        <TimeEntriesSummaryFooter summary={summary} totalCount={total} canSeeMoney={canSeeMoney} />
-
         {!canManage ? (
           <p className="mt-2 text-xs text-muted-foreground">
             {t('staff.time_tracking.entries.readOnlyNotice', 'You can view these entries but not change them.')}

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

@@ -1410,6 +1410,7 @@
   "staff.time_tracking.entries.source.mobile": "Mobil",
   "staff.time_tracking.entries.source.timer": "Timer",
   "staff.time_tracking.entries.summary.count": "Gesamt ({visible} von {total} Einträgen)",
+  "staff.time_tracking.entries.summary.filteredCount": "Gesamt aller {total} passenden Einträge",
   "staff.time_tracking.entries.summary.multiCurrencyHint": "Diese Einträge werden in mehreren Währungen abgerechnet und werden daher getrennt statt summiert angezeigt.",
   "staff.time_tracking.entries.table.durationAria": "Dauer des Eintrags",
   "staff.time_tracking.entries.table.noTask": "Keine Aufgabe",

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

@@ -1410,6 +1410,7 @@
   "staff.time_tracking.entries.source.mobile": "Mobile",
   "staff.time_tracking.entries.source.timer": "Timer",
   "staff.time_tracking.entries.summary.count": "Total ({visible} of {total} entries)",
+  "staff.time_tracking.entries.summary.filteredCount": "Total of all {total} matching entries",
   "staff.time_tracking.entries.summary.multiCurrencyHint": "These entries are billed in more than one currency, so they are shown separately instead of added up.",
   "staff.time_tracking.entries.table.durationAria": "Entry duration",
   "staff.time_tracking.entries.table.noTask": "No task",

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

@@ -1410,6 +1410,7 @@
   "staff.time_tracking.entries.source.mobile": "Móvil",
   "staff.time_tracking.entries.source.timer": "Cronómetro",
   "staff.time_tracking.entries.summary.count": "Total ({visible} de {total} registros)",
+  "staff.time_tracking.entries.summary.filteredCount": "Total de los {total} registros coincidentes",
   "staff.time_tracking.entries.summary.multiCurrencyHint": "Estos registros se facturan en más de una moneda, por eso se muestran por separado en lugar de sumarse.",
   "staff.time_tracking.entries.table.durationAria": "Duración del registro",
   "staff.time_tracking.entries.table.noTask": "Sin tarea",

package/src/modules/staff/i18n/ko.json

@@ -1410,6 +1410,7 @@
   "staff.time_tracking.entries.source.mobile": "모바일",
   "staff.time_tracking.entries.source.timer": "타이머",
   "staff.time_tracking.entries.summary.count": "합계 (전체 {total}건 중 {visible}건)",
+  "staff.time_tracking.entries.summary.filteredCount": "일치하는 항목 {total}건 전체 합계",
   "staff.time_tracking.entries.summary.multiCurrencyHint": "이 기록들은 두 가지 이상의 통화로 청구되므로 합산하지 않고 따로 표시합니다.",
   "staff.time_tracking.entries.table.durationAria": "기록 소요 시간",
   "staff.time_tracking.entries.table.noTask": "작업 없음",

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

@@ -1410,6 +1410,7 @@
   "staff.time_tracking.entries.source.mobile": "Mobilnie",
   "staff.time_tracking.entries.source.timer": "Stoper",
   "staff.time_tracking.entries.summary.count": "Razem ({visible} z {total} wpisów)",
+  "staff.time_tracking.entries.summary.filteredCount": "Razem wszystkie pasujące wpisy: {total}",
   "staff.time_tracking.entries.summary.multiCurrencyHint": "Te wpisy są rozliczane w więcej niż jednej walucie, więc pokazujemy je osobno zamiast sumować.",
   "staff.time_tracking.entries.table.durationAria": "Czas trwania wpisu",
   "staff.time_tracking.entries.table.noTask": "Bez zadania",

package/src/modules/staff/lib/time-tracking-ui/TimeEntriesSummaryFooter.tsx

@@ -10,6 +10,7 @@ import { formatCurrency } from '@open-mercato/ui/utils/format'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { formatDuration } from '../time-tracking/duration'
 import type { TimeEntriesSummary } from './timeEntryListData'
+import type { TimeEntryTotals } from '../timesheets/timeEntryTotals'
 
 /**
  * The mockup's table footer: `Razem (5 z 23 wpisów) · 15:15 · 4 315,00 PLN`.
@@ -21,28 +22,43 @@ import type { TimeEntriesSummary } from './timeEntryListData'
  * financially false, and a footer is exactly where somebody would trust it.
  */
 export type TimeEntriesSummaryFooterProps = {
+  /** Sums of the rows on the current page. */
   summary: TimeEntriesSummary
   totalCount: number
   canSeeMoney: boolean
+  /**
+   * Sums of the WHOLE filtered set, from the list API's `includeTotals=true`.
+   * When present the footer shows these instead of the page sums; absent or
+   * `null` keeps the page-only behaviour.
+   */
+  totals?: TimeEntryTotals | null
 }
 
-function DefaultTimeEntriesSummaryFooter({ summary, totalCount, canSeeMoney }: TimeEntriesSummaryFooterProps) {
+function DefaultTimeEntriesSummaryFooter({ summary, totalCount, canSeeMoney, totals }: TimeEntriesSummaryFooterProps) {
   const t = useT()
-  const money = canSeeMoney ? summary.money : []
+  const wholeSet = totals ?? null
+  const money = canSeeMoney ? (wholeSet ? wholeSet.money ?? [] : summary.money) : []
+  const minutes = wholeSet ? wholeSet.durationMinutes : summary.totalMinutes
 
   return (
     <div
-      className="mt-2 flex flex-wrap items-center justify-end gap-x-4 gap-y-1 rounded-md border border-border bg-muted/40 px-4 py-2 text-sm"
+      className="flex flex-wrap items-center justify-end gap-x-4 gap-y-1 text-sm"
       data-testid="entries-summary-footer"
+      data-staff-entries-summary-footer=""
+      data-summary-scope={wholeSet ? 'filtered' : 'page'}
     >
       <span className="text-muted-foreground">
-        {t('staff.time_tracking.entries.summary.count', 'Total ({visible} of {total} entries)', {
-          visible: summary.visibleCount,
-          total: totalCount,
-        })}
+        {wholeSet
+          ? t('staff.time_tracking.entries.summary.filteredCount', 'Total of all {total} matching entries', {
+              total: wholeSet.entryCount,
+            })
+          : t('staff.time_tracking.entries.summary.count', 'Total ({visible} of {total} entries)', {
+              visible: summary.visibleCount,
+              total: totalCount,
+            })}
       </span>
       <span className="font-mono font-semibold tabular-nums text-foreground" data-testid="entries-summary-duration">
-        {formatDuration(summary.totalMinutes, 'clock')}
+        {formatDuration(minutes, 'clock')}
       </span>
       {money.length > 1 ? (
         <span
@@ -76,6 +92,7 @@ const timeEntriesSummaryFooterPropsSchema: z.ZodType<TimeEntriesSummaryFooterPro
   summary: opaqueProp<TimeEntriesSummary>(),
   totalCount: z.number(),
   canSeeMoney: z.boolean(),
+  totals: opaqueProp<TimeEntryTotals>().nullable().optional(),
 })
 
 registerComponent<TimeEntriesSummaryFooterProps>({

package/src/modules/staff/lib/time-tracking-ui/timeEntryListData.ts

@@ -29,6 +29,7 @@ import {
   readRowString,
   type ApiRow,
 } from './timeEntryDialogState'
+import type { TimeEntryTotals } from '../timesheets/timeEntryTotals'
 
 /** The shared refusal code every write path answers when an entry is frozen in a report. */
 export const TIME_ENTRY_LOCKED_CODE = 'time_entry_locked'
@@ -144,6 +145,35 @@ export function summarizeTimeEntries(rows: readonly TimeEntryListRow[]): TimeEnt
   }
 }
 
+function readFiniteNumber(value: unknown): number | null {
+  return typeof value === 'number' && Number.isFinite(value) ? value : null
+}
+
+/**
+ * Reads the list API's optional `totals` (sent for `includeTotals=true`). Anything
+ * malformed reads as `null`, which keeps the footer on the page-only sums rather
+ * than showing a whole-set figure it cannot trust.
+ */
+export function readTimeEntryTotals(value: unknown): TimeEntryTotals | null {
+  if (!value || typeof value !== 'object') return null
+  const raw = value as Record<string, unknown>
+  const entryCount = readFiniteNumber(raw.entryCount)
+  const durationMinutes = readFiniteNumber(raw.durationMinutes)
+  const roundedMinutes = readFiniteNumber(raw.roundedMinutes)
+  if (entryCount === null || durationMinutes === null || roundedMinutes === null) return null
+  const totals: TimeEntryTotals = { entryCount, durationMinutes, roundedMinutes }
+  if (Array.isArray(raw.money)) {
+    totals.money = raw.money.flatMap((item) => {
+      if (!item || typeof item !== 'object') return []
+      const amount = readFiniteNumber((item as Record<string, unknown>).amount)
+      if (amount === null) return []
+      const code = (item as Record<string, unknown>).currencyCode
+      return [{ currencyCode: typeof code === 'string' && code.length > 0 ? code : null, amount }]
+    })
+  }
+  return totals
+}
+
 type ErrorBag = Record<string, unknown>
 
 /**