@open-mercato/core 0.6.6-develop.6354.1.4730e55f76 → 0.6.6-develop.6357.1.7c17a47f4e
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/modules/data_sync/backend/data-sync/runs/[id]/page.js +39 -16
- package/dist/modules/data_sync/backend/data-sync/runs/[id]/page.js.map +2 -2
- package/dist/modules/staff/widgets/dashboard/timesheets-time-reporting/widget.client.js +31 -31
- package/dist/modules/staff/widgets/dashboard/timesheets-time-reporting/widget.client.js.map +2 -2
- package/package.json +7 -7
- package/src/modules/data_sync/backend/data-sync/runs/[id]/page.tsx +23 -4
- package/src/modules/staff/widgets/dashboard/timesheets-time-reporting/widget.client.tsx +46 -37
|
@@ -10,6 +10,7 @@ import { StatusBadge } from "@open-mercato/ui/primitives/status-badge";
|
|
|
10
10
|
import { Button } from "@open-mercato/ui/primitives/button";
|
|
11
11
|
import { LogList } from "@open-mercato/ui/backend/LogList";
|
|
12
12
|
import { Progress } from "@open-mercato/ui/primitives/progress";
|
|
13
|
+
import { Pagination } from "@open-mercato/ui/primitives/pagination";
|
|
13
14
|
import { Spinner } from "@open-mercato/ui/primitives/spinner";
|
|
14
15
|
import { apiCall } from "@open-mercato/ui/backend/utils/apiCall";
|
|
15
16
|
import { useGuardedMutation } from "@open-mercato/ui/backend/injection/useGuardedMutation";
|
|
@@ -36,6 +37,7 @@ function resolvePathnameId(pathname) {
|
|
|
36
37
|
if (!runId || runId === "runs" || runId === "data-sync") return void 0;
|
|
37
38
|
return decodeURIComponent(runId);
|
|
38
39
|
}
|
|
40
|
+
const LOG_PAGE_SIZE = 50;
|
|
39
41
|
function SyncRunDetailPage({ params }) {
|
|
40
42
|
const pathname = usePathname();
|
|
41
43
|
const router = useRouter();
|
|
@@ -50,6 +52,9 @@ function SyncRunDetailPage({ params }) {
|
|
|
50
52
|
const [isNotFound, setIsNotFound] = React.useState(false);
|
|
51
53
|
const [logs, setLogs] = React.useState([]);
|
|
52
54
|
const [isLoadingLogs, setIsLoadingLogs] = React.useState(false);
|
|
55
|
+
const [logsTotal, setLogsTotal] = React.useState(0);
|
|
56
|
+
const [logsPage, setLogsPage] = React.useState(1);
|
|
57
|
+
const logsPageRef = React.useRef(1);
|
|
53
58
|
const resolveCurrentRunId = React.useCallback(() => {
|
|
54
59
|
return runId ?? (typeof window !== "undefined" ? resolvePathnameId(window.location.pathname) : void 0);
|
|
55
60
|
}, [runId]);
|
|
@@ -78,18 +83,22 @@ function SyncRunDetailPage({ params }) {
|
|
|
78
83
|
setRun(call.result);
|
|
79
84
|
setIsLoading(false);
|
|
80
85
|
}, [resolveCurrentRunId, t]);
|
|
81
|
-
const loadLogs = React.useCallback(async () => {
|
|
86
|
+
const loadLogs = React.useCallback(async (page) => {
|
|
82
87
|
const currentRunId = resolveCurrentRunId();
|
|
83
88
|
if (!currentRunId) return;
|
|
89
|
+
const targetPage = page ?? logsPageRef.current;
|
|
84
90
|
setIsLoadingLogs(true);
|
|
85
|
-
const params2 = new URLSearchParams({ runId: currentRunId, pageSize:
|
|
91
|
+
const params2 = new URLSearchParams({ runId: currentRunId, pageSize: String(LOG_PAGE_SIZE), page: String(targetPage) });
|
|
86
92
|
const call = await apiCall(
|
|
87
93
|
`/api/integrations/logs?${params2.toString()}`,
|
|
88
94
|
void 0,
|
|
89
|
-
{ fallback: { items: [] } }
|
|
95
|
+
{ fallback: { items: [], total: 0 } }
|
|
90
96
|
);
|
|
91
97
|
if (call.ok && call.result) {
|
|
92
98
|
setLogs(call.result.items);
|
|
99
|
+
if (typeof call.result.total === "number") setLogsTotal(call.result.total);
|
|
100
|
+
logsPageRef.current = targetPage;
|
|
101
|
+
setLogsPage(targetPage);
|
|
93
102
|
}
|
|
94
103
|
setIsLoadingLogs(false);
|
|
95
104
|
}, [resolveCurrentRunId]);
|
|
@@ -279,19 +288,33 @@ function SyncRunDetailPage({ params }) {
|
|
|
279
288
|
] }),
|
|
280
289
|
/* @__PURE__ */ jsxs(Card, { children: [
|
|
281
290
|
/* @__PURE__ */ jsx(CardHeader, { children: /* @__PURE__ */ jsx(CardTitle, { children: t("data_sync.runs.detail.logs") }) }),
|
|
282
|
-
/* @__PURE__ */
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
291
|
+
/* @__PURE__ */ jsxs(CardContent, { children: [
|
|
292
|
+
isLoadingLogs ? /* @__PURE__ */ jsx("div", { className: "flex justify-center py-4", children: /* @__PURE__ */ jsx(Spinner, {}) }) : /* @__PURE__ */ jsx(
|
|
293
|
+
LogList,
|
|
294
|
+
{
|
|
295
|
+
entries: logs.map((log) => ({
|
|
296
|
+
id: log.id,
|
|
297
|
+
time: new Date(log.createdAt).toLocaleString(),
|
|
298
|
+
level: log.level,
|
|
299
|
+
message: log.message,
|
|
300
|
+
body: log.payload ? /* @__PURE__ */ jsx("pre", { className: "overflow-x-auto whitespace-pre-wrap rounded-md border bg-card p-3 text-xs", children: JSON.stringify(log.payload, null, 2) }) : /* @__PURE__ */ jsx("p", { className: "text-sm text-muted-foreground", children: t("data_sync.runs.detail.logs.noPayload", "No payload recorded for this log entry.") })
|
|
301
|
+
})),
|
|
302
|
+
emptyMessage: t("data_sync.runs.detail.noLogs")
|
|
303
|
+
}
|
|
304
|
+
),
|
|
305
|
+
logsTotal > LOG_PAGE_SIZE && /* @__PURE__ */ jsx(
|
|
306
|
+
Pagination,
|
|
307
|
+
{
|
|
308
|
+
className: "mt-4",
|
|
309
|
+
page: logsPage,
|
|
310
|
+
pageSize: LOG_PAGE_SIZE,
|
|
311
|
+
total: logsTotal,
|
|
312
|
+
onPageChange: (next) => {
|
|
313
|
+
void loadLogs(next);
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
)
|
|
317
|
+
] })
|
|
295
318
|
] })
|
|
296
319
|
] }) });
|
|
297
320
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../../../src/modules/data_sync/backend/data-sync/runs/%5Bid%5D/page.tsx"],
|
|
4
|
-
"sourcesContent": ["\"use client\"\nimport * as React from 'react'\nimport { usePathname, useRouter } from 'next/navigation'\nimport { Page, PageBody } from '@open-mercato/ui/backend/Page'\nimport { FormHeader } from '@open-mercato/ui/backend/forms'\nimport { Card, CardHeader, CardTitle, CardContent } from '@open-mercato/ui/primitives/card'\nimport { Badge } from '@open-mercato/ui/primitives/badge'\nimport { StatusBadge } from '@open-mercato/ui/primitives/status-badge'\nimport { Button } from '@open-mercato/ui/primitives/button'\nimport { LogList, type LogListEntry } from '@open-mercato/ui/backend/LogList'\nimport { Progress } from '@open-mercato/ui/primitives/progress'\nimport { Spinner } from '@open-mercato/ui/primitives/spinner'\nimport { apiCall } from '@open-mercato/ui/backend/utils/apiCall'\nimport { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'\nimport { flash } from '@open-mercato/ui/backend/FlashMessages'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\nimport { LoadingMessage, ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'\nimport { useAppEvent } from '@open-mercato/ui/backend/injection/useAppEvent'\nimport { RotateCcw, XCircle } from 'lucide-react'\nimport { getSyncRunStatusVariant } from '../../../../lib/syncRunStatus'\n\ntype SyncRunDetail = {\n id: string\n integrationId: string\n entityType: string\n direction: 'import' | 'export'\n status: 'pending' | 'running' | 'completed' | 'failed' | 'cancelled' | 'paused'\n createdCount: number\n updatedCount: number\n skippedCount: number\n failedCount: number\n batchesCompleted: number\n lastError: string | null\n progressJobId: string | null\n progressJob: {\n id: string\n status: string\n progressPercent: number\n processedCount: number\n totalCount: number | null\n etaSeconds: number | null\n meta?: Record<string, unknown> | null\n } | null\n triggeredBy: string | null\n createdAt: string\n updatedAt: string\n}\n\ntype ProgressEventPayload = {\n jobId?: string\n status?: string\n progressPercent?: number\n processedCount?: number\n totalCount?: number | null\n etaSeconds?: number | null\n meta?: Record<string, unknown> | null\n}\n\ntype LogEntry = {\n id: string\n level: 'info' | 'warn' | 'error'\n message: string\n createdAt: string\n payload?: Record<string, unknown> | null\n}\n\nfunction formatEtaSeconds(seconds: number): string {\n if (seconds < 60) return `${seconds}s`\n if (seconds < 3600) return `${Math.ceil(seconds / 60)}m`\n const hours = Math.floor(seconds / 3600)\n const minutes = Math.ceil((seconds % 3600) / 60)\n return `${hours}h ${minutes}m`\n}\n\ntype SyncRunDetailPageProps = {\n params?: {\n id?: string | string[]\n }\n}\n\nfunction resolveRouteId(value: string | string[] | undefined): string | undefined {\n if (Array.isArray(value)) return value[0]\n return value\n}\n\nfunction resolvePathnameId(pathname: string): string | undefined {\n const parts = pathname.split('/').filter(Boolean)\n const runId = parts.at(-1)\n if (!runId || runId === 'runs' || runId === 'data-sync') return undefined\n return decodeURIComponent(runId)\n}\n\nexport default function SyncRunDetailPage({ params }: SyncRunDetailPageProps) {\n const pathname = usePathname()\n const router = useRouter()\n const runId = resolveRouteId(params?.id) ?? resolvePathnameId(pathname)\n const t = useT()\n const { runMutation } = useGuardedMutation<Record<string, unknown>>({\n contextId: 'data_sync.runDetail',\n })\n\n const [run, setRun] = React.useState<SyncRunDetail | null>(null)\n const [isLoading, setIsLoading] = React.useState(true)\n const [error, setError] = React.useState<string | null>(null)\n const [isNotFound, setIsNotFound] = React.useState(false)\n const [logs, setLogs] = React.useState<LogEntry[]>([])\n const [isLoadingLogs, setIsLoadingLogs] = React.useState(false)\n\n const resolveCurrentRunId = React.useCallback(() => {\n return runId ?? (\n typeof window !== 'undefined'\n ? resolvePathnameId(window.location.pathname)\n : undefined\n )\n }, [runId])\n\n const loadRun = React.useCallback(async () => {\n const currentRunId = resolveCurrentRunId()\n if (!currentRunId) {\n setError(t('data_sync.runs.detail.loadError'))\n setIsLoading(false)\n return\n }\n setIsNotFound(false)\n const call = await apiCall<SyncRunDetail>(\n `/api/data_sync/runs/${encodeURIComponent(currentRunId)}`,\n undefined,\n { fallback: null },\n )\n if (!call.ok || !call.result) {\n if (call.status === 404) {\n setIsNotFound(true)\n } else {\n setError(t('data_sync.runs.detail.loadError'))\n }\n setIsLoading(false)\n return\n }\n setRun(call.result)\n setIsLoading(false)\n }, [resolveCurrentRunId, t])\n\n const loadLogs = React.useCallback(async () => {\n const currentRunId = resolveCurrentRunId()\n if (!currentRunId) return\n setIsLoadingLogs(true)\n const params = new URLSearchParams({ runId: currentRunId, pageSize: '50' })\n const call = await apiCall<{ items: LogEntry[] }>(\n `/api/integrations/logs?${params.toString()}`,\n undefined,\n { fallback: { items: [] } },\n )\n if (call.ok && call.result) {\n setLogs(call.result.items)\n }\n setIsLoadingLogs(false)\n }, [resolveCurrentRunId])\n\n React.useEffect(() => {\n void loadRun()\n void loadLogs()\n }, [loadRun, loadLogs])\n\n const handleProgressEvent = React.useCallback((payload: ProgressEventPayload) => {\n const eventJobId = typeof payload.jobId === 'string' ? payload.jobId : null\n if (!eventJobId) return\n\n setRun((current) => {\n if (!current?.progressJobId || current.progressJobId !== eventJobId) return current\n return {\n ...current,\n status: (payload.status as SyncRunDetail['status']) ?? current.status,\n progressJob: {\n id: eventJobId,\n status: payload.status ?? current.progressJob?.status ?? current.status,\n progressPercent: payload.progressPercent ?? current.progressJob?.progressPercent ?? 0,\n processedCount: payload.processedCount ?? current.progressJob?.processedCount ?? 0,\n totalCount: payload.totalCount ?? current.progressJob?.totalCount ?? null,\n etaSeconds: payload.etaSeconds ?? current.progressJob?.etaSeconds ?? null,\n meta: payload.meta ?? current.progressJob?.meta ?? null,\n },\n }\n })\n }, [])\n\n useAppEvent('progress.job.updated', (event) => {\n handleProgressEvent(event.payload as ProgressEventPayload)\n }, [handleProgressEvent])\n\n useAppEvent('progress.job.started', (event) => {\n handleProgressEvent(event.payload as ProgressEventPayload)\n }, [handleProgressEvent])\n\n useAppEvent('progress.job.completed', (event) => {\n handleProgressEvent(event.payload as ProgressEventPayload)\n void loadRun()\n void loadLogs()\n }, [handleProgressEvent, loadLogs, loadRun])\n\n useAppEvent('progress.job.failed', (event) => {\n handleProgressEvent(event.payload as ProgressEventPayload)\n void loadRun()\n void loadLogs()\n }, [handleProgressEvent, loadLogs, loadRun])\n\n useAppEvent('progress.job.cancelled', (event) => {\n handleProgressEvent(event.payload as ProgressEventPayload)\n void loadRun()\n void loadLogs()\n }, [handleProgressEvent, loadLogs, loadRun])\n\n useAppEvent('om:bridge:reconnected', () => {\n void loadRun()\n void loadLogs()\n }, [loadLogs, loadRun])\n\n const handleCancel = React.useCallback(async () => {\n const currentRunId = resolveCurrentRunId()\n if (!currentRunId) return\n const call = await runMutation({\n // optimistic-lock-exempt: run lifecycle action endpoint (cancel), not a concurrent record edit\n operation: () => apiCall(`/api/data_sync/runs/${encodeURIComponent(currentRunId)}/cancel`, {\n method: 'POST',\n }, { fallback: null }),\n mutationPayload: { runId: currentRunId },\n context: {\n operation: 'update',\n actionId: 'cancel-sync-run',\n runId: currentRunId,\n },\n })\n if (call.ok) {\n flash(t('data_sync.runs.detail.cancelSuccess'), 'success')\n void loadRun()\n } else {\n flash(t('data_sync.runs.detail.cancelError'), 'error')\n }\n }, [resolveCurrentRunId, runMutation, t, loadRun])\n\n const handleRetry = React.useCallback(async () => {\n const currentRunId = resolveCurrentRunId()\n if (!currentRunId) return\n const call = await runMutation({\n // optimistic-lock-exempt: starts a new retry run (create), not a concurrent record edit\n operation: () => apiCall<{ id: string }>(`/api/data_sync/runs/${encodeURIComponent(currentRunId)}/retry`, {\n method: 'POST',\n headers: { 'Content-Type': 'application/json' },\n body: JSON.stringify({ fromBeginning: false }),\n }, { fallback: null }),\n mutationPayload: { runId: currentRunId, fromBeginning: false },\n context: {\n operation: 'create',\n actionId: 'retry-sync-run',\n runId: currentRunId,\n },\n })\n if (call.ok && call.result) {\n flash(t('data_sync.runs.detail.retrySuccess'), 'success')\n router.push(`/backend/data-sync/runs/${encodeURIComponent(call.result.id)}`)\n } else {\n flash(t('data_sync.runs.detail.retryError'), 'error')\n }\n }, [resolveCurrentRunId, router, runMutation, t])\n\n if (isLoading) return <Page><PageBody><LoadingMessage label={t('data_sync.runs.detail.title')} /></PageBody></Page>\n if (isNotFound) {\n return (\n <Page>\n <PageBody>\n <RecordNotFoundState\n label={t('data_sync.runs.detail.notFound', 'Sync run not found.')}\n backHref=\"/backend/data-sync\"\n backLabel={t('data_sync.runs.detail.back')}\n />\n </PageBody>\n </Page>\n )\n }\n if (error || !run) return <Page><PageBody><ErrorMessage label={error ?? t('data_sync.runs.detail.loadError')} /></PageBody></Page>\n\n const totalProcessed = run.createdCount + run.updatedCount + run.skippedCount + run.failedCount\n const progressPercent = run.progressJob?.progressPercent ?? (run.status === 'completed' ? 100 : 0)\n const progressStatus = run.progressJob?.status ?? run.status\n const processedCount = run.progressJob?.processedCount ?? totalProcessed\n const hasProgressTotal = typeof run.progressJob?.totalCount === 'number' && run.progressJob.totalCount > 0\n const etaLabel = run.progressJob?.etaSeconds && run.progressJob.etaSeconds > 0\n ? formatEtaSeconds(run.progressJob.etaSeconds)\n : null\n\n return (\n <Page>\n <PageBody className=\"space-y-6\">\n <FormHeader\n mode=\"detail\"\n backHref=\"/backend/data-sync\"\n backLabel={t('data_sync.runs.detail.back')}\n entityTypeLabel={t('data_sync.runs.detail.title')}\n title={`${run.integrationId} \u2014 ${run.entityType}`}\n statusBadge={(\n <div className=\"mt-2 flex flex-wrap gap-2\">\n <Badge variant=\"outline\">{t(`data_sync.dashboard.direction.${run.direction}`)}</Badge>\n <StatusBadge variant={getSyncRunStatusVariant(run.status)}>\n {t(`data_sync.dashboard.status.${run.status}`)}\n </StatusBadge>\n {run.triggeredBy ? <Badge variant=\"outline\">{run.triggeredBy}</Badge> : null}\n </div>\n )}\n actionsContent={(\n <>\n {(run.status === 'running' || run.status === 'pending') ? (\n <Button type=\"button\" variant=\"destructive\" size=\"sm\" onClick={() => void handleCancel()}>\n <XCircle className=\"mr-2 h-4 w-4\" />\n {t('data_sync.runs.detail.cancel')}\n </Button>\n ) : null}\n {run.status === 'failed' ? (\n <Button type=\"button\" variant=\"outline\" size=\"sm\" onClick={() => void handleRetry()}>\n <RotateCcw className=\"mr-2 h-4 w-4\" />\n {t('data_sync.runs.detail.retry')}\n </Button>\n ) : null}\n </>\n )}\n />\n\n <Card>\n <CardHeader>\n <div className=\"flex items-center justify-between gap-3\">\n <CardTitle>{t('data_sync.runs.detail.progress')}</CardTitle>\n <StatusBadge variant={getSyncRunStatusVariant(progressStatus)}>\n {t(`data_sync.dashboard.status.${progressStatus}`)}\n </StatusBadge>\n </div>\n </CardHeader>\n <CardContent className=\"space-y-3\">\n <div className=\"flex items-center justify-between gap-3 text-sm\">\n <span className=\"font-medium\">\n {hasProgressTotal\n ? t('data_sync.runs.detail.progress.percent', { percent: progressPercent })\n : t('data_sync.runs.detail.progress.itemsProcessed', { count: processedCount })}\n </span>\n {etaLabel ? (\n <span className=\"text-muted-foreground\">\n {t('data_sync.runs.detail.progress.eta', { eta: etaLabel })}\n </span>\n ) : null}\n </div>\n {hasProgressTotal ? (\n <Progress value={progressPercent} className=\"h-3\" />\n ) : (\n <div className=\"relative h-3 w-full overflow-hidden rounded-full bg-secondary\">\n <div className=\"absolute inset-y-0 left-0 w-1/2 animate-pulse rounded-full bg-primary/80\" />\n <div className=\"absolute inset-y-0 right-0 w-1/3 rounded-full bg-primary/10\" />\n </div>\n )}\n <div className=\"flex flex-wrap items-center justify-between gap-2 text-sm text-muted-foreground\">\n <span>\n {hasProgressTotal\n ? t('data_sync.runs.detail.progress.itemsProcessedTotal', {\n processed: processedCount,\n total: run.progressJob?.totalCount ?? 0,\n })\n : t('data_sync.runs.detail.progress.itemsProcessed', { count: processedCount })}\n </span>\n <span>{t('data_sync.runs.detail.progress.batches', { count: run.batchesCompleted })}</span>\n </div>\n </CardContent>\n </Card>\n\n <div className=\"grid grid-cols-2 sm:grid-cols-4 gap-4\">\n <Card>\n <CardContent className=\"pt-6 text-center\">\n <div className=\"text-2xl font-bold text-status-success-text\">{run.createdCount}</div>\n <p className=\"text-sm text-muted-foreground\">{t('data_sync.runs.detail.counters.created')}</p>\n </CardContent>\n </Card>\n <Card>\n <CardContent className=\"pt-6 text-center\">\n <div className=\"text-2xl font-bold text-status-info-text\">{run.updatedCount}</div>\n <p className=\"text-sm text-muted-foreground\">{t('data_sync.runs.detail.counters.updated')}</p>\n </CardContent>\n </Card>\n <Card>\n <CardContent className=\"pt-6 text-center\">\n <div className=\"text-2xl font-bold text-muted-foreground\">{run.skippedCount}</div>\n <p className=\"text-sm text-muted-foreground\">{t('data_sync.runs.detail.counters.skipped')}</p>\n </CardContent>\n </Card>\n <Card>\n <CardContent className=\"pt-6 text-center\">\n <div className=\"text-2xl font-bold text-status-error-text\">{run.failedCount}</div>\n <p className=\"text-sm text-muted-foreground\">{t('data_sync.runs.detail.counters.failed')}</p>\n </CardContent>\n </Card>\n </div>\n\n {run.lastError && (\n <Card className=\"border-status-error-border bg-status-error-bg\">\n <CardHeader>\n <CardTitle className=\"text-status-error-text\">{t('data_sync.runs.detail.error')}</CardTitle>\n </CardHeader>\n <CardContent>\n <pre className=\"text-sm text-status-error-text whitespace-pre-wrap\">{run.lastError}</pre>\n </CardContent>\n </Card>\n )}\n\n <Card>\n <CardHeader>\n <CardTitle>{t('data_sync.runs.detail.logs')}</CardTitle>\n </CardHeader>\n <CardContent>\n {isLoadingLogs ? (\n <div className=\"flex justify-center py-4\"><Spinner /></div>\n ) : (\n <LogList\n entries={logs.map<LogListEntry>((log) => ({\n id: log.id,\n time: new Date(log.createdAt).toLocaleString(),\n level: log.level,\n message: log.message,\n body: log.payload ? (\n <pre className=\"overflow-x-auto whitespace-pre-wrap rounded-md border bg-card p-3 text-xs\">\n {JSON.stringify(log.payload, null, 2)}\n </pre>\n ) : (\n <p className=\"text-sm text-muted-foreground\">\n {t('data_sync.runs.detail.logs.noPayload', 'No payload recorded for this log entry.')}\n </p>\n ),\n }))}\n emptyMessage={t('data_sync.runs.detail.noLogs')}\n />\n )}\n </CardContent>\n </Card>\n </PageBody>\n </Page>\n )\n}\n"],
|
|
5
|
-
"mappings": ";
|
|
4
|
+
"sourcesContent": ["\"use client\"\nimport * as React from 'react'\nimport { usePathname, useRouter } from 'next/navigation'\nimport { Page, PageBody } from '@open-mercato/ui/backend/Page'\nimport { FormHeader } from '@open-mercato/ui/backend/forms'\nimport { Card, CardHeader, CardTitle, CardContent } from '@open-mercato/ui/primitives/card'\nimport { Badge } from '@open-mercato/ui/primitives/badge'\nimport { StatusBadge } from '@open-mercato/ui/primitives/status-badge'\nimport { Button } from '@open-mercato/ui/primitives/button'\nimport { LogList, type LogListEntry } from '@open-mercato/ui/backend/LogList'\nimport { Progress } from '@open-mercato/ui/primitives/progress'\nimport { Pagination } from '@open-mercato/ui/primitives/pagination'\nimport { Spinner } from '@open-mercato/ui/primitives/spinner'\nimport { apiCall } from '@open-mercato/ui/backend/utils/apiCall'\nimport { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'\nimport { flash } from '@open-mercato/ui/backend/FlashMessages'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\nimport { LoadingMessage, ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'\nimport { useAppEvent } from '@open-mercato/ui/backend/injection/useAppEvent'\nimport { RotateCcw, XCircle } from 'lucide-react'\nimport { getSyncRunStatusVariant } from '../../../../lib/syncRunStatus'\n\ntype SyncRunDetail = {\n id: string\n integrationId: string\n entityType: string\n direction: 'import' | 'export'\n status: 'pending' | 'running' | 'completed' | 'failed' | 'cancelled' | 'paused'\n createdCount: number\n updatedCount: number\n skippedCount: number\n failedCount: number\n batchesCompleted: number\n lastError: string | null\n progressJobId: string | null\n progressJob: {\n id: string\n status: string\n progressPercent: number\n processedCount: number\n totalCount: number | null\n etaSeconds: number | null\n meta?: Record<string, unknown> | null\n } | null\n triggeredBy: string | null\n createdAt: string\n updatedAt: string\n}\n\ntype ProgressEventPayload = {\n jobId?: string\n status?: string\n progressPercent?: number\n processedCount?: number\n totalCount?: number | null\n etaSeconds?: number | null\n meta?: Record<string, unknown> | null\n}\n\ntype LogEntry = {\n id: string\n level: 'info' | 'warn' | 'error'\n message: string\n createdAt: string\n payload?: Record<string, unknown> | null\n}\n\nfunction formatEtaSeconds(seconds: number): string {\n if (seconds < 60) return `${seconds}s`\n if (seconds < 3600) return `${Math.ceil(seconds / 60)}m`\n const hours = Math.floor(seconds / 3600)\n const minutes = Math.ceil((seconds % 3600) / 60)\n return `${hours}h ${minutes}m`\n}\n\ntype SyncRunDetailPageProps = {\n params?: {\n id?: string | string[]\n }\n}\n\nfunction resolveRouteId(value: string | string[] | undefined): string | undefined {\n if (Array.isArray(value)) return value[0]\n return value\n}\n\nfunction resolvePathnameId(pathname: string): string | undefined {\n const parts = pathname.split('/').filter(Boolean)\n const runId = parts.at(-1)\n if (!runId || runId === 'runs' || runId === 'data-sync') return undefined\n return decodeURIComponent(runId)\n}\n\nconst LOG_PAGE_SIZE = 50\n\nexport default function SyncRunDetailPage({ params }: SyncRunDetailPageProps) {\n const pathname = usePathname()\n const router = useRouter()\n const runId = resolveRouteId(params?.id) ?? resolvePathnameId(pathname)\n const t = useT()\n const { runMutation } = useGuardedMutation<Record<string, unknown>>({\n contextId: 'data_sync.runDetail',\n })\n\n const [run, setRun] = React.useState<SyncRunDetail | null>(null)\n const [isLoading, setIsLoading] = React.useState(true)\n const [error, setError] = React.useState<string | null>(null)\n const [isNotFound, setIsNotFound] = React.useState(false)\n const [logs, setLogs] = React.useState<LogEntry[]>([])\n const [isLoadingLogs, setIsLoadingLogs] = React.useState(false)\n const [logsTotal, setLogsTotal] = React.useState(0)\n const [logsPage, setLogsPage] = React.useState(1)\n const logsPageRef = React.useRef(1)\n\n const resolveCurrentRunId = React.useCallback(() => {\n return runId ?? (\n typeof window !== 'undefined'\n ? resolvePathnameId(window.location.pathname)\n : undefined\n )\n }, [runId])\n\n const loadRun = React.useCallback(async () => {\n const currentRunId = resolveCurrentRunId()\n if (!currentRunId) {\n setError(t('data_sync.runs.detail.loadError'))\n setIsLoading(false)\n return\n }\n setIsNotFound(false)\n const call = await apiCall<SyncRunDetail>(\n `/api/data_sync/runs/${encodeURIComponent(currentRunId)}`,\n undefined,\n { fallback: null },\n )\n if (!call.ok || !call.result) {\n if (call.status === 404) {\n setIsNotFound(true)\n } else {\n setError(t('data_sync.runs.detail.loadError'))\n }\n setIsLoading(false)\n return\n }\n setRun(call.result)\n setIsLoading(false)\n }, [resolveCurrentRunId, t])\n\n const loadLogs = React.useCallback(async (page?: number) => {\n const currentRunId = resolveCurrentRunId()\n if (!currentRunId) return\n const targetPage = page ?? logsPageRef.current\n setIsLoadingLogs(true)\n const params = new URLSearchParams({ runId: currentRunId, pageSize: String(LOG_PAGE_SIZE), page: String(targetPage) })\n const call = await apiCall<{ items: LogEntry[]; total?: number }>(\n `/api/integrations/logs?${params.toString()}`,\n undefined,\n { fallback: { items: [], total: 0 } },\n )\n if (call.ok && call.result) {\n setLogs(call.result.items)\n if (typeof call.result.total === 'number') setLogsTotal(call.result.total)\n logsPageRef.current = targetPage\n setLogsPage(targetPage)\n }\n setIsLoadingLogs(false)\n }, [resolveCurrentRunId])\n\n React.useEffect(() => {\n void loadRun()\n void loadLogs()\n }, [loadRun, loadLogs])\n\n const handleProgressEvent = React.useCallback((payload: ProgressEventPayload) => {\n const eventJobId = typeof payload.jobId === 'string' ? payload.jobId : null\n if (!eventJobId) return\n\n setRun((current) => {\n if (!current?.progressJobId || current.progressJobId !== eventJobId) return current\n return {\n ...current,\n status: (payload.status as SyncRunDetail['status']) ?? current.status,\n progressJob: {\n id: eventJobId,\n status: payload.status ?? current.progressJob?.status ?? current.status,\n progressPercent: payload.progressPercent ?? current.progressJob?.progressPercent ?? 0,\n processedCount: payload.processedCount ?? current.progressJob?.processedCount ?? 0,\n totalCount: payload.totalCount ?? current.progressJob?.totalCount ?? null,\n etaSeconds: payload.etaSeconds ?? current.progressJob?.etaSeconds ?? null,\n meta: payload.meta ?? current.progressJob?.meta ?? null,\n },\n }\n })\n }, [])\n\n useAppEvent('progress.job.updated', (event) => {\n handleProgressEvent(event.payload as ProgressEventPayload)\n }, [handleProgressEvent])\n\n useAppEvent('progress.job.started', (event) => {\n handleProgressEvent(event.payload as ProgressEventPayload)\n }, [handleProgressEvent])\n\n useAppEvent('progress.job.completed', (event) => {\n handleProgressEvent(event.payload as ProgressEventPayload)\n void loadRun()\n void loadLogs()\n }, [handleProgressEvent, loadLogs, loadRun])\n\n useAppEvent('progress.job.failed', (event) => {\n handleProgressEvent(event.payload as ProgressEventPayload)\n void loadRun()\n void loadLogs()\n }, [handleProgressEvent, loadLogs, loadRun])\n\n useAppEvent('progress.job.cancelled', (event) => {\n handleProgressEvent(event.payload as ProgressEventPayload)\n void loadRun()\n void loadLogs()\n }, [handleProgressEvent, loadLogs, loadRun])\n\n useAppEvent('om:bridge:reconnected', () => {\n void loadRun()\n void loadLogs()\n }, [loadLogs, loadRun])\n\n const handleCancel = React.useCallback(async () => {\n const currentRunId = resolveCurrentRunId()\n if (!currentRunId) return\n const call = await runMutation({\n // optimistic-lock-exempt: run lifecycle action endpoint (cancel), not a concurrent record edit\n operation: () => apiCall(`/api/data_sync/runs/${encodeURIComponent(currentRunId)}/cancel`, {\n method: 'POST',\n }, { fallback: null }),\n mutationPayload: { runId: currentRunId },\n context: {\n operation: 'update',\n actionId: 'cancel-sync-run',\n runId: currentRunId,\n },\n })\n if (call.ok) {\n flash(t('data_sync.runs.detail.cancelSuccess'), 'success')\n void loadRun()\n } else {\n flash(t('data_sync.runs.detail.cancelError'), 'error')\n }\n }, [resolveCurrentRunId, runMutation, t, loadRun])\n\n const handleRetry = React.useCallback(async () => {\n const currentRunId = resolveCurrentRunId()\n if (!currentRunId) return\n const call = await runMutation({\n // optimistic-lock-exempt: starts a new retry run (create), not a concurrent record edit\n operation: () => apiCall<{ id: string }>(`/api/data_sync/runs/${encodeURIComponent(currentRunId)}/retry`, {\n method: 'POST',\n headers: { 'Content-Type': 'application/json' },\n body: JSON.stringify({ fromBeginning: false }),\n }, { fallback: null }),\n mutationPayload: { runId: currentRunId, fromBeginning: false },\n context: {\n operation: 'create',\n actionId: 'retry-sync-run',\n runId: currentRunId,\n },\n })\n if (call.ok && call.result) {\n flash(t('data_sync.runs.detail.retrySuccess'), 'success')\n router.push(`/backend/data-sync/runs/${encodeURIComponent(call.result.id)}`)\n } else {\n flash(t('data_sync.runs.detail.retryError'), 'error')\n }\n }, [resolveCurrentRunId, router, runMutation, t])\n\n if (isLoading) return <Page><PageBody><LoadingMessage label={t('data_sync.runs.detail.title')} /></PageBody></Page>\n if (isNotFound) {\n return (\n <Page>\n <PageBody>\n <RecordNotFoundState\n label={t('data_sync.runs.detail.notFound', 'Sync run not found.')}\n backHref=\"/backend/data-sync\"\n backLabel={t('data_sync.runs.detail.back')}\n />\n </PageBody>\n </Page>\n )\n }\n if (error || !run) return <Page><PageBody><ErrorMessage label={error ?? t('data_sync.runs.detail.loadError')} /></PageBody></Page>\n\n const totalProcessed = run.createdCount + run.updatedCount + run.skippedCount + run.failedCount\n const progressPercent = run.progressJob?.progressPercent ?? (run.status === 'completed' ? 100 : 0)\n const progressStatus = run.progressJob?.status ?? run.status\n const processedCount = run.progressJob?.processedCount ?? totalProcessed\n const hasProgressTotal = typeof run.progressJob?.totalCount === 'number' && run.progressJob.totalCount > 0\n const etaLabel = run.progressJob?.etaSeconds && run.progressJob.etaSeconds > 0\n ? formatEtaSeconds(run.progressJob.etaSeconds)\n : null\n\n return (\n <Page>\n <PageBody className=\"space-y-6\">\n <FormHeader\n mode=\"detail\"\n backHref=\"/backend/data-sync\"\n backLabel={t('data_sync.runs.detail.back')}\n entityTypeLabel={t('data_sync.runs.detail.title')}\n title={`${run.integrationId} \u2014 ${run.entityType}`}\n statusBadge={(\n <div className=\"mt-2 flex flex-wrap gap-2\">\n <Badge variant=\"outline\">{t(`data_sync.dashboard.direction.${run.direction}`)}</Badge>\n <StatusBadge variant={getSyncRunStatusVariant(run.status)}>\n {t(`data_sync.dashboard.status.${run.status}`)}\n </StatusBadge>\n {run.triggeredBy ? <Badge variant=\"outline\">{run.triggeredBy}</Badge> : null}\n </div>\n )}\n actionsContent={(\n <>\n {(run.status === 'running' || run.status === 'pending') ? (\n <Button type=\"button\" variant=\"destructive\" size=\"sm\" onClick={() => void handleCancel()}>\n <XCircle className=\"mr-2 h-4 w-4\" />\n {t('data_sync.runs.detail.cancel')}\n </Button>\n ) : null}\n {run.status === 'failed' ? (\n <Button type=\"button\" variant=\"outline\" size=\"sm\" onClick={() => void handleRetry()}>\n <RotateCcw className=\"mr-2 h-4 w-4\" />\n {t('data_sync.runs.detail.retry')}\n </Button>\n ) : null}\n </>\n )}\n />\n\n <Card>\n <CardHeader>\n <div className=\"flex items-center justify-between gap-3\">\n <CardTitle>{t('data_sync.runs.detail.progress')}</CardTitle>\n <StatusBadge variant={getSyncRunStatusVariant(progressStatus)}>\n {t(`data_sync.dashboard.status.${progressStatus}`)}\n </StatusBadge>\n </div>\n </CardHeader>\n <CardContent className=\"space-y-3\">\n <div className=\"flex items-center justify-between gap-3 text-sm\">\n <span className=\"font-medium\">\n {hasProgressTotal\n ? t('data_sync.runs.detail.progress.percent', { percent: progressPercent })\n : t('data_sync.runs.detail.progress.itemsProcessed', { count: processedCount })}\n </span>\n {etaLabel ? (\n <span className=\"text-muted-foreground\">\n {t('data_sync.runs.detail.progress.eta', { eta: etaLabel })}\n </span>\n ) : null}\n </div>\n {hasProgressTotal ? (\n <Progress value={progressPercent} className=\"h-3\" />\n ) : (\n <div className=\"relative h-3 w-full overflow-hidden rounded-full bg-secondary\">\n <div className=\"absolute inset-y-0 left-0 w-1/2 animate-pulse rounded-full bg-primary/80\" />\n <div className=\"absolute inset-y-0 right-0 w-1/3 rounded-full bg-primary/10\" />\n </div>\n )}\n <div className=\"flex flex-wrap items-center justify-between gap-2 text-sm text-muted-foreground\">\n <span>\n {hasProgressTotal\n ? t('data_sync.runs.detail.progress.itemsProcessedTotal', {\n processed: processedCount,\n total: run.progressJob?.totalCount ?? 0,\n })\n : t('data_sync.runs.detail.progress.itemsProcessed', { count: processedCount })}\n </span>\n <span>{t('data_sync.runs.detail.progress.batches', { count: run.batchesCompleted })}</span>\n </div>\n </CardContent>\n </Card>\n\n <div className=\"grid grid-cols-2 sm:grid-cols-4 gap-4\">\n <Card>\n <CardContent className=\"pt-6 text-center\">\n <div className=\"text-2xl font-bold text-status-success-text\">{run.createdCount}</div>\n <p className=\"text-sm text-muted-foreground\">{t('data_sync.runs.detail.counters.created')}</p>\n </CardContent>\n </Card>\n <Card>\n <CardContent className=\"pt-6 text-center\">\n <div className=\"text-2xl font-bold text-status-info-text\">{run.updatedCount}</div>\n <p className=\"text-sm text-muted-foreground\">{t('data_sync.runs.detail.counters.updated')}</p>\n </CardContent>\n </Card>\n <Card>\n <CardContent className=\"pt-6 text-center\">\n <div className=\"text-2xl font-bold text-muted-foreground\">{run.skippedCount}</div>\n <p className=\"text-sm text-muted-foreground\">{t('data_sync.runs.detail.counters.skipped')}</p>\n </CardContent>\n </Card>\n <Card>\n <CardContent className=\"pt-6 text-center\">\n <div className=\"text-2xl font-bold text-status-error-text\">{run.failedCount}</div>\n <p className=\"text-sm text-muted-foreground\">{t('data_sync.runs.detail.counters.failed')}</p>\n </CardContent>\n </Card>\n </div>\n\n {run.lastError && (\n <Card className=\"border-status-error-border bg-status-error-bg\">\n <CardHeader>\n <CardTitle className=\"text-status-error-text\">{t('data_sync.runs.detail.error')}</CardTitle>\n </CardHeader>\n <CardContent>\n <pre className=\"text-sm text-status-error-text whitespace-pre-wrap\">{run.lastError}</pre>\n </CardContent>\n </Card>\n )}\n\n <Card>\n <CardHeader>\n <CardTitle>{t('data_sync.runs.detail.logs')}</CardTitle>\n </CardHeader>\n <CardContent>\n {isLoadingLogs ? (\n <div className=\"flex justify-center py-4\"><Spinner /></div>\n ) : (\n <LogList\n entries={logs.map<LogListEntry>((log) => ({\n id: log.id,\n time: new Date(log.createdAt).toLocaleString(),\n level: log.level,\n message: log.message,\n body: log.payload ? (\n <pre className=\"overflow-x-auto whitespace-pre-wrap rounded-md border bg-card p-3 text-xs\">\n {JSON.stringify(log.payload, null, 2)}\n </pre>\n ) : (\n <p className=\"text-sm text-muted-foreground\">\n {t('data_sync.runs.detail.logs.noPayload', 'No payload recorded for this log entry.')}\n </p>\n ),\n }))}\n emptyMessage={t('data_sync.runs.detail.noLogs')}\n />\n )}\n {logsTotal > LOG_PAGE_SIZE && (\n <Pagination\n className=\"mt-4\"\n page={logsPage}\n pageSize={LOG_PAGE_SIZE}\n total={logsTotal}\n onPageChange={(next) => { void loadLogs(next) }}\n />\n )}\n </CardContent>\n </Card>\n </PageBody>\n </Page>\n )\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": ["params"]
|
|
7
7
|
}
|
|
@@ -45,46 +45,46 @@ const TimeReportingWidget = ({
|
|
|
45
45
|
setLoading(true);
|
|
46
46
|
setError(null);
|
|
47
47
|
try {
|
|
48
|
-
const assignmentsRes = await
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
48
|
+
const [assignmentsRes, selfRes] = await Promise.all([
|
|
49
|
+
readApiResultOrThrow(
|
|
50
|
+
"/api/staff/timesheets/my-projects?pageSize=100",
|
|
51
|
+
void 0,
|
|
52
|
+
{ errorMessage: "", fallback: { items: [] } }
|
|
53
|
+
),
|
|
54
|
+
readApiResultOrThrow(
|
|
55
|
+
"/api/staff/team-members/self",
|
|
56
|
+
void 0,
|
|
57
|
+
{ errorMessage: "", fallback: { member: null } }
|
|
58
|
+
)
|
|
59
|
+
]);
|
|
53
60
|
const assignmentItems = Array.isArray(assignmentsRes.items) ? assignmentsRes.items : [];
|
|
54
61
|
const projectIds = assignmentItems.map((item) => String(item.time_project_id ?? item.timeProjectId ?? "")).filter((id) => id.length > 0);
|
|
55
|
-
|
|
56
|
-
|
|
62
|
+
const memberId = selfRes.member?.id ?? null;
|
|
63
|
+
setStaffMemberId(memberId);
|
|
64
|
+
const today = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
|
|
65
|
+
const [projectsRes, entriesRes] = await Promise.all([
|
|
66
|
+
projectIds.length > 0 ? readApiResultOrThrow(
|
|
57
67
|
`/api/staff/timesheets/time-projects?ids=${projectIds.join(",")}&pageSize=100`,
|
|
58
68
|
void 0,
|
|
59
69
|
{ errorMessage: "", fallback: { items: [] } }
|
|
60
|
-
)
|
|
61
|
-
|
|
62
|
-
setProjects(items.map((item) => ({
|
|
63
|
-
id: String(item.id ?? ""),
|
|
64
|
-
name: String(item.name ?? ""),
|
|
65
|
-
code: typeof item.code === "string" ? item.code : null
|
|
66
|
-
})));
|
|
67
|
-
} else {
|
|
68
|
-
setProjects([]);
|
|
69
|
-
}
|
|
70
|
-
const selfRes = await readApiResultOrThrow(
|
|
71
|
-
"/api/staff/team-members/self",
|
|
72
|
-
void 0,
|
|
73
|
-
{ errorMessage: "", fallback: { member: null } }
|
|
74
|
-
);
|
|
75
|
-
const memberId = selfRes.member?.id ?? null;
|
|
76
|
-
setStaffMemberId(memberId);
|
|
77
|
-
if (memberId) {
|
|
78
|
-
const today = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
|
|
79
|
-
const entriesRes = await readApiResultOrThrow(
|
|
70
|
+
) : Promise.resolve({ items: [] }),
|
|
71
|
+
memberId ? readApiResultOrThrow(
|
|
80
72
|
`/api/staff/timesheets/time-entries?staffMemberId=${memberId}&from=${today}&to=${today}&pageSize=100`,
|
|
81
73
|
void 0,
|
|
82
74
|
{ errorMessage: "", fallback: { items: [] } }
|
|
83
|
-
)
|
|
75
|
+
) : Promise.resolve({ items: [] })
|
|
76
|
+
]);
|
|
77
|
+
const projectItems = Array.isArray(projectsRes.items) ? projectsRes.items : [];
|
|
78
|
+
setProjects(projectItems.map((item) => ({
|
|
79
|
+
id: String(item.id ?? ""),
|
|
80
|
+
name: String(item.name ?? ""),
|
|
81
|
+
code: typeof item.code === "string" ? item.code : null
|
|
82
|
+
})));
|
|
83
|
+
if (memberId) {
|
|
84
84
|
const entries = Array.isArray(entriesRes.items) ? entriesRes.items : [];
|
|
85
|
-
const running = entries.find((
|
|
86
|
-
const startedAt =
|
|
87
|
-
const endedAt =
|
|
85
|
+
const running = entries.find((entry) => {
|
|
86
|
+
const startedAt = entry.started_at ?? entry.startedAt;
|
|
87
|
+
const endedAt = entry.ended_at ?? entry.endedAt;
|
|
88
88
|
return startedAt != null && endedAt == null;
|
|
89
89
|
});
|
|
90
90
|
if (running) {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../../src/modules/staff/widgets/dashboard/timesheets-time-reporting/widget.client.tsx"],
|
|
4
|
-
"sourcesContent": ["\"use client\"\n\nimport * as React from 'react'\nimport type { DashboardWidgetComponentProps } from '@open-mercato/shared/modules/dashboard/widgets'\nimport { apiCall, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'\nimport { Button } from '@open-mercato/ui/primitives/button'\nimport { Input } from '@open-mercato/ui/primitives/input'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\nimport { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'\nimport { startTimerEntry } from '../../../lib/timesheets-ui/startTimer'\nimport { resolveTimerActionError } from '../../../lib/timesheets-ui/timerErrors'\nimport { DEFAULT_SETTINGS, hydrateSettings, type TimeReportingSettings } from './config'\n\ntype ProjectOption = { id: string; name: string; code: string | null }\n\ntype TimerState = {\n entryId: string | null\n running: boolean\n startedAt: string | null\n projectId: string | null\n}\n\nconst TIMER_WIDGET_MUTATION_CONTEXT_ID = 'staff-timesheets-time-reporting-widget'\n\ntype TimerWidgetMutationContext = {\n formId: string\n resourceKind: string\n resourceId: string\n staffMemberId: string\n action: 'timer-create' | 'timer-start' | 'timer-stop'\n retryLastMutation: () => Promise<boolean>\n}\n\nfunction formatElapsed(startedAt: string): string {\n const elapsed = Math.max(0, Date.now() - new Date(startedAt).getTime())\n const totalSeconds = Math.floor(elapsed / 1000)\n const hours = Math.floor(totalSeconds / 3600)\n const minutes = Math.floor((totalSeconds % 3600) / 60)\n const seconds = totalSeconds % 60\n return `${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}:${String(seconds).padStart(2, '0')}`\n}\n\nconst TimeReportingWidget: React.FC<DashboardWidgetComponentProps<TimeReportingSettings>> = ({\n mode,\n settings = DEFAULT_SETTINGS,\n onSettingsChange,\n refreshToken,\n onRefreshStateChange,\n}) => {\n const t = useT()\n const { runMutation, retryLastMutation } = useGuardedMutation<TimerWidgetMutationContext>({\n contextId: TIMER_WIDGET_MUTATION_CONTEXT_ID,\n blockedMessage: t('ui.forms.flash.saveBlocked', 'Save blocked by validation'),\n })\n const hydrated = React.useMemo(() => hydrateSettings(settings), [settings])\n\n const [projects, setProjects] = React.useState<ProjectOption[]>([])\n const [selectedProjectId, setSelectedProjectId] = React.useState<string | null>(hydrated.lastProjectId)\n const [notes, setNotes] = React.useState('')\n const [timer, setTimer] = React.useState<TimerState>({ entryId: null, running: false, startedAt: null, projectId: null })\n const [elapsed, setElapsed] = React.useState('00:00:00')\n const [staffMemberId, setStaffMemberId] = React.useState<string | null>(null)\n const [loading, setLoading] = React.useState(true)\n const [actionLoading, setActionLoading] = React.useState(false)\n const [error, setError] = React.useState<string | null>(null)\n\n const loadState = React.useCallback(async () => {\n onRefreshStateChange?.(true)\n setLoading(true)\n setError(null)\n try {\n // Load assigned projects\n const assignmentsRes = await readApiResultOrThrow<{ items?: Array<Record<string, unknown>> }>(\n '/api/staff/timesheets/my-projects?pageSize=100',\n undefined,\n { errorMessage: '', fallback: { items: [] } },\n )\n const assignmentItems = Array.isArray(assignmentsRes.items) ? assignmentsRes.items : []\n const projectIds = assignmentItems\n .map((item) => String(item.time_project_id ?? item.timeProjectId ?? ''))\n .filter((id) => id.length > 0)\n\n if (projectIds.length > 0) {\n const projectsRes = await readApiResultOrThrow<{ items?: Array<Record<string, unknown>> }>(\n `/api/staff/timesheets/time-projects?ids=${projectIds.join(',')}&pageSize=100`,\n undefined,\n { errorMessage: '', fallback: { items: [] } },\n )\n const items = Array.isArray(projectsRes.items) ? projectsRes.items : []\n setProjects(items.map((item) => ({\n id: String(item.id ?? ''),\n name: String(item.name ?? ''),\n code: typeof item.code === 'string' ? item.code : null,\n })))\n } else {\n setProjects([])\n }\n\n // Check for active timer \u2014 look for today's entries with startedAt set and endedAt null\n const selfRes = await readApiResultOrThrow<{ member?: { id: string } | null }>(\n '/api/staff/team-members/self',\n undefined,\n { errorMessage: '', fallback: { member: null } },\n )\n const memberId = selfRes.member?.id ?? null\n setStaffMemberId(memberId)\n if (memberId) {\n const today = new Date().toISOString().slice(0, 10)\n const entriesRes = await readApiResultOrThrow<{ items?: Array<Record<string, unknown>> }>(\n `/api/staff/timesheets/time-entries?staffMemberId=${memberId}&from=${today}&to=${today}&pageSize=100`,\n undefined,\n { errorMessage: '', fallback: { items: [] } },\n )\n const entries = Array.isArray(entriesRes.items) ? entriesRes.items : []\n const running = entries.find((e) => {\n const startedAt = e.started_at ?? e.startedAt\n const endedAt = e.ended_at ?? e.endedAt\n return startedAt != null && endedAt == null\n })\n if (running) {\n setTimer({\n entryId: String(running.id ?? ''),\n running: true,\n startedAt: String(running.started_at ?? running.startedAt ?? ''),\n projectId: String(running.time_project_id ?? running.timeProjectId ?? ''),\n })\n } else {\n setTimer({ entryId: null, running: false, startedAt: null, projectId: null })\n }\n }\n } catch (err) {\n console.error('staff.timesheets.timeReporting.load', err)\n setError(t('staff.timesheets.widgets.timeReporting.error', 'Failed to load timer state'))\n } finally {\n setLoading(false)\n onRefreshStateChange?.(false)\n }\n }, [onRefreshStateChange, t])\n\n React.useEffect(() => {\n void loadState()\n }, [loadState, refreshToken])\n\n // Tick elapsed time\n React.useEffect(() => {\n if (!timer.running || !timer.startedAt) return\n const tick = () => setElapsed(formatElapsed(timer.startedAt!))\n tick()\n const interval = setInterval(tick, 1000)\n return () => clearInterval(interval)\n }, [timer.running, timer.startedAt])\n\n const handleStart = React.useCallback(async () => {\n if (!selectedProjectId || !staffMemberId) return\n if (timer.running) return\n setActionLoading(true)\n try {\n const today = new Date().toISOString().slice(0, 10)\n // Single atomic create+start request (issue #3311): a partial failure can\n // no longer leave an orphaned, unstarted timer entry, and a rejected start\n // now surfaces here instead of being silently ignored. The call is routed\n // through the mutation guard (issue #3308) so global injection modules can\n // run onBeforeSave/onAfterSave and surface conflicts consistently.\n const startPayload = {\n staffMemberId,\n timeProjectId: selectedProjectId,\n date: today,\n notes: notes.trim() || null,\n }\n await runMutation({\n operation: () => startTimerEntry(startPayload),\n context: {\n formId: TIMER_WIDGET_MUTATION_CONTEXT_ID,\n resourceKind: 'staff.timesheets.time_entry',\n resourceId: staffMemberId,\n staffMemberId,\n action: 'timer-start',\n retryLastMutation,\n },\n mutationPayload: startPayload,\n })\n\n onSettingsChange({ ...hydrated, lastProjectId: selectedProjectId })\n await loadState()\n } catch (err) {\n console.error('staff.timesheets.timeReporting.start', err)\n setError(resolveTimerActionError(err, t('staff.timesheets.widgets.timeReporting.startError', 'Failed to start timer')))\n } finally {\n setActionLoading(false)\n }\n }, [selectedProjectId, staffMemberId, timer.running, notes, hydrated, onSettingsChange, loadState, runMutation, retryLastMutation, t])\n\n const handleStop = React.useCallback(async () => {\n if (!timer.entryId || !staffMemberId) return\n setActionLoading(true)\n try {\n const stopPayload = {\n id: timer.entryId,\n action: 'timer-stop',\n staffMemberId,\n }\n await runMutation({\n operation: () =>\n apiCall(`/api/staff/timesheets/time-entries/${timer.entryId}/timer-stop`, { method: 'POST' }),\n context: {\n formId: TIMER_WIDGET_MUTATION_CONTEXT_ID,\n resourceKind: 'staff.timesheets.time_entry',\n resourceId: timer.entryId,\n staffMemberId,\n action: 'timer-stop',\n retryLastMutation,\n },\n mutationPayload: stopPayload,\n })\n await loadState()\n } catch (err) {\n console.error('staff.timesheets.timeReporting.stop', err)\n setError(resolveTimerActionError(err, t('staff.timesheets.widgets.timeReporting.stopError', 'Failed to stop timer')))\n } finally {\n setActionLoading(false)\n }\n }, [timer.entryId, staffMemberId, loadState, runMutation, retryLastMutation, t])\n\n if (mode === 'settings') {\n return (\n <div className=\"space-y-2 text-sm\">\n <p className=\"text-muted-foreground\">\n {t('staff.timesheets.widgets.timeReporting.settings.description', 'No additional settings. Select a project and start tracking from the widget.')}\n </p>\n </div>\n )\n }\n\n if (loading) {\n return (\n <div className=\"flex h-full items-center justify-center py-8\">\n <p className=\"text-sm text-muted-foreground\">{t('staff.timesheets.widgets.timeReporting.loading', 'Loading...')}</p>\n </div>\n )\n }\n\n if (error) {\n return (\n <div className=\"flex h-full items-center justify-center py-8\">\n <p role=\"alert\" className=\"text-sm text-destructive\">{error}</p>\n </div>\n )\n }\n\n if (projects.length === 0) {\n return (\n <div className=\"flex h-full items-center justify-center py-8\">\n <p className=\"text-sm text-muted-foreground\">\n {t('staff.timesheets.widgets.timeReporting.noProjects', 'No projects assigned.')}\n </p>\n </div>\n )\n }\n\n // Timer is running\n if (timer.running) {\n const runningProject = projects.find((p) => p.id === timer.projectId)\n return (\n <div className=\"space-y-3\">\n <div className=\"text-sm text-muted-foreground\">\n {runningProject?.name ?? t('staff.timesheets.widgets.timeReporting.unknownProject', 'Unknown project')}\n </div>\n <div className=\"text-center\">\n <p className=\"font-mono text-3xl font-bold tabular-nums\">{elapsed}</p>\n <p className=\"mt-1 text-xs text-muted-foreground\">\n {t('staff.timesheets.widgets.timeReporting.running', 'Timer running')}\n </p>\n </div>\n <Button\n type=\"button\"\n variant=\"destructive\"\n className=\"w-full\"\n onClick={handleStop}\n disabled={actionLoading}\n >\n {t('staff.timesheets.widgets.timeReporting.stop', 'Stop Timer')}\n </Button>\n </div>\n )\n }\n\n // Timer not running \u2014 show start form\n return (\n <div className=\"space-y-3\">\n <div className=\"space-y-1.5\">\n <label className=\"text-xs font-medium text-muted-foreground\" htmlFor=\"timer-project\">\n {t('staff.timesheets.widgets.timeReporting.project', 'Project')}\n </label>\n <select\n id=\"timer-project\"\n className=\"w-full rounded-md border bg-background px-3 py-2 text-sm\"\n value={selectedProjectId ?? ''}\n onChange={(e) => setSelectedProjectId(e.target.value || null)}\n >\n <option value=\"\">{t('staff.timesheets.widgets.timeReporting.selectProject', 'Select project...')}</option>\n {projects.map((project) => (\n <option key={project.id} value={project.id}>\n {project.name}{project.code ? ` (${project.code})` : ''}\n </option>\n ))}\n </select>\n </div>\n <div className=\"space-y-1.5\">\n <label className=\"text-xs font-medium text-muted-foreground\" htmlFor=\"timer-notes\">\n {t('staff.timesheets.widgets.timeReporting.taskNote', 'Task / Note')}\n </label>\n <Input\n id=\"timer-notes\"\n value={notes}\n onChange={(e) => setNotes(e.target.value)}\n placeholder={t('staff.timesheets.widgets.timeReporting.notesPlaceholder', 'What are you working on?')}\n />\n </div>\n <div className=\"text-center\">\n <p className=\"text-sm text-muted-foreground\">\n {t('staff.timesheets.widgets.timeReporting.notRunning', 'Not running')}\n </p>\n </div>\n <Button\n type=\"button\"\n className=\"w-full\"\n onClick={handleStart}\n disabled={actionLoading || !selectedProjectId}\n >\n {t('staff.timesheets.widgets.timeReporting.start', 'Start Timer')}\n </Button>\n </div>\n )\n}\n\nexport default TimeReportingWidget\n"],
|
|
5
|
-
"mappings": ";
|
|
4
|
+
"sourcesContent": ["\"use client\"\n\nimport * as React from 'react'\nimport type { DashboardWidgetComponentProps } from '@open-mercato/shared/modules/dashboard/widgets'\nimport { apiCall, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'\nimport { Button } from '@open-mercato/ui/primitives/button'\nimport { Input } from '@open-mercato/ui/primitives/input'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\nimport { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'\nimport { startTimerEntry } from '../../../lib/timesheets-ui/startTimer'\nimport { resolveTimerActionError } from '../../../lib/timesheets-ui/timerErrors'\nimport { DEFAULT_SETTINGS, hydrateSettings, type TimeReportingSettings } from './config'\n\ntype ProjectOption = { id: string; name: string; code: string | null }\n\ntype TimerState = {\n entryId: string | null\n running: boolean\n startedAt: string | null\n projectId: string | null\n}\n\nconst TIMER_WIDGET_MUTATION_CONTEXT_ID = 'staff-timesheets-time-reporting-widget'\n\ntype TimerWidgetMutationContext = {\n formId: string\n resourceKind: string\n resourceId: string\n staffMemberId: string\n action: 'timer-create' | 'timer-start' | 'timer-stop'\n retryLastMutation: () => Promise<boolean>\n}\n\nfunction formatElapsed(startedAt: string): string {\n const elapsed = Math.max(0, Date.now() - new Date(startedAt).getTime())\n const totalSeconds = Math.floor(elapsed / 1000)\n const hours = Math.floor(totalSeconds / 3600)\n const minutes = Math.floor((totalSeconds % 3600) / 60)\n const seconds = totalSeconds % 60\n return `${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}:${String(seconds).padStart(2, '0')}`\n}\n\nconst TimeReportingWidget: React.FC<DashboardWidgetComponentProps<TimeReportingSettings>> = ({\n mode,\n settings = DEFAULT_SETTINGS,\n onSettingsChange,\n refreshToken,\n onRefreshStateChange,\n}) => {\n const t = useT()\n const { runMutation, retryLastMutation } = useGuardedMutation<TimerWidgetMutationContext>({\n contextId: TIMER_WIDGET_MUTATION_CONTEXT_ID,\n blockedMessage: t('ui.forms.flash.saveBlocked', 'Save blocked by validation'),\n })\n const hydrated = React.useMemo(() => hydrateSettings(settings), [settings])\n\n const [projects, setProjects] = React.useState<ProjectOption[]>([])\n const [selectedProjectId, setSelectedProjectId] = React.useState<string | null>(hydrated.lastProjectId)\n const [notes, setNotes] = React.useState('')\n const [timer, setTimer] = React.useState<TimerState>({ entryId: null, running: false, startedAt: null, projectId: null })\n const [elapsed, setElapsed] = React.useState('00:00:00')\n const [staffMemberId, setStaffMemberId] = React.useState<string | null>(null)\n const [loading, setLoading] = React.useState(true)\n const [actionLoading, setActionLoading] = React.useState(false)\n const [error, setError] = React.useState<string | null>(null)\n\n const loadState = React.useCallback(async () => {\n onRefreshStateChange?.(true)\n setLoading(true)\n setError(null)\n try {\n // Assignments and the current user's staff member are independent \u2014 fetch them together.\n const [assignmentsRes, selfRes] = await Promise.all([\n readApiResultOrThrow<{ items?: Array<Record<string, unknown>> }>(\n '/api/staff/timesheets/my-projects?pageSize=100',\n undefined,\n { errorMessage: '', fallback: { items: [] } },\n ),\n readApiResultOrThrow<{ member?: { id: string } | null }>(\n '/api/staff/team-members/self',\n undefined,\n { errorMessage: '', fallback: { member: null } },\n ),\n ])\n\n const assignmentItems = Array.isArray(assignmentsRes.items) ? assignmentsRes.items : []\n const projectIds = assignmentItems\n .map((item) => String(item.time_project_id ?? item.timeProjectId ?? ''))\n .filter((id) => id.length > 0)\n\n const memberId = selfRes.member?.id ?? null\n setStaffMemberId(memberId)\n\n const today = new Date().toISOString().slice(0, 10)\n\n // Project details depend on the assignment ids and active entries depend on the staff\n // member id, but the two requests are independent of each other \u2014 fetch them together.\n const [projectsRes, entriesRes] = await Promise.all([\n projectIds.length > 0\n ? readApiResultOrThrow<{ items?: Array<Record<string, unknown>> }>(\n `/api/staff/timesheets/time-projects?ids=${projectIds.join(',')}&pageSize=100`,\n undefined,\n { errorMessage: '', fallback: { items: [] } },\n )\n : Promise.resolve<{ items?: Array<Record<string, unknown>> }>({ items: [] }),\n memberId\n ? readApiResultOrThrow<{ items?: Array<Record<string, unknown>> }>(\n `/api/staff/timesheets/time-entries?staffMemberId=${memberId}&from=${today}&to=${today}&pageSize=100`,\n undefined,\n { errorMessage: '', fallback: { items: [] } },\n )\n : Promise.resolve<{ items?: Array<Record<string, unknown>> }>({ items: [] }),\n ])\n\n const projectItems = Array.isArray(projectsRes.items) ? projectsRes.items : []\n setProjects(projectItems.map((item) => ({\n id: String(item.id ?? ''),\n name: String(item.name ?? ''),\n code: typeof item.code === 'string' ? item.code : null,\n })))\n\n if (memberId) {\n const entries = Array.isArray(entriesRes.items) ? entriesRes.items : []\n const running = entries.find((entry) => {\n const startedAt = entry.started_at ?? entry.startedAt\n const endedAt = entry.ended_at ?? entry.endedAt\n return startedAt != null && endedAt == null\n })\n if (running) {\n setTimer({\n entryId: String(running.id ?? ''),\n running: true,\n startedAt: String(running.started_at ?? running.startedAt ?? ''),\n projectId: String(running.time_project_id ?? running.timeProjectId ?? ''),\n })\n } else {\n setTimer({ entryId: null, running: false, startedAt: null, projectId: null })\n }\n }\n } catch (err) {\n console.error('staff.timesheets.timeReporting.load', err)\n setError(t('staff.timesheets.widgets.timeReporting.error', 'Failed to load timer state'))\n } finally {\n setLoading(false)\n onRefreshStateChange?.(false)\n }\n }, [onRefreshStateChange, t])\n\n React.useEffect(() => {\n void loadState()\n }, [loadState, refreshToken])\n\n // Tick elapsed time\n React.useEffect(() => {\n if (!timer.running || !timer.startedAt) return\n const tick = () => setElapsed(formatElapsed(timer.startedAt!))\n tick()\n const interval = setInterval(tick, 1000)\n return () => clearInterval(interval)\n }, [timer.running, timer.startedAt])\n\n const handleStart = React.useCallback(async () => {\n if (!selectedProjectId || !staffMemberId) return\n if (timer.running) return\n setActionLoading(true)\n try {\n const today = new Date().toISOString().slice(0, 10)\n // Single atomic create+start request (issue #3311): a partial failure can\n // no longer leave an orphaned, unstarted timer entry, and a rejected start\n // now surfaces here instead of being silently ignored. The call is routed\n // through the mutation guard (issue #3308) so global injection modules can\n // run onBeforeSave/onAfterSave and surface conflicts consistently.\n const startPayload = {\n staffMemberId,\n timeProjectId: selectedProjectId,\n date: today,\n notes: notes.trim() || null,\n }\n await runMutation({\n operation: () => startTimerEntry(startPayload),\n context: {\n formId: TIMER_WIDGET_MUTATION_CONTEXT_ID,\n resourceKind: 'staff.timesheets.time_entry',\n resourceId: staffMemberId,\n staffMemberId,\n action: 'timer-start',\n retryLastMutation,\n },\n mutationPayload: startPayload,\n })\n\n onSettingsChange({ ...hydrated, lastProjectId: selectedProjectId })\n await loadState()\n } catch (err) {\n console.error('staff.timesheets.timeReporting.start', err)\n setError(resolveTimerActionError(err, t('staff.timesheets.widgets.timeReporting.startError', 'Failed to start timer')))\n } finally {\n setActionLoading(false)\n }\n }, [selectedProjectId, staffMemberId, timer.running, notes, hydrated, onSettingsChange, loadState, runMutation, retryLastMutation, t])\n\n const handleStop = React.useCallback(async () => {\n if (!timer.entryId || !staffMemberId) return\n setActionLoading(true)\n try {\n const stopPayload = {\n id: timer.entryId,\n action: 'timer-stop',\n staffMemberId,\n }\n await runMutation({\n operation: () =>\n apiCall(`/api/staff/timesheets/time-entries/${timer.entryId}/timer-stop`, { method: 'POST' }),\n context: {\n formId: TIMER_WIDGET_MUTATION_CONTEXT_ID,\n resourceKind: 'staff.timesheets.time_entry',\n resourceId: timer.entryId,\n staffMemberId,\n action: 'timer-stop',\n retryLastMutation,\n },\n mutationPayload: stopPayload,\n })\n await loadState()\n } catch (err) {\n console.error('staff.timesheets.timeReporting.stop', err)\n setError(resolveTimerActionError(err, t('staff.timesheets.widgets.timeReporting.stopError', 'Failed to stop timer')))\n } finally {\n setActionLoading(false)\n }\n }, [timer.entryId, staffMemberId, loadState, runMutation, retryLastMutation, t])\n\n if (mode === 'settings') {\n return (\n <div className=\"space-y-2 text-sm\">\n <p className=\"text-muted-foreground\">\n {t('staff.timesheets.widgets.timeReporting.settings.description', 'No additional settings. Select a project and start tracking from the widget.')}\n </p>\n </div>\n )\n }\n\n if (loading) {\n return (\n <div className=\"flex h-full items-center justify-center py-8\">\n <p className=\"text-sm text-muted-foreground\">{t('staff.timesheets.widgets.timeReporting.loading', 'Loading...')}</p>\n </div>\n )\n }\n\n if (error) {\n return (\n <div className=\"flex h-full items-center justify-center py-8\">\n <p role=\"alert\" className=\"text-sm text-destructive\">{error}</p>\n </div>\n )\n }\n\n if (projects.length === 0) {\n return (\n <div className=\"flex h-full items-center justify-center py-8\">\n <p className=\"text-sm text-muted-foreground\">\n {t('staff.timesheets.widgets.timeReporting.noProjects', 'No projects assigned.')}\n </p>\n </div>\n )\n }\n\n // Timer is running\n if (timer.running) {\n const runningProject = projects.find((p) => p.id === timer.projectId)\n return (\n <div className=\"space-y-3\">\n <div className=\"text-sm text-muted-foreground\">\n {runningProject?.name ?? t('staff.timesheets.widgets.timeReporting.unknownProject', 'Unknown project')}\n </div>\n <div className=\"text-center\">\n <p className=\"font-mono text-3xl font-bold tabular-nums\">{elapsed}</p>\n <p className=\"mt-1 text-xs text-muted-foreground\">\n {t('staff.timesheets.widgets.timeReporting.running', 'Timer running')}\n </p>\n </div>\n <Button\n type=\"button\"\n variant=\"destructive\"\n className=\"w-full\"\n onClick={handleStop}\n disabled={actionLoading}\n >\n {t('staff.timesheets.widgets.timeReporting.stop', 'Stop Timer')}\n </Button>\n </div>\n )\n }\n\n // Timer not running \u2014 show start form\n return (\n <div className=\"space-y-3\">\n <div className=\"space-y-1.5\">\n <label className=\"text-xs font-medium text-muted-foreground\" htmlFor=\"timer-project\">\n {t('staff.timesheets.widgets.timeReporting.project', 'Project')}\n </label>\n <select\n id=\"timer-project\"\n className=\"w-full rounded-md border bg-background px-3 py-2 text-sm\"\n value={selectedProjectId ?? ''}\n onChange={(e) => setSelectedProjectId(e.target.value || null)}\n >\n <option value=\"\">{t('staff.timesheets.widgets.timeReporting.selectProject', 'Select project...')}</option>\n {projects.map((project) => (\n <option key={project.id} value={project.id}>\n {project.name}{project.code ? ` (${project.code})` : ''}\n </option>\n ))}\n </select>\n </div>\n <div className=\"space-y-1.5\">\n <label className=\"text-xs font-medium text-muted-foreground\" htmlFor=\"timer-notes\">\n {t('staff.timesheets.widgets.timeReporting.taskNote', 'Task / Note')}\n </label>\n <Input\n id=\"timer-notes\"\n value={notes}\n onChange={(e) => setNotes(e.target.value)}\n placeholder={t('staff.timesheets.widgets.timeReporting.notesPlaceholder', 'What are you working on?')}\n />\n </div>\n <div className=\"text-center\">\n <p className=\"text-sm text-muted-foreground\">\n {t('staff.timesheets.widgets.timeReporting.notRunning', 'Not running')}\n </p>\n </div>\n <Button\n type=\"button\"\n className=\"w-full\"\n onClick={handleStart}\n disabled={actionLoading || !selectedProjectId}\n >\n {t('staff.timesheets.widgets.timeReporting.start', 'Start Timer')}\n </Button>\n </div>\n )\n}\n\nexport default TimeReportingWidget\n"],
|
|
5
|
+
"mappings": ";AA2OQ,cAyCA,YAzCA;AAzOR,YAAY,WAAW;AAEvB,SAAS,SAAS,4BAA4B;AAC9C,SAAS,cAAc;AACvB,SAAS,aAAa;AACtB,SAAS,YAAY;AACrB,SAAS,0BAA0B;AACnC,SAAS,uBAAuB;AAChC,SAAS,+BAA+B;AACxC,SAAS,kBAAkB,uBAAmD;AAW9E,MAAM,mCAAmC;AAWzC,SAAS,cAAc,WAA2B;AAChD,QAAM,UAAU,KAAK,IAAI,GAAG,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE,QAAQ,CAAC;AACtE,QAAM,eAAe,KAAK,MAAM,UAAU,GAAI;AAC9C,QAAM,QAAQ,KAAK,MAAM,eAAe,IAAI;AAC5C,QAAM,UAAU,KAAK,MAAO,eAAe,OAAQ,EAAE;AACrD,QAAM,UAAU,eAAe;AAC/B,SAAO,GAAG,OAAO,KAAK,EAAE,SAAS,GAAG,GAAG,CAAC,IAAI,OAAO,OAAO,EAAE,SAAS,GAAG,GAAG,CAAC,IAAI,OAAO,OAAO,EAAE,SAAS,GAAG,GAAG,CAAC;AAClH;AAEA,MAAM,sBAAsF,CAAC;AAAA,EAC3F;AAAA,EACA,WAAW;AAAA,EACX;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,IAAI,KAAK;AACf,QAAM,EAAE,aAAa,kBAAkB,IAAI,mBAA+C;AAAA,IACxF,WAAW;AAAA,IACX,gBAAgB,EAAE,8BAA8B,4BAA4B;AAAA,EAC9E,CAAC;AACD,QAAM,WAAW,MAAM,QAAQ,MAAM,gBAAgB,QAAQ,GAAG,CAAC,QAAQ,CAAC;AAE1E,QAAM,CAAC,UAAU,WAAW,IAAI,MAAM,SAA0B,CAAC,CAAC;AAClE,QAAM,CAAC,mBAAmB,oBAAoB,IAAI,MAAM,SAAwB,SAAS,aAAa;AACtG,QAAM,CAAC,OAAO,QAAQ,IAAI,MAAM,SAAS,EAAE;AAC3C,QAAM,CAAC,OAAO,QAAQ,IAAI,MAAM,SAAqB,EAAE,SAAS,MAAM,SAAS,OAAO,WAAW,MAAM,WAAW,KAAK,CAAC;AACxH,QAAM,CAAC,SAAS,UAAU,IAAI,MAAM,SAAS,UAAU;AACvD,QAAM,CAAC,eAAe,gBAAgB,IAAI,MAAM,SAAwB,IAAI;AAC5E,QAAM,CAAC,SAAS,UAAU,IAAI,MAAM,SAAS,IAAI;AACjD,QAAM,CAAC,eAAe,gBAAgB,IAAI,MAAM,SAAS,KAAK;AAC9D,QAAM,CAAC,OAAO,QAAQ,IAAI,MAAM,SAAwB,IAAI;AAE5D,QAAM,YAAY,MAAM,YAAY,YAAY;AAC9C,2BAAuB,IAAI;AAC3B,eAAW,IAAI;AACf,aAAS,IAAI;AACb,QAAI;AAEF,YAAM,CAAC,gBAAgB,OAAO,IAAI,MAAM,QAAQ,IAAI;AAAA,QAClD;AAAA,UACE;AAAA,UACA;AAAA,UACA,EAAE,cAAc,IAAI,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE;AAAA,QAC9C;AAAA,QACA;AAAA,UACE;AAAA,UACA;AAAA,UACA,EAAE,cAAc,IAAI,UAAU,EAAE,QAAQ,KAAK,EAAE;AAAA,QACjD;AAAA,MACF,CAAC;AAED,YAAM,kBAAkB,MAAM,QAAQ,eAAe,KAAK,IAAI,eAAe,QAAQ,CAAC;AACtF,YAAM,aAAa,gBAChB,IAAI,CAAC,SAAS,OAAO,KAAK,mBAAmB,KAAK,iBAAiB,EAAE,CAAC,EACtE,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;AAE/B,YAAM,WAAW,QAAQ,QAAQ,MAAM;AACvC,uBAAiB,QAAQ;AAEzB,YAAM,SAAQ,oBAAI,KAAK,GAAE,YAAY,EAAE,MAAM,GAAG,EAAE;AAIlD,YAAM,CAAC,aAAa,UAAU,IAAI,MAAM,QAAQ,IAAI;AAAA,QAClD,WAAW,SAAS,IAChB;AAAA,UACE,2CAA2C,WAAW,KAAK,GAAG,CAAC;AAAA,UAC/D;AAAA,UACA,EAAE,cAAc,IAAI,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE;AAAA,QAC9C,IACA,QAAQ,QAAoD,EAAE,OAAO,CAAC,EAAE,CAAC;AAAA,QAC7E,WACI;AAAA,UACE,oDAAoD,QAAQ,SAAS,KAAK,OAAO,KAAK;AAAA,UACtF;AAAA,UACA,EAAE,cAAc,IAAI,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE;AAAA,QAC9C,IACA,QAAQ,QAAoD,EAAE,OAAO,CAAC,EAAE,CAAC;AAAA,MAC/E,CAAC;AAED,YAAM,eAAe,MAAM,QAAQ,YAAY,KAAK,IAAI,YAAY,QAAQ,CAAC;AAC7E,kBAAY,aAAa,IAAI,CAAC,UAAU;AAAA,QACtC,IAAI,OAAO,KAAK,MAAM,EAAE;AAAA,QACxB,MAAM,OAAO,KAAK,QAAQ,EAAE;AAAA,QAC5B,MAAM,OAAO,KAAK,SAAS,WAAW,KAAK,OAAO;AAAA,MACpD,EAAE,CAAC;AAEH,UAAI,UAAU;AACZ,cAAM,UAAU,MAAM,QAAQ,WAAW,KAAK,IAAI,WAAW,QAAQ,CAAC;AACtE,cAAM,UAAU,QAAQ,KAAK,CAAC,UAAU;AACtC,gBAAM,YAAY,MAAM,cAAc,MAAM;AAC5C,gBAAM,UAAU,MAAM,YAAY,MAAM;AACxC,iBAAO,aAAa,QAAQ,WAAW;AAAA,QACzC,CAAC;AACD,YAAI,SAAS;AACX,mBAAS;AAAA,YACP,SAAS,OAAO,QAAQ,MAAM,EAAE;AAAA,YAChC,SAAS;AAAA,YACT,WAAW,OAAO,QAAQ,cAAc,QAAQ,aAAa,EAAE;AAAA,YAC/D,WAAW,OAAO,QAAQ,mBAAmB,QAAQ,iBAAiB,EAAE;AAAA,UAC1E,CAAC;AAAA,QACH,OAAO;AACL,mBAAS,EAAE,SAAS,MAAM,SAAS,OAAO,WAAW,MAAM,WAAW,KAAK,CAAC;AAAA,QAC9E;AAAA,MACF;AAAA,IACF,SAAS,KAAK;AACZ,cAAQ,MAAM,uCAAuC,GAAG;AACxD,eAAS,EAAE,gDAAgD,4BAA4B,CAAC;AAAA,IAC1F,UAAE;AACA,iBAAW,KAAK;AAChB,6BAAuB,KAAK;AAAA,IAC9B;AAAA,EACF,GAAG,CAAC,sBAAsB,CAAC,CAAC;AAE5B,QAAM,UAAU,MAAM;AACpB,SAAK,UAAU;AAAA,EACjB,GAAG,CAAC,WAAW,YAAY,CAAC;AAG5B,QAAM,UAAU,MAAM;AACpB,QAAI,CAAC,MAAM,WAAW,CAAC,MAAM,UAAW;AACxC,UAAM,OAAO,MAAM,WAAW,cAAc,MAAM,SAAU,CAAC;AAC7D,SAAK;AACL,UAAM,WAAW,YAAY,MAAM,GAAI;AACvC,WAAO,MAAM,cAAc,QAAQ;AAAA,EACrC,GAAG,CAAC,MAAM,SAAS,MAAM,SAAS,CAAC;AAEnC,QAAM,cAAc,MAAM,YAAY,YAAY;AAChD,QAAI,CAAC,qBAAqB,CAAC,cAAe;AAC1C,QAAI,MAAM,QAAS;AACnB,qBAAiB,IAAI;AACrB,QAAI;AACF,YAAM,SAAQ,oBAAI,KAAK,GAAE,YAAY,EAAE,MAAM,GAAG,EAAE;AAMlD,YAAM,eAAe;AAAA,QACnB;AAAA,QACA,eAAe;AAAA,QACf,MAAM;AAAA,QACN,OAAO,MAAM,KAAK,KAAK;AAAA,MACzB;AACA,YAAM,YAAY;AAAA,QAChB,WAAW,MAAM,gBAAgB,YAAY;AAAA,QAC7C,SAAS;AAAA,UACP,QAAQ;AAAA,UACR,cAAc;AAAA,UACd,YAAY;AAAA,UACZ;AAAA,UACA,QAAQ;AAAA,UACR;AAAA,QACF;AAAA,QACA,iBAAiB;AAAA,MACnB,CAAC;AAED,uBAAiB,EAAE,GAAG,UAAU,eAAe,kBAAkB,CAAC;AAClE,YAAM,UAAU;AAAA,IAClB,SAAS,KAAK;AACZ,cAAQ,MAAM,wCAAwC,GAAG;AACzD,eAAS,wBAAwB,KAAK,EAAE,qDAAqD,uBAAuB,CAAC,CAAC;AAAA,IACxH,UAAE;AACA,uBAAiB,KAAK;AAAA,IACxB;AAAA,EACF,GAAG,CAAC,mBAAmB,eAAe,MAAM,SAAS,OAAO,UAAU,kBAAkB,WAAW,aAAa,mBAAmB,CAAC,CAAC;AAErI,QAAM,aAAa,MAAM,YAAY,YAAY;AAC/C,QAAI,CAAC,MAAM,WAAW,CAAC,cAAe;AACtC,qBAAiB,IAAI;AACrB,QAAI;AACF,YAAM,cAAc;AAAA,QAClB,IAAI,MAAM;AAAA,QACV,QAAQ;AAAA,QACR;AAAA,MACF;AACA,YAAM,YAAY;AAAA,QAChB,WAAW,MACT,QAAQ,sCAAsC,MAAM,OAAO,eAAe,EAAE,QAAQ,OAAO,CAAC;AAAA,QAC9F,SAAS;AAAA,UACP,QAAQ;AAAA,UACR,cAAc;AAAA,UACd,YAAY,MAAM;AAAA,UAClB;AAAA,UACA,QAAQ;AAAA,UACR;AAAA,QACF;AAAA,QACA,iBAAiB;AAAA,MACnB,CAAC;AACD,YAAM,UAAU;AAAA,IAClB,SAAS,KAAK;AACZ,cAAQ,MAAM,uCAAuC,GAAG;AACxD,eAAS,wBAAwB,KAAK,EAAE,oDAAoD,sBAAsB,CAAC,CAAC;AAAA,IACtH,UAAE;AACA,uBAAiB,KAAK;AAAA,IACxB;AAAA,EACF,GAAG,CAAC,MAAM,SAAS,eAAe,WAAW,aAAa,mBAAmB,CAAC,CAAC;AAE/E,MAAI,SAAS,YAAY;AACvB,WACE,oBAAC,SAAI,WAAU,qBACb,8BAAC,OAAE,WAAU,yBACV,YAAE,+DAA+D,8EAA8E,GAClJ,GACF;AAAA,EAEJ;AAEA,MAAI,SAAS;AACX,WACE,oBAAC,SAAI,WAAU,gDACb,8BAAC,OAAE,WAAU,iCAAiC,YAAE,kDAAkD,YAAY,GAAE,GAClH;AAAA,EAEJ;AAEA,MAAI,OAAO;AACT,WACE,oBAAC,SAAI,WAAU,gDACb,8BAAC,OAAE,MAAK,SAAQ,WAAU,4BAA4B,iBAAM,GAC9D;AAAA,EAEJ;AAEA,MAAI,SAAS,WAAW,GAAG;AACzB,WACE,oBAAC,SAAI,WAAU,gDACb,8BAAC,OAAE,WAAU,iCACV,YAAE,qDAAqD,uBAAuB,GACjF,GACF;AAAA,EAEJ;AAGA,MAAI,MAAM,SAAS;AACjB,UAAM,iBAAiB,SAAS,KAAK,CAAC,MAAM,EAAE,OAAO,MAAM,SAAS;AACpE,WACE,qBAAC,SAAI,WAAU,aACb;AAAA,0BAAC,SAAI,WAAU,iCACZ,0BAAgB,QAAQ,EAAE,yDAAyD,iBAAiB,GACvG;AAAA,MACA,qBAAC,SAAI,WAAU,eACb;AAAA,4BAAC,OAAE,WAAU,6CAA6C,mBAAQ;AAAA,QAClE,oBAAC,OAAE,WAAU,sCACV,YAAE,kDAAkD,eAAe,GACtE;AAAA,SACF;AAAA,MACA;AAAA,QAAC;AAAA;AAAA,UACC,MAAK;AAAA,UACL,SAAQ;AAAA,UACR,WAAU;AAAA,UACV,SAAS;AAAA,UACT,UAAU;AAAA,UAET,YAAE,+CAA+C,YAAY;AAAA;AAAA,MAChE;AAAA,OACF;AAAA,EAEJ;AAGA,SACE,qBAAC,SAAI,WAAU,aACb;AAAA,yBAAC,SAAI,WAAU,eACb;AAAA,0BAAC,WAAM,WAAU,6CAA4C,SAAQ,iBAClE,YAAE,kDAAkD,SAAS,GAChE;AAAA,MACA;AAAA,QAAC;AAAA;AAAA,UACC,IAAG;AAAA,UACH,WAAU;AAAA,UACV,OAAO,qBAAqB;AAAA,UAC5B,UAAU,CAAC,MAAM,qBAAqB,EAAE,OAAO,SAAS,IAAI;AAAA,UAE5D;AAAA,gCAAC,YAAO,OAAM,IAAI,YAAE,wDAAwD,mBAAmB,GAAE;AAAA,YAChG,SAAS,IAAI,CAAC,YACb,qBAAC,YAAwB,OAAO,QAAQ,IACrC;AAAA,sBAAQ;AAAA,cAAM,QAAQ,OAAO,KAAK,QAAQ,IAAI,MAAM;AAAA,iBAD1C,QAAQ,EAErB,CACD;AAAA;AAAA;AAAA,MACH;AAAA,OACF;AAAA,IACA,qBAAC,SAAI,WAAU,eACb;AAAA,0BAAC,WAAM,WAAU,6CAA4C,SAAQ,eAClE,YAAE,mDAAmD,aAAa,GACrE;AAAA,MACA;AAAA,QAAC;AAAA;AAAA,UACC,IAAG;AAAA,UACH,OAAO;AAAA,UACP,UAAU,CAAC,MAAM,SAAS,EAAE,OAAO,KAAK;AAAA,UACxC,aAAa,EAAE,2DAA2D,0BAA0B;AAAA;AAAA,MACtG;AAAA,OACF;AAAA,IACA,oBAAC,SAAI,WAAU,eACb,8BAAC,OAAE,WAAU,iCACV,YAAE,qDAAqD,aAAa,GACvE,GACF;AAAA,IACA;AAAA,MAAC;AAAA;AAAA,QACC,MAAK;AAAA,QACL,WAAU;AAAA,QACV,SAAS;AAAA,QACT,UAAU,iBAAiB,CAAC;AAAA,QAE3B,YAAE,gDAAgD,aAAa;AAAA;AAAA,IAClE;AAAA,KACF;AAEJ;AAEA,IAAO,wBAAQ;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@open-mercato/core",
|
|
3
|
-
"version": "0.6.6-develop.
|
|
3
|
+
"version": "0.6.6-develop.6357.1.7c17a47f4e",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -246,16 +246,16 @@
|
|
|
246
246
|
"zod": "^4.4.3"
|
|
247
247
|
},
|
|
248
248
|
"peerDependencies": {
|
|
249
|
-
"@open-mercato/ai-assistant": "0.6.6-develop.
|
|
250
|
-
"@open-mercato/shared": "0.6.6-develop.
|
|
251
|
-
"@open-mercato/ui": "0.6.6-develop.
|
|
249
|
+
"@open-mercato/ai-assistant": "0.6.6-develop.6357.1.7c17a47f4e",
|
|
250
|
+
"@open-mercato/shared": "0.6.6-develop.6357.1.7c17a47f4e",
|
|
251
|
+
"@open-mercato/ui": "0.6.6-develop.6357.1.7c17a47f4e",
|
|
252
252
|
"react": "^19.0.0",
|
|
253
253
|
"react-dom": "^19.0.0"
|
|
254
254
|
},
|
|
255
255
|
"devDependencies": {
|
|
256
|
-
"@open-mercato/ai-assistant": "0.6.6-develop.
|
|
257
|
-
"@open-mercato/shared": "0.6.6-develop.
|
|
258
|
-
"@open-mercato/ui": "0.6.6-develop.
|
|
256
|
+
"@open-mercato/ai-assistant": "0.6.6-develop.6357.1.7c17a47f4e",
|
|
257
|
+
"@open-mercato/shared": "0.6.6-develop.6357.1.7c17a47f4e",
|
|
258
|
+
"@open-mercato/ui": "0.6.6-develop.6357.1.7c17a47f4e",
|
|
259
259
|
"@testing-library/dom": "^10.4.1",
|
|
260
260
|
"@testing-library/jest-dom": "^6.9.1",
|
|
261
261
|
"@testing-library/react": "^16.3.1",
|
|
@@ -9,6 +9,7 @@ import { StatusBadge } from '@open-mercato/ui/primitives/status-badge'
|
|
|
9
9
|
import { Button } from '@open-mercato/ui/primitives/button'
|
|
10
10
|
import { LogList, type LogListEntry } from '@open-mercato/ui/backend/LogList'
|
|
11
11
|
import { Progress } from '@open-mercato/ui/primitives/progress'
|
|
12
|
+
import { Pagination } from '@open-mercato/ui/primitives/pagination'
|
|
12
13
|
import { Spinner } from '@open-mercato/ui/primitives/spinner'
|
|
13
14
|
import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
|
|
14
15
|
import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
|
|
@@ -90,6 +91,8 @@ function resolvePathnameId(pathname: string): string | undefined {
|
|
|
90
91
|
return decodeURIComponent(runId)
|
|
91
92
|
}
|
|
92
93
|
|
|
94
|
+
const LOG_PAGE_SIZE = 50
|
|
95
|
+
|
|
93
96
|
export default function SyncRunDetailPage({ params }: SyncRunDetailPageProps) {
|
|
94
97
|
const pathname = usePathname()
|
|
95
98
|
const router = useRouter()
|
|
@@ -105,6 +108,9 @@ export default function SyncRunDetailPage({ params }: SyncRunDetailPageProps) {
|
|
|
105
108
|
const [isNotFound, setIsNotFound] = React.useState(false)
|
|
106
109
|
const [logs, setLogs] = React.useState<LogEntry[]>([])
|
|
107
110
|
const [isLoadingLogs, setIsLoadingLogs] = React.useState(false)
|
|
111
|
+
const [logsTotal, setLogsTotal] = React.useState(0)
|
|
112
|
+
const [logsPage, setLogsPage] = React.useState(1)
|
|
113
|
+
const logsPageRef = React.useRef(1)
|
|
108
114
|
|
|
109
115
|
const resolveCurrentRunId = React.useCallback(() => {
|
|
110
116
|
return runId ?? (
|
|
@@ -140,18 +146,22 @@ export default function SyncRunDetailPage({ params }: SyncRunDetailPageProps) {
|
|
|
140
146
|
setIsLoading(false)
|
|
141
147
|
}, [resolveCurrentRunId, t])
|
|
142
148
|
|
|
143
|
-
const loadLogs = React.useCallback(async () => {
|
|
149
|
+
const loadLogs = React.useCallback(async (page?: number) => {
|
|
144
150
|
const currentRunId = resolveCurrentRunId()
|
|
145
151
|
if (!currentRunId) return
|
|
152
|
+
const targetPage = page ?? logsPageRef.current
|
|
146
153
|
setIsLoadingLogs(true)
|
|
147
|
-
const params = new URLSearchParams({ runId: currentRunId, pageSize:
|
|
148
|
-
const call = await apiCall<{ items: LogEntry[] }>(
|
|
154
|
+
const params = new URLSearchParams({ runId: currentRunId, pageSize: String(LOG_PAGE_SIZE), page: String(targetPage) })
|
|
155
|
+
const call = await apiCall<{ items: LogEntry[]; total?: number }>(
|
|
149
156
|
`/api/integrations/logs?${params.toString()}`,
|
|
150
157
|
undefined,
|
|
151
|
-
{ fallback: { items: [] } },
|
|
158
|
+
{ fallback: { items: [], total: 0 } },
|
|
152
159
|
)
|
|
153
160
|
if (call.ok && call.result) {
|
|
154
161
|
setLogs(call.result.items)
|
|
162
|
+
if (typeof call.result.total === 'number') setLogsTotal(call.result.total)
|
|
163
|
+
logsPageRef.current = targetPage
|
|
164
|
+
setLogsPage(targetPage)
|
|
155
165
|
}
|
|
156
166
|
setIsLoadingLogs(false)
|
|
157
167
|
}, [resolveCurrentRunId])
|
|
@@ -432,6 +442,15 @@ export default function SyncRunDetailPage({ params }: SyncRunDetailPageProps) {
|
|
|
432
442
|
emptyMessage={t('data_sync.runs.detail.noLogs')}
|
|
433
443
|
/>
|
|
434
444
|
)}
|
|
445
|
+
{logsTotal > LOG_PAGE_SIZE && (
|
|
446
|
+
<Pagination
|
|
447
|
+
className="mt-4"
|
|
448
|
+
page={logsPage}
|
|
449
|
+
pageSize={LOG_PAGE_SIZE}
|
|
450
|
+
total={logsTotal}
|
|
451
|
+
onPageChange={(next) => { void loadLogs(next) }}
|
|
452
|
+
/>
|
|
453
|
+
)}
|
|
435
454
|
</CardContent>
|
|
436
455
|
</Card>
|
|
437
456
|
</PageBody>
|
|
@@ -69,52 +69,61 @@ const TimeReportingWidget: React.FC<DashboardWidgetComponentProps<TimeReportingS
|
|
|
69
69
|
setLoading(true)
|
|
70
70
|
setError(null)
|
|
71
71
|
try {
|
|
72
|
-
//
|
|
73
|
-
const assignmentsRes = await
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
72
|
+
// Assignments and the current user's staff member are independent — fetch them together.
|
|
73
|
+
const [assignmentsRes, selfRes] = await Promise.all([
|
|
74
|
+
readApiResultOrThrow<{ items?: Array<Record<string, unknown>> }>(
|
|
75
|
+
'/api/staff/timesheets/my-projects?pageSize=100',
|
|
76
|
+
undefined,
|
|
77
|
+
{ errorMessage: '', fallback: { items: [] } },
|
|
78
|
+
),
|
|
79
|
+
readApiResultOrThrow<{ member?: { id: string } | null }>(
|
|
80
|
+
'/api/staff/team-members/self',
|
|
81
|
+
undefined,
|
|
82
|
+
{ errorMessage: '', fallback: { member: null } },
|
|
83
|
+
),
|
|
84
|
+
])
|
|
85
|
+
|
|
78
86
|
const assignmentItems = Array.isArray(assignmentsRes.items) ? assignmentsRes.items : []
|
|
79
87
|
const projectIds = assignmentItems
|
|
80
88
|
.map((item) => String(item.time_project_id ?? item.timeProjectId ?? ''))
|
|
81
89
|
.filter((id) => id.length > 0)
|
|
82
90
|
|
|
83
|
-
if (projectIds.length > 0) {
|
|
84
|
-
const projectsRes = await readApiResultOrThrow<{ items?: Array<Record<string, unknown>> }>(
|
|
85
|
-
`/api/staff/timesheets/time-projects?ids=${projectIds.join(',')}&pageSize=100`,
|
|
86
|
-
undefined,
|
|
87
|
-
{ errorMessage: '', fallback: { items: [] } },
|
|
88
|
-
)
|
|
89
|
-
const items = Array.isArray(projectsRes.items) ? projectsRes.items : []
|
|
90
|
-
setProjects(items.map((item) => ({
|
|
91
|
-
id: String(item.id ?? ''),
|
|
92
|
-
name: String(item.name ?? ''),
|
|
93
|
-
code: typeof item.code === 'string' ? item.code : null,
|
|
94
|
-
})))
|
|
95
|
-
} else {
|
|
96
|
-
setProjects([])
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
// Check for active timer — look for today's entries with startedAt set and endedAt null
|
|
100
|
-
const selfRes = await readApiResultOrThrow<{ member?: { id: string } | null }>(
|
|
101
|
-
'/api/staff/team-members/self',
|
|
102
|
-
undefined,
|
|
103
|
-
{ errorMessage: '', fallback: { member: null } },
|
|
104
|
-
)
|
|
105
91
|
const memberId = selfRes.member?.id ?? null
|
|
106
92
|
setStaffMemberId(memberId)
|
|
93
|
+
|
|
94
|
+
const today = new Date().toISOString().slice(0, 10)
|
|
95
|
+
|
|
96
|
+
// Project details depend on the assignment ids and active entries depend on the staff
|
|
97
|
+
// member id, but the two requests are independent of each other — fetch them together.
|
|
98
|
+
const [projectsRes, entriesRes] = await Promise.all([
|
|
99
|
+
projectIds.length > 0
|
|
100
|
+
? readApiResultOrThrow<{ items?: Array<Record<string, unknown>> }>(
|
|
101
|
+
`/api/staff/timesheets/time-projects?ids=${projectIds.join(',')}&pageSize=100`,
|
|
102
|
+
undefined,
|
|
103
|
+
{ errorMessage: '', fallback: { items: [] } },
|
|
104
|
+
)
|
|
105
|
+
: Promise.resolve<{ items?: Array<Record<string, unknown>> }>({ items: [] }),
|
|
106
|
+
memberId
|
|
107
|
+
? readApiResultOrThrow<{ items?: Array<Record<string, unknown>> }>(
|
|
108
|
+
`/api/staff/timesheets/time-entries?staffMemberId=${memberId}&from=${today}&to=${today}&pageSize=100`,
|
|
109
|
+
undefined,
|
|
110
|
+
{ errorMessage: '', fallback: { items: [] } },
|
|
111
|
+
)
|
|
112
|
+
: Promise.resolve<{ items?: Array<Record<string, unknown>> }>({ items: [] }),
|
|
113
|
+
])
|
|
114
|
+
|
|
115
|
+
const projectItems = Array.isArray(projectsRes.items) ? projectsRes.items : []
|
|
116
|
+
setProjects(projectItems.map((item) => ({
|
|
117
|
+
id: String(item.id ?? ''),
|
|
118
|
+
name: String(item.name ?? ''),
|
|
119
|
+
code: typeof item.code === 'string' ? item.code : null,
|
|
120
|
+
})))
|
|
121
|
+
|
|
107
122
|
if (memberId) {
|
|
108
|
-
const today = new Date().toISOString().slice(0, 10)
|
|
109
|
-
const entriesRes = await readApiResultOrThrow<{ items?: Array<Record<string, unknown>> }>(
|
|
110
|
-
`/api/staff/timesheets/time-entries?staffMemberId=${memberId}&from=${today}&to=${today}&pageSize=100`,
|
|
111
|
-
undefined,
|
|
112
|
-
{ errorMessage: '', fallback: { items: [] } },
|
|
113
|
-
)
|
|
114
123
|
const entries = Array.isArray(entriesRes.items) ? entriesRes.items : []
|
|
115
|
-
const running = entries.find((
|
|
116
|
-
const startedAt =
|
|
117
|
-
const endedAt =
|
|
124
|
+
const running = entries.find((entry) => {
|
|
125
|
+
const startedAt = entry.started_at ?? entry.startedAt
|
|
126
|
+
const endedAt = entry.ended_at ?? entry.endedAt
|
|
118
127
|
return startedAt != null && endedAt == null
|
|
119
128
|
})
|
|
120
129
|
if (running) {
|