Skip to content

Commit e4b18a9

Browse files
committed
Merge remote-tracking branch 'origin/main' into wt-9962
# Conflicts: # packages/expo-native-components/android/src/main/java/expo/modules/clerk/ClerkExpoModule.kt # packages/expo-native-components/ios/ClerkExpoModule.swift # packages/expo/src/specs/NativeClerkModule.android.ts # packages/expo/src/specs/NativeClerkModule.ts # packages/expo/src/utils/native-module.ts
2 parents 46ebdcc + 8578f30 commit e4b18a9

22 files changed

Lines changed: 166 additions & 36 deletions
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/ui': patch
3+
---
4+
5+
Fix `<OrganizationProfile />` Security page showing Directory Sync and SSO setup actions to organization admins when the organization isn't allowed to set up enterprise SSO and Directory Sync. Those organizations now see their enterprise connections read-only, alongside the SSO bypass section.

‎integration/tests/composed-components.test.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,9 @@ test.describe('composed OrganizationProfile exports @generic', () => {
463463
// the composed counterpart to the security tab (there are no composable sub-sections here).
464464
await expect(u.page.getByRole('heading', { name: /^security$/i })).toBeVisible();
465465
await expect(u.page.getByText(/^SSO$/)).toBeVisible();
466-
await expect(u.page.locator('.cl-profileSection__sso').getByRole('button', { name: /^configure$/i })).toBeVisible();
466+
await expect(u.page.locator('.cl-profileSection__sso')).toBeVisible();
467+
await expect(u.page.locator('.cl-profileSection__sso').getByRole('button', { name: /^configure$/i })).toHaveCount(
468+
0,
469+
);
467470
});
468471
});

‎packages/mosaic/src/features/organization-profile/organization-profile-members-panel/__tests__/members-table-tab.controller.test.tsx‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@ describe('members table roles', () => {
2424
it('holds role editing until roles arrive and uses server labels', async () => {
2525
const model = createModel();
2626
const { result, rerender } = renderHook(({ roles }) => useMembersTableController(model, roles), {
27-
initialProps: { roles: null as MembersRoles | null },
27+
initialProps: { roles: { roles: null as MembersRoles | null, isLoading: true } },
2828
});
2929
expect(result.current.onChangeRole).toBeUndefined();
30+
expect(result.current.isLoading).toBe(true);
3031

3132
const roles = { roles: [{ key: 'org:reader', name: 'Reader' }], hasRoleSetMigration: false };
32-
rerender({ roles });
33+
rerender({ roles: { roles, isLoading: false } });
34+
expect(result.current.isLoading).toBe(false);
3335
expect(result.current.roles).toEqual([{ value: 'org:reader', label: 'Reader' }]);
3436

3537
await act(() => Promise.resolve(result.current.onChangeRole?.('member_1', 'org:reader')));
@@ -38,7 +40,7 @@ describe('members table roles', () => {
3840

3941
it('keeps migration roles visible but prevents role changes', () => {
4042
const roles = { roles: [{ key: 'org:admin', name: 'Admin' }], hasRoleSetMigration: true };
41-
const { result } = renderHook(() => useMembersTableController(createModel(), roles));
43+
const { result } = renderHook(() => useMembersTableController(createModel(), { roles, isLoading: false }));
4244
expect(result.current.roles).toHaveLength(1);
4345
expect(result.current.hasRoleSetMigration).toBe(true);
4446
expect(result.current.onChangeRole).toBeUndefined();

‎packages/mosaic/src/features/organization-profile/organization-profile-members-panel/__tests__/organization-profile-invitations.feature.test.tsx‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,24 @@ describe('inviting members', () => {
551551
roles.release();
552552
});
553553

554-
it('does not offer Invite when roles fail to load', async () => {
554+
it('offers Invite as unavailable until roles load', async () => {
555+
serveInvite({ permissions: ['org:sys_memberships:manage'] });
556+
const roles = holdRequests('get', '/v1/organizations/:organizationId/roles');
557+
await renderWithClerk(<OrganizationProfileMembersPanel />);
558+
const user = userEvent.setup();
559+
expect(await screen.findByText('[email protected]')).toBeVisible();
560+
await waitFor(() => expect(roles.requests).toHaveLength(1));
561+
const invite = screen.getByRole('button', { name: 'Invite' });
562+
expect(invite).toHaveAttribute('aria-disabled', 'true');
563+
await user.click(invite);
564+
expect(screen.queryByRole('dialog', { name: 'Invite members' })).toBeNull();
565+
roles.release();
566+
await waitFor(() => expect(screen.getByRole('button', { name: 'Invite' })).not.toHaveAttribute('aria-disabled'));
567+
await user.click(screen.getByRole('button', { name: 'Invite' }));
568+
expect(await screen.findByRole('dialog', { name: 'Invite members' })).toBeVisible();
569+
});
570+
571+
it('keeps Invite unavailable when roles fail to load', async () => {
555572
serveInvite();
556573
const roles = holdRequests('get', '/v1/organizations/:organizationId/roles');
557574
await renderWithClerk(<OrganizationProfileMembersPanel />);
@@ -560,7 +577,7 @@ describe('inviting members', () => {
560577
await userEvent.setup().click(await screen.findByRole('tab', { name: 'Invitations' }));
561578
expect(await screen.findByText('[email protected]')).toBeVisible();
562579
await waitFor(() => expect(screen.queryByRole('button', { name: 'Manage [email protected]' })).toBeVisible());
563-
expect(screen.queryByRole('button', { name: 'Invite' })).toBeNull();
580+
expect(screen.getByRole('button', { name: 'Invite' })).toHaveAttribute('aria-disabled', 'true');
564581
});
565582

566583
it('replaces a pending invitation for the same address', async () => {

‎packages/mosaic/src/features/organization-profile/organization-profile-members-panel/__tests__/organization-profile-members-panel.controller.test.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ describe('members panel role loading', () => {
1212
const { result, rerender } = renderHook(() => useMembersPanelRolesController(loadRoles));
1313

1414
expect(loadRoles).toHaveBeenCalledTimes(1);
15-
expect(result.current).toBeNull();
15+
expect(result.current).toEqual({ roles: null, isLoading: true });
1616
rerender();
1717
expect(loadRoles).toHaveBeenCalledTimes(1);
1818

1919
const roles = { roles: [{ key: 'org:reader', name: 'Reader' }], hasRoleSetMigration: false };
2020
await act(() => Promise.resolve(request.resolve(roles)));
21-
expect(result.current).toEqual(roles);
21+
expect(result.current).toEqual({ roles, isLoading: false });
2222
});
2323

2424
it('stays unavailable after a failed role load', async () => {
@@ -27,13 +27,13 @@ describe('members panel role loading', () => {
2727
const { result, rerender } = renderHook(() => useMembersPanelRolesController(loadRoles));
2828

2929
await act(() => Promise.resolve(request.reject(new Error('failed'))));
30-
expect(result.current).toBeNull();
30+
expect(result.current).toEqual({ roles: null, isLoading: false });
3131
rerender();
3232
expect(loadRoles).toHaveBeenCalledTimes(1);
3333
});
3434

3535
it('does not load without a loader', () => {
3636
const { result } = renderHook(() => useMembersPanelRolesController(undefined));
37-
expect(result.current).toBeNull();
37+
expect(result.current).toEqual({ roles: null, isLoading: false });
3838
});
3939
});

‎packages/mosaic/src/features/organization-profile/organization-profile-members-panel/__tests__/organization-profile-members-panel.feature.test.tsx‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,16 +212,35 @@ describe('OrganizationProfileMembersPanel', () => {
212212
expect(await screen.findByRole('combobox', { name: /^Change role for Bob Smith/ })).toBeVisible();
213213
});
214214

215-
it('keeps members visible and role editing unavailable while roles load', async () => {
215+
it('keeps the members table loading until roles load', async () => {
216216
serve(['org:sys_memberships:read', 'org:sys_memberships:manage']);
217217
const roles = holdRequests('get', '/v1/organizations/:organizationId/roles');
218-
await renderWithClerk(<OrganizationProfileMembersPanel />);
219-
expect(await screen.findByText('Bob Smith')).toBeVisible();
218+
const { clerk, rerender } = await renderWithClerk(<div />);
219+
const activeOrganization = clerk.organization;
220+
if (!activeOrganization) {
221+
throw new Error('Expected an active organization');
222+
}
223+
const getMemberships = vi.spyOn(activeOrganization, 'getMemberships');
224+
rerender(<OrganizationProfileMembersPanel />);
225+
await waitFor(() => expect(getMemberships).toHaveBeenCalled());
226+
await act(async () => {
227+
await getMemberships.mock.results[0]?.value;
228+
});
220229
await waitFor(() => expect(roles.requests).toHaveLength(1));
221-
expect(screen.queryByRole('combobox', { name: /^Change role for Bob Smith/ })).toBeNull();
222-
expect(screen.getByRole('button', { name: 'Manage Bob Smith' })).toBeVisible();
230+
expect(screen.getByRole('table', { name: 'Members' })).toHaveAttribute('aria-busy', 'true');
231+
expect(screen.queryByText('Bob Smith')).toBeNull();
223232
roles.release();
224233
expect(await screen.findByRole('combobox', { name: /^Change role for Bob Smith/ })).toBeVisible();
234+
expect(screen.getByRole('table', { name: 'Members' })).toHaveAttribute('aria-busy', 'false');
235+
});
236+
237+
it('shows members to a reader without waiting for roles', async () => {
238+
serve();
239+
const roles = holdRequests('get', '/v1/organizations/:organizationId/roles');
240+
await renderWithClerk(<OrganizationProfileMembersPanel />);
241+
expect(await screen.findByText('Bob Smith')).toBeVisible();
242+
expect(roles.requests).toHaveLength(0);
243+
roles.release();
225244
});
226245

227246
it('shows the membership role label when the role is absent from available options', async () => {

‎packages/mosaic/src/features/organization-profile/organization-profile-members-panel/invitations-table-tab.types.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export interface InvitationsTableTabViewProps {
2424
inviteButtonRef?: Ref<HTMLButtonElement>;
2525
tableContainerRef?: Ref<HTMLDivElement>;
2626
onInvite?: MouseEventHandler<HTMLButtonElement>;
27+
isInviteDisabled?: boolean;
2728
registerTrigger: (id: string) => Ref<HTMLButtonElement>;
2829
revoke?: ConfirmController<OrganizationProfileInvitation>;
2930
finalFocus?: DialogFocusTarget;

‎packages/mosaic/src/features/organization-profile/organization-profile-members-panel/invitations-table-tab.view.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export function InvitationsTableTabView({
2525
inviteButtonRef,
2626
tableContainerRef,
2727
onInvite,
28+
isInviteDisabled,
2829
registerTrigger,
2930
revoke,
3031
finalFocus,
@@ -64,6 +65,8 @@ export function InvitationsTableTabView({
6465
<Table.Toolbar>
6566
<Button
6667
ref={inviteButtonRef}
68+
disabled={isInviteDisabled}
69+
focusableWhenDisabled
6770
onClick={onInvite}
6871
>
6972
<Icon name='plus' />

‎packages/mosaic/src/features/organization-profile/organization-profile-members-panel/members-table-tab.controller.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@ import { usePendingAction } from '../../../hooks/use-pending-action';
77
import { useLocale, useMessages } from '../../../localization';
88
import { formatDate } from '../../../utils/format-date';
99
import type { useMembersTableModel } from './members-table-tab.model';
10-
import type { MembersRoles, OrganizationProfileMember } from './members-table-tab.types';
10+
import type { MembersRolesState, OrganizationProfileMember } from './members-table-tab.types';
1111
import { canManageMember } from './members-table-tab.utils';
1212

13-
export function useMembersTableController(model: ReturnType<typeof useMembersTableModel>, roles: MembersRoles | null) {
13+
export function useMembersTableController(
14+
model: ReturnType<typeof useMembersTableModel>,
15+
{ roles, isLoading: isLoadingRoles }: MembersRolesState,
16+
) {
1417
const locale = useLocale();
1518
const messages = useMessages('membersTableTab');
1619
const roleNames = useMessages('roles');
@@ -39,7 +42,7 @@ export function useMembersTableController(model: ReturnType<typeof useMembersTab
3942
totalCount: model.totalCount,
4043
page: model.page,
4144
onPageChange: model.fetchPage,
42-
isLoading: model.isLoading,
45+
isLoading: model.isLoading || isLoadingRoles,
4346
isFetching: model.isFetching,
4447
isError: model.isError,
4548
onRetry: model.retry,

0 commit comments

Comments
 (0)