Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions frontend/src/__tests__/users.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2483,3 +2483,58 @@ describe('group assignment UX (issue #998)', () => {
});
});
});

// ============================================================================
// GROUP UNION HINT (issue #1001)
// ============================================================================
describe('group union permission hint (issue #1001)', () => {
const mockUsers = [
{ id: '1', email: 'alice@test.com', groups: ['g1'], mfa_enabled: false },
];
const mockGroups = [
{ id: 'g1', name: 'Admins', permissions: [], description: '', allowed_accounts: [] },
{ id: 'g2', name: 'Viewers', permissions: [], description: '', allowed_accounts: [] },
];

beforeEach(() => {
document.body.innerHTML = `
<div id="users-list"></div>
<div id="user-stats"></div>
<div id="bulk-actions-bar" class="hidden">
<span id="selected-count">0</span>
</div>
`;
userState.setAllUsers(mockUsers as any);
userState.setFilteredUsers(mockUsers as any);
userState.setAvailableGroups(mockGroups as any);
userState.clearSelectedUserIds();
jest.clearAllMocks();
});

it('renders the union hint in the group membership expand panel', () => {
userList.renderUsers(mockUsers as any);

const expandBtn = document.querySelector<HTMLButtonElement>(
'.user-expand-btn[data-user-id="1"]',
);
expect(expandBtn).toBeTruthy();
expandBtn!.click();

const panel = document.querySelector('.user-expand-panel[data-user-id="1"]');
expect(panel).toBeTruthy();
expect(panel!.textContent).toContain('combined (union) of all selected groups');
});

it('hint appears in expand-panel-groups section, before the checkbox list', () => {
userList.renderUsers(mockUsers as any);

const expandBtn = document.querySelector<HTMLButtonElement>(
'.user-expand-btn[data-user-id="1"]',
);
expandBtn!.click();

const groupsSection = document.querySelector('.expand-panel-groups');
expect(groupsSection).toBeTruthy();
expect(groupsSection!.textContent).toContain('combined (union) of all selected groups');
});
});
1 change: 1 addition & 0 deletions frontend/src/users/userList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ function renderUserExpandPanel(user: APIUser): string {
<div class="expand-panel-body">
<div class="expand-panel-groups">
<h5>Group Membership</h5>
<p class="text-muted">A user receives the combined (union) of all selected groups&#8217; permissions, so adding a lower-privilege group alongside a higher one has no effect.</p>
${availableGroups.length === 0
? '<p class="text-muted">No groups defined yet.</p>'
: `<div class="group-checkbox-list">
Expand Down
Loading