Update entity to include form defaults

Author: LauraBeatris

packages/clerk-js/src/core/resources/OrganizationCreationDefaults.ts

@@ -1,4 +1,6 @@
 import type {
+  OrganizationCreationAdvisorySeverity,
+  OrganizationCreationAdvisoryType,
   OrganizationCreationDefaultsJSON,
   OrganizationCreationDefaultsJSONSnapshot,
   OrganizationCreationDefaultsResource,
@@ -7,10 +9,17 @@ import type {
 import { BaseResource } from './internal';
 
 export class OrganizationCreationDefaults extends BaseResource implements OrganizationCreationDefaultsResource {
-  creationAdvisory: {
-    type: 'existing_org_with_domain';
-    severity: 'warning';
+  advisory: {
+    type: OrganizationCreationAdvisoryType;
+    severity: OrganizationCreationAdvisorySeverity;
   } | null = null;
+  form: {
+    name: string;
+    slug: string;
+  } = {
+    name: '',
+    slug: '',
+  };
 
   public constructor(data: OrganizationCreationDefaultsJSON | OrganizationCreationDefaultsJSONSnapshot | null = null) {
     super();
@@ -22,8 +31,13 @@ export class OrganizationCreationDefaults extends BaseResource implements Organi
       return this;
     }
 
-    if (data.creation_advisory) {
-      this.creationAdvisory = this.withDefault(data.creation_advisory, this.creationAdvisory ?? null);
+    if (data.advisory) {
+      this.advisory = this.withDefault(data.advisory, this.advisory ?? null);
+    }
+
+    if (data.form) {
+      this.form.name = this.withDefault(data.form.name, this.form.name);
+      this.form.slug = this.withDefault(data.form.slug, this.form.slug);
     }
 
     return this;
@@ -41,10 +55,10 @@ export class OrganizationCreationDefaults extends BaseResource implements Organi
 
   public __internal_toSnapshot(): OrganizationCreationDefaultsJSONSnapshot {
     return {
-      creation_advisory: this.creationAdvisory
+      advisory: this.advisory
         ? {
-            type: this.creationAdvisory.type,
-            severity: this.creationAdvisory.severity,
+            type: this.advisory.type,
+            severity: this.advisory.severity,
           }
         : null,
     } as unknown as OrganizationCreationDefaultsJSONSnapshot;

packages/shared/src/types/organizationCreationDefaults.ts

@@ -6,15 +6,23 @@ export type OrganizationCreationAdvisoryType = 'existing_org_with_domain';
 export type OrganizationCreationAdvisorySeverity = 'warning';
 
 export interface OrganizationCreationDefaultsJSON extends ClerkResourceJSON {
-  creation_advisory: {
+  advisory: {
     type: OrganizationCreationAdvisoryType;
     severity: OrganizationCreationAdvisorySeverity;
   } | null;
+  form: {
+    name: string;
+    slug: string;
+  };
 }
 
 export interface OrganizationCreationDefaultsResource extends ClerkResource {
-  creationAdvisory: {
+  advisory: {
     type: OrganizationCreationAdvisoryType;
     severity: OrganizationCreationAdvisorySeverity;
   } | null;
+  form: {
+    name: string;
+    slug: string;
+  };
 }

packages/ui/src/components/CreateOrganization/CreateOrganizationForm.tsx

@@ -36,6 +36,7 @@ type CreateOrganizationFormProps = {
   };
 };
 
+// TODO -> Prefill form with organization creation defaults
 export const CreateOrganizationForm = withCardStateProvider((props: CreateOrganizationFormProps) => {
   const card = useCardState();
   const wizard = useWizard({ onNextStep: () => card.setError(undefined) });

packages/ui/src/components/SessionTasks/tasks/TaskChooseOrganization/CreateOrganizationScreen.tsx

@@ -4,7 +4,6 @@ import type { CreateOrganizationParams } from '@clerk/shared/types';
 import { useEnvironment } from '@/ui/contexts';
 import { useSessionTasksContext, useTaskChooseOrganizationContext } from '@/ui/contexts/components/SessionTasks';
 import { localizationKeys } from '@/ui/customizables';
-// or from '@/ui/elements'
 import { useCardState } from '@/ui/elements/contexts';
 import { Form } from '@/ui/elements/Form';
 import { FormButtonContainer } from '@/ui/elements/FormButtons';
@@ -19,7 +18,7 @@ import { OrganizationCreationDefaultsAlert } from './OrganizationCreationDefault
 
 // TODO: Replace with actual API call to OrganizationCreationDefaults.retrieve()
 const organizationCreationDefaults = {
-  creationAdvisory: {
+  advisory: {
     type: 'existing_org_with_domain' as const,
     severity: 'warning' as const,
   },

packages/ui/src/components/SessionTasks/tasks/TaskChooseOrganization/OrganizationCreationDefaultsAlert.tsx

@@ -1,21 +1,21 @@
 import type { OrganizationCreationAdvisoryType, OrganizationCreationDefaultsResource } from '@clerk/shared/types';
 
 import { type LocalizationKey, localizationKeys } from '@/localization';
-import { Alert } from '@/ui/elements/Alert'; // or from '@/ui/elements'
+import { Alert } from '@/ui/elements/Alert';
 
 export function OrganizationCreationDefaultsAlert({
   organizationCreationDefaults,
 }: {
   organizationCreationDefaults: OrganizationCreationDefaultsResource;
 }) {
-  if (!organizationCreationDefaults.creationAdvisory) {
+  if (!organizationCreationDefaults.advisory) {
     return null;
   }
 
   return (
     <Alert
       variant='warning'
-      title={advisoryTypeToLocalizationKey[organizationCreationDefaults.creationAdvisory.type]}
+      title={advisoryTypeToLocalizationKey[organizationCreationDefaults.advisory.type]}
     />
   );
 }