@terreno/admin-frontend 58.0.6 → 58.1.1
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 +58 -0
- package/dist/AdminNestedArrayField.d.ts.map +1 -1
- package/dist/AdminNestedArrayField.js +6 -5
- package/dist/AdminNestedArrayField.js.map +1 -1
- package/dist/AdminRolesList.d.ts +34 -1
- package/dist/AdminRolesList.d.ts.map +1 -1
- package/dist/AdminRolesList.js +53 -8
- package/dist/AdminRolesList.js.map +1 -1
- package/dist/AdminShell.d.ts.map +1 -1
- package/dist/AdminShell.js +7 -2
- package/dist/AdminShell.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/useAdminRoles.d.ts +8 -0
- package/dist/useAdminRoles.d.ts.map +1 -1
- package/dist/useAdminRoles.js +11 -0
- package/dist/useAdminRoles.js.map +1 -1
- package/dist/widgets/aiObservability/datasets/AiDatasetDetailScreen.d.ts.map +1 -1
- package/dist/widgets/aiObservability/datasets/AiDatasetDetailScreen.js +10 -36
- package/dist/widgets/aiObservability/datasets/AiDatasetDetailScreen.js.map +1 -1
- package/dist/widgets/aiObservability/datasets/AiDatasetDetailView.d.ts +4 -6
- package/dist/widgets/aiObservability/datasets/AiDatasetDetailView.d.ts.map +1 -1
- package/dist/widgets/aiObservability/datasets/AiDatasetDetailView.js +11 -64
- package/dist/widgets/aiObservability/datasets/AiDatasetDetailView.js.map +1 -1
- package/dist/widgets/aiObservability/datasets/AiDatasetItemScreen.d.ts +4 -0
- package/dist/widgets/aiObservability/datasets/AiDatasetItemScreen.d.ts.map +1 -0
- package/dist/widgets/aiObservability/datasets/AiDatasetItemScreen.js +204 -0
- package/dist/widgets/aiObservability/datasets/AiDatasetItemScreen.js.map +1 -0
- package/dist/widgets/aiObservability/datasets/AiDatasetItemView.d.ts +23 -0
- package/dist/widgets/aiObservability/datasets/AiDatasetItemView.d.ts.map +1 -0
- package/dist/widgets/aiObservability/datasets/AiDatasetItemView.js +31 -0
- package/dist/widgets/aiObservability/datasets/AiDatasetItemView.js.map +1 -0
- package/dist/widgets/aiObservability/datasets/ExpectedOutputForm.d.ts +12 -0
- package/dist/widgets/aiObservability/datasets/ExpectedOutputForm.d.ts.map +1 -0
- package/dist/widgets/aiObservability/datasets/ExpectedOutputForm.js +101 -0
- package/dist/widgets/aiObservability/datasets/ExpectedOutputForm.js.map +1 -0
- package/dist/widgets/aiObservability/datasets/datasetTypes.d.ts +5 -0
- package/dist/widgets/aiObservability/datasets/datasetTypes.d.ts.map +1 -1
- package/dist/widgets/aiObservability/datasets/datasetTypes.js +9 -0
- package/dist/widgets/aiObservability/datasets/datasetTypes.js.map +1 -1
- package/dist/widgets/aiObservability/datasets/expectedOutputModel.d.ts +44 -0
- package/dist/widgets/aiObservability/datasets/expectedOutputModel.d.ts.map +1 -0
- package/dist/widgets/aiObservability/datasets/expectedOutputModel.js +265 -0
- package/dist/widgets/aiObservability/datasets/expectedOutputModel.js.map +1 -0
- package/dist/widgets/aiObservability/datasets/useAiObservabilityDatasetsApi.d.ts +6 -0
- package/dist/widgets/aiObservability/datasets/useAiObservabilityDatasetsApi.d.ts.map +1 -1
- package/dist/widgets/aiObservability/datasets/useAiObservabilityDatasetsApi.js +8 -0
- package/dist/widgets/aiObservability/datasets/useAiObservabilityDatasetsApi.js.map +1 -1
- package/dist/widgets/aiObservability/prompts/AiPromptEditorView.d.ts.map +1 -1
- package/dist/widgets/aiObservability/prompts/AiPromptEditorView.js +5 -2
- package/dist/widgets/aiObservability/prompts/AiPromptEditorView.js.map +1 -1
- package/dist/widgets/aiObservability/prompts/AiPromptHubView.d.ts.map +1 -1
- package/dist/widgets/aiObservability/prompts/AiPromptHubView.js +4 -3
- package/dist/widgets/aiObservability/prompts/AiPromptHubView.js.map +1 -1
- package/dist/widgets/aiObservability/prompts/AiPromptsListScreen.d.ts.map +1 -1
- package/dist/widgets/aiObservability/prompts/AiPromptsListScreen.js +2 -1
- package/dist/widgets/aiObservability/prompts/AiPromptsListScreen.js.map +1 -1
- package/dist/widgets/aiObservability/prompts/AiPromptsListView.d.ts +2 -0
- package/dist/widgets/aiObservability/prompts/AiPromptsListView.d.ts.map +1 -1
- package/dist/widgets/aiObservability/prompts/AiPromptsListView.js +92 -26
- package/dist/widgets/aiObservability/prompts/AiPromptsListView.js.map +1 -1
- package/dist/widgets/aiObservability/prompts/promptTypes.d.ts +29 -5
- package/dist/widgets/aiObservability/prompts/promptTypes.d.ts.map +1 -1
- package/dist/widgets/aiObservability/prompts/promptTypes.js +114 -11
- package/dist/widgets/aiObservability/prompts/promptTypes.js.map +1 -1
- package/dist/widgets/aiObservability/shell/AiObservabilityScreenWidgets.d.ts.map +1 -1
- package/dist/widgets/aiObservability/shell/AiObservabilityScreenWidgets.js +2 -0
- package/dist/widgets/aiObservability/shell/AiObservabilityScreenWidgets.js.map +1 -1
- package/dist/widgets/aiObservability/shell/aiObservabilityNav.d.ts.map +1 -1
- package/dist/widgets/aiObservability/shell/aiObservabilityNav.js +1 -0
- package/dist/widgets/aiObservability/shell/aiObservabilityNav.js.map +1 -1
- package/dist/widgets/aiObservability/traces/AiTraceDetailView.d.ts.map +1 -1
- package/dist/widgets/aiObservability/traces/AiTraceDetailView.js +15 -1
- package/dist/widgets/aiObservability/traces/AiTraceDetailView.js.map +1 -1
- package/dist/widgets/aiObservability/traces/AiTracesListView.d.ts.map +1 -1
- package/dist/widgets/aiObservability/traces/AiTracesListView.js +23 -1
- package/dist/widgets/aiObservability/traces/AiTracesListView.js.map +1 -1
- package/dist/widgets/aiObservability/traces/traceTypes.d.ts +15 -0
- package/dist/widgets/aiObservability/traces/traceTypes.d.ts.map +1 -1
- package/dist/widgets/aiObservability/traces/traceTypes.js +39 -0
- package/dist/widgets/aiObservability/traces/traceTypes.js.map +1 -1
- package/dist/widgets/aiObservability/traces/useAiObservabilityTracesApi.d.ts.map +1 -1
- package/dist/widgets/aiObservability/traces/useAiObservabilityTracesApi.js +12 -0
- package/dist/widgets/aiObservability/traces/useAiObservabilityTracesApi.js.map +1 -1
- package/package.json +4 -4
- package/src/AdminNestedArrayField.tsx +6 -4
- package/src/AdminRolesList.test.tsx +119 -2
- package/src/AdminRolesList.tsx +171 -13
- package/src/AdminShell.test.tsx +14 -0
- package/src/AdminShell.tsx +7 -1
- package/src/index.tsx +13 -1
- package/src/isolated/AdminNestedArrayField.isolated.tsx +50 -8
- package/src/isolated/aiObservabilityDatasets.isolated.tsx +417 -67
- package/src/isolated/aiObservabilityPrompts.isolated.tsx +42 -24
- package/src/isolated/aiObservabilityTraces.isolated.tsx +2 -1
- package/src/isolated/aiTracesTable.isolated.tsx +24 -1
- package/src/useAdminRoles.test.ts +15 -1
- package/src/useAdminRoles.ts +25 -1
- package/src/widgets/aiObservability/datasets/AiDatasetDetailScreen.tsx +17 -48
- package/src/widgets/aiObservability/datasets/AiDatasetDetailView.test.tsx +40 -77
- package/src/widgets/aiObservability/datasets/AiDatasetDetailView.tsx +29 -153
- package/src/widgets/aiObservability/datasets/AiDatasetItemScreen.tsx +279 -0
- package/src/widgets/aiObservability/datasets/AiDatasetItemView.test.tsx +110 -0
- package/src/widgets/aiObservability/datasets/AiDatasetItemView.tsx +174 -0
- package/src/widgets/aiObservability/datasets/ExpectedOutputForm.test.tsx +234 -0
- package/src/widgets/aiObservability/datasets/ExpectedOutputForm.tsx +313 -0
- package/src/widgets/aiObservability/datasets/datasetTypes.test.ts +31 -0
- package/src/widgets/aiObservability/datasets/datasetTypes.ts +13 -0
- package/src/widgets/aiObservability/datasets/expectedOutputModel.test.ts +285 -0
- package/src/widgets/aiObservability/datasets/expectedOutputModel.ts +338 -0
- package/src/widgets/aiObservability/datasets/useAiObservabilityDatasetsApi.test.ts +11 -0
- package/src/widgets/aiObservability/datasets/useAiObservabilityDatasetsApi.ts +22 -0
- package/src/widgets/aiObservability/prompts/AiPromptEditorView.tsx +7 -2
- package/src/widgets/aiObservability/prompts/AiPromptHubView.tsx +10 -3
- package/src/widgets/aiObservability/prompts/AiPromptsListScreen.tsx +3 -0
- package/src/widgets/aiObservability/prompts/AiPromptsListView.test.tsx +149 -3
- package/src/widgets/aiObservability/prompts/AiPromptsListView.tsx +176 -42
- package/src/widgets/aiObservability/prompts/promptTypes.test.ts +87 -7
- package/src/widgets/aiObservability/prompts/promptTypes.ts +140 -15
- package/src/widgets/aiObservability/shell/AiObservabilityScreenWidgets.tsx +2 -0
- package/src/widgets/aiObservability/shell/aiObservabilityNav.ts +1 -0
- package/src/widgets/aiObservability/traces/AiTraceDetailView.test.tsx +120 -0
- package/src/widgets/aiObservability/traces/AiTraceDetailView.tsx +47 -7
- package/src/widgets/aiObservability/traces/AiTracesListView.tsx +23 -0
- package/src/widgets/aiObservability/traces/traceTypes.test.ts +46 -0
- package/src/widgets/aiObservability/traces/traceTypes.ts +53 -0
- package/src/widgets/aiObservability/traces/useAiObservabilityTracesApi.test.ts +40 -0
- package/src/widgets/aiObservability/traces/useAiObservabilityTracesApi.ts +12 -0
|
@@ -8,7 +8,12 @@ import React from "react";
|
|
|
8
8
|
import {renderWithTheme} from "../../ui/src/test-utils";
|
|
9
9
|
import {AdminRolesField} from "./AdminRolesField";
|
|
10
10
|
import {AdminRolesList} from "./AdminRolesList";
|
|
11
|
-
import {
|
|
11
|
+
import {
|
|
12
|
+
normalizeRoles,
|
|
13
|
+
normalizeStatementDescriptions,
|
|
14
|
+
normalizeStatements,
|
|
15
|
+
type RolesQueryResult,
|
|
16
|
+
} from "./useAdminRoles";
|
|
12
17
|
|
|
13
18
|
const mockUseListRolesQuery = mock(
|
|
14
19
|
(_arg?: undefined, _options?: {skip?: boolean}): RolesQueryResult => ({
|
|
@@ -21,7 +26,10 @@ interface MockMutationResult {
|
|
|
21
26
|
unwrap: () => Promise<unknown>;
|
|
22
27
|
}
|
|
23
28
|
interface MockStatementsResult {
|
|
24
|
-
data?: {
|
|
29
|
+
data?: {
|
|
30
|
+
statementDescriptions?: Record<string, Record<string, string>>;
|
|
31
|
+
statements?: Record<string, string[]>;
|
|
32
|
+
};
|
|
25
33
|
error: unknown;
|
|
26
34
|
isLoading: boolean;
|
|
27
35
|
}
|
|
@@ -44,6 +52,7 @@ const mockUseListStatementsQuery = mock(
|
|
|
44
52
|
|
|
45
53
|
mock.module("./useAdminRoles", () => ({
|
|
46
54
|
normalizeRoles,
|
|
55
|
+
normalizeStatementDescriptions,
|
|
47
56
|
normalizeStatements,
|
|
48
57
|
useAdminRoles: () => ({
|
|
49
58
|
useCreateRoleMutation: () => [mockCreateRole, {isLoading: false}],
|
|
@@ -229,6 +238,52 @@ describe("AdminRolesList", () => {
|
|
|
229
238
|
);
|
|
230
239
|
});
|
|
231
240
|
|
|
241
|
+
it("shows permission descriptions beside action badges", () => {
|
|
242
|
+
mockUseListStatementsQuery.mockReturnValue({
|
|
243
|
+
data: {
|
|
244
|
+
statementDescriptions: {todo: {read: "View todos"}},
|
|
245
|
+
statements: {todo: ["read", "update"]},
|
|
246
|
+
},
|
|
247
|
+
error: null,
|
|
248
|
+
isLoading: false,
|
|
249
|
+
});
|
|
250
|
+
mockUseListRolesQuery.mockReturnValue({data: [], error: null, isLoading: false});
|
|
251
|
+
const {getByText, UNSAFE_root} = renderWithTheme(<AdminRolesList apiBase="/admin" />);
|
|
252
|
+
|
|
253
|
+
const readBadge = UNSAFE_root.findAll(
|
|
254
|
+
(node) =>
|
|
255
|
+
node.props.testID === "admin-permissions-todo-read" && typeof node.props.value === "string"
|
|
256
|
+
);
|
|
257
|
+
assert.equal(readBadge[0]?.props.value, "read");
|
|
258
|
+
expect(getByText("View todos")).toBeTruthy();
|
|
259
|
+
});
|
|
260
|
+
|
|
261
|
+
it("hides action badges when showActionBadges is false", () => {
|
|
262
|
+
mockUseListStatementsQuery.mockReturnValue({
|
|
263
|
+
data: {
|
|
264
|
+
statementDescriptions: {todo: {read: "View todos"}},
|
|
265
|
+
statements: {signoff: ["approve"], todo: ["read", "update"]},
|
|
266
|
+
},
|
|
267
|
+
error: null,
|
|
268
|
+
isLoading: false,
|
|
269
|
+
});
|
|
270
|
+
mockUseListRolesQuery.mockReturnValue({data: [], error: null, isLoading: false});
|
|
271
|
+
const {getByText, UNSAFE_root} = renderWithTheme(
|
|
272
|
+
<AdminRolesList apiBase="/admin" showActionBadges={false} />
|
|
273
|
+
);
|
|
274
|
+
|
|
275
|
+
const badges = UNSAFE_root.findAll(
|
|
276
|
+
(node) =>
|
|
277
|
+
typeof node.props.testID === "string" &&
|
|
278
|
+
node.props.testID.startsWith("admin-permissions-") &&
|
|
279
|
+
typeof node.props.status === "string"
|
|
280
|
+
);
|
|
281
|
+
assert.equal(badges.length, 0);
|
|
282
|
+
expect(getByText("View todos")).toBeTruthy();
|
|
283
|
+
expect(getByText("update")).toBeTruthy();
|
|
284
|
+
expect(getByText("approve")).toBeTruthy();
|
|
285
|
+
});
|
|
286
|
+
|
|
232
287
|
it("enables editing for non-sealed roles and disables sealed roles", () => {
|
|
233
288
|
mockUseListRolesQuery.mockReturnValue({
|
|
234
289
|
data: ROLES,
|
|
@@ -523,6 +578,68 @@ describe("AdminRolesList", () => {
|
|
|
523
578
|
});
|
|
524
579
|
expect(queryByText("Role already exists")).toBeNull();
|
|
525
580
|
});
|
|
581
|
+
|
|
582
|
+
it("hides filtered actions and writes them back unchanged", async () => {
|
|
583
|
+
mockUseListRolesQuery.mockReturnValue({
|
|
584
|
+
data: [
|
|
585
|
+
{
|
|
586
|
+
displayName: "Todo User",
|
|
587
|
+
name: "todoUser",
|
|
588
|
+
permissions: {
|
|
589
|
+
admin: ["access", "runScripts"],
|
|
590
|
+
adminTodo: ["read", "writeOwned"],
|
|
591
|
+
todo: ["read", "update"],
|
|
592
|
+
},
|
|
593
|
+
},
|
|
594
|
+
],
|
|
595
|
+
error: null,
|
|
596
|
+
isLoading: false,
|
|
597
|
+
refetch: mockRefetch,
|
|
598
|
+
});
|
|
599
|
+
const {getByTestId, queryByTestId} = renderWithTheme(
|
|
600
|
+
<AdminRolesList
|
|
601
|
+
apiBase="/admin"
|
|
602
|
+
isActionVisible={({action, resource}) => {
|
|
603
|
+
if (resource === "adminTodo") {
|
|
604
|
+
return false;
|
|
605
|
+
}
|
|
606
|
+
if (resource === "todo" && action === "read") {
|
|
607
|
+
return false;
|
|
608
|
+
}
|
|
609
|
+
return true;
|
|
610
|
+
}}
|
|
611
|
+
/>
|
|
612
|
+
);
|
|
613
|
+
|
|
614
|
+
expect(queryByTestId("admin-roles-item-todoUser-permission-adminTodo-read")).toBeNull();
|
|
615
|
+
expect(queryByTestId("admin-permissions-adminTodo-write")).toBeNull();
|
|
616
|
+
expect(queryByTestId("admin-roles-item-todoUser-permission-todo-read")).toBeNull();
|
|
617
|
+
expect(getByTestId("admin-roles-item-todoUser-permission-todo-update")).toBeTruthy();
|
|
618
|
+
expect(getByTestId("admin-permissions-admin-access")).toBeTruthy();
|
|
619
|
+
|
|
620
|
+
await act(async () => {
|
|
621
|
+
fireEvent.press(getByTestId("admin-roles-edit-todoUser"));
|
|
622
|
+
});
|
|
623
|
+
expect(queryByTestId("admin-role-access-adminTodo")).toBeNull();
|
|
624
|
+
expect(queryByTestId("admin-role-permission-todo-read-clickable")).toBeNull();
|
|
625
|
+
expect(getByTestId("admin-role-page-access")).toBeTruthy();
|
|
626
|
+
|
|
627
|
+
await act(async () => {
|
|
628
|
+
fireEvent.press(getByTestId("admin-role-permission-todo-update-clickable"));
|
|
629
|
+
});
|
|
630
|
+
await act(async () => {
|
|
631
|
+
fireEvent.press(getByTestId("admin-role-save-button"));
|
|
632
|
+
});
|
|
633
|
+
|
|
634
|
+
const updateInput = mockUpdateRole.mock.calls[0]?.[0] as {
|
|
635
|
+
changes?: {permissions?: Record<string, string[]>};
|
|
636
|
+
};
|
|
637
|
+
assert.deepEqual(updateInput.changes?.permissions, {
|
|
638
|
+
admin: ["access", "runScripts"],
|
|
639
|
+
adminTodo: ["read", "writeOwned"],
|
|
640
|
+
todo: ["read"],
|
|
641
|
+
});
|
|
642
|
+
});
|
|
526
643
|
});
|
|
527
644
|
|
|
528
645
|
describe("AdminRolesField", () => {
|
package/src/AdminRolesList.tsx
CHANGED
|
@@ -16,11 +16,40 @@ import type {AdminScreenProps} from "./types";
|
|
|
16
16
|
import {resolveAdminBases} from "./types";
|
|
17
17
|
import {
|
|
18
18
|
normalizeRoles,
|
|
19
|
+
normalizeStatementDescriptions,
|
|
19
20
|
normalizeStatements,
|
|
20
21
|
type RbacRoleRow,
|
|
22
|
+
type StatementDescriptions,
|
|
21
23
|
useAdminRoles,
|
|
22
24
|
} from "./useAdminRoles";
|
|
23
25
|
|
|
26
|
+
/** One statement action the roles screen can show or hide. */
|
|
27
|
+
export interface RoleActionVisibilityArgs {
|
|
28
|
+
action: string;
|
|
29
|
+
resource: string;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
/**
|
|
33
|
+
* Return false to hide an action from the list and the editor.
|
|
34
|
+
* Hidden actions already stored on a role are written back unchanged.
|
|
35
|
+
*/
|
|
36
|
+
export type RoleActionVisibility = (permission: RoleActionVisibilityArgs) => boolean;
|
|
37
|
+
|
|
38
|
+
export interface AdminRolesListProps extends AdminScreenProps {
|
|
39
|
+
/**
|
|
40
|
+
* Hides statement actions without removing them from a saved role.
|
|
41
|
+
* The same verb can be a model grant on one resource and a named check on
|
|
42
|
+
* another, so the predicate receives both. Omit to show every action.
|
|
43
|
+
*/
|
|
44
|
+
isActionVisible?: RoleActionVisibility;
|
|
45
|
+
/**
|
|
46
|
+
* Show the colored action badges (read, update, delete, and the rest) on role cards
|
|
47
|
+
* and the available-permissions list. When false, a described permission shows its
|
|
48
|
+
* description and an undescribed one shows the action name as text. Defaults to true.
|
|
49
|
+
*/
|
|
50
|
+
showActionBadges?: boolean;
|
|
51
|
+
}
|
|
52
|
+
|
|
24
53
|
interface RoleFormState {
|
|
25
54
|
description: string;
|
|
26
55
|
displayName: string;
|
|
@@ -96,6 +125,43 @@ const PERMISSION_GROUPS: readonly {key: PermissionGroupKey; label: string}[] = [
|
|
|
96
125
|
{key: "model", label: "Model permissions"},
|
|
97
126
|
];
|
|
98
127
|
|
|
128
|
+
const isStatementActionVisible = ({
|
|
129
|
+
action,
|
|
130
|
+
isActionVisible,
|
|
131
|
+
resource,
|
|
132
|
+
}: {
|
|
133
|
+
action: string;
|
|
134
|
+
isActionVisible?: RoleActionVisibility;
|
|
135
|
+
resource: string;
|
|
136
|
+
}): boolean => {
|
|
137
|
+
if (!isActionVisible) {
|
|
138
|
+
return true;
|
|
139
|
+
}
|
|
140
|
+
return isActionVisible({action, resource});
|
|
141
|
+
};
|
|
142
|
+
|
|
143
|
+
const shownPermissions = ({
|
|
144
|
+
isActionVisible,
|
|
145
|
+
permissions,
|
|
146
|
+
}: {
|
|
147
|
+
isActionVisible?: RoleActionVisibility;
|
|
148
|
+
permissions: Record<string, readonly string[]>;
|
|
149
|
+
}): Record<string, readonly string[]> => {
|
|
150
|
+
if (!isActionVisible) {
|
|
151
|
+
return permissions;
|
|
152
|
+
}
|
|
153
|
+
const result: Record<string, readonly string[]> = {};
|
|
154
|
+
for (const [resource, actions] of Object.entries(permissions)) {
|
|
155
|
+
const visible = actions.filter((action) =>
|
|
156
|
+
isStatementActionVisible({action, isActionVisible, resource})
|
|
157
|
+
);
|
|
158
|
+
if (visible.length > 0) {
|
|
159
|
+
result[resource] = visible;
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
return result;
|
|
163
|
+
};
|
|
164
|
+
|
|
99
165
|
const groupPermissions = (
|
|
100
166
|
permissions: Record<string, readonly string[]>
|
|
101
167
|
): Record<PermissionGroupKey, [string, string[]][]> => {
|
|
@@ -115,14 +181,64 @@ const groupPermissions = (
|
|
|
115
181
|
return grouped;
|
|
116
182
|
};
|
|
117
183
|
|
|
184
|
+
export const descriptionFor = (
|
|
185
|
+
descriptions: StatementDescriptions,
|
|
186
|
+
resource: string,
|
|
187
|
+
action: string
|
|
188
|
+
): string | undefined => {
|
|
189
|
+
const description = descriptions[resource]?.[action]?.trim();
|
|
190
|
+
if (!description) {
|
|
191
|
+
return undefined;
|
|
192
|
+
}
|
|
193
|
+
return description;
|
|
194
|
+
};
|
|
195
|
+
|
|
196
|
+
export interface PermissionActionLabelProps {
|
|
197
|
+
action: string;
|
|
198
|
+
description?: string;
|
|
199
|
+
showActionBadges: boolean;
|
|
200
|
+
testID: string;
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
export const PermissionActionLabel: React.FC<PermissionActionLabelProps> = ({
|
|
204
|
+
action,
|
|
205
|
+
description,
|
|
206
|
+
showActionBadges,
|
|
207
|
+
testID,
|
|
208
|
+
}) => {
|
|
209
|
+
if (!showActionBadges) {
|
|
210
|
+
return (
|
|
211
|
+
<Text color="secondaryDark" size="sm" testID={testID}>
|
|
212
|
+
{description ?? action}
|
|
213
|
+
</Text>
|
|
214
|
+
);
|
|
215
|
+
}
|
|
216
|
+
return (
|
|
217
|
+
<Box alignItems="center" direction="row" gap={1}>
|
|
218
|
+
<Badge
|
|
219
|
+
status={PERMISSION_KIND_STATUS[permissionKind(action)]}
|
|
220
|
+
testID={testID}
|
|
221
|
+
value={action}
|
|
222
|
+
/>
|
|
223
|
+
{description ? (
|
|
224
|
+
<Text color="secondaryDark" size="sm" testID={`${testID}-description`}>
|
|
225
|
+
{description}
|
|
226
|
+
</Text>
|
|
227
|
+
) : null}
|
|
228
|
+
</Box>
|
|
229
|
+
);
|
|
230
|
+
};
|
|
231
|
+
|
|
118
232
|
/**
|
|
119
233
|
* Custom permissions first, then model permissions. Each group has one row per resource with
|
|
120
|
-
* color-coded action badges (read green, write amber, delete red).
|
|
234
|
+
* color-coded action badges (read green, write amber, delete red), unless badges are hidden.
|
|
121
235
|
*/
|
|
122
236
|
const PermissionRows: React.FC<{
|
|
237
|
+
descriptions: StatementDescriptions;
|
|
123
238
|
permissions: Record<string, readonly string[]>;
|
|
239
|
+
showActionBadges: boolean;
|
|
124
240
|
testIDPrefix: string;
|
|
125
|
-
}> = ({permissions, testIDPrefix}) => {
|
|
241
|
+
}> = ({descriptions, permissions, showActionBadges, testIDPrefix}) => {
|
|
126
242
|
const grouped = groupPermissions(permissions);
|
|
127
243
|
const groups = PERMISSION_GROUPS.filter((group) => grouped[group.key].length > 0);
|
|
128
244
|
if (groups.length === 0) {
|
|
@@ -137,7 +253,7 @@ const PermissionRows: React.FC<{
|
|
|
137
253
|
</Text>
|
|
138
254
|
{grouped[group.key].map(([resource, actions]) => (
|
|
139
255
|
<Box
|
|
140
|
-
alignItems="center"
|
|
256
|
+
alignItems={showActionBadges ? "center" : "start"}
|
|
141
257
|
direction="row"
|
|
142
258
|
gap={2}
|
|
143
259
|
key={resource}
|
|
@@ -149,13 +265,14 @@ const PermissionRows: React.FC<{
|
|
|
149
265
|
{resource}
|
|
150
266
|
</Text>
|
|
151
267
|
</Box>
|
|
152
|
-
<Box direction="row" gap={1} wrap>
|
|
268
|
+
<Box direction={showActionBadges ? "row" : "column"} gap={1} wrap>
|
|
153
269
|
{sortActionsByKind(actions).map((action) => (
|
|
154
|
-
<
|
|
270
|
+
<PermissionActionLabel
|
|
271
|
+
action={action}
|
|
272
|
+
description={descriptionFor(descriptions, resource, action)}
|
|
155
273
|
key={action}
|
|
156
|
-
|
|
274
|
+
showActionBadges={showActionBadges}
|
|
157
275
|
testID={`${testIDPrefix}-${resource}-${action}`}
|
|
158
|
-
value={action}
|
|
159
276
|
/>
|
|
160
277
|
))}
|
|
161
278
|
</Box>
|
|
@@ -207,7 +324,12 @@ const clonePermissions = (permissions?: Record<string, string[]>): Record<string
|
|
|
207
324
|
);
|
|
208
325
|
};
|
|
209
326
|
|
|
210
|
-
export const AdminRolesList: React.FC<
|
|
327
|
+
export const AdminRolesList: React.FC<AdminRolesListProps> = ({
|
|
328
|
+
apiBase,
|
|
329
|
+
baseUrl,
|
|
330
|
+
isActionVisible,
|
|
331
|
+
showActionBadges = true,
|
|
332
|
+
}) => {
|
|
211
333
|
const {apiBase: resolvedApiBase} = resolveAdminBases({apiBase, baseUrl});
|
|
212
334
|
const {useCreateRoleMutation, useListRolesQuery, useListStatementsQuery, useUpdateRoleMutation} =
|
|
213
335
|
useAdminRoles(resolvedApiBase);
|
|
@@ -221,6 +343,10 @@ export const AdminRolesList: React.FC<AdminScreenProps> = ({apiBase, baseUrl}) =
|
|
|
221
343
|
const [updateRole, {isLoading: isUpdating}] = useUpdateRoleMutation();
|
|
222
344
|
const roles = normalizeRoles(data);
|
|
223
345
|
const statements = normalizeStatements(statementsData);
|
|
346
|
+
const statementDescriptions = useMemo(
|
|
347
|
+
() => normalizeStatementDescriptions(statementsData),
|
|
348
|
+
[statementsData]
|
|
349
|
+
);
|
|
224
350
|
const resources = useMemo(() => Object.keys(statements).sort(), [statements]);
|
|
225
351
|
const hasAdminPageStatement =
|
|
226
352
|
statements[ADMIN_PAGE_RESOURCE]?.includes(ADMIN_PAGE_ACTION) ?? false;
|
|
@@ -403,7 +529,12 @@ export const AdminRolesList: React.FC<AdminScreenProps> = ({apiBase, baseUrl}) =
|
|
|
403
529
|
</Text>
|
|
404
530
|
{role.description ? <Text size="sm">{role.description}</Text> : null}
|
|
405
531
|
<PermissionRows
|
|
406
|
-
|
|
532
|
+
descriptions={statementDescriptions}
|
|
533
|
+
permissions={shownPermissions({
|
|
534
|
+
isActionVisible,
|
|
535
|
+
permissions: role.permissions ?? {},
|
|
536
|
+
})}
|
|
537
|
+
showActionBadges={showActionBadges}
|
|
407
538
|
testIDPrefix={`admin-roles-item-${role.name}-permission`}
|
|
408
539
|
/>
|
|
409
540
|
</Box>
|
|
@@ -415,7 +546,12 @@ export const AdminRolesList: React.FC<AdminScreenProps> = ({apiBase, baseUrl}) =
|
|
|
415
546
|
{areStatementsLoading ? <Spinner /> : null}
|
|
416
547
|
{statementsError ? <Text color="error">Failed to load permissions.</Text> : null}
|
|
417
548
|
{!areStatementsLoading && !statementsError ? (
|
|
418
|
-
<PermissionRows
|
|
549
|
+
<PermissionRows
|
|
550
|
+
descriptions={statementDescriptions}
|
|
551
|
+
permissions={shownPermissions({isActionVisible, permissions: statements})}
|
|
552
|
+
showActionBadges={showActionBadges}
|
|
553
|
+
testIDPrefix="admin-permissions"
|
|
554
|
+
/>
|
|
419
555
|
) : null}
|
|
420
556
|
</Box>
|
|
421
557
|
</Box>
|
|
@@ -462,7 +598,12 @@ export const AdminRolesList: React.FC<AdminScreenProps> = ({apiBase, baseUrl}) =
|
|
|
462
598
|
/>
|
|
463
599
|
<Box gap={2} testID="admin-role-permissions">
|
|
464
600
|
<Heading size="sm">Permissions</Heading>
|
|
465
|
-
{hasAdminPageStatement
|
|
601
|
+
{hasAdminPageStatement &&
|
|
602
|
+
isStatementActionVisible({
|
|
603
|
+
action: ADMIN_PAGE_ACTION,
|
|
604
|
+
isActionVisible,
|
|
605
|
+
resource: ADMIN_PAGE_RESOURCE,
|
|
606
|
+
}) ? (
|
|
466
607
|
<Box gap={2} testID="admin-role-page-access">
|
|
467
608
|
<Heading size="sm">Admin page</Heading>
|
|
468
609
|
<Text>
|
|
@@ -488,7 +629,12 @@ export const AdminRolesList: React.FC<AdminScreenProps> = ({apiBase, baseUrl}) =
|
|
|
488
629
|
</Box>
|
|
489
630
|
) : null}
|
|
490
631
|
{resources.map((resource) => {
|
|
491
|
-
const actions = statements[resource]
|
|
632
|
+
const actions = (statements[resource] ?? []).filter((action) =>
|
|
633
|
+
isStatementActionVisible({action, isActionVisible, resource})
|
|
634
|
+
);
|
|
635
|
+
if (actions.length === 0) {
|
|
636
|
+
return null;
|
|
637
|
+
}
|
|
492
638
|
const hasStandardAccess = STANDARD_ACCESS_ACTIONS.every((action) =>
|
|
493
639
|
actions.includes(action)
|
|
494
640
|
);
|
|
@@ -515,6 +661,7 @@ export const AdminRolesList: React.FC<AdminScreenProps> = ({apiBase, baseUrl}) =
|
|
|
515
661
|
<Box direction="row" gap={3} wrap>
|
|
516
662
|
{customActions.map((action) => {
|
|
517
663
|
const isSelected = form.permissions[resource]?.includes(action) ?? false;
|
|
664
|
+
const description = descriptionFor(statementDescriptions, resource, action);
|
|
518
665
|
return (
|
|
519
666
|
<Box
|
|
520
667
|
accessibilityHint={`Toggles the ${action} permission for ${resource}`}
|
|
@@ -527,7 +674,18 @@ export const AdminRolesList: React.FC<AdminScreenProps> = ({apiBase, baseUrl}) =
|
|
|
527
674
|
testID={`admin-role-permission-${resource}-${action}`}
|
|
528
675
|
>
|
|
529
676
|
<CheckBox selected={isSelected} />
|
|
530
|
-
<
|
|
677
|
+
<Box>
|
|
678
|
+
<Text>{action}</Text>
|
|
679
|
+
{description ? (
|
|
680
|
+
<Text
|
|
681
|
+
color="secondaryDark"
|
|
682
|
+
size="sm"
|
|
683
|
+
testID={`admin-role-permission-${resource}-${action}-description`}
|
|
684
|
+
>
|
|
685
|
+
{description}
|
|
686
|
+
</Text>
|
|
687
|
+
) : null}
|
|
688
|
+
</Box>
|
|
531
689
|
</Box>
|
|
532
690
|
);
|
|
533
691
|
})}
|
package/src/AdminShell.test.tsx
CHANGED
|
@@ -642,6 +642,20 @@ describe("AdminShell", () => {
|
|
|
642
642
|
|
|
643
643
|
assert.isNotNull(getByTestId("admin-shell-child"));
|
|
644
644
|
assert.isNotNull(getByTestId("admin-shell-main"));
|
|
645
|
+
|
|
646
|
+
// react-native-web drops a multi-value `padding` string, so the inset has to be longhand.
|
|
647
|
+
const contentStyle = getByTestId("admin-shell-content").props.style as {
|
|
648
|
+
padding?: unknown;
|
|
649
|
+
paddingBottom?: number;
|
|
650
|
+
paddingLeft?: number;
|
|
651
|
+
paddingRight?: number;
|
|
652
|
+
paddingTop?: number;
|
|
653
|
+
};
|
|
654
|
+
assert.strictEqual(contentStyle.paddingTop, 24);
|
|
655
|
+
assert.strictEqual(contentStyle.paddingRight, 28);
|
|
656
|
+
assert.strictEqual(contentStyle.paddingBottom, 80);
|
|
657
|
+
assert.strictEqual(contentStyle.paddingLeft, 28);
|
|
658
|
+
assert.isUndefined(contentStyle.padding);
|
|
645
659
|
});
|
|
646
660
|
|
|
647
661
|
it("renders the sidebar footer when provided", () => {
|
package/src/AdminShell.tsx
CHANGED
|
@@ -599,12 +599,18 @@ export const AdminShell: React.FC<AdminShellProps> = ({
|
|
|
599
599
|
__style: {
|
|
600
600
|
boxSizing: "border-box",
|
|
601
601
|
maxWidth: 1280,
|
|
602
|
-
padding
|
|
602
|
+
// react-native-web drops multi-value padding ("24px 28px 80px"), which left
|
|
603
|
+
// every admin page flush against the sidebar. Longhand values match the top bar.
|
|
604
|
+
paddingBottom: 80,
|
|
605
|
+
paddingLeft: 28,
|
|
606
|
+
paddingRight: 28,
|
|
607
|
+
paddingTop: 24,
|
|
603
608
|
width: "100%",
|
|
604
609
|
},
|
|
605
610
|
}}
|
|
606
611
|
flex="grow"
|
|
607
612
|
minHeight={0}
|
|
613
|
+
testID="admin-shell-content"
|
|
608
614
|
width="100%"
|
|
609
615
|
>
|
|
610
616
|
<Box flex="grow" minHeight={0}>
|
package/src/index.tsx
CHANGED
|
@@ -23,7 +23,15 @@ export {
|
|
|
23
23
|
} from "./AdminProvider";
|
|
24
24
|
export {AdminRefField, type AdminRefFieldProps} from "./AdminRefField";
|
|
25
25
|
export {AdminRolesField} from "./AdminRolesField";
|
|
26
|
-
export {
|
|
26
|
+
export {
|
|
27
|
+
AdminRolesList,
|
|
28
|
+
type AdminRolesListProps,
|
|
29
|
+
descriptionFor,
|
|
30
|
+
PermissionActionLabel,
|
|
31
|
+
type PermissionActionLabelProps,
|
|
32
|
+
type RoleActionVisibility,
|
|
33
|
+
type RoleActionVisibilityArgs,
|
|
34
|
+
} from "./AdminRolesList";
|
|
27
35
|
export {AdminScreenPage, type AdminScreenPageProps} from "./AdminScreenPage";
|
|
28
36
|
export {AdminScreenRouter, type AdminScreenRouterProps} from "./AdminScreenRouter";
|
|
29
37
|
export {AdminScriptList} from "./AdminScriptList";
|
|
@@ -188,6 +196,10 @@ export {
|
|
|
188
196
|
type AdminModelQueryOptions,
|
|
189
197
|
useAdminModelApi,
|
|
190
198
|
} from "./useAdminModelApi";
|
|
199
|
+
export {
|
|
200
|
+
normalizeStatementDescriptions,
|
|
201
|
+
type StatementDescriptions,
|
|
202
|
+
} from "./useAdminRoles";
|
|
191
203
|
export {
|
|
192
204
|
type AdminRpcQueryState,
|
|
193
205
|
unwrapAdminEnvelope,
|
|
@@ -30,20 +30,26 @@ mock.module("@terreno/ui", () => {
|
|
|
30
30
|
itemHeight,
|
|
31
31
|
renderItem,
|
|
32
32
|
callbackNewDataIds,
|
|
33
|
+
variableHeight,
|
|
33
34
|
}: {
|
|
34
35
|
dataIDs: string[];
|
|
35
36
|
itemHeight: number;
|
|
36
37
|
renderItem: (arg: {item: string}) => React.ReactElement;
|
|
37
38
|
callbackNewDataIds: (ids: string[]) => void;
|
|
39
|
+
variableHeight?: boolean;
|
|
38
40
|
}) => {
|
|
39
|
-
return ReactMod.createElement(
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
41
|
+
return ReactMod.createElement(
|
|
42
|
+
RN.View,
|
|
43
|
+
{itemHeight, testID: "mock-draggable-list", variableHeight},
|
|
44
|
+
[
|
|
45
|
+
...dataIDs.map((id) => ReactMod.cloneElement(renderItem({item: id}), {key: id})),
|
|
46
|
+
ReactMod.createElement(RN.Pressable, {
|
|
47
|
+
key: "__reorder",
|
|
48
|
+
onPress: () => callbackNewDataIds([...dataIDs].reverse()),
|
|
49
|
+
testID: "mock-reorder",
|
|
50
|
+
}),
|
|
51
|
+
]
|
|
52
|
+
);
|
|
47
53
|
};
|
|
48
54
|
const Box = ({children, ...rest}: Record<string, unknown>) =>
|
|
49
55
|
ReactMod.createElement(RN.View, rest, children);
|
|
@@ -253,6 +259,41 @@ describe("AdminNestedArrayField", () => {
|
|
|
253
259
|
expect(next.map((i: Record<string, unknown>) => i.name)).toEqual(["c", "b", "a"]);
|
|
254
260
|
});
|
|
255
261
|
|
|
262
|
+
it("keeps the new order across re-renders so a second reorder maps to the right items", () => {
|
|
263
|
+
const onChange = mock<NestedOnChange>(() => {});
|
|
264
|
+
const items = baseItems as unknown as Record<string, AdminFieldConfig>;
|
|
265
|
+
const original = [
|
|
266
|
+
{active: true, count: 1, name: "a", tags: []},
|
|
267
|
+
{active: false, count: 2, name: "b", tags: []},
|
|
268
|
+
{active: true, count: 3, name: "c", tags: []},
|
|
269
|
+
];
|
|
270
|
+
const {getByTestId, rerender} = renderWithTheme(
|
|
271
|
+
<AdminNestedArrayField
|
|
272
|
+
baseUrl="/admin"
|
|
273
|
+
items={items}
|
|
274
|
+
onChange={onChange}
|
|
275
|
+
title="Items"
|
|
276
|
+
value={original}
|
|
277
|
+
/>
|
|
278
|
+
);
|
|
279
|
+
fireEvent.press(getByTestId("mock-reorder"));
|
|
280
|
+
const reordered = onChange.mock.calls[0][0];
|
|
281
|
+
expect(reordered.map((i: Record<string, unknown>) => i.name)).toEqual(["c", "b", "a"]);
|
|
282
|
+
|
|
283
|
+
rerender(
|
|
284
|
+
<AdminNestedArrayField
|
|
285
|
+
baseUrl="/admin"
|
|
286
|
+
items={items}
|
|
287
|
+
onChange={onChange}
|
|
288
|
+
title="Items"
|
|
289
|
+
value={reordered}
|
|
290
|
+
/>
|
|
291
|
+
);
|
|
292
|
+
fireEvent.press(getByTestId("mock-reorder"));
|
|
293
|
+
const reorderedAgain = onChange.mock.calls[1][0];
|
|
294
|
+
expect(reorderedAgain.map((i: Record<string, unknown>) => i.name)).toEqual(["a", "b", "c"]);
|
|
295
|
+
});
|
|
296
|
+
|
|
256
297
|
it("supports re-render with longer value array (grows itemIds)", () => {
|
|
257
298
|
const onChange = mock<NestedOnChange>(() => {});
|
|
258
299
|
const {rerender, toJSON} = renderWithTheme(
|
|
@@ -338,6 +379,7 @@ describe("AdminNestedArrayField", () => {
|
|
|
338
379
|
);
|
|
339
380
|
// Header 44 + name 76 + media group (84 + port 76 + sonarr group (84 + 2 * 76)) + padding 24
|
|
340
381
|
expect(getByTestId("mock-draggable-list").props.itemHeight).toBe(540);
|
|
382
|
+
expect(getByTestId("mock-draggable-list").props.variableHeight).toBe(true);
|
|
341
383
|
});
|
|
342
384
|
|
|
343
385
|
it("gives nested groups per-item test IDs in editable rows", () => {
|