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.

Bind User Access actions to the current datagrid row

pulse-triage[bot]4616fd3a705b
diff --git a/frontend-modern/src/components/Settings/UserAssignmentsPanel.tsx b/frontend-modern/src/components/Settings/UserAssignmentsPanel.tsx
index 78dc0b408a..912d1b3db5 100644
--- a/frontend-modern/src/components/Settings/UserAssignmentsPanel.tsx
+++ b/frontend-modern/src/components/Settings/UserAssignmentsPanel.tsx
@@ -38,7 +38,7 @@ export const UserAssignmentsPanel: Component<UserAssignmentsPanelProps> = (props
placeholder="Search users..."
value={state.searchQuery()}
onChange={state.setSearchQuery}
- disabled={!state.canEdit()}
+ disabled={!state.accessAllowed() || Boolean(state.loadError())}
class="min-w-60"
inputClass="min-h-10 sm:min-h-9 py-2.5"
/>
diff --git a/frontend-modern/src/components/Settings/__tests__/RBACPaywallPanels.test.tsx b/frontend-modern/src/components/Settings/__tests__/RBACPaywallPanels.test.tsx
index 2009cae79f..f9e980f21a 100644
--- a/frontend-modern/src/components/Settings/__tests__/RBACPaywallPanels.test.tsx
+++ b/frontend-modern/src/components/Settings/__tests__/RBACPaywallPanels.test.tsx
@@ -323,7 +323,14 @@ describe('RBAC paywall settings panels', () => {
within(dialog).queryByRole('button', { name: 'Retry saved permissions' }),
).not.toBeInTheDocument();
expect(getUserPermissionsMock).toHaveBeenCalledTimes(2);
- expect(getUserPermissionsMock).toHaveBeenLastCalledWith('alice');
+ expect(getUserPermissionsMock).toHaveBeenLastCalledWith(
+ 'alice',
+ expect.objectContaining({
+ expectedOrgID: 'default',
+ retry: false,
+ signal: expect.any(AbortSignal),
+ }),
+ );
pending.resolve([{ action: 'read', resource: 'alerts' }]);
expect(await within(dialog).findByText('alerts')).toBeInTheDocument();
expect(within(dialog).queryByRole('alert')).not.toBeInTheDocument();
diff --git a/frontend-modern/src/components/Settings/__tests__/UserAccessReaderLifetime.test.tsx b/frontend-modern/src/components/Settings/__tests__/UserAccessReaderLifetime.test.tsx
index 9515a3c4d3..f20a8183fe 100644
--- a/frontend-modern/src/components/Settings/__tests__/UserAccessReaderLifetime.test.tsx
+++ b/frontend-modern/src/components/Settings/__tests__/UserAccessReaderLifetime.test.tsx
@@ -1,6 +1,7 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { cleanup, render, waitFor } from '@solidjs/testing-library';
import { createSignal } from 'solid-js';
+import { createStore } from 'solid-js/store';
import { eventBus } from '@/stores/events';
import { useUserAssignmentsPanelState } from '../useUserAssignmentsPanelState';
import type { Permission, Role, UserRoleAssignment } from '@/types/rbac';
@@ -377,4 +378,18 @@ describe('User Access reader lifetime', () => {
expect(state.canEdit()).toBe(true);
expect(state.filteredAssignments()).toEqual([]);
});
+ it('accepts the current datagrid store proxy without admitting an earlier-read proxy by principal alone', async () => {
+ const { state } = mount();
+ await loaded(state);
+ const [row] = createStore(alice);
+ await state.openManageAccess(row);
+ expect(state.showModal()).toBe(true);
+ state.closeModal();
+ mocks.getUsers.mockResolvedValueOnce([{ ...alice }]);
+ await state.loadData();
+ await state.openManageAccess(row);
+ state.openDeleteUser(row);
+ expect(state.showModal()).toBe(false);
+ expect(state.userPendingDeletion()).toBeNull();
+ });
});
diff --git a/frontend-modern/src/components/Settings/useUserAssignmentsPanelState.ts b/frontend-modern/src/components/Settings/useUserAssignmentsPanelState.ts
index 986db1de2f..464f8f3727 100644
--- a/frontend-modern/src/components/Settings/useUserAssignmentsPanelState.ts
+++ b/frontend-modern/src/components/Settings/useUserAssignmentsPanelState.ts
@@ -1,4 +1,5 @@
import { batch, createEffect, createMemo, createSignal, on, onCleanup } from 'solid-js';
+import { unwrap } from 'solid-js/store';
import { RBACAPI } from '@/api/rbac';
import { getOrgID } from '@/utils/apiClient';
import { eventBus } from '@/stores/events';
@@ -64,7 +65,8 @@ export function useUserAssignmentsPanelState(props: UserAssignmentsPanelProps =
!loadError() &&
!saving() &&
!deletingUser();
- const isCurrentUser = (user: UserRoleAssignment) => assignments().includes(user);
+ const isCurrentUser = (user: UserRoleAssignment) =>
+ assignments().some((current) => unwrap(current) === unwrap(user));
const requestOptions = (controller: AbortController) => ({
signal: controller.signal,
expectedOrgID: context.org,