Skip to content

Commit 7609058

Browse files
fix: minor fixes applied (#139)
* fix: minor fixes applied * fix: tests added for missing parts in audit user
1 parent b10a18f commit 7609058

3 files changed

Lines changed: 75 additions & 2 deletions

File tree

src/authz-module/audit-user/index.test.tsx

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,4 +496,75 @@ describe('AuditUserPage', () => {
496496
expect(screen.getByText(/this is the user's only role/i)).toBeInTheDocument();
497497
});
498498
});
499+
500+
it('handles undefined data from useUserAssignedRoles with default destructuring', async () => {
501+
(useUserAccount as jest.Mock).mockReturnValue({
502+
data: mockUser,
503+
isLoading: false,
504+
isError: false,
505+
error: null,
506+
});
507+
508+
(useUserAssignedRoles as jest.Mock).mockReturnValue({
509+
data: undefined, // This triggers the default destructuring assignment
510+
isLoading: false,
511+
isError: false,
512+
error: null,
513+
});
514+
515+
renderWithRouter();
516+
517+
await waitFor(() => {
518+
expect(screen.getByText('johndoe', { selector: 'li[aria-current="page"]' })).toBeInTheDocument();
519+
expect(screen.getByRole('table')).toBeInTheDocument();
520+
});
521+
});
522+
523+
it('navigates to home when user not found and isErrorUser is false', async () => {
524+
(useUserAccount as jest.Mock).mockReturnValue({
525+
data: null,
526+
isLoading: false,
527+
isError: false,
528+
error: null,
529+
});
530+
531+
(useUserAssignedRoles as jest.Mock).mockReturnValue({
532+
data: mockAssignments,
533+
isLoading: false,
534+
isError: false,
535+
error: null,
536+
});
537+
538+
renderWithRouter();
539+
540+
await waitFor(() => {
541+
expect(screen.getByText('Home Page')).toBeInTheDocument();
542+
});
543+
});
544+
545+
it('navigates to home when user not found and error is 404', async () => {
546+
(useUserAccount as jest.Mock).mockReturnValue({
547+
data: null,
548+
isLoading: false,
549+
isError: true,
550+
error: {
551+
customAttributes: {
552+
httpErrorStatus: 404,
553+
},
554+
},
555+
});
556+
557+
(useUserAssignedRoles as jest.Mock).mockReturnValue({
558+
data: mockAssignments,
559+
isLoading: false,
560+
isError: false,
561+
error: null,
562+
});
563+
564+
renderWithRouter();
565+
566+
await waitFor(() => {
567+
expect(screen.getByText('Home Page')).toBeInTheDocument();
568+
});
569+
});
499570
});

src/authz-module/audit-user/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ const AuditUserPage = () => {
4242
isLoading: isLoadingUser, data: user, isError: isErrorUser, error: errorUser,
4343
} = useUserAccount(username);
4444
const { querySettings, handleTableFetch } = useQuerySettings();
45-
const { isLoading: isLoadingUserAssignments, data: { results: userAssignments, count } = { results: [], count: 0 } } = useUserAssignedRoles(username ?? '', querySettings);
45+
const {
46+
isLoading: isLoadingUserAssignments, data: { results: userAssignments, count } = { results: [], count: 0 },
47+
} = useUserAssignedRoles(username, querySettings);
4648
const [roleToDelete, setRoleToDelete] = useState<RoleToDelete | null>(null);
4749
const [showConfirmDeletionModal, setShowConfirmDeletionModal] = useState(false);
4850
const {

src/authz-module/role-assignation-wizard/components/SelectUsersAndRoleStep.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ const SelectUsersAndRoleStep = ({
107107
</Tooltip>
108108
)}
109109
>
110-
<div>{radioContent}</div>
110+
<div tabIndex={0} role="button" aria-disabled="true" aria-describedby={`tooltip-disabled-${role.role}`}>{radioContent}</div>
111111
</OverlayTrigger>
112112
);
113113
}

0 commit comments

Comments
 (0)