@shivaedev/admin 0.25.0 → 0.26.0
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/CHANGELOG.md +10 -0
- package/README.md +16 -0
- package/dist/client/adapters/JobDetail.d.ts +5 -2
- package/dist/client/adapters/JobDetail.d.ts.map +1 -1
- package/dist/client/adapters/JobDetail.js +13 -9
- package/dist/client/adapters/JobDetail.js.map +1 -1
- package/dist/client/adapters/JobList.d.ts +3 -1
- package/dist/client/adapters/JobList.d.ts.map +1 -1
- package/dist/client/adapters/JobList.js +3 -3
- package/dist/client/adapters/JobList.js.map +1 -1
- package/dist/client/adapters/JobsQueueView.d.ts +3 -1
- package/dist/client/adapters/JobsQueueView.d.ts.map +1 -1
- package/dist/client/adapters/JobsQueueView.js +2 -2
- package/dist/client/adapters/JobsQueueView.js.map +1 -1
- package/dist/client/adapters/JobsView.d.ts +3 -2
- package/dist/client/adapters/JobsView.d.ts.map +1 -1
- package/dist/client/adapters/JobsView.js +10 -2
- package/dist/client/adapters/JobsView.js.map +1 -1
- package/dist/client/adapters/SessionListView.d.ts +2 -0
- package/dist/client/adapters/SessionListView.d.ts.map +1 -1
- package/dist/client/adapters/SessionListView.js +5 -5
- package/dist/client/adapters/SessionListView.js.map +1 -1
- package/dist/client/adapters/SessionsView.d.ts +3 -2
- package/dist/client/adapters/SessionsView.d.ts.map +1 -1
- package/dist/client/adapters/SessionsView.js +10 -2
- package/dist/client/adapters/SessionsView.js.map +1 -1
- package/dist/client/adapters/Timestamp.d.ts +8 -0
- package/dist/client/adapters/Timestamp.d.ts.map +1 -0
- package/dist/client/adapters/Timestamp.js +7 -0
- package/dist/client/adapters/Timestamp.js.map +1 -0
- package/dist/client/adapters/UsersTable.d.ts +2 -0
- package/dist/client/adapters/UsersTable.d.ts.map +1 -1
- package/dist/client/adapters/UsersTable.js +3 -3
- package/dist/client/adapters/UsersTable.js.map +1 -1
- package/dist/client/adapters/UsersView.d.ts +3 -2
- package/dist/client/adapters/UsersView.d.ts.map +1 -1
- package/dist/client/adapters/UsersView.js +4 -2
- package/dist/client/adapters/UsersView.js.map +1 -1
- package/dist/client/adapters/timestampText.d.ts +7 -0
- package/dist/client/adapters/timestampText.d.ts.map +1 -0
- package/dist/client/adapters/timestampText.js +9 -0
- package/dist/client/adapters/timestampText.js.map +1 -0
- package/dist/jobs/PageWithRetry.d.ts +15 -15
- package/package.json +14 -14
- package/src/client/adapters/JobDetail.tsx +23 -8
- package/src/client/adapters/JobList.tsx +5 -2
- package/src/client/adapters/JobsQueueView.tsx +4 -1
- package/src/client/adapters/JobsView.ts +12 -3
- package/src/client/adapters/SessionListView.tsx +7 -5
- package/src/client/adapters/SessionsView.ts +12 -3
- package/src/client/adapters/Timestamp.tsx +18 -0
- package/src/client/adapters/UsersTable.tsx +6 -5
- package/src/client/adapters/UsersView.ts +6 -3
- package/src/client/adapters/timestampText.ts +17 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,15 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.26.0 - 2026-11-18
|
|
4
|
+
|
|
5
|
+
### Added
|
|
6
|
+
|
|
7
|
+
- `UsersView`, `SessionsView` and `JobsView` take optional `locale` and `timeZone` props, a BCP 47 language tag and an IANA zone name, and show their times in them. Pass the values the application reads from identity's `AccountPreferences`; admin does not read them itself. A value the browser's `Intl` cannot read falls back to the browser's locale and time zone.
|
|
8
|
+
|
|
9
|
+
### Changed
|
|
10
|
+
|
|
11
|
+
- The Users, Sessions and Jobs views show each time as a date and a time with seconds and the zone's short name, such as `20 Oct 2026, 14:34:56 CEST`, in the browser's locale and time zone, instead of the raw ISO timestamp. The `<time>` element's `dateTime` attribute keeps the UTC instant in ISO form, and the job detail's Created, Started and Completed times are now `<time>` elements too. A test that reads the visible text of these times needs the new text, or the `dateTime` attribute for the instant.
|
|
12
|
+
|
|
3
13
|
## 0.25.0 - 2026-11-11
|
|
4
14
|
|
|
5
15
|
### Added
|
package/README.md
CHANGED
|
@@ -293,6 +293,22 @@ const sessions = bind(SessionsPage.contract, Client);
|
|
|
293
293
|
|
|
294
294
|
The view lists signed-in sessions with the user's name and email, started, last activity and expiry times. It marks the supplied current session id and asks for confirmation in the page before revoking. A successful revoke refreshes the bound list. Revoking the current session calls `onCurrentSessionRevoked`; the application uses that callback to clear its auth state and navigate to sign-in. The starter mounts this page at `/admin/sessions` and connects the callback to its sign-out flow.
|
|
295
295
|
|
|
296
|
+
### Dates in the built-in views
|
|
297
|
+
|
|
298
|
+
The Users, Sessions and Jobs views show each time as a date and a time with seconds and the zone's short name, such as `20 Oct 2026, 14:34:56 CEST`, in the browser's locale and time zone. Pass `locale` and `timeZone` to a view to use the viewer's own instead, such as the values the application reads from identity's `AccountPreferences`. Admin does not read those preferences itself:
|
|
299
|
+
|
|
300
|
+
```tsx
|
|
301
|
+
<UsersView
|
|
302
|
+
roles={AppAccess.Role.literals}
|
|
303
|
+
list={users.list.query}
|
|
304
|
+
changeRole={changeRole}
|
|
305
|
+
locale={preferences.locale}
|
|
306
|
+
timeZone={preferences.timezone}
|
|
307
|
+
/>;
|
|
308
|
+
```
|
|
309
|
+
|
|
310
|
+
`locale` is a BCP 47 language tag and `timeZone` an IANA zone name; `SessionsView` and `JobsView` take the same two props. When the browser's `Intl` cannot read one of them, the view falls back to the browser's locale and time zone. Every time is a `<time>` element whose `dateTime` attribute keeps the UTC instant in ISO form.
|
|
311
|
+
|
|
296
312
|
### Client permission routes
|
|
297
313
|
|
|
298
314
|
`adminPage` requires a permission middleware, including for custom pages. It applies that middleware to the whole contract, installs a read policy checking the page grant on every query, and exposes its permission as `page.route.permission`. Queries need no repeated page-grant policy. An additional query policy can restrict access further. Bound live queries use the same page grant as one-off reads. Set the React route's `staticData.permission` to that value. Use `permissionGuard` from `@shivaedev/react/adapters/permissionGuard.ts` in protected routes' `beforeLoad` and wrap the router in `PermissionBoundary` from `@shivaedev/react/adapters/permissionBoundary.ts` with the session and one application fallback.
|
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
import type { AdminJob, JobsViewClient, RetryJob } from "#client/adapters/jobsTypes.ts";
|
|
2
|
-
|
|
2
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
3
|
+
export declare function JobDetail({ api, dates, queue, id, retry, }: {
|
|
3
4
|
readonly api: JobsViewClient;
|
|
5
|
+
readonly dates: DateDisplay;
|
|
4
6
|
readonly queue: string;
|
|
5
7
|
readonly id: string;
|
|
6
8
|
readonly retry: RetryJob | undefined;
|
|
7
9
|
}): import("react").JSX.Element;
|
|
8
|
-
export declare function JobRecord({ job, retry }: {
|
|
10
|
+
export declare function JobRecord({ dates, job, retry }: {
|
|
11
|
+
readonly dates: DateDisplay;
|
|
9
12
|
readonly job: AdminJob;
|
|
10
13
|
readonly retry?: RetryJob | undefined;
|
|
11
14
|
}): import("react").JSX.Element;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JobDetail.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/JobDetail.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAExF,wBAAgB,SAAS,CAAC,EACzB,GAAG,EACH,KAAK,EACL,EAAE,EACF,KAAK,GACL,EAAE;IACF,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,SAAS,CAAC;CACrC,+BAQA;
|
|
1
|
+
{"version":3,"file":"JobDetail.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/JobDetail.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAExF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAErE,wBAAgB,SAAS,CAAC,EACzB,GAAG,EACH,KAAK,EACL,KAAK,EACL,EAAE,EACF,KAAK,GACL,EAAE;IACF,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,SAAS,CAAC;CACrC,+BAQA;AAiBD,wBAAgB,SAAS,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;IAAE,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;CAAE,+BA6C9I"}
|
|
@@ -1,30 +1,34 @@
|
|
|
1
1
|
import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import {
|
|
2
|
+
import { Option } from "effect";
|
|
3
3
|
import { useAction, useQuery } from "@shivaedev/react/client/resultState.ts";
|
|
4
4
|
import { JobButton } from "#client/adapters/JobButton.tsx";
|
|
5
5
|
import { JobsQueryPanel } from "#client/adapters/JobsQueryPanel.tsx";
|
|
6
|
-
|
|
6
|
+
import { Timestamp } from "#client/adapters/Timestamp.tsx";
|
|
7
|
+
export function JobDetail({ api, dates, queue, id, retry, }) {
|
|
7
8
|
const state = useQuery(api.job.query({ id, queue }));
|
|
8
|
-
return (_jsxs("section", { "aria-label": "Job detail", children: [_jsx("h2", { className: "mb-4 text-xl font-semibold", children: "Job detail" }), _jsx(JobsQueryPanel, { state: state, children: (job) => _jsx(JobResult, { job: job, retry: retry }) })] }));
|
|
9
|
+
return (_jsxs("section", { "aria-label": "Job detail", children: [_jsx("h2", { className: "mb-4 text-xl font-semibold", children: "Job detail" }), _jsx(JobsQueryPanel, { state: state, children: (job) => _jsx(JobResult, { dates: dates, job: job, retry: retry }) })] }));
|
|
9
10
|
}
|
|
10
|
-
function JobResult({ job, retry }) {
|
|
11
|
+
function JobResult({ dates, job, retry, }) {
|
|
11
12
|
if (Option.isNone(job)) {
|
|
12
13
|
return _jsx("p", { children: "Job not found." });
|
|
13
14
|
}
|
|
14
|
-
return _jsx(JobRecord, { job: job.value, retry: retry });
|
|
15
|
+
return _jsx(JobRecord, { dates: dates, job: job.value, retry: retry });
|
|
15
16
|
}
|
|
16
|
-
export function JobRecord({ job, retry }) {
|
|
17
|
+
export function JobRecord({ dates, job, retry }) {
|
|
18
|
+
function shown(time) {
|
|
19
|
+
return _jsx(Timestamp, { dates: dates, time: time });
|
|
20
|
+
}
|
|
17
21
|
const failure = ("sourceOutput" in job ? job.sourceOutput : job.output)?.message ?? "No failure recorded.";
|
|
18
22
|
const deadLetterDetails = "sourceId" in job ? (_jsxs(_Fragment, { children: [_jsx("h3", { className: "font-medium", children: "Dead-letter source" }), _jsx("p", { className: "text-sm break-all", children: Option.getOrElse(job.sourceId, () => "Unknown original") }), _jsx("pre", { className: "bg-muted max-w-full overflow-auto rounded-md p-3 text-xs", children: JSON.stringify(job.sourceOutput, null, 2) })] })) : null;
|
|
19
23
|
const retryControl = retry !== undefined && job.state === "failed" && !("sourceId" in job) ? _jsx(RetryControl, { job: job, retry: retry }) : null;
|
|
20
24
|
return (_jsx("div", { className: "min-w-0 rounded-md border p-4", children: _jsxs("div", { className: "min-w-0 space-y-4", children: [_jsx("dl", { className: "grid min-w-0 gap-3 text-sm wrap-anywhere sm:grid-cols-2", children: Object.entries({
|
|
21
25
|
Attempt: job.attempt,
|
|
22
|
-
Completed: Option.match(job.completedOn, { onNone: () => "—", onSome:
|
|
23
|
-
Created:
|
|
26
|
+
Completed: Option.match(job.completedOn, { onNone: () => "—", onSome: shown }),
|
|
27
|
+
Created: shown(job.createdOn),
|
|
24
28
|
"ID": job.id,
|
|
25
29
|
Queue: job.queue,
|
|
26
30
|
"Retry count / limit": `${job.retryCount} / ${job.retryLimit}`,
|
|
27
|
-
Started: Option.match(job.startedOn, { onNone: () => "—", onSome:
|
|
31
|
+
Started: Option.match(job.startedOn, { onNone: () => "—", onSome: shown }),
|
|
28
32
|
State: job.state,
|
|
29
33
|
}).map(([label, value]) => (_jsxs("div", { children: [_jsx("dt", { className: "text-muted-foreground", children: label }), _jsx("dd", { children: value })] }, label))) }), _jsx("h3", { className: "font-medium", children: "Payload" }), _jsx("pre", { className: "bg-muted max-w-full overflow-auto rounded-md p-3 text-xs", children: JSON.stringify(job.data, null, 2) }), _jsx("h3", { className: "font-medium", children: "Failure" }), _jsx("p", { className: "wrap-anywhere", children: failure }), _jsx("h3", { className: "font-medium", children: "Output" }), _jsx("pre", { className: "bg-muted max-w-full overflow-auto rounded-md p-3 text-xs", children: JSON.stringify(job.output, null, 2) }), deadLetterDetails, retryControl] }) }));
|
|
30
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JobDetail.js","sourceRoot":"","sources":["../../../src/client/adapters/JobDetail.tsx"],"names":[],"mappings":";AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"JobDetail.js","sourceRoot":"","sources":["../../../src/client/adapters/JobDetail.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import type { QueueDisplay } from "@shivaedev/jobs/display.ts";
|
|
2
2
|
import type { JobsViewClient, RetryJob } from "#client/adapters/jobsTypes.ts";
|
|
3
|
-
|
|
3
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
4
|
+
export declare function JobList({ api, dates, queue, kind, retry, subject, }: {
|
|
4
5
|
readonly api: JobsViewClient;
|
|
6
|
+
readonly dates: DateDisplay;
|
|
5
7
|
readonly queue: string;
|
|
6
8
|
readonly kind: "failed" | "deadLettered";
|
|
7
9
|
readonly retry: RetryJob | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JobList.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/JobList.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAM/D,OAAO,KAAK,EAAY,cAAc,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"JobList.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/JobList.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAM/D,OAAO,KAAK,EAAY,cAAc,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACxF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAErE,wBAAgB,OAAO,CAAC,EACvB,GAAG,EACH,KAAK,EACL,KAAK,EACL,IAAI,EACJ,KAAK,EACL,OAAO,GACP,EAAE;IACF,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,cAAc,CAAC;IACzC,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;CAC3C,+BA4CA"}
|
|
@@ -6,7 +6,7 @@ import { JobDetail, JobRecord } from "#client/adapters/JobDetail.tsx";
|
|
|
6
6
|
import { JobPagination } from "#client/adapters/JobPagination.tsx";
|
|
7
7
|
import { JobsQueryPanel } from "#client/adapters/JobsQueryPanel.tsx";
|
|
8
8
|
import { JobTable } from "#client/adapters/JobTable.tsx";
|
|
9
|
-
export function JobList({ api, queue, kind, retry, subject, }) {
|
|
9
|
+
export function JobList({ api, dates, queue, kind, retry, subject, }) {
|
|
10
10
|
const [cursors, setCursors] = useState([]);
|
|
11
11
|
const [selectedId, select] = useState();
|
|
12
12
|
const cursor = cursors.at(-1);
|
|
@@ -15,10 +15,10 @@ export function JobList({ api, queue, kind, retry, subject, }) {
|
|
|
15
15
|
let selectedDetail = null;
|
|
16
16
|
if (selectedId !== undefined) {
|
|
17
17
|
if (kind === "failed") {
|
|
18
|
-
selectedDetail = _jsx(JobDetail, { api: api, id: selectedId, queue: queue, retry: retry }, selectedId);
|
|
18
|
+
selectedDetail = _jsx(JobDetail, { api: api, dates: dates, id: selectedId, queue: queue, retry: retry }, selectedId);
|
|
19
19
|
}
|
|
20
20
|
else if (Option.isSome(selected)) {
|
|
21
|
-
selectedDetail = (_jsxs("section", { "aria-label": "Dead-letter detail", children: [_jsx("h2", { className: "mb-4 text-xl font-semibold", children: "Dead-letter detail" }), _jsx(JobRecord, { job: selected.value })] }));
|
|
21
|
+
selectedDetail = (_jsxs("section", { "aria-label": "Dead-letter detail", children: [_jsx("h2", { className: "mb-4 text-xl font-semibold", children: "Dead-letter detail" }), _jsx(JobRecord, { dates: dates, job: selected.value })] }));
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
function selectJob(job) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JobList.js","sourceRoot":"","sources":["../../../src/client/adapters/JobList.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAkB,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjD,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"JobList.js","sourceRoot":"","sources":["../../../src/client/adapters/JobList.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import type { QueueDisplay } from "@shivaedev/jobs/display.ts";
|
|
2
2
|
import type { JobsViewClient, RetryJob } from "#client/adapters/jobsTypes.ts";
|
|
3
|
-
|
|
3
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
4
|
+
export declare function JobsQueueView({ api, dates, label, queue, retry, subject, }: {
|
|
4
5
|
readonly api: JobsViewClient;
|
|
6
|
+
readonly dates: DateDisplay;
|
|
5
7
|
readonly label?: string | undefined;
|
|
6
8
|
readonly queue: string;
|
|
7
9
|
readonly retry: RetryJob | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JobsQueueView.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/JobsQueueView.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAK/D,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"JobsQueueView.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/JobsQueueView.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAK/D,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAErE,wBAAgB,aAAa,CAAC,EAC7B,GAAG,EACH,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,OAAO,GACP,EAAE;IACF,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;CAC3C,+BAuCA;AAED,wBAAgB,eAAe,CAAC,EAC/B,MAAM,EACN,MAAM,EACN,KAAK,GACL,EAAE;IACF,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,GAAG,YAAY,CAAC,EAAE,CAAC;IACpD,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACvB,+BAoBA"}
|
|
@@ -4,13 +4,13 @@ import { useQuery } from "@shivaedev/react/client/resultState.ts";
|
|
|
4
4
|
import { JobList } from "#client/adapters/JobList.tsx";
|
|
5
5
|
import { JobsMetrics } from "#client/adapters/JobsMetrics.tsx";
|
|
6
6
|
import { JobsQueryPanel } from "#client/adapters/JobsQueryPanel.tsx";
|
|
7
|
-
export function JobsQueueView({ api, label, queue, retry, subject, }) {
|
|
7
|
+
export function JobsQueueView({ api, dates, label, queue, retry, subject, }) {
|
|
8
8
|
const [kind, setKind] = useState("failed");
|
|
9
9
|
const counts = useQuery(api.counts.query({ queue }));
|
|
10
10
|
return (_jsxs(_Fragment, { children: [_jsxs("section", { "aria-label": "Queue counts", className: "space-y-4", children: [_jsx("h2", { className: "text-xl font-semibold", children: label ?? queue }), _jsx(JobsQueryPanel, { state: counts, children: (value) => (_jsx(JobsMetrics, { values: { Active: value.activeCount, Failed: value.failedCount, Queued: value.queuedCount, Total: value.totalCount } })) })] }), _jsx("div", { "aria-label": "Job lists", className: "flex flex-wrap gap-3", role: "tablist", children: [
|
|
11
11
|
["failed", "Failed"],
|
|
12
12
|
["deadLettered", "Dead-lettered"],
|
|
13
|
-
].map(([value, tabLabel]) => (_jsx("button", { "aria-controls": `jobs-${value}-panel`, "aria-selected": kind === value, className: "rounded-md border px-3 py-2", id: `jobs-${value}-tab`, onClick: () => setKind(value), role: "tab", type: "button", children: tabLabel }, value))) }), _jsx("div", { "aria-labelledby": `jobs-${kind}-tab`, id: `jobs-${kind}-panel`, role: "tabpanel", children: _jsx(JobList, { api: api, kind: kind, queue: queue, retry: retry, subject: subject }, kind) })] }));
|
|
13
|
+
].map(([value, tabLabel]) => (_jsx("button", { "aria-controls": `jobs-${value}-panel`, "aria-selected": kind === value, className: "rounded-md border px-3 py-2", id: `jobs-${value}-tab`, onClick: () => setKind(value), role: "tab", type: "button", children: tabLabel }, value))) }), _jsx("div", { "aria-labelledby": `jobs-${kind}-tab`, id: `jobs-${kind}-panel`, role: "tabpanel", children: _jsx(JobList, { api: api, dates: dates, kind: kind, queue: queue, retry: retry, subject: subject }, kind) })] }));
|
|
14
14
|
}
|
|
15
15
|
export function JobsQueuePicker({ queues, select, value, }) {
|
|
16
16
|
return (_jsxs("label", { className: "flex min-w-0 flex-col gap-2 text-sm sm:max-w-sm", children: ["Queue", _jsx("select", { className: "bg-background h-10 w-full max-w-full min-w-0 rounded-md border px-3", onChange: (event) => select(event.target.value), value: value, children: queues.map((queue) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JobsQueueView.js","sourceRoot":"","sources":["../../../src/client/adapters/JobsQueueView.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"JobsQueueView.js","sourceRoot":"","sources":["../../../src/client/adapters/JobsQueueView.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { QueueDisplay } from "@shivaedev/jobs/display.ts";
|
|
2
2
|
import type { JobsViewClient, RetryJob, RunScheduleNow } from "#client/adapters/jobsTypes.ts";
|
|
3
|
-
|
|
3
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
4
|
+
export interface JobsViewProps extends DateDisplay {
|
|
4
5
|
readonly api: JobsViewClient;
|
|
5
6
|
readonly queues: readonly (string | QueueDisplay)[];
|
|
6
7
|
readonly retry?: RetryJob | undefined;
|
|
@@ -9,7 +10,7 @@ export interface JobsViewProps {
|
|
|
9
10
|
readonly name: string;
|
|
10
11
|
}[];
|
|
11
12
|
}
|
|
12
|
-
export declare function JobsView({ api, queues, retry, schedules, runScheduleNow }: JobsViewProps): import("react").DetailedReactHTMLElement<{
|
|
13
|
+
export declare function JobsView({ api, queues, retry, schedules, runScheduleNow, locale, timeZone }: JobsViewProps): import("react").DetailedReactHTMLElement<{
|
|
13
14
|
role: "alert";
|
|
14
15
|
}, HTMLElement> | import("react").DetailedReactHTMLElement<{
|
|
15
16
|
className: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JobsView.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/JobsView.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI/D,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"JobsView.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/JobsView.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI/D,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE9F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAErE,MAAM,WAAW,aAAc,SAAQ,WAAW;IACjD,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,GAAG,YAAY,CAAC,EAAE,CAAC;IACpD,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IACtC,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IACrD,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC1D;AAED,wBAAgB,QAAQ,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,aAAa;;;;gBAiC1G"}
|
|
@@ -4,7 +4,7 @@ import { useQuery } from "@shivaedev/react/client/resultState.ts";
|
|
|
4
4
|
import { JobsHealthMetrics } from "#client/adapters/JobsMetrics.tsx";
|
|
5
5
|
import { JobsQueuePicker, JobsQueueView } from "#client/adapters/JobsQueueView.tsx";
|
|
6
6
|
import { RunScheduleControl } from "#client/adapters/RunScheduleControl.tsx";
|
|
7
|
-
export function JobsView({ api, queues, retry, schedules, runScheduleNow }) {
|
|
7
|
+
export function JobsView({ api, queues, retry, schedules, runScheduleNow, locale, timeZone }) {
|
|
8
8
|
const definitions = queues.map((definition) => (typeof definition === "string" ? { name: definition } : definition));
|
|
9
9
|
const [name, selectQueue] = useState(definitions[0]?.name ?? "");
|
|
10
10
|
const queue = definitions.find((candidate) => candidate.name === name);
|
|
@@ -17,6 +17,14 @@ export function JobsView({ api, queues, retry, schedules, runScheduleNow }) {
|
|
|
17
17
|
? createElement("p", null, "No queues or schedules registered.")
|
|
18
18
|
: createElement("div", { className: "min-w-0 space-y-6" }, createElement(JobsQueuePicker, { queues: definitions, select: selectQueue, value: name }), runScheduleNow !== undefined && schedules?.some((schedule) => schedule.name === name)
|
|
19
19
|
? createElement(RunScheduleControl, { key: `run-${name}`, queue: name, run: runScheduleNow })
|
|
20
|
-
: null, createElement(JobsQueueView, {
|
|
20
|
+
: null, createElement(JobsQueueView, {
|
|
21
|
+
api,
|
|
22
|
+
dates: { locale, timeZone },
|
|
23
|
+
key: name,
|
|
24
|
+
label: queue.label,
|
|
25
|
+
queue: name,
|
|
26
|
+
retry,
|
|
27
|
+
subject: queue.subject,
|
|
28
|
+
})));
|
|
21
29
|
}
|
|
22
30
|
//# sourceMappingURL=JobsView.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JobsView.js","sourceRoot":"","sources":["../../../src/client/adapters/JobsView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEhD,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"JobsView.js","sourceRoot":"","sources":["../../../src/client/adapters/JobsView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEhD,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAW7E,MAAM,UAAU,QAAQ,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAiB;IAC1G,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IACrH,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;IACjE,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACvE,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IACrD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;IACrI,IAAI,MAAM,EAAE,CAAC;QACZ,OAAO,aAAa,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,mCAAmC,CAAC,CAAC;IACnF,CAAC;IACD,OAAO,aAAa,CACnB,KAAK,EACL,EAAE,SAAS,EAAE,mBAAmB,EAAE,EAClC,aAAa,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EACnD,KAAK,KAAK,SAAS;QAClB,CAAC,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,oCAAoC,CAAC;QAChE,CAAC,CAAC,aAAa,CACb,KAAK,EACL,EAAE,SAAS,EAAE,mBAAmB,EAAE,EAClC,aAAa,CAAC,eAAe,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EACzF,cAAc,KAAK,SAAS,IAAI,SAAS,EAAE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAC;YACpF,CAAC,CAAC,aAAa,CAAC,kBAAkB,EAAE,EAAE,GAAG,EAAE,OAAO,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC;YAC7F,CAAC,CAAC,IAAI,EACP,aAAa,CAAC,aAAa,EAAE;YAC5B,GAAG;YACH,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;YAC3B,GAAG,EAAE,IAAI;YACT,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,KAAK,EAAE,IAAI;YACX,KAAK;YACL,OAAO,EAAE,KAAK,CAAC,OAAO;SACtB,CAAC,CACF,CACH,CAAC;AACH,CAAC"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { SignedInSession } from "@shivaedev/identity/signedInSessions.ts";
|
|
2
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
2
3
|
interface SessionControls {
|
|
3
4
|
readonly currentSessionId: string | undefined;
|
|
5
|
+
readonly dates: DateDisplay;
|
|
4
6
|
readonly pending: boolean;
|
|
5
7
|
readonly select: (session: typeof SignedInSession.Type) => void;
|
|
6
8
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionListView.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/SessionListView.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SessionListView.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/SessionListView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAE/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAErE,UAAU,eAAe;IACxB,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,eAAe,CAAC,IAAI,KAAK,IAAI,CAAC;CAChE;AAED,wBAAgB,eAAe,CAAC,EAAE,QAAQ,EAAE,GAAG,QAAQ,EAAE,EAAE,eAAe,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,OAAO,eAAe,CAAC,IAAI,CAAC,EAAE,CAAA;CAAE,+BAW3I"}
|
|
@@ -1,22 +1,22 @@
|
|
|
1
1
|
import { createElement as _createElement } from "react";
|
|
2
2
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
3
|
-
import {
|
|
3
|
+
import { Timestamp } from "#client/adapters/Timestamp.tsx";
|
|
4
4
|
export function SessionListView({ sessions, ...controls }) {
|
|
5
5
|
if (sessions.length === 0) {
|
|
6
6
|
return _jsx("p", { children: "No signed-in sessions." });
|
|
7
7
|
}
|
|
8
8
|
return (_jsx("ul", { "aria-label": "Sessions", className: "grid min-w-0 gap-4", children: sessions.map((session) => (_createElement(SessionRow, { ...controls, key: session.id, session: session }))) }));
|
|
9
9
|
}
|
|
10
|
-
function SessionRow({ session, currentSessionId, pending, select }) {
|
|
10
|
+
function SessionRow({ session, currentSessionId, dates, pending, select }) {
|
|
11
11
|
const current = session.id === currentSessionId && _jsx("p", { className: "font-medium", children: "Your current session" });
|
|
12
|
-
return (_jsxs("li", { className: "min-w-0 space-y-3 rounded-md border p-4 wrap-anywhere", children: [_jsxs("div", { className: "flex flex-wrap items-start justify-between gap-3", children: [_jsxs("div", { className: "min-w-0", children: [_jsx("p", { className: "font-medium", children: session.user.name }), _jsx("p", { children: session.user.email }), current] }), _jsx("button", { "aria-label": `Revoke session for ${session.user.email}`, className: "rounded-md border px-3 py-2 disabled:opacity-50", disabled: pending, onClick: () => select(session), type: "button", children: "Revoke session" })] }), _jsx(SessionTimes, { session: session })] }));
|
|
12
|
+
return (_jsxs("li", { className: "min-w-0 space-y-3 rounded-md border p-4 wrap-anywhere", children: [_jsxs("div", { className: "flex flex-wrap items-start justify-between gap-3", children: [_jsxs("div", { className: "min-w-0", children: [_jsx("p", { className: "font-medium", children: session.user.name }), _jsx("p", { children: session.user.email }), current] }), _jsx("button", { "aria-label": `Revoke session for ${session.user.email}`, className: "rounded-md border px-3 py-2 disabled:opacity-50", disabled: pending, onClick: () => select(session), type: "button", children: "Revoke session" })] }), _jsx(SessionTimes, { dates: dates, session: session })] }));
|
|
13
13
|
}
|
|
14
|
-
function SessionTimes({ session }) {
|
|
14
|
+
function SessionTimes({ dates, session }) {
|
|
15
15
|
const times = [
|
|
16
16
|
["Started", session.startedAt],
|
|
17
17
|
["Last activity", session.lastActivityAt],
|
|
18
18
|
["Expires", session.expiresAt],
|
|
19
19
|
];
|
|
20
|
-
return (_jsx("dl", { className: "grid min-w-0 gap-3 text-sm sm:grid-cols-3", children: times.map(([label, time]) => (_jsxs("div", { children: [_jsx("dt", { className: "text-muted-foreground", children: label }), _jsx("dd", { children: _jsx(
|
|
20
|
+
return (_jsx("dl", { className: "grid min-w-0 gap-3 text-sm sm:grid-cols-3", children: times.map(([label, time]) => (_jsxs("div", { children: [_jsx("dt", { className: "text-muted-foreground", children: label }), _jsx("dd", { children: _jsx(Timestamp, { dates: dates, time: time }) })] }, label))) }));
|
|
21
21
|
}
|
|
22
22
|
//# sourceMappingURL=SessionListView.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionListView.js","sourceRoot":"","sources":["../../../src/client/adapters/SessionListView.tsx"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"SessionListView.js","sourceRoot":"","sources":["../../../src/client/adapters/SessionListView.tsx"],"names":[],"mappings":";;AACA,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAU3D,MAAM,UAAU,eAAe,CAAC,EAAE,QAAQ,EAAE,GAAG,QAAQ,EAAqF;IAC3I,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO,iDAA6B,CAAC;IACtC,CAAC;IACD,OAAO,CACN,2BAAe,UAAU,EAAC,SAAS,EAAC,oBAAoB,YACtD,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAC1B,eAAC,UAAU,OAAK,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,GAAI,CAC/D,CAAC,GACE,CACL,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAuE;IAC7I,MAAM,OAAO,GAAG,OAAO,CAAC,EAAE,KAAK,gBAAgB,IAAI,YAAG,SAAS,EAAC,aAAa,qCAAyB,CAAC;IACvG,OAAO,CACN,cAAI,SAAS,EAAC,uDAAuD,aACpE,eAAK,SAAS,EAAC,kDAAkD,aAChE,eAAK,SAAS,EAAC,SAAS,aACvB,YAAG,SAAS,EAAC,aAAa,YAAE,OAAO,CAAC,IAAI,CAAC,IAAI,GAAK,EAClD,sBAAI,OAAO,CAAC,IAAI,CAAC,KAAK,GAAK,EAC1B,OAAO,IACH,EACN,+BACa,sBAAsB,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,EACtD,SAAS,EAAC,iDAAiD,EAC3D,QAAQ,EAAE,OAAO,EACjB,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAC9B,IAAI,EAAC,QAAQ,+BAGL,IACJ,EACN,KAAC,YAAY,IAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,GAAI,IAC5C,CACL,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,EAAE,KAAK,EAAE,OAAO,EAAkF;IACvH,MAAM,KAAK,GAAG;QACb,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC;QAC9B,CAAC,eAAe,EAAE,OAAO,CAAC,cAAc,CAAC;QACzC,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC;KACrB,CAAC;IACX,OAAO,CACN,aAAI,SAAS,EAAC,2CAA2C,YACvD,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAC7B,0BACC,aAAI,SAAS,EAAC,uBAAuB,YAAE,KAAK,GAAM,EAClD,uBACC,KAAC,SAAS,IAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,GAAI,GACnC,KAJI,KAAK,CAKT,CACN,CAAC,GACE,CACL,CAAC;AACH,CAAC"}
|
|
@@ -3,7 +3,8 @@ import type * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
|
3
3
|
import type * as Atom from "effect/reactivity/Atom";
|
|
4
4
|
import type { SessionList, SessionListInput } from "@shivaedev/identity/signedInSessions.ts";
|
|
5
5
|
import type { AtomServices } from "@shivaedev/react/AtomServices.ts";
|
|
6
|
-
|
|
6
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
7
|
+
export interface SessionsViewProps<R, E> extends DateDisplay {
|
|
7
8
|
readonly currentSessionId: string | undefined;
|
|
8
9
|
readonly list: (input: typeof SessionListInput.Type) => Atom.Atom<AsyncResult.AsyncResult<SessionList, unknown>>;
|
|
9
10
|
readonly onCurrentSessionRevoked: () => void;
|
|
@@ -12,7 +13,7 @@ export interface SessionsViewProps<R, E> {
|
|
|
12
13
|
}) => Effect.Effect<void, unknown, AtomServices<R>>;
|
|
13
14
|
readonly runtime: Atom.AtomRuntime<R, E>;
|
|
14
15
|
}
|
|
15
|
-
export declare function SessionsView<R, E>({ currentSessionId, list, onCurrentSessionRevoked, revoke, runtime }: SessionsViewProps<R, E>): import("react").DetailedReactHTMLElement<{
|
|
16
|
+
export declare function SessionsView<R, E>({ currentSessionId, list, locale, onCurrentSessionRevoked, revoke, runtime, timeZone }: SessionsViewProps<R, E>): import("react").DetailedReactHTMLElement<{
|
|
16
17
|
role: "alert";
|
|
17
18
|
}, HTMLElement> | import("react").DetailedReactHTMLElement<{
|
|
18
19
|
"aria-label": string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionsView.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/SessionsView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,MAAM,EAAqB,MAAM,QAAQ,CAAC;AAC/D,OAAO,KAAK,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAEpD,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAmB,MAAM,yCAAyC,CAAC;AAC9G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"SessionsView.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/SessionsView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,MAAM,EAAqB,MAAM,QAAQ,CAAC;AAC/D,OAAO,KAAK,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAEpD,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAmB,MAAM,yCAAyC,CAAC;AAC9G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAKrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAErE,MAAM,WAAW,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAE,SAAQ,WAAW;IAC3D,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,gBAAgB,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;IACjH,QAAQ,CAAC,uBAAuB,EAAE,MAAM,IAAI,CAAC;IAC7C,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IACnG,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CACzC;AAMD,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,EAAE,uBAAuB,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC;;;;;gBA2DjJ"}
|
|
@@ -7,7 +7,7 @@ import { SessionPagination } from "#client/adapters/SessionPagination.tsx";
|
|
|
7
7
|
function forbidden(cause) {
|
|
8
8
|
return Option.exists(Option.flatMap(cause, Cause.findErrorOption), (error) => Predicate.isTagged(error, "Forbidden"));
|
|
9
9
|
}
|
|
10
|
-
export function SessionsView({ currentSessionId, list, onCurrentSessionRevoked, revoke, runtime }) {
|
|
10
|
+
export function SessionsView({ currentSessionId, list, locale, onCurrentSessionRevoked, revoke, runtime, timeZone }) {
|
|
11
11
|
const [cursors, setCursors] = useState([]);
|
|
12
12
|
const [selected, select] = useState();
|
|
13
13
|
const cursor = cursors.at(-1);
|
|
@@ -35,7 +35,15 @@ export function SessionsView({ currentSessionId, list, onCurrentSessionRevoked,
|
|
|
35
35
|
onConfirm: action.dispatch,
|
|
36
36
|
pending: action.pending,
|
|
37
37
|
selected,
|
|
38
|
-
}), data === undefined
|
|
38
|
+
}), data === undefined
|
|
39
|
+
? null
|
|
40
|
+
: createElement(SessionListView, {
|
|
41
|
+
currentSessionId,
|
|
42
|
+
dates: { locale, timeZone },
|
|
43
|
+
pending: action.pending,
|
|
44
|
+
select,
|
|
45
|
+
sessions: data.sessions,
|
|
46
|
+
}), createElement(SessionPagination, {
|
|
39
47
|
cursors,
|
|
40
48
|
data,
|
|
41
49
|
go: (next) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionsView.js","sourceRoot":"","sources":["../../../src/client/adapters/SessionsView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAe,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAG/D,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGhD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"SessionsView.js","sourceRoot":"","sources":["../../../src/client/adapters/SessionsView.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { DateTime } from "effect";
|
|
2
|
+
import { type DateDisplay } from "#client/adapters/timestampText.ts";
|
|
3
|
+
export declare function Timestamp({ className, dates, time, }: {
|
|
4
|
+
readonly className?: string;
|
|
5
|
+
readonly dates: DateDisplay;
|
|
6
|
+
readonly time: DateTime.DateTime;
|
|
7
|
+
}): import("react").JSX.Element;
|
|
8
|
+
//# sourceMappingURL=Timestamp.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Timestamp.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/Timestamp.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,KAAK,WAAW,EAAiB,MAAM,mCAAmC,CAAC;AAEpF,wBAAgB,SAAS,CAAC,EACzB,SAAS,EACT,KAAK,EACL,IAAI,GACJ,EAAE;IACF,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC;CACjC,+BAMA"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
import { DateTime } from "effect";
|
|
3
|
+
import { timestampText } from "#client/adapters/timestampText.ts";
|
|
4
|
+
export function Timestamp({ className, dates, time, }) {
|
|
5
|
+
return (_jsx("time", { className: className, dateTime: DateTime.formatIso(time), children: timestampText(time, dates) }));
|
|
6
|
+
}
|
|
7
|
+
//# sourceMappingURL=Timestamp.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Timestamp.js","sourceRoot":"","sources":["../../../src/client/adapters/Timestamp.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAoB,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAEpF,MAAM,UAAU,SAAS,CAAC,EACzB,SAAS,EACT,KAAK,EACL,IAAI,GAKJ;IACA,OAAO,CACN,eAAM,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,YAC5D,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,GACrB,CACP,CAAC;AACH,CAAC"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
1
2
|
import type { ChangeRoleInput } from "#users/ChangeRoleInput.ts";
|
|
2
3
|
import type { UsersList } from "#users/List.ts";
|
|
3
4
|
interface RoleControls<TRole extends string> {
|
|
5
|
+
readonly dates: DateDisplay;
|
|
4
6
|
readonly dispatch: (input: ChangeRoleInput<TRole>) => void;
|
|
5
7
|
readonly pending: boolean;
|
|
6
8
|
readonly roles: readonly TRole[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UsersTable.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/UsersTable.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,UAAU,YAAY,CAAC,KAAK,SAAS,MAAM;IAC1C,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC;IAC3D,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS,KAAK,EAAE,CAAC;CACjC;
|
|
1
|
+
{"version":3,"file":"UsersTable.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/UsersTable.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,UAAU,YAAY,CAAC,KAAK,SAAS,MAAM;IAC1C,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC;IAC3D,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS,KAAK,EAAE,CAAC;CACjC;AAkFD,wBAAgB,UAAU,CAAC,KAAK,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAE,EAAE,YAAY,CAAC,KAAK,CAAC,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;CAAE,+BASzH"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createElement as _createElement } from "react";
|
|
2
2
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
3
|
-
import {
|
|
3
|
+
import { Timestamp } from "#client/adapters/Timestamp.tsx";
|
|
4
4
|
function UserRole({ user, canChangeRoles, roles, pending, dispatch, }) {
|
|
5
5
|
if (!canChangeRoles) {
|
|
6
6
|
return user.role;
|
|
@@ -12,8 +12,8 @@ function UserRole({ user, canChangeRoles, roles, pending, dispatch, }) {
|
|
|
12
12
|
}
|
|
13
13
|
}, value: user.role, children: roles.map((role) => (_jsx("option", { value: role, children: role }, role))) }));
|
|
14
14
|
}
|
|
15
|
-
function UserRow({ user, canChangeRoles, ...controls }) {
|
|
16
|
-
return (_jsxs("tr", { className: "block min-w-0 rounded-md border sm:table-row sm:rounded-none sm:border-0 sm:border-b", children: [_jsx(UserCell, { label: "Name", children: user.name }), _jsx(UserCell, { label: "Email", children: user.email }), _jsx(UserCell, { label: "Role", children: _jsx(UserRole, { ...controls, canChangeRoles: canChangeRoles, user: user }) }), _jsx(UserCell, { label: "Signed up", children: _jsx(
|
|
15
|
+
function UserRow({ user, canChangeRoles, dates, ...controls }) {
|
|
16
|
+
return (_jsxs("tr", { className: "block min-w-0 rounded-md border sm:table-row sm:rounded-none sm:border-0 sm:border-b", children: [_jsx(UserCell, { label: "Name", children: user.name }), _jsx(UserCell, { label: "Email", children: user.email }), _jsx(UserCell, { label: "Role", children: _jsx(UserRole, { ...controls, canChangeRoles: canChangeRoles, user: user }) }), _jsx(UserCell, { label: "Signed up", children: _jsx(Timestamp, { className: "sm:whitespace-nowrap", dates: dates, time: user.createdAt }) })] }));
|
|
17
17
|
}
|
|
18
18
|
function UserCell({ label, children }) {
|
|
19
19
|
return (_jsxs("td", { className: "block min-w-0 p-3 wrap-anywhere sm:table-cell sm:wrap-normal", children: [_jsx("span", { className: "block font-medium sm:hidden", children: label }), _jsx("div", { children: children })] }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UsersTable.js","sourceRoot":"","sources":["../../../src/client/adapters/UsersTable.tsx"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"UsersTable.js","sourceRoot":"","sources":["../../../src/client/adapters/UsersTable.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
import type * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
2
2
|
import type * as Atom from "effect/reactivity/Atom";
|
|
3
3
|
import type { UserListInput } from "@shivaedev/identity/users.ts";
|
|
4
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
4
5
|
import type { ChangeRoleInput } from "#users/ChangeRoleInput.ts";
|
|
5
6
|
import type { UsersList } from "#users/List.ts";
|
|
6
|
-
export interface UsersViewProps<TRole extends string> {
|
|
7
|
+
export interface UsersViewProps<TRole extends string> extends DateDisplay {
|
|
7
8
|
readonly changeRole: Atom.AtomResultFn<ChangeRoleInput<TRole>, void, unknown>;
|
|
8
9
|
readonly list: (input: typeof UserListInput.Type) => Atom.Atom<AsyncResult.AsyncResult<UsersList, unknown>>;
|
|
9
10
|
readonly roles: readonly TRole[];
|
|
10
11
|
}
|
|
11
|
-
export declare function UsersView<TRole extends string>({ list, changeRole, roles }: UsersViewProps<TRole>): import("react").DetailedReactHTMLElement<{
|
|
12
|
+
export declare function UsersView<TRole extends string>({ list, changeRole, roles, locale, timeZone }: UsersViewProps<TRole>): import("react").DetailedReactHTMLElement<{
|
|
12
13
|
"aria-label": string;
|
|
13
14
|
className: string;
|
|
14
15
|
}, HTMLElement>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UsersView.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/UsersView.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAEpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"UsersView.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/UsersView.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAEpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAErE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,MAAM,WAAW,cAAc,CAAC,KAAK,SAAS,MAAM,CAAE,SAAQ,WAAW;IACxE,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9E,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,aAAa,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5G,QAAQ,CAAC,KAAK,EAAE,SAAS,KAAK,EAAE,CAAC;CACjC;AAaD,wBAAgB,SAAS,CAAC,KAAK,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,cAAc,CAAC,KAAK,CAAC;;;gBA+CnH"}
|
|
@@ -12,13 +12,15 @@ function failure(cause) {
|
|
|
12
12
|
}
|
|
13
13
|
return "Could not change the role. Try again.";
|
|
14
14
|
}
|
|
15
|
-
export function UsersView({ list, changeRole, roles }) {
|
|
15
|
+
export function UsersView({ list, changeRole, roles, locale, timeZone }) {
|
|
16
16
|
const [cursors, setCursors] = useState([]);
|
|
17
17
|
const cursor = cursors.at(-1);
|
|
18
18
|
const state = useQuery(list({ ...(cursor === undefined ? {} : { cursor }), limit: 20 }));
|
|
19
19
|
const action = useAction(changeRole);
|
|
20
20
|
const data = Option.getOrUndefined(state.data);
|
|
21
|
-
return createElement("section", { "aria-label": "App users", className: "space-y-4" }, createElement("button", { className: "rounded-md border px-3 py-2 disabled:opacity-50", disabled: state.pending, onClick: state.refresh, type: "button" }, "Refresh users"), state.pending ? createElement("p", { role: "status" }, "Loading users…") : null, Option.isSome(state.cause) ? createElement("p", { role: "alert" }, "Could not load users. Try refreshing.") : null, Option.isSome(action.cause) ? createElement("p", { role: "alert" }, failure(action.cause.value)) : null, data === undefined
|
|
21
|
+
return createElement("section", { "aria-label": "App users", className: "space-y-4" }, createElement("button", { className: "rounded-md border px-3 py-2 disabled:opacity-50", disabled: state.pending, onClick: state.refresh, type: "button" }, "Refresh users"), state.pending ? createElement("p", { role: "status" }, "Loading users…") : null, Option.isSome(state.cause) ? createElement("p", { role: "alert" }, "Could not load users. Try refreshing.") : null, Option.isSome(action.cause) ? createElement("p", { role: "alert" }, failure(action.cause.value)) : null, data === undefined
|
|
22
|
+
? null
|
|
23
|
+
: createElement(UsersTable, { data, dates: { locale, timeZone }, dispatch: action.dispatch, pending: action.pending, roles }), data === undefined
|
|
22
24
|
? null
|
|
23
25
|
: createElement("nav", { "aria-label": "User pages", className: "flex gap-4" }, createElement("button", {
|
|
24
26
|
className: "rounded-md border px-3 py-2 disabled:opacity-50",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UsersView.js","sourceRoot":"","sources":["../../../src/client/adapters/UsersView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAGlD,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEhD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"UsersView.js","sourceRoot":"","sources":["../../../src/client/adapters/UsersView.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { DateTime } from "effect";
|
|
2
|
+
export interface DateDisplay {
|
|
3
|
+
readonly locale?: string | undefined;
|
|
4
|
+
readonly timeZone?: string | undefined;
|
|
5
|
+
}
|
|
6
|
+
export declare function timestampText(time: DateTime.DateTime, { locale, timeZone }: DateDisplay): string;
|
|
7
|
+
//# sourceMappingURL=timestampText.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"timestampText.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/timestampText.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAU,MAAM,QAAQ,CAAC;AAE1C,MAAM,WAAW,WAAW;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACvC;AAID,wBAAgB,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,WAAW,GAAG,MAAM,CAOhG"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { DateTime, Option } from "effect";
|
|
2
|
+
const STYLE = { dateStyle: "medium", timeStyle: "long" };
|
|
3
|
+
export function timestampText(time, { locale, timeZone }) {
|
|
4
|
+
const options = locale === undefined ? STYLE : { ...STYLE, locale };
|
|
5
|
+
// Intl throws on a locale or time zone it cannot read, and a saved preference must not take the page down with it.
|
|
6
|
+
const preferred = Option.liftThrowable(() => timeZone === undefined ? DateTime.formatLocal(time, options) : DateTime.format(time, { ...options, timeZone }))();
|
|
7
|
+
return Option.getOrElse(preferred, () => DateTime.formatLocal(time, STYLE));
|
|
8
|
+
}
|
|
9
|
+
//# sourceMappingURL=timestampText.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"timestampText.js","sourceRoot":"","sources":["../../../src/client/adapters/timestampText.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAO1C,MAAM,KAAK,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAW,CAAC;AAElE,MAAM,UAAU,aAAa,CAAC,IAAuB,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAe;IACvF,MAAM,OAAO,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,CAAC;IACpE,mHAAmH;IACnH,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,CAC3C,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,CAAC,CAC9G,EAAE,CAAC;IACJ,OAAO,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;AAC7E,CAAC"}
|
|
@@ -117,7 +117,20 @@ export declare const JobsPageWithRetry: import("#page.ts").AdminPage & {
|
|
|
117
117
|
readonly Forbidden: typeof import("@shivaedev/errors/taxonomy.ts").Forbidden;
|
|
118
118
|
readonly JobsQueueUnregistered: typeof import("./schemas.ts").JobsQueueUnregistered;
|
|
119
119
|
readonly JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
|
|
120
|
-
}>)[], import("effect/rpc/Rpc").Rpc<"admin.jobs
|
|
120
|
+
}>)[], import("effect/rpc/Rpc").Rpc<"admin.jobs.runScheduleNow", import("effect/Schema").Struct<{
|
|
121
|
+
readonly queue: import("effect/Schema").String;
|
|
122
|
+
}>, import("effect/Schema").Option<import("effect/Schema").String>, import("effect/Schema").Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").Forbidden | typeof import("@shivaedev/errors/taxonomy.ts").InternalServerError | typeof import("@shivaedev/errors/taxonomy.ts").ServiceUnavailable | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.job", import("effect/Schema").Struct<{
|
|
123
|
+
readonly id: import("effect/Schema").String;
|
|
124
|
+
readonly queue: import("effect/Schema").String;
|
|
125
|
+
}>, import("effect/Schema").Option<typeof import("./Row.ts").JobsRow>, import("effect/Schema").Union<readonly [import("effect/Schema").Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").InternalServerError | typeof import("@shivaedev/errors/taxonomy.ts").ServiceUnavailable | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission | (import("effect/Context").Reference<<A, E, R>(effect: import("effect/Effect").Effect<A, E, R>, request: {
|
|
126
|
+
readonly rpc: import("effect/rpc/Rpc").Any;
|
|
127
|
+
readonly payload: unknown;
|
|
128
|
+
}) => import("effect/Effect").Effect<A, E | import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy | import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied | import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired | import("effect/Types").unhandled, R>> & {
|
|
129
|
+
"~effect/rpc/RpcMiddleware": "~effect/rpc/RpcMiddleware";
|
|
130
|
+
"~ClientError": never;
|
|
131
|
+
error: import("effect/Schema").Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired]>;
|
|
132
|
+
requiredForClient: false;
|
|
133
|
+
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.$changes", import("effect/Schema").Struct<{
|
|
121
134
|
queries: import("effect/Schema").$Array<import("effect/Schema").Union<readonly (import("effect/Schema").Struct<{
|
|
122
135
|
query: import("effect/Schema").Literal<"counts">;
|
|
123
136
|
payload: import("effect/Schema").Struct<{
|
|
@@ -275,22 +288,9 @@ export declare const JobsPageWithRetry: import("#page.ts").AdminPage & {
|
|
|
275
288
|
"~ClientError": never;
|
|
276
289
|
error: import("effect/Schema").Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired]>;
|
|
277
290
|
requiredForClient: false;
|
|
278
|
-
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.job", import("effect/Schema").Struct<{
|
|
279
|
-
readonly id: import("effect/Schema").String;
|
|
280
|
-
readonly queue: import("effect/Schema").String;
|
|
281
|
-
}>, import("effect/Schema").Option<typeof import("./Row.ts").JobsRow>, import("effect/Schema").Union<readonly [import("effect/Schema").Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").InternalServerError | typeof import("@shivaedev/errors/taxonomy.ts").ServiceUnavailable | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission | (import("effect/Context").Reference<<A, E, R>(effect: import("effect/Effect").Effect<A, E, R>, request: {
|
|
282
|
-
readonly rpc: import("effect/rpc/Rpc").Any;
|
|
283
|
-
readonly payload: unknown;
|
|
284
|
-
}) => import("effect/Effect").Effect<A, E | import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy | import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied | import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired | import("effect/Types").unhandled, R>> & {
|
|
285
|
-
"~effect/rpc/RpcMiddleware": "~effect/rpc/RpcMiddleware";
|
|
286
|
-
"~ClientError": never;
|
|
287
|
-
error: import("effect/Schema").Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired]>;
|
|
288
|
-
requiredForClient: false;
|
|
289
291
|
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.retry", import("effect/Schema").Struct<{
|
|
290
292
|
readonly id: import("effect/Schema").String;
|
|
291
293
|
readonly queue: import("effect/Schema").String;
|
|
292
|
-
}>, import("effect/Schema").Void, import("effect/Schema").Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").Forbidden | typeof import("@shivaedev/errors/taxonomy.ts").InternalServerError | typeof import("@shivaedev/errors/taxonomy.ts").ServiceUnavailable | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered | typeof import("./NotFailed.ts").JobsNotFailed)[]>, typeof JobsPermission, never
|
|
293
|
-
readonly queue: import("effect/Schema").String;
|
|
294
|
-
}>, import("effect/Schema").Option<import("effect/Schema").String>, import("effect/Schema").Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").Forbidden | typeof import("@shivaedev/errors/taxonomy.ts").InternalServerError | typeof import("@shivaedev/errors/taxonomy.ts").ServiceUnavailable | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof JobsPermission, never>, readonly [], undefined>;
|
|
294
|
+
}>, import("effect/Schema").Void, import("effect/Schema").Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").Forbidden | typeof import("@shivaedev/errors/taxonomy.ts").InternalServerError | typeof import("@shivaedev/errors/taxonomy.ts").ServiceUnavailable | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered | typeof import("./NotFailed.ts").JobsNotFailed)[]>, typeof JobsPermission, never>, readonly [], undefined>;
|
|
295
295
|
};
|
|
296
296
|
//# sourceMappingURL=PageWithRetry.d.ts.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/admin",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.26.0",
|
|
4
4
|
"description": "Explicit admin page contracts and a protected native Effect RPC registry",
|
|
5
5
|
"homepage": "https://github.com/ShivaeDev/platform/tree/main/packages/admin#readme",
|
|
6
6
|
"bugs": {
|
|
@@ -49,22 +49,22 @@
|
|
|
49
49
|
"dependencies": {
|
|
50
50
|
"@shivaedev/access": "0.6.3",
|
|
51
51
|
"@shivaedev/changes": "0.12.0",
|
|
52
|
-
"@shivaedev/contract": "0.
|
|
52
|
+
"@shivaedev/contract": "0.45.0",
|
|
53
53
|
"@shivaedev/errors": "0.12.0",
|
|
54
|
-
"@shivaedev/identity": "0.32.
|
|
55
|
-
"@shivaedev/jobs": "0.42.
|
|
54
|
+
"@shivaedev/identity": "0.32.1",
|
|
55
|
+
"@shivaedev/jobs": "0.42.3"
|
|
56
56
|
},
|
|
57
57
|
"devDependencies": {
|
|
58
58
|
"@effect/atom-react": "4.1.2",
|
|
59
|
-
"@shivaedev/build": "0.
|
|
60
|
-
"@shivaedev/quality": "0.78.
|
|
61
|
-
"@shivaedev/rate-limit": "0.6.
|
|
62
|
-
"@shivaedev/react": "0.
|
|
63
|
-
"@shivaedev/server": "0.34.
|
|
64
|
-
"@shivaedev/sql": "0.
|
|
65
|
-
"@shivaedev/test-kits": "0.
|
|
66
|
-
"@shivaedev/test-sql": "0.25.
|
|
67
|
-
"@shivaedev/test-story": "0.47.
|
|
59
|
+
"@shivaedev/build": "0.2.0",
|
|
60
|
+
"@shivaedev/quality": "0.78.1",
|
|
61
|
+
"@shivaedev/rate-limit": "0.6.11",
|
|
62
|
+
"@shivaedev/react": "0.48.0",
|
|
63
|
+
"@shivaedev/server": "0.34.2",
|
|
64
|
+
"@shivaedev/sql": "0.48.0",
|
|
65
|
+
"@shivaedev/test-kits": "0.13.0",
|
|
66
|
+
"@shivaedev/test-sql": "0.25.1",
|
|
67
|
+
"@shivaedev/test-story": "0.47.2",
|
|
68
68
|
"@types/node": "24.19.2",
|
|
69
69
|
"@types/react": "19.3.0",
|
|
70
70
|
"@types/react-dom": "19.3.0",
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
},
|
|
78
78
|
"peerDependencies": {
|
|
79
79
|
"@effect/atom-react": "4.1.2",
|
|
80
|
-
"@shivaedev/react": "0.
|
|
80
|
+
"@shivaedev/react": "0.48.0",
|
|
81
81
|
"effect": "4.1.2",
|
|
82
82
|
"react": "19.3.1"
|
|
83
83
|
},
|
|
@@ -1,16 +1,20 @@
|
|
|
1
|
-
import { DateTime, Option } from "effect";
|
|
1
|
+
import { type DateTime, Option } from "effect";
|
|
2
2
|
import { useAction, useQuery } from "@shivaedev/react/client/resultState.ts";
|
|
3
3
|
import { JobButton } from "#client/adapters/JobButton.tsx";
|
|
4
4
|
import { JobsQueryPanel } from "#client/adapters/JobsQueryPanel.tsx";
|
|
5
5
|
import type { AdminJob, JobsViewClient, RetryJob } from "#client/adapters/jobsTypes.ts";
|
|
6
|
+
import { Timestamp } from "#client/adapters/Timestamp.tsx";
|
|
7
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
6
8
|
|
|
7
9
|
export function JobDetail({
|
|
8
10
|
api,
|
|
11
|
+
dates,
|
|
9
12
|
queue,
|
|
10
13
|
id,
|
|
11
14
|
retry,
|
|
12
15
|
}: {
|
|
13
16
|
readonly api: JobsViewClient;
|
|
17
|
+
readonly dates: DateDisplay;
|
|
14
18
|
readonly queue: string;
|
|
15
19
|
readonly id: string;
|
|
16
20
|
readonly retry: RetryJob | undefined;
|
|
@@ -19,19 +23,30 @@ export function JobDetail({
|
|
|
19
23
|
return (
|
|
20
24
|
<section aria-label="Job detail">
|
|
21
25
|
<h2 className="mb-4 text-xl font-semibold">Job detail</h2>
|
|
22
|
-
<JobsQueryPanel state={state}>{(job) => <JobResult job={job} retry={retry} />}</JobsQueryPanel>
|
|
26
|
+
<JobsQueryPanel state={state}>{(job) => <JobResult dates={dates} job={job} retry={retry} />}</JobsQueryPanel>
|
|
23
27
|
</section>
|
|
24
28
|
);
|
|
25
29
|
}
|
|
26
30
|
|
|
27
|
-
function JobResult({
|
|
31
|
+
function JobResult({
|
|
32
|
+
dates,
|
|
33
|
+
job,
|
|
34
|
+
retry,
|
|
35
|
+
}: {
|
|
36
|
+
readonly dates: DateDisplay;
|
|
37
|
+
readonly job: Option.Option<AdminJob>;
|
|
38
|
+
readonly retry: RetryJob | undefined;
|
|
39
|
+
}) {
|
|
28
40
|
if (Option.isNone(job)) {
|
|
29
41
|
return <p>Job not found.</p>;
|
|
30
42
|
}
|
|
31
|
-
return <JobRecord job={job.value} retry={retry} />;
|
|
43
|
+
return <JobRecord dates={dates} job={job.value} retry={retry} />;
|
|
32
44
|
}
|
|
33
45
|
|
|
34
|
-
export function JobRecord({ job, retry }: { readonly job: AdminJob; readonly retry?: RetryJob | undefined }) {
|
|
46
|
+
export function JobRecord({ dates, job, retry }: { readonly dates: DateDisplay; readonly job: AdminJob; readonly retry?: RetryJob | undefined }) {
|
|
47
|
+
function shown(time: DateTime.DateTime) {
|
|
48
|
+
return <Timestamp dates={dates} time={time} />;
|
|
49
|
+
}
|
|
35
50
|
const failure = ("sourceOutput" in job ? job.sourceOutput : job.output)?.message ?? "No failure recorded.";
|
|
36
51
|
const deadLetterDetails =
|
|
37
52
|
"sourceId" in job ? (
|
|
@@ -48,12 +63,12 @@ export function JobRecord({ job, retry }: { readonly job: AdminJob; readonly ret
|
|
|
48
63
|
<dl className="grid min-w-0 gap-3 text-sm wrap-anywhere sm:grid-cols-2">
|
|
49
64
|
{Object.entries({
|
|
50
65
|
Attempt: job.attempt,
|
|
51
|
-
Completed: Option.match(job.completedOn, { onNone: () => "—", onSome:
|
|
52
|
-
Created:
|
|
66
|
+
Completed: Option.match(job.completedOn, { onNone: () => "—", onSome: shown }),
|
|
67
|
+
Created: shown(job.createdOn),
|
|
53
68
|
"ID": job.id,
|
|
54
69
|
Queue: job.queue,
|
|
55
70
|
"Retry count / limit": `${job.retryCount} / ${job.retryLimit}`,
|
|
56
|
-
Started: Option.match(job.startedOn, { onNone: () => "—", onSome:
|
|
71
|
+
Started: Option.match(job.startedOn, { onNone: () => "—", onSome: shown }),
|
|
57
72
|
State: job.state,
|
|
58
73
|
}).map(([label, value]) => (
|
|
59
74
|
<div key={label}>
|
|
@@ -7,15 +7,18 @@ import { JobPagination } from "#client/adapters/JobPagination.tsx";
|
|
|
7
7
|
import { JobsQueryPanel } from "#client/adapters/JobsQueryPanel.tsx";
|
|
8
8
|
import { JobTable } from "#client/adapters/JobTable.tsx";
|
|
9
9
|
import type { AdminJob, JobsViewClient, RetryJob } from "#client/adapters/jobsTypes.ts";
|
|
10
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
10
11
|
|
|
11
12
|
export function JobList({
|
|
12
13
|
api,
|
|
14
|
+
dates,
|
|
13
15
|
queue,
|
|
14
16
|
kind,
|
|
15
17
|
retry,
|
|
16
18
|
subject,
|
|
17
19
|
}: {
|
|
18
20
|
readonly api: JobsViewClient;
|
|
21
|
+
readonly dates: DateDisplay;
|
|
19
22
|
readonly queue: string;
|
|
20
23
|
readonly kind: "failed" | "deadLettered";
|
|
21
24
|
readonly retry: RetryJob | undefined;
|
|
@@ -29,12 +32,12 @@ export function JobList({
|
|
|
29
32
|
let selectedDetail: ReactNode = null;
|
|
30
33
|
if (selectedId !== undefined) {
|
|
31
34
|
if (kind === "failed") {
|
|
32
|
-
selectedDetail = <JobDetail api={api} id={selectedId} key={selectedId} queue={queue} retry={retry} />;
|
|
35
|
+
selectedDetail = <JobDetail api={api} dates={dates} id={selectedId} key={selectedId} queue={queue} retry={retry} />;
|
|
33
36
|
} else if (Option.isSome(selected)) {
|
|
34
37
|
selectedDetail = (
|
|
35
38
|
<section aria-label="Dead-letter detail">
|
|
36
39
|
<h2 className="mb-4 text-xl font-semibold">Dead-letter detail</h2>
|
|
37
|
-
<JobRecord job={selected.value} />
|
|
40
|
+
<JobRecord dates={dates} job={selected.value} />
|
|
38
41
|
</section>
|
|
39
42
|
);
|
|
40
43
|
}
|
|
@@ -5,15 +5,18 @@ import { JobList } from "#client/adapters/JobList.tsx";
|
|
|
5
5
|
import { JobsMetrics } from "#client/adapters/JobsMetrics.tsx";
|
|
6
6
|
import { JobsQueryPanel } from "#client/adapters/JobsQueryPanel.tsx";
|
|
7
7
|
import type { JobsViewClient, RetryJob } from "#client/adapters/jobsTypes.ts";
|
|
8
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
8
9
|
|
|
9
10
|
export function JobsQueueView({
|
|
10
11
|
api,
|
|
12
|
+
dates,
|
|
11
13
|
label,
|
|
12
14
|
queue,
|
|
13
15
|
retry,
|
|
14
16
|
subject,
|
|
15
17
|
}: {
|
|
16
18
|
readonly api: JobsViewClient;
|
|
19
|
+
readonly dates: DateDisplay;
|
|
17
20
|
readonly label?: string | undefined;
|
|
18
21
|
readonly queue: string;
|
|
19
22
|
readonly retry: RetryJob | undefined;
|
|
@@ -53,7 +56,7 @@ export function JobsQueueView({
|
|
|
53
56
|
))}
|
|
54
57
|
</div>
|
|
55
58
|
<div aria-labelledby={`jobs-${kind}-tab`} id={`jobs-${kind}-panel`} role="tabpanel">
|
|
56
|
-
<JobList api={api} key={kind} kind={kind} queue={queue} retry={retry} subject={subject} />
|
|
59
|
+
<JobList api={api} dates={dates} key={kind} kind={kind} queue={queue} retry={retry} subject={subject} />
|
|
57
60
|
</div>
|
|
58
61
|
</>
|
|
59
62
|
);
|
|
@@ -6,8 +6,9 @@ import { JobsHealthMetrics } from "#client/adapters/JobsMetrics.tsx";
|
|
|
6
6
|
import { JobsQueuePicker, JobsQueueView } from "#client/adapters/JobsQueueView.tsx";
|
|
7
7
|
import type { JobsViewClient, RetryJob, RunScheduleNow } from "#client/adapters/jobsTypes.ts";
|
|
8
8
|
import { RunScheduleControl } from "#client/adapters/RunScheduleControl.tsx";
|
|
9
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
9
10
|
|
|
10
|
-
export interface JobsViewProps {
|
|
11
|
+
export interface JobsViewProps extends DateDisplay {
|
|
11
12
|
readonly api: JobsViewClient;
|
|
12
13
|
readonly queues: readonly (string | QueueDisplay)[];
|
|
13
14
|
readonly retry?: RetryJob | undefined;
|
|
@@ -15,7 +16,7 @@ export interface JobsViewProps {
|
|
|
15
16
|
readonly schedules?: readonly { readonly name: string }[];
|
|
16
17
|
}
|
|
17
18
|
|
|
18
|
-
export function JobsView({ api, queues, retry, schedules, runScheduleNow }: JobsViewProps) {
|
|
19
|
+
export function JobsView({ api, queues, retry, schedules, runScheduleNow, locale, timeZone }: JobsViewProps) {
|
|
19
20
|
const definitions = queues.map((definition) => (typeof definition === "string" ? { name: definition } : definition));
|
|
20
21
|
const [name, selectQueue] = useState(definitions[0]?.name ?? "");
|
|
21
22
|
const queue = definitions.find((candidate) => candidate.name === name);
|
|
@@ -37,7 +38,15 @@ export function JobsView({ api, queues, retry, schedules, runScheduleNow }: Jobs
|
|
|
37
38
|
runScheduleNow !== undefined && schedules?.some((schedule) => schedule.name === name)
|
|
38
39
|
? createElement(RunScheduleControl, { key: `run-${name}`, queue: name, run: runScheduleNow })
|
|
39
40
|
: null,
|
|
40
|
-
createElement(JobsQueueView, {
|
|
41
|
+
createElement(JobsQueueView, {
|
|
42
|
+
api,
|
|
43
|
+
dates: { locale, timeZone },
|
|
44
|
+
key: name,
|
|
45
|
+
label: queue.label,
|
|
46
|
+
queue: name,
|
|
47
|
+
retry,
|
|
48
|
+
subject: queue.subject,
|
|
49
|
+
}),
|
|
41
50
|
),
|
|
42
51
|
);
|
|
43
52
|
}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
import { DateTime } from "effect";
|
|
2
1
|
import type { SignedInSession } from "@shivaedev/identity/signedInSessions.ts";
|
|
2
|
+
import { Timestamp } from "#client/adapters/Timestamp.tsx";
|
|
3
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
3
4
|
|
|
4
5
|
interface SessionControls {
|
|
5
6
|
readonly currentSessionId: string | undefined;
|
|
7
|
+
readonly dates: DateDisplay;
|
|
6
8
|
readonly pending: boolean;
|
|
7
9
|
readonly select: (session: typeof SignedInSession.Type) => void;
|
|
8
10
|
}
|
|
@@ -20,7 +22,7 @@ export function SessionListView({ sessions, ...controls }: SessionControls & { r
|
|
|
20
22
|
);
|
|
21
23
|
}
|
|
22
24
|
|
|
23
|
-
function SessionRow({ session, currentSessionId, pending, select }: SessionControls & { readonly session: typeof SignedInSession.Type }) {
|
|
25
|
+
function SessionRow({ session, currentSessionId, dates, pending, select }: SessionControls & { readonly session: typeof SignedInSession.Type }) {
|
|
24
26
|
const current = session.id === currentSessionId && <p className="font-medium">Your current session</p>;
|
|
25
27
|
return (
|
|
26
28
|
<li className="min-w-0 space-y-3 rounded-md border p-4 wrap-anywhere">
|
|
@@ -40,12 +42,12 @@ function SessionRow({ session, currentSessionId, pending, select }: SessionContr
|
|
|
40
42
|
Revoke session
|
|
41
43
|
</button>
|
|
42
44
|
</div>
|
|
43
|
-
<SessionTimes session={session} />
|
|
45
|
+
<SessionTimes dates={dates} session={session} />
|
|
44
46
|
</li>
|
|
45
47
|
);
|
|
46
48
|
}
|
|
47
49
|
|
|
48
|
-
function SessionTimes({ session }: { readonly session: typeof SignedInSession.Type }) {
|
|
50
|
+
function SessionTimes({ dates, session }: { readonly dates: DateDisplay; readonly session: typeof SignedInSession.Type }) {
|
|
49
51
|
const times = [
|
|
50
52
|
["Started", session.startedAt],
|
|
51
53
|
["Last activity", session.lastActivityAt],
|
|
@@ -57,7 +59,7 @@ function SessionTimes({ session }: { readonly session: typeof SignedInSession.Ty
|
|
|
57
59
|
<div key={label}>
|
|
58
60
|
<dt className="text-muted-foreground">{label}</dt>
|
|
59
61
|
<dd>
|
|
60
|
-
<
|
|
62
|
+
<Timestamp dates={dates} time={time} />
|
|
61
63
|
</dd>
|
|
62
64
|
</div>
|
|
63
65
|
))}
|
|
@@ -8,8 +8,9 @@ import { useAction, useQuery } from "@shivaedev/react/client/resultState.ts";
|
|
|
8
8
|
import { SessionConfirmation } from "#client/adapters/SessionConfirmation.tsx";
|
|
9
9
|
import { SessionListView } from "#client/adapters/SessionListView.tsx";
|
|
10
10
|
import { SessionPagination } from "#client/adapters/SessionPagination.tsx";
|
|
11
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
11
12
|
|
|
12
|
-
export interface SessionsViewProps<R, E> {
|
|
13
|
+
export interface SessionsViewProps<R, E> extends DateDisplay {
|
|
13
14
|
readonly currentSessionId: string | undefined;
|
|
14
15
|
readonly list: (input: typeof SessionListInput.Type) => Atom.Atom<AsyncResult.AsyncResult<SessionList, unknown>>;
|
|
15
16
|
readonly onCurrentSessionRevoked: () => void;
|
|
@@ -21,7 +22,7 @@ function forbidden(cause: Option.Option<Cause.Cause<unknown>>) {
|
|
|
21
22
|
return Option.exists(Option.flatMap(cause, Cause.findErrorOption), (error) => Predicate.isTagged(error, "Forbidden"));
|
|
22
23
|
}
|
|
23
24
|
|
|
24
|
-
export function SessionsView<R, E>({ currentSessionId, list, onCurrentSessionRevoked, revoke, runtime }: SessionsViewProps<R, E>) {
|
|
25
|
+
export function SessionsView<R, E>({ currentSessionId, list, locale, onCurrentSessionRevoked, revoke, runtime, timeZone }: SessionsViewProps<R, E>) {
|
|
25
26
|
const [cursors, setCursors] = useState<readonly NonNullable<typeof SessionListInput.Type.cursor>[]>([]);
|
|
26
27
|
const [selected, select] = useState<typeof SignedInSession.Type>();
|
|
27
28
|
const cursor = cursors.at(-1);
|
|
@@ -61,7 +62,15 @@ export function SessionsView<R, E>({ currentSessionId, list, onCurrentSessionRev
|
|
|
61
62
|
pending: action.pending,
|
|
62
63
|
selected,
|
|
63
64
|
}),
|
|
64
|
-
data === undefined
|
|
65
|
+
data === undefined
|
|
66
|
+
? null
|
|
67
|
+
: createElement(SessionListView, {
|
|
68
|
+
currentSessionId,
|
|
69
|
+
dates: { locale, timeZone },
|
|
70
|
+
pending: action.pending,
|
|
71
|
+
select,
|
|
72
|
+
sessions: data.sessions,
|
|
73
|
+
}),
|
|
65
74
|
createElement(SessionPagination, {
|
|
66
75
|
cursors,
|
|
67
76
|
data,
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { DateTime } from "effect";
|
|
2
|
+
import { type DateDisplay, timestampText } from "#client/adapters/timestampText.ts";
|
|
3
|
+
|
|
4
|
+
export function Timestamp({
|
|
5
|
+
className,
|
|
6
|
+
dates,
|
|
7
|
+
time,
|
|
8
|
+
}: {
|
|
9
|
+
readonly className?: string;
|
|
10
|
+
readonly dates: DateDisplay;
|
|
11
|
+
readonly time: DateTime.DateTime;
|
|
12
|
+
}) {
|
|
13
|
+
return (
|
|
14
|
+
<time className={className} dateTime={DateTime.formatIso(time)}>
|
|
15
|
+
{timestampText(time, dates)}
|
|
16
|
+
</time>
|
|
17
|
+
);
|
|
18
|
+
}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
import { DateTime } from "effect";
|
|
2
1
|
import type { ReactNode } from "react";
|
|
3
2
|
import type { DirectoryUser } from "@shivaedev/identity/users.ts";
|
|
3
|
+
import { Timestamp } from "#client/adapters/Timestamp.tsx";
|
|
4
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
4
5
|
import type { ChangeRoleInput } from "#users/ChangeRoleInput.ts";
|
|
5
6
|
import type { UsersList } from "#users/List.ts";
|
|
6
7
|
|
|
7
8
|
interface RoleControls<TRole extends string> {
|
|
9
|
+
readonly dates: DateDisplay;
|
|
8
10
|
readonly dispatch: (input: ChangeRoleInput<TRole>) => void;
|
|
9
11
|
readonly pending: boolean;
|
|
10
12
|
readonly roles: readonly TRole[];
|
|
@@ -16,7 +18,7 @@ function UserRole<TRole extends string>({
|
|
|
16
18
|
roles,
|
|
17
19
|
pending,
|
|
18
20
|
dispatch,
|
|
19
|
-
}: RoleControls<TRole> & {
|
|
21
|
+
}: Omit<RoleControls<TRole>, "dates"> & {
|
|
20
22
|
readonly user: typeof DirectoryUser.Type;
|
|
21
23
|
readonly canChangeRoles: boolean;
|
|
22
24
|
}) {
|
|
@@ -48,6 +50,7 @@ function UserRole<TRole extends string>({
|
|
|
48
50
|
function UserRow<TRole extends string>({
|
|
49
51
|
user,
|
|
50
52
|
canChangeRoles,
|
|
53
|
+
dates,
|
|
51
54
|
...controls
|
|
52
55
|
}: RoleControls<TRole> & { readonly user: typeof DirectoryUser.Type; readonly canChangeRoles: boolean }) {
|
|
53
56
|
return (
|
|
@@ -58,9 +61,7 @@ function UserRow<TRole extends string>({
|
|
|
58
61
|
<UserRole {...controls} canChangeRoles={canChangeRoles} user={user} />
|
|
59
62
|
</UserCell>
|
|
60
63
|
<UserCell label="Signed up">
|
|
61
|
-
<
|
|
62
|
-
{DateTime.formatIso(user.createdAt)}
|
|
63
|
-
</time>
|
|
64
|
+
<Timestamp className="sm:whitespace-nowrap" dates={dates} time={user.createdAt} />
|
|
64
65
|
</UserCell>
|
|
65
66
|
</tr>
|
|
66
67
|
);
|
|
@@ -4,11 +4,12 @@ import type * as Atom from "effect/reactivity/Atom";
|
|
|
4
4
|
import { createElement, useState } from "react";
|
|
5
5
|
import type { UserListInput } from "@shivaedev/identity/users.ts";
|
|
6
6
|
import { useAction, useQuery } from "@shivaedev/react/client/resultState.ts";
|
|
7
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
7
8
|
import { UsersTable } from "#client/adapters/UsersTable.tsx";
|
|
8
9
|
import type { ChangeRoleInput } from "#users/ChangeRoleInput.ts";
|
|
9
10
|
import type { UsersList } from "#users/List.ts";
|
|
10
11
|
|
|
11
|
-
export interface UsersViewProps<TRole extends string> {
|
|
12
|
+
export interface UsersViewProps<TRole extends string> extends DateDisplay {
|
|
12
13
|
readonly changeRole: Atom.AtomResultFn<ChangeRoleInput<TRole>, void, unknown>;
|
|
13
14
|
readonly list: (input: typeof UserListInput.Type) => Atom.Atom<AsyncResult.AsyncResult<UsersList, unknown>>;
|
|
14
15
|
readonly roles: readonly TRole[];
|
|
@@ -25,7 +26,7 @@ function failure(cause: Cause.Cause<unknown>): string {
|
|
|
25
26
|
return "Could not change the role. Try again.";
|
|
26
27
|
}
|
|
27
28
|
|
|
28
|
-
export function UsersView<TRole extends string>({ list, changeRole, roles }: UsersViewProps<TRole>) {
|
|
29
|
+
export function UsersView<TRole extends string>({ list, changeRole, roles, locale, timeZone }: UsersViewProps<TRole>) {
|
|
29
30
|
const [cursors, setCursors] = useState<readonly string[]>([]);
|
|
30
31
|
const cursor = cursors.at(-1);
|
|
31
32
|
const state = useQuery(list({ ...(cursor === undefined ? {} : { cursor }), limit: 20 }));
|
|
@@ -42,7 +43,9 @@ export function UsersView<TRole extends string>({ list, changeRole, roles }: Use
|
|
|
42
43
|
state.pending ? createElement("p", { role: "status" }, "Loading users…") : null,
|
|
43
44
|
Option.isSome(state.cause) ? createElement("p", { role: "alert" }, "Could not load users. Try refreshing.") : null,
|
|
44
45
|
Option.isSome(action.cause) ? createElement("p", { role: "alert" }, failure(action.cause.value)) : null,
|
|
45
|
-
data === undefined
|
|
46
|
+
data === undefined
|
|
47
|
+
? null
|
|
48
|
+
: createElement(UsersTable<TRole>, { data, dates: { locale, timeZone }, dispatch: action.dispatch, pending: action.pending, roles }),
|
|
46
49
|
data === undefined
|
|
47
50
|
? null
|
|
48
51
|
: createElement(
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { DateTime, Option } from "effect";
|
|
2
|
+
|
|
3
|
+
export interface DateDisplay {
|
|
4
|
+
readonly locale?: string | undefined;
|
|
5
|
+
readonly timeZone?: string | undefined;
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
const STYLE = { dateStyle: "medium", timeStyle: "long" } as const;
|
|
9
|
+
|
|
10
|
+
export function timestampText(time: DateTime.DateTime, { locale, timeZone }: DateDisplay): string {
|
|
11
|
+
const options = locale === undefined ? STYLE : { ...STYLE, locale };
|
|
12
|
+
// Intl throws on a locale or time zone it cannot read, and a saved preference must not take the page down with it.
|
|
13
|
+
const preferred = Option.liftThrowable(() =>
|
|
14
|
+
timeZone === undefined ? DateTime.formatLocal(time, options) : DateTime.format(time, { ...options, timeZone }),
|
|
15
|
+
)();
|
|
16
|
+
return Option.getOrElse(preferred, () => DateTime.formatLocal(time, STYLE));
|
|
17
|
+
}
|