Skip to content

armgit / Pulse

Public Imported from GitHub
0

Real-time monitoring dashboard for Proxmox VE, PBS, Docker, Kubernetes, TrueNAS and vSphere. Self-hosted, with alerts for failed backups, full disks, unhealthy containers and offline nodes.

Reactivate role controls for the newly admitted reader

pulse-triage[bot]b6cacc34f5e4
diff --git a/frontend-modern/src/components/Settings/__tests__/RolesReaderLifetime.test.tsx b/frontend-modern/src/components/Settings/__tests__/RolesReaderLifetime.test.tsx
index f5b25c7c15..8fcb2e4cce 100644
--- a/frontend-modern/src/components/Settings/__tests__/RolesReaderLifetime.test.tsx
+++ b/frontend-modern/src/components/Settings/__tests__/RolesReaderLifetime.test.tsx
@@ -66,7 +66,7 @@ function mount() {
return allowed();
},
});
- return <div />;
+ return <button disabled={!state.canEdit()}>Current reader action</button>;
});
return { state, setUser, setAllowed, view };
}
@@ -109,6 +109,7 @@ describe('Roles reader lifetime', () => {
expect(state.showModal()).toBe(false);
state.openEditRole(south);
expect(state.formName()).toBe('South role');
+ expect(screen.getByRole('button', { name: 'Current reader action' })).not.toBeDisabled();
});
it.each(['success', 'failure'] as const)(
@@ -134,6 +135,19 @@ describe('Roles reader lifetime', () => {
},
);
+ it('reactivates rendered controls after capability withdrawal and restoration', async () => {
+ const [feature, setFeature] = createSignal(true);
+ enabled = feature;
+ const { state } = mount();
+ await loaded(state);
+ expect(screen.getByRole('button', { name: 'Current reader action' })).not.toBeDisabled();
+ setFeature(false);
+ expect(screen.getByRole('button', { name: 'Current reader action' })).toBeDisabled();
+ setFeature(true);
+ await loaded(state);
+ expect(screen.getByRole('button', { name: 'Current reader action' })).not.toBeDisabled();
+ });
+
it('does not let an old completion finish a newer loading state', async () => {
const old = deferred<Role[]>(),
current = deferred<Role[]>();
diff --git a/frontend-modern/src/components/Settings/useRolesPanelState.ts b/frontend-modern/src/components/Settings/useRolesPanelState.ts
index 3fff8e3ed4..43780cdb02 100644
--- a/frontend-modern/src/components/Settings/useRolesPanelState.ts
+++ b/frontend-modern/src/components/Settings/useRolesPanelState.ts
@@ -42,15 +42,19 @@ export function useRolesPanelState(props: RolesPanelProps = {}) {
});
const accessAllowed = () => featureGate.rbacEnabled() && props.canManage !== false;
const currentOrg = () => getOrgID() || 'default';
- let context = { org: currentOrg(), user: props.currentUser, allowed: accessAllowed() };
+ const [context, setContext] = createSignal({
+ org: currentOrg(),
+ user: props.currentUser,
+ allowed: accessAllowed(),
+ });
let disposed = false;
let readController: AbortController | undefined;
let mutationController: AbortController | undefined;
const contextIsCurrent = () =>
!disposed &&
- context.org === currentOrg() &&
- context.user === props.currentUser &&
- context.allowed === accessAllowed();
+ context().org === currentOrg() &&
+ context().user === props.currentUser &&
+ context().allowed === accessAllowed();
const canEdit = () =>
contextIsCurrent() &&
accessAllowed() &&
@@ -62,7 +66,7 @@ export function useRolesPanelState(props: RolesPanelProps = {}) {
const isCurrentRole = (role: Role) => roles().some((current) => unwrap(current) === unwrap(role));
const requestOptions = (controller: AbortController) => ({
signal: controller.signal,
- expectedOrgID: context.org,
+ expectedOrgID: context().org,
retry: false,
});
@@ -86,11 +90,11 @@ export function useRolesPanelState(props: RolesPanelProps = {}) {
const loadRoles = async () => {
if (!contextIsCurrent() || !accessAllowed() || readController || mutationController) return;
- const reader = context;
+ const reader = context();
const controller = new AbortController();
readController = controller;
const isCurrentRead = () =>
- contextIsCurrent() && reader === context && readController === controller;
+ contextIsCurrent() && reader === context() && readController === controller;
batch(() => {
clearEditor();
setRolePendingDeletion(null);
@@ -149,7 +153,7 @@ export function useRolesPanelState(props: RolesPanelProps = {}) {
mutationController?.abort();
readController = mutationController = undefined;
// A new object also invalidates operations when returning to the same reader.
- context = { org: currentOrg(), user: props.currentUser, allowed: accessAllowed() };
+ setContext({ org: currentOrg(), user: props.currentUser, allowed: accessAllowed() });
batch(() => {
clearEditor();
setRoles([]);
@@ -207,11 +211,11 @@ export function useRolesPanelState(props: RolesPanelProps = {}) {
};
const mutateRole = async (role: Role, remove: boolean) => {
- const reader = context;
+ const reader = context();
const controller = new AbortController();
mutationController = controller;
const isCurrentWrite = () =>
- contextIsCurrent() && reader === context && mutationController === controller;
+ contextIsCurrent() && reader === context() && mutationController === controller;
batch(() => {
setSaving(!remove);
setDeleting(remove);
@@ -239,7 +243,7 @@ export function useRolesPanelState(props: RolesPanelProps = {}) {
setDeleting(false);
}
}
- if (saved && contextIsCurrent() && reader === context) await loadRoles();
+ if (saved && contextIsCurrent() && reader === context()) await loadRoles();
};
const handleDeleteRole = async () => {
const role = rolePendingDeletion();