@shivaedev/admin 0.5.0 → 0.7.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/README.md +27 -16
- package/dist/client/UsersTable.d.ts +5 -4
- package/dist/client/UsersTable.d.ts.map +1 -1
- package/dist/client/UsersTable.js +13 -14
- package/dist/client/UsersTable.js.map +1 -1
- package/dist/client/UsersView.d.ts +5 -4
- package/dist/client/UsersView.d.ts.map +1 -1
- package/dist/client/UsersView.js +6 -6
- package/dist/client/UsersView.js.map +1 -1
- package/dist/jobs/keys.d.ts +5 -5
- package/dist/jobs/keys.js +1 -1
- package/dist/jobs/keys.js.map +1 -1
- package/dist/jobs/page.d.ts +42 -41
- package/dist/jobs/page.d.ts.map +1 -1
- package/dist/jobs/page.js +4 -2
- package/dist/jobs/page.js.map +1 -1
- package/dist/jobs/retryPage.d.ts +14 -13
- package/dist/jobs/retryPage.d.ts.map +1 -1
- package/dist/jobs/retryPage.js +4 -2
- package/dist/jobs/retryPage.js.map +1 -1
- package/dist/page.d.ts +11 -7
- package/dist/page.d.ts.map +1 -1
- package/dist/page.js +6 -2
- package/dist/page.js.map +1 -1
- package/dist/permissions.d.ts +26 -5
- package/dist/permissions.d.ts.map +1 -1
- package/dist/permissions.js +7 -3
- package/dist/permissions.js.map +1 -1
- package/dist/server/jobsHandlers.d.ts +7 -7
- package/dist/server/jobsHandlers.d.ts.map +1 -1
- package/dist/server/jobsHandlersWithRetry.d.ts +2 -2
- package/dist/server/jobsHandlersWithRetry.d.ts.map +1 -1
- package/dist/server/users.d.ts +46 -0
- package/dist/server/users.d.ts.map +1 -0
- package/dist/server/users.js +67 -0
- package/dist/server/users.js.map +1 -0
- package/dist/server/usersHandlers.d.ts +3 -1
- package/dist/server/usersHandlers.d.ts.map +1 -1
- package/dist/server/usersHandlers.js +13 -12
- package/dist/server/usersHandlers.js.map +1 -1
- package/dist/users/page.d.ts +19 -18
- package/dist/users/page.d.ts.map +1 -1
- package/dist/users/page.js +30 -26
- package/dist/users/page.js.map +1 -1
- package/dist/users/roles.d.ts +33 -0
- package/dist/users/roles.d.ts.map +1 -0
- package/dist/users/roles.js +16 -0
- package/dist/users/roles.js.map +1 -0
- package/package.json +12 -9
- package/src/client/UsersTable.tsx +48 -51
- package/src/client/UsersView.ts +10 -9
- package/src/jobs/keys.ts +1 -1
- package/src/jobs/page.ts +4 -2
- package/src/jobs/retryPage.ts +4 -2
- package/src/page.ts +15 -7
- package/src/permissions.ts +6 -3
- package/src/server/jobsHandlers.ts +2 -2
- package/src/server/jobsHandlersWithRetry.ts +1 -1
- package/src/server/users.ts +76 -0
- package/src/server/usersHandlers.ts +19 -13
- package/src/users/page.ts +31 -26
- package/src/users/roles.ts +20 -0
package/dist/users/page.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { Schema } from "effect";
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import type { roleSet } from "@shivaedev/access/roleSet.ts";
|
|
3
|
+
import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
+
import { UsersPermission } from "#permissions.ts";
|
|
5
|
+
import { LastRoleAssigner } from "#users/roles.ts";
|
|
4
6
|
export declare const UsersList: Schema.Struct<{
|
|
5
7
|
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
6
8
|
readonly users: Schema.$Array<Schema.Struct<{
|
|
@@ -8,13 +10,13 @@ export declare const UsersList: Schema.Struct<{
|
|
|
8
10
|
readonly email: Schema.String;
|
|
9
11
|
readonly id: Schema.String;
|
|
10
12
|
readonly name: Schema.String;
|
|
11
|
-
readonly
|
|
13
|
+
readonly role: Schema.String;
|
|
12
14
|
}>>;
|
|
13
15
|
readonly canChangeRoles: Schema.Boolean;
|
|
14
16
|
}>;
|
|
15
|
-
export declare const
|
|
17
|
+
export declare function usersPage<const TRole extends string>(access: Pick<ReturnType<typeof roleSet<TRole>>, "Role">): import("#page.ts").AdminPage & {
|
|
16
18
|
readonly id: "users";
|
|
17
|
-
readonly contract: import("@shivaedev/
|
|
19
|
+
readonly contract: import("@shivaedev/contract/contract.ts").Contract<"admin.users", readonly [NoInfer<import("@shivaedev/contract/operation.ts").Query<"list", Schema.Struct<{
|
|
18
20
|
readonly cursor: Schema.optionalKey<Schema.String>;
|
|
19
21
|
readonly limit: Schema.Number;
|
|
20
22
|
}>, Schema.Struct<{
|
|
@@ -24,19 +26,19 @@ export declare const UsersPage: import("#page.ts").AdminPage & {
|
|
|
24
26
|
readonly email: Schema.String;
|
|
25
27
|
readonly id: Schema.String;
|
|
26
28
|
readonly name: Schema.String;
|
|
27
|
-
readonly
|
|
29
|
+
readonly role: Schema.String;
|
|
28
30
|
}>>;
|
|
29
31
|
readonly canChangeRoles: Schema.Boolean;
|
|
30
32
|
}>, {
|
|
31
33
|
readonly AuthUnavailable: typeof AuthUnavailable;
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
34
|
+
readonly Forbidden: typeof Forbidden;
|
|
35
|
+
}>>], readonly [NoInfer<import("@shivaedev/contract/operation.ts").Command<"changeRole", Schema.Struct<{
|
|
36
|
+
role: Schema.Literals<TRole[]>;
|
|
37
|
+
userId: Schema.String;
|
|
36
38
|
}>, Schema.Void, {
|
|
37
39
|
readonly AuthUnavailable: typeof AuthUnavailable;
|
|
38
40
|
readonly Forbidden: typeof Forbidden;
|
|
39
|
-
readonly
|
|
41
|
+
readonly LastRoleAssigner: typeof LastRoleAssigner;
|
|
40
42
|
readonly NotFound: typeof NotFound;
|
|
41
43
|
}>>], import("effect/rpc/Rpc").Rpc<"admin.users.$changes", Schema.Struct<{
|
|
42
44
|
queries: Schema.$Array<Schema.Union<readonly Schema.Struct<{
|
|
@@ -58,11 +60,10 @@ export declare const UsersPage: import("#page.ts").AdminPage & {
|
|
|
58
60
|
}>]>>;
|
|
59
61
|
}>, Schema.Struct<{
|
|
60
62
|
readonly _tag: Schema.Literal<"Resync">;
|
|
61
|
-
}>]>, Schema.Never>, Schema.Never, typeof
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
}>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable | typeof LastOwner)[]>, typeof import("../permissions.ts").AdminPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.list", Schema.Struct<{
|
|
63
|
+
}>]>, Schema.Never>, Schema.Never, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.changeRole", Schema.Struct<{
|
|
64
|
+
role: Schema.Literals<TRole[]>;
|
|
65
|
+
userId: Schema.String;
|
|
66
|
+
}>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable | typeof LastRoleAssigner)[]>, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.list", Schema.Struct<{
|
|
66
67
|
readonly cursor: Schema.optionalKey<Schema.String>;
|
|
67
68
|
readonly limit: Schema.Number;
|
|
68
69
|
}>, Schema.Struct<{
|
|
@@ -72,9 +73,9 @@ export declare const UsersPage: import("#page.ts").AdminPage & {
|
|
|
72
73
|
readonly email: Schema.String;
|
|
73
74
|
readonly id: Schema.String;
|
|
74
75
|
readonly name: Schema.String;
|
|
75
|
-
readonly
|
|
76
|
+
readonly role: Schema.String;
|
|
76
77
|
}>>;
|
|
77
78
|
readonly canChangeRoles: Schema.Boolean;
|
|
78
|
-
}>, Schema.Union<readonly (typeof AuthUnavailable)[]>, typeof
|
|
79
|
+
}>, Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>, typeof UsersPermission, never>, readonly [], undefined>;
|
|
79
80
|
};
|
|
80
81
|
//# sourceMappingURL=page.d.ts.map
|
package/dist/users/page.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAI5D,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAErF,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAA2B,MAAM,iBAAiB,CAAC;AAI5E,eAAO,MAAM,SAAS;;;;;;;;;;EAAwE,CAAC;AAC/F,wBAAgB,SAAS,CAAC,KAAK,CAAC,KAAK,SAAS,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuB5G"}
|
package/dist/users/page.js
CHANGED
|
@@ -1,31 +1,35 @@
|
|
|
1
1
|
import { Schema } from "effect";
|
|
2
|
-
import { contract } from "@shivaedev/
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import { ChangeRoleInput, LastOwner, UserList, UserListInput } from "@shivaedev/platform/rpc/userRoles.ts";
|
|
2
|
+
import { contract } from "@shivaedev/contract/contract.ts";
|
|
3
|
+
import { collection } from "@shivaedev/contract/keys.ts";
|
|
4
|
+
import { command, query } from "@shivaedev/contract/operation.ts";
|
|
5
|
+
import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
7
6
|
import { adminPage } from "#page.ts";
|
|
7
|
+
import { UsersPermission } from "#permissions.ts";
|
|
8
|
+
import { LastRoleAssigner, UserList, UserListInput } from "#users/roles.ts";
|
|
8
9
|
const users = collection("admin.users", Schema.String);
|
|
9
10
|
export const UsersList = Schema.Struct({ ...UserList.fields, canChangeRoles: Schema.Boolean });
|
|
10
|
-
export
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
11
|
+
export function usersPage(access) {
|
|
12
|
+
return adminPage({
|
|
13
|
+
contract: contract("admin.users", {
|
|
14
|
+
commands: [
|
|
15
|
+
command("changeRole", {
|
|
16
|
+
invalidates: () => [users.list],
|
|
17
|
+
payload: { role: access.Role, userId: Schema.String },
|
|
18
|
+
rejections: { AuthUnavailable, Forbidden, LastRoleAssigner, NotFound },
|
|
19
|
+
}),
|
|
20
|
+
],
|
|
21
|
+
queries: [
|
|
22
|
+
query("list", {
|
|
23
|
+
payload: UserListInput.fields,
|
|
24
|
+
reads: () => [users.list],
|
|
25
|
+
rejections: { AuthUnavailable, Forbidden },
|
|
26
|
+
success: UsersList,
|
|
27
|
+
}),
|
|
28
|
+
],
|
|
29
|
+
}),
|
|
30
|
+
id: "users",
|
|
31
|
+
permission: UsersPermission,
|
|
32
|
+
route: { path: "/admin/users", title: "Users" },
|
|
33
|
+
});
|
|
34
|
+
}
|
|
31
35
|
//# sourceMappingURL=page.js.map
|
package/dist/users/page.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE5E,MAAM,KAAK,GAAG,UAAU,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;AAEvD,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;AAC/F,MAAM,UAAU,SAAS,CAA6B,MAAuD;IAC5G,OAAO,SAAS,CAAC;QAChB,QAAQ,EAAE,QAAQ,CAAC,aAAa,EAAE;YACjC,QAAQ,EAAE;gBACT,OAAO,CAAC,YAAY,EAAE;oBACrB,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;oBAC/B,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;oBACrD,UAAU,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,gBAAgB,EAAE,QAAQ,EAAE;iBACtE,CAAC;aACF;YACD,OAAO,EAAE;gBACR,KAAK,CAAC,MAAM,EAAE;oBACb,OAAO,EAAE,aAAa,CAAC,MAAM;oBAC7B,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;oBACzB,UAAU,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE;oBAC1C,OAAO,EAAE,SAAS;iBAClB,CAAC;aACF;SACD,CAAC;QACF,EAAE,EAAE,OAAO;QACX,UAAU,EAAE,eAAe;QAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE;KAC/C,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
export declare const AppUser: Schema.Struct<{
|
|
3
|
+
readonly createdAt: Schema.DateTimeUtcFromString;
|
|
4
|
+
readonly email: Schema.String;
|
|
5
|
+
readonly id: Schema.String;
|
|
6
|
+
readonly name: Schema.String;
|
|
7
|
+
readonly role: Schema.String;
|
|
8
|
+
}>;
|
|
9
|
+
export declare const UserListInput: Schema.Struct<{
|
|
10
|
+
readonly cursor: Schema.optionalKey<Schema.String>;
|
|
11
|
+
readonly limit: Schema.Number;
|
|
12
|
+
}>;
|
|
13
|
+
export declare const UserList: Schema.Struct<{
|
|
14
|
+
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
15
|
+
readonly users: Schema.$Array<Schema.Struct<{
|
|
16
|
+
readonly createdAt: Schema.DateTimeUtcFromString;
|
|
17
|
+
readonly email: Schema.String;
|
|
18
|
+
readonly id: Schema.String;
|
|
19
|
+
readonly name: Schema.String;
|
|
20
|
+
readonly role: Schema.String;
|
|
21
|
+
}>>;
|
|
22
|
+
}>;
|
|
23
|
+
export interface ChangeRoleInput<TRole extends string = string> {
|
|
24
|
+
readonly role: TRole;
|
|
25
|
+
readonly userId: string;
|
|
26
|
+
}
|
|
27
|
+
declare const LastRoleAssigner_base: Schema.Class<LastRoleAssigner, Schema.TaggedStruct<"LastRoleAssigner", {
|
|
28
|
+
readonly userId: Schema.String;
|
|
29
|
+
}>, import("effect/Cause").YieldableError>;
|
|
30
|
+
export declare class LastRoleAssigner extends LastRoleAssigner_base {
|
|
31
|
+
}
|
|
32
|
+
export {};
|
|
33
|
+
//# sourceMappingURL=roles.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"roles.d.ts","sourceRoot":"","sources":["../../src/users/roles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,eAAO,MAAM,OAAO;;;;;;EAMlB,CAAC;AAEH,eAAO,MAAM,aAAa;;;EAGxB,CAAC;AACH,eAAO,MAAM,QAAQ;;;;;;;;;EAAgG,CAAC;AACtH,MAAM,WAAW,eAAe,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM;IAC7D,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB;;;;AACD,qBAAa,gBAAiB,SAAQ,qBAAqF;CAAG"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
export const AppUser = Schema.Struct({
|
|
3
|
+
createdAt: Schema.DateTimeUtcFromString,
|
|
4
|
+
email: Schema.String,
|
|
5
|
+
id: Schema.String,
|
|
6
|
+
name: Schema.String,
|
|
7
|
+
role: Schema.String,
|
|
8
|
+
});
|
|
9
|
+
export const UserListInput = Schema.Struct({
|
|
10
|
+
cursor: Schema.optionalKey(Schema.String),
|
|
11
|
+
limit: Schema.Number.check(Schema.isInt(), Schema.isBetween({ maximum: 100, minimum: 1 })),
|
|
12
|
+
});
|
|
13
|
+
export const UserList = Schema.Struct({ next: Schema.OptionFromNullOr(Schema.String), users: Schema.Array(AppUser) });
|
|
14
|
+
export class LastRoleAssigner extends Schema.TaggedError()("LastRoleAssigner", { userId: Schema.String }) {
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=roles.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../src/users/roles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC,qBAAqB;IACvC,KAAK,EAAE,MAAM,CAAC,MAAM;IACpB,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC,MAAM;CACnB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;IAC1C,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1F,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAKtH,MAAM,OAAO,gBAAiB,SAAQ,MAAM,CAAC,WAAW,EAAoB,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;CAAG"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/admin",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.7.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": {
|
|
@@ -41,17 +41,20 @@
|
|
|
41
41
|
"README.md"
|
|
42
42
|
],
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@shivaedev/access": "0.1.
|
|
45
|
-
"@shivaedev/
|
|
46
|
-
"@shivaedev/
|
|
47
|
-
"@shivaedev/
|
|
48
|
-
"@shivaedev/
|
|
44
|
+
"@shivaedev/access": "0.1.1",
|
|
45
|
+
"@shivaedev/contract": "0.18.0",
|
|
46
|
+
"@shivaedev/errors": "0.1.0",
|
|
47
|
+
"@shivaedev/identity": "0.2.0",
|
|
48
|
+
"@shivaedev/jobs": "0.21.0",
|
|
49
|
+
"@shivaedev/react": "0.20.0",
|
|
50
|
+
"@shivaedev/sql": "0.23.0"
|
|
49
51
|
},
|
|
50
52
|
"devDependencies": {
|
|
51
53
|
"@effect/atom-react": "4.0.5",
|
|
52
|
-
"@shivaedev/
|
|
53
|
-
"@shivaedev/
|
|
54
|
-
"@shivaedev/test-
|
|
54
|
+
"@shivaedev/quality": "0.42.0",
|
|
55
|
+
"@shivaedev/server": "0.2.0",
|
|
56
|
+
"@shivaedev/test-sql": "0.10.1",
|
|
57
|
+
"@shivaedev/test-story": "0.21.1",
|
|
55
58
|
"@types/node": "24.19.2",
|
|
56
59
|
"@types/react": "19.3.0",
|
|
57
60
|
"@types/react-dom": "19.3.0",
|
|
@@ -1,71 +1,58 @@
|
|
|
1
1
|
import { DateTime } from "effect";
|
|
2
|
-
import { type AppUser, type ChangeRoleInput, UserRole } from "@shivaedev/platform/rpc/userRoles.ts";
|
|
3
2
|
import type { UsersList } from "#users/page.ts";
|
|
3
|
+
import type { AppUser, ChangeRoleInput } from "#users/roles.ts";
|
|
4
4
|
|
|
5
|
-
interface RoleControls {
|
|
6
|
-
readonly dispatch: (input:
|
|
5
|
+
interface RoleControls<TRole extends string> {
|
|
6
|
+
readonly dispatch: (input: ChangeRoleInput<TRole>) => void;
|
|
7
7
|
readonly pending: boolean;
|
|
8
|
+
readonly roles: readonly TRole[];
|
|
8
9
|
}
|
|
9
10
|
|
|
10
|
-
function
|
|
11
|
-
return (
|
|
12
|
-
<tr>
|
|
13
|
-
{["Name", "Email", "Roles", "Signed up"].map((label) => (
|
|
14
|
-
<th className="whitespace-nowrap p-3" key={label} scope="col">
|
|
15
|
-
{label}
|
|
16
|
-
</th>
|
|
17
|
-
))}
|
|
18
|
-
</tr>
|
|
19
|
-
);
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
function RoleCheckbox({ user, role, pending, dispatch }: RoleControls & { readonly user: typeof AppUser.Type; readonly role: typeof UserRole.Type }) {
|
|
23
|
-
return (
|
|
24
|
-
<label className="mr-3 inline-flex gap-1">
|
|
25
|
-
<input
|
|
26
|
-
aria-label={`${role} for ${user.email}`}
|
|
27
|
-
checked={user.roles.includes(role)}
|
|
28
|
-
disabled={pending}
|
|
29
|
-
onChange={(event) => dispatch({ grant: event.target.checked, role, userId: user.id })}
|
|
30
|
-
type="checkbox"
|
|
31
|
-
/>
|
|
32
|
-
{role}
|
|
33
|
-
</label>
|
|
34
|
-
);
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
function UserRoles({
|
|
11
|
+
function UserRole<TRole extends string>({
|
|
38
12
|
user,
|
|
39
13
|
canChangeRoles,
|
|
40
|
-
|
|
14
|
+
roles,
|
|
41
15
|
pending,
|
|
42
|
-
|
|
16
|
+
dispatch,
|
|
17
|
+
}: RoleControls<TRole> & {
|
|
43
18
|
readonly user: typeof AppUser.Type;
|
|
44
19
|
readonly canChangeRoles: boolean;
|
|
45
20
|
}) {
|
|
46
|
-
return (
|
|
47
|
-
<
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
21
|
+
return canChangeRoles ? (
|
|
22
|
+
<select
|
|
23
|
+
aria-label={`Role for ${user.email}`}
|
|
24
|
+
className="rounded-md border bg-background p-2"
|
|
25
|
+
disabled={pending}
|
|
26
|
+
onChange={(event) => {
|
|
27
|
+
const role = roles.find((candidate) => candidate === event.target.value);
|
|
28
|
+
if (role !== undefined) {
|
|
29
|
+
dispatch({ role, userId: user.id });
|
|
30
|
+
}
|
|
31
|
+
}}
|
|
32
|
+
value={user.role}
|
|
33
|
+
>
|
|
34
|
+
{roles.map((role) => (
|
|
35
|
+
<option key={role} value={role}>
|
|
36
|
+
{role}
|
|
37
|
+
</option>
|
|
38
|
+
))}
|
|
39
|
+
</select>
|
|
40
|
+
) : (
|
|
41
|
+
user.role
|
|
53
42
|
);
|
|
54
43
|
}
|
|
55
44
|
|
|
56
|
-
function UserRow({
|
|
45
|
+
function UserRow<TRole extends string>({
|
|
57
46
|
user,
|
|
47
|
+
canChangeRoles,
|
|
58
48
|
...controls
|
|
59
|
-
}: RoleControls & {
|
|
60
|
-
readonly user: typeof AppUser.Type;
|
|
61
|
-
readonly canChangeRoles: boolean;
|
|
62
|
-
}) {
|
|
49
|
+
}: RoleControls<TRole> & { readonly user: typeof AppUser.Type; readonly canChangeRoles: boolean }) {
|
|
63
50
|
return (
|
|
64
51
|
<tr className="border-b">
|
|
65
52
|
<td className="p-3">{user.name}</td>
|
|
66
53
|
<td className="p-3">{user.email}</td>
|
|
67
54
|
<td className="p-3">
|
|
68
|
-
<
|
|
55
|
+
<UserRole {...controls} canChangeRoles={canChangeRoles} user={user} />
|
|
69
56
|
</td>
|
|
70
57
|
<td className="whitespace-nowrap p-3">
|
|
71
58
|
<time dateTime={DateTime.formatIso(user.createdAt)}>{DateTime.formatIso(user.createdAt)}</time>
|
|
@@ -73,8 +60,7 @@ function UserRow({
|
|
|
73
60
|
</tr>
|
|
74
61
|
);
|
|
75
62
|
}
|
|
76
|
-
|
|
77
|
-
function UserRows({ data, ...controls }: RoleControls & { readonly data: typeof UsersList.Type }) {
|
|
63
|
+
function UserRows<TRole extends string>({ data, ...controls }: RoleControls<TRole> & { readonly data: typeof UsersList.Type }) {
|
|
78
64
|
return (
|
|
79
65
|
<div className="overflow-x-auto rounded-md border">
|
|
80
66
|
<table className="w-full text-left text-sm">
|
|
@@ -91,12 +77,23 @@ function UserRows({ data, ...controls }: RoleControls & { readonly data: typeof
|
|
|
91
77
|
</div>
|
|
92
78
|
);
|
|
93
79
|
}
|
|
94
|
-
|
|
95
|
-
export function UsersTable({ data, ...controls }: RoleControls & { readonly data: typeof UsersList.Type }) {
|
|
80
|
+
export function UsersTable<TRole extends string>({ data, ...controls }: RoleControls<TRole> & { readonly data: typeof UsersList.Type }) {
|
|
96
81
|
return (
|
|
97
82
|
<div className="space-y-4">
|
|
98
|
-
{data.canChangeRoles ? null : <p>
|
|
83
|
+
{data.canChangeRoles ? null : <p>Permission to assign roles is required to change roles.</p>}
|
|
99
84
|
{data.users.length === 0 ? <p>No users.</p> : <UserRows {...controls} data={data} />}
|
|
100
85
|
</div>
|
|
101
86
|
);
|
|
102
87
|
}
|
|
88
|
+
|
|
89
|
+
function UserHeaders() {
|
|
90
|
+
return (
|
|
91
|
+
<tr>
|
|
92
|
+
{["Name", "Email", "Role", "Signed up"].map((label) => (
|
|
93
|
+
<th className="whitespace-nowrap p-3" key={label} scope="col">
|
|
94
|
+
{label}
|
|
95
|
+
</th>
|
|
96
|
+
))}
|
|
97
|
+
</tr>
|
|
98
|
+
);
|
|
99
|
+
}
|
package/src/client/UsersView.ts
CHANGED
|
@@ -2,28 +2,29 @@ import { Cause, Option, Predicate } from "effect";
|
|
|
2
2
|
import type * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
3
3
|
import type * as Atom from "effect/reactivity/Atom";
|
|
4
4
|
import { createElement, useState } from "react";
|
|
5
|
-
import { useAction, useQuery } from "@shivaedev/
|
|
6
|
-
import type { ChangeRoleInput, UserListInput } from "@shivaedev/platform/rpc/userRoles.ts";
|
|
5
|
+
import { useAction, useQuery } from "@shivaedev/react/client/resultState.ts";
|
|
7
6
|
import type { UsersList } from "#users/page.ts";
|
|
7
|
+
import type { ChangeRoleInput, UserListInput } from "#users/roles.ts";
|
|
8
8
|
import { UsersTable } from "./UsersTable.tsx";
|
|
9
9
|
|
|
10
|
-
export interface UsersViewProps {
|
|
11
|
-
readonly changeRole: Atom.AtomResultFn<
|
|
10
|
+
export interface UsersViewProps<TRole extends string> {
|
|
11
|
+
readonly changeRole: Atom.AtomResultFn<ChangeRoleInput<TRole>, void, unknown>;
|
|
12
12
|
readonly list: (input: typeof UserListInput.Type) => Atom.Atom<AsyncResult.AsyncResult<typeof UsersList.Type, unknown>>;
|
|
13
|
+
readonly roles: readonly TRole[];
|
|
13
14
|
}
|
|
14
15
|
|
|
15
16
|
function failure(cause: Cause.Cause<unknown>): string {
|
|
16
17
|
const error = Option.getOrUndefined(Cause.findErrorOption(cause));
|
|
17
|
-
if (Predicate.isTagged(error, "
|
|
18
|
-
return "The last
|
|
18
|
+
if (Predicate.isTagged(error, "LastRoleAssigner")) {
|
|
19
|
+
return "The last user who can assign roles cannot be removed. Assign another user permission to change roles first.";
|
|
19
20
|
}
|
|
20
21
|
if (Predicate.isTagged(error, "Forbidden")) {
|
|
21
|
-
return "
|
|
22
|
+
return "Permission required to assign roles.";
|
|
22
23
|
}
|
|
23
24
|
return "Could not change the role. Try again.";
|
|
24
25
|
}
|
|
25
26
|
|
|
26
|
-
export function UsersView({ list, changeRole }: UsersViewProps) {
|
|
27
|
+
export function UsersView<TRole extends string>({ list, changeRole, roles }: UsersViewProps<TRole>) {
|
|
27
28
|
const [cursors, setCursors] = useState<readonly string[]>([]);
|
|
28
29
|
const cursor = cursors.at(-1);
|
|
29
30
|
const state = useQuery(list({ ...(cursor === undefined ? {} : { cursor }), limit: 20 }));
|
|
@@ -40,7 +41,7 @@ export function UsersView({ list, changeRole }: UsersViewProps) {
|
|
|
40
41
|
state.pending ? createElement("p", { role: "status" }, "Loading users…") : null,
|
|
41
42
|
Option.isSome(state.cause) ? createElement("p", { role: "alert" }, "Could not load users. Try refreshing.") : null,
|
|
42
43
|
Option.isSome(action.cause) ? createElement("p", { role: "alert" }, failure(action.cause.value)) : null,
|
|
43
|
-
data === undefined ? null : createElement(UsersTable
|
|
44
|
+
data === undefined ? null : createElement(UsersTable<TRole>, { data, dispatch: action.dispatch, pending: action.pending, roles }),
|
|
44
45
|
data === undefined
|
|
45
46
|
? null
|
|
46
47
|
: createElement(
|
package/src/jobs/keys.ts
CHANGED
package/src/jobs/page.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Schema } from "effect";
|
|
2
|
-
import { contract } from "@shivaedev/
|
|
3
|
-
import { query } from "@shivaedev/
|
|
2
|
+
import { contract } from "@shivaedev/contract/contract.ts";
|
|
3
|
+
import { query } from "@shivaedev/contract/operation.ts";
|
|
4
4
|
import { adminPage } from "#page.ts";
|
|
5
|
+
import { JobsPermission } from "#permissions.ts";
|
|
5
6
|
import { jobsKeys } from "./keys.ts";
|
|
6
7
|
import { deadLetteredSchema, JobsFailures, JobsHealth, type JobsQueue, jobPage, jobSchema, PageFields, QueueCounts } from "./schemas.ts";
|
|
7
8
|
|
|
@@ -39,6 +40,7 @@ export function jobsPage<const TQueues extends readonly JobsQueue[]>(...queues:
|
|
|
39
40
|
],
|
|
40
41
|
}),
|
|
41
42
|
id: "jobs",
|
|
43
|
+
permission: JobsPermission,
|
|
42
44
|
route: { path: "/admin/jobs", title: "Jobs" },
|
|
43
45
|
});
|
|
44
46
|
return Object.assign(page, { queues });
|
package/src/jobs/retryPage.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Schema } from "effect";
|
|
2
|
-
import { contract } from "@shivaedev/
|
|
3
|
-
import { command } from "@shivaedev/
|
|
2
|
+
import { contract } from "@shivaedev/contract/contract.ts";
|
|
3
|
+
import { command } from "@shivaedev/contract/operation.ts";
|
|
4
4
|
import { adminPage } from "#page.ts";
|
|
5
|
+
import { JobsPermission } from "#permissions.ts";
|
|
5
6
|
import { jobsKeys } from "./keys.ts";
|
|
6
7
|
import { jobsPage } from "./page.ts";
|
|
7
8
|
import { JobsFailures, type JobsQueue } from "./schemas.ts";
|
|
@@ -32,6 +33,7 @@ export function jobsPageWithRetry<const TQueues extends readonly JobsQueue[]>(..
|
|
|
32
33
|
queries: page.contract.declaration.queries,
|
|
33
34
|
}),
|
|
34
35
|
id: page.id,
|
|
36
|
+
permission: JobsPermission,
|
|
35
37
|
route: page.route,
|
|
36
38
|
}),
|
|
37
39
|
{ queues },
|
package/src/page.ts
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import type { Rpc, RpcGroup } from "effect/rpc";
|
|
2
|
-
import type {
|
|
3
|
-
import type {
|
|
4
|
-
import {
|
|
1
|
+
import type { Rpc, RpcGroup, RpcMiddleware } from "effect/rpc";
|
|
2
|
+
import type { Permission } from "@shivaedev/access/permission.ts";
|
|
3
|
+
import type { Contract } from "@shivaedev/contract/contract.ts";
|
|
4
|
+
import type { CommandShape, QueryShape, StreamShape } from "@shivaedev/contract/operation.ts";
|
|
5
5
|
|
|
6
6
|
export interface AdminRoute {
|
|
7
7
|
readonly path: string;
|
|
8
|
+
readonly permission: Permission;
|
|
8
9
|
readonly title: string;
|
|
9
10
|
}
|
|
10
11
|
|
|
@@ -27,13 +28,20 @@ export function adminPage<
|
|
|
27
28
|
const TCommands extends readonly CommandShape[],
|
|
28
29
|
TRpcs extends Rpc.Any,
|
|
29
30
|
const TStreams extends readonly StreamShape[],
|
|
31
|
+
TMiddleware extends RpcMiddleware.AnyService & { readonly permission: Permission },
|
|
30
32
|
>(page: {
|
|
31
33
|
readonly id: TId;
|
|
32
|
-
readonly route: AdminRoute
|
|
34
|
+
readonly route: Omit<AdminRoute, "permission">;
|
|
35
|
+
readonly permission: TMiddleware;
|
|
33
36
|
readonly contract: Contract<TName, TQueries, TCommands, TRpcs, TStreams>;
|
|
34
37
|
}): AdminPage & {
|
|
35
38
|
readonly id: TId;
|
|
36
|
-
readonly contract: Contract<TName, TQueries, TCommands, Rpc.AddMiddleware<TRpcs,
|
|
39
|
+
readonly contract: Contract<TName, TQueries, TCommands, Rpc.AddMiddleware<TRpcs, TMiddleware>, TStreams>;
|
|
37
40
|
} {
|
|
38
|
-
return {
|
|
41
|
+
return {
|
|
42
|
+
...page,
|
|
43
|
+
route: { ...page.route, permission: page.permission.permission },
|
|
44
|
+
[AdminPageTypeId]: true as const,
|
|
45
|
+
contract: page.contract.middleware(page.permission),
|
|
46
|
+
};
|
|
39
47
|
}
|
package/src/permissions.ts
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { permission } from "@shivaedev/access/permission.ts";
|
|
2
|
-
import { permissionMiddleware } from "@shivaedev/
|
|
2
|
+
import { permissionMiddleware } from "@shivaedev/identity/permission.ts";
|
|
3
3
|
|
|
4
|
-
export const
|
|
5
|
-
export
|
|
4
|
+
export const ReadUsers = permission("users.read");
|
|
5
|
+
export const AssignRoles = permission("roles.assign");
|
|
6
|
+
export const ReadJobs = permission("jobs.read");
|
|
7
|
+
export class UsersPermission extends permissionMiddleware<UsersPermission>()("@shivaedev/admin/UsersPermission", ReadUsers) {}
|
|
8
|
+
export class JobsPermission extends permissionMiddleware<JobsPermission>()("@shivaedev/admin/JobsPermission", ReadJobs) {}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type Context, DateTime, Effect, Option } from "effect";
|
|
2
|
-
import type { PgBossError, PgBossPayloadError } from "@shivaedev/
|
|
3
|
-
import type { PgBossService } from "@shivaedev/
|
|
2
|
+
import type { PgBossError, PgBossPayloadError } from "@shivaedev/jobs/server/error.ts";
|
|
3
|
+
import type { PgBossService } from "@shivaedev/jobs/server/service.ts";
|
|
4
4
|
import type { jobsPage } from "#jobs/page.ts";
|
|
5
5
|
import { JobsPayloadInvalid, type JobsQueue, JobsQueueUnregistered, JobsUnavailable } from "#jobs/schemas.ts";
|
|
6
6
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type Context, Effect, Option } from "effect";
|
|
2
|
-
import type { PgBossService } from "@shivaedev/
|
|
2
|
+
import type { PgBossService } from "@shivaedev/jobs/server/service.ts";
|
|
3
3
|
import { JobsNotFailed, type jobsPageWithRetry } from "#jobs/retryPage.ts";
|
|
4
4
|
import { type JobsQueue, JobsQueueUnregistered } from "#jobs/schemas.ts";
|
|
5
5
|
import { jobsFailures, jobsReadHandlers } from "./jobsHandlers.ts";
|