Fix tests

Author: LauraBeatris

packages/clerk-js/src/test/fixtures.ts

@@ -92,6 +92,9 @@ const createBaseOrganizationSettings = (): OrganizationSettingsJSON => {
     slug: {
       disabled: true,
     },
+    organization_creation_defaults: {
+      enabled: false,
+    },
   } as unknown as OrganizationSettingsJSON;
 };
 

packages/clerk-js/src/ui/components/SessionTasks/tasks/TaskChooseOrganization/CreateOrganizationScreen.tsx

@@ -22,7 +22,7 @@ import { OrganizationCreationDefaultsAlert } from './OrganizationCreationDefault
 
 type CreateOrganizationScreenProps = {
   onCancel?: () => void;
-  organizationCreationDefaults?: OrganizationCreationDefaultsResource;
+  organizationCreationDefaults?: OrganizationCreationDefaultsResource | null;
 };
 
 export const CreateOrganizationScreen = (props: CreateOrganizationScreenProps) => {

packages/clerk-js/src/ui/components/SessionTasks/tasks/TaskChooseOrganization/__tests__/TaskChooseOrganization.test.tsx

@@ -349,6 +349,7 @@ describe('TaskChooseOrganization', () => {
       it('prefills create organization form with defaults', async () => {
         const { wrapper, fixtures } = await createFixtures(f => {
           f.withOrganizations();
+          f.withOrganizationSlug(true);
           f.withForceOrganizationSelection();
           f.withOrganizationCreationDefaults(true);
           f.withUser({
@@ -368,10 +369,10 @@ describe('TaskChooseOrganization', () => {
           }),
         );
 
-        const { findByText } = render(<TaskChooseOrganization />, { wrapper });
+        const { findByRole } = render(<TaskChooseOrganization />, { wrapper });
 
-        expect(await findByText('Test Org')).toBeInTheDocument();
-        expect(await findByText('test-org')).toBeInTheDocument();
+        expect(await findByRole('textbox', { name: /name/i })).toHaveValue('Test Org');
+        expect(await findByRole('textbox', { name: /slug/i })).toHaveValue('test-org');
       });
     });
 

packages/clerk-js/src/ui/components/SessionTasks/tasks/TaskChooseOrganization/index.tsx

@@ -1,11 +1,13 @@
 import { useClerk, useSession, useUser } from '@clerk/shared/react';
+import type { OrganizationCreationDefaultsResource } from '@clerk/shared/types';
 import { useState } from 'react';
 
-import { useSignOutContext, withCoreSessionSwitchGuard } from '@/ui/contexts';
+import { useEnvironment, useSignOutContext, withCoreSessionSwitchGuard } from '@/ui/contexts';
 import { descriptors, Flex, Flow, localizationKeys, Spinner } from '@/ui/customizables';
 import { Card } from '@/ui/elements/Card';
 import { withCardStateProvider } from '@/ui/elements/contexts';
 import { Header } from '@/ui/elements/Header';
+import { useFetch } from '@/ui/hooks';
 import { useMultipleSessions } from '@/ui/hooks/useMultipleSessions';
 import { useOrganizationListInView } from '@/ui/hooks/useOrganizationListInView';
 
@@ -16,8 +18,17 @@ import { CreateOrganizationScreen } from './CreateOrganizationScreen';
 const TaskChooseOrganizationInternal = () => {
   const { user } = useUser();
   const { userMemberships, userSuggestions, userInvitations } = useOrganizationListInView();
+  const { organizationSettings } = useEnvironment();
+  const organizationCreationDefaults = useFetch(
+    organizationSettings.organizationCreationDefaults?.enabled ? user?.getOrganizationCreationDefaults : undefined,
+    'organization-creation-defaults',
+  );
 
-  const isLoading = userMemberships?.isLoading || userInvitations?.isLoading || userSuggestions?.isLoading;
+  const isLoading =
+    userMemberships?.isLoading ||
+    userInvitations?.isLoading ||
+    userSuggestions?.isLoading ||
+    organizationCreationDefaults?.isLoading;
   const hasExistingResources = !!(userMemberships?.count || userInvitations?.count || userSuggestions?.count);
   const isOrganizationCreationDisabled = !isLoading && !user?.createOrganizationEnabled && !hasExistingResources;
 
@@ -47,7 +58,10 @@ const TaskChooseOrganizationInternal = () => {
                 />
               </Flex>
             ) : (
-              <TaskChooseOrganizationFlows initialFlow={hasExistingResources ? 'choose' : 'create'} />
+              <TaskChooseOrganizationFlows
+                initialFlow={hasExistingResources ? 'choose' : 'create'}
+                organizationCreationDefaults={organizationCreationDefaults.data}
+              />
             )}
           </Card.Content>
 
@@ -103,6 +117,7 @@ const TaskChooseOrganizationCardFooter = () => {
 
 type TaskChooseOrganizationFlowsProps = {
   initialFlow: 'create' | 'choose';
+  organizationCreationDefaults?: OrganizationCreationDefaultsResource | null;
 };
 
 const TaskChooseOrganizationFlows = withCardStateProvider((props: TaskChooseOrganizationFlowsProps) => {
@@ -112,6 +127,7 @@ const TaskChooseOrganizationFlows = withCardStateProvider((props: TaskChooseOrga
     return (
       <CreateOrganizationScreen
         onCancel={props.initialFlow === 'choose' ? () => setCurrentFlow('choose') : undefined}
+        organizationCreationDefaults={props.organizationCreationDefaults}
       />
     );
   }

packages/shared/src/types/organizationSettings.ts

@@ -40,5 +40,8 @@ export interface OrganizationSettingsResource extends ClerkResource {
   slug: {
     disabled: boolean;
   };
+  organizationCreationDefaults: {
+    enabled: boolean;
+  };
   __internal_toSnapshot: () => OrganizationSettingsJSONSnapshot;
 }