fix: pass passwordComplexity as an arg

Author: jorgemoya

core/app/[locale]/(default)/(auth)/register/_actions/register-customer.ts

@@ -6,7 +6,12 @@ import { parseWithZod } from '@conform-to/zod';
 import { getLocale, getTranslations } from 'next-intl/server';
 import { z } from 'zod';
 
-import { Field, FieldGroup, schema } from '@/vibes/soul/form/dynamic-form/schema';
+import {
+  Field,
+  FieldGroup,
+  PasswordComplexitySettings,
+  schema,
+} from '@/vibes/soul/form/dynamic-form/schema';
 import { signIn } from '~/auth';
 import { client } from '~/client';
 import { graphql, VariablesOf } from '~/client/graphql';
@@ -335,10 +340,12 @@ function parseRegisterCustomerInput(
 }
 
 export async function registerCustomer<F extends Field>(
-  fields: Array<F | FieldGroup<F>>,
-  prevState: {
+  {
+    fields,
+    passwordComplexity,
+  }: { fields: Array<F | FieldGroup<F>>; passwordComplexity?: PasswordComplexitySettings | null },
+  _prevState: {
     lastResult: SubmissionResult | null;
-    passwordComplexity?: Parameters<typeof schema>[1];
   },
   formData: FormData,
 ) {
@@ -347,13 +354,12 @@ export async function registerCustomer<F extends Field>(
   const cartId = await getCartId();
 
   const submission = parseWithZod(formData, {
-    schema: schema(fields, prevState.passwordComplexity),
+    schema: schema(fields, passwordComplexity),
   });
 
   if (submission.status !== 'success') {
     return {
       lastResult: submission.reply(),
-      passwordComplexity: prevState.passwordComplexity,
     };
   }
 
@@ -374,7 +380,6 @@ export async function registerCustomer<F extends Field>(
         lastResult: submission.reply({
           formErrors: response.data.customer.registerCustomer.errors.map((error) => error.message),
         }),
-        passwordComplexity: prevState.passwordComplexity,
       };
     }
 
@@ -395,20 +400,17 @@ export async function registerCustomer<F extends Field>(
         lastResult: submission.reply({
           formErrors: error.errors.map(({ message }) => message),
         }),
-        passwordComplexity: prevState.passwordComplexity,
       };
     }
 
     if (error instanceof Error) {
       return {
         lastResult: submission.reply({ formErrors: [error.message] }),
-        passwordComplexity: prevState.passwordComplexity,
       };
     }
 
     return {
       lastResult: submission.reply({ formErrors: [t('somethingWentWrong')] }),
-      passwordComplexity: prevState.passwordComplexity,
     };
   }
 

core/app/[locale]/(default)/gift-certificates/purchase/_actions/add-to-cart.tsx

@@ -7,7 +7,6 @@ import { getFormatter, getTranslations } from 'next-intl/server';
 import { ReactNode } from 'react';
 import { z } from 'zod';
 
-import { Field, FieldGroup } from '@/vibes/soul/form/dynamic-form/schema';
 import { client } from '~/client';
 import { graphql, ResultOf } from '~/client/graphql';
 import { ExistingResultType } from '~/client/util';
@@ -100,7 +99,7 @@ const schema = (
 };
 
 export async function addGiftCertificateToCart(
-  _fields: Array<Field | FieldGroup<Field>>,
+  _args: unknown,
   _prevState: State,
   formData: FormData,
 ): Promise<State> {

core/app/[locale]/(default)/webpages/[id]/contact/_actions/submit-contact-form.ts

@@ -58,7 +58,7 @@ function parseContactFormInput(
 }
 
 export async function submitContactForm<F extends Field>(
-  fields: Array<F | FieldGroup<F>>,
+  { fields }: { fields: Array<F | FieldGroup<F>> },
   _prevState: { lastResult: SubmissionResult | null },
   formData: FormData,
 ) {

core/vibes/soul/form/dynamic-form/index.tsx

@@ -40,15 +40,17 @@ import { Field, FieldGroup, PasswordComplexitySettings, schema } from './schema'
 import { removeOptionsFromFields } from './utils';
 
 type Action<F extends Field, S, P> = (
-  fields: Array<F | FieldGroup<F>>,
+  {
+    fields,
+    passwordComplexity,
+  }: { fields: Array<F | FieldGroup<F>>; passwordComplexity?: PasswordComplexitySettings | null },
   state: Awaited<S>,
   payload: P,
 ) => S | Promise<S>;
 
 interface State {
   lastResult: SubmissionResult | null;
   successMessage?: ReactNode;
-  passwordComplexity?: PasswordComplexitySettings | null;
 }
 
 export type DynamicFormAction<F extends Field> = Action<F, State, FormData>;
@@ -78,21 +80,17 @@ export function DynamicForm<F extends Field>({
   onCancel,
   onChange,
   onSuccess,
-  passwordComplexity: defaultPasswordComplexity,
+  passwordComplexity,
 }: DynamicFormProps<F>) {
   // Remove options from fields before passing to action to reduce payload size
   // Options are only needed for rendering, not for processing form submissions
   // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
   const fieldsWithoutOptions = removeOptionsFromFields(fields) as Array<F | FieldGroup<F>>;
-  const actionWithFields = action.bind(null, fieldsWithoutOptions);
+  const actionWithFields = action.bind(null, { fields: fieldsWithoutOptions, passwordComplexity });
 
-  const [{ lastResult, successMessage, passwordComplexity }, formAction] = useActionState(
-    actionWithFields,
-    {
-      lastResult: null,
-      passwordComplexity: defaultPasswordComplexity,
-    },
-  );
+  const [{ lastResult, successMessage }, formAction] = useActionState(actionWithFields, {
+    lastResult: null,
+  });
 
   const dynamicSchema = schema(fields, passwordComplexity);
   const defaultValue = fields

core/vibes/soul/sections/address-list-section/index.tsx

@@ -180,7 +180,7 @@ export function AddressListSection<A extends Address, F extends Field>({
           <div className="border-b border-[var(--address-list-section-border,hsl(var(--contrast-100)))] pb-6 pt-5">
             <div className="w-[480px] space-y-4">
               <DynamicForm
-                action={(_fields, _prevState, formData) => {
+                action={(_args, _prevState, formData) => {
                   setShowNewAddressForm(false);
 
                   startTransition(() => {
@@ -239,7 +239,7 @@ export function AddressListSection<A extends Address, F extends Field>({
                 {activeAddressIds.includes(address.id) ? (
                   <div className="w-[480px] space-y-4">
                     <DynamicForm
-                      action={(_fields, _prevState, formData) => {
+                      action={(_args, _prevState, formData) => {
                         setActiveAddressIds((prev) => prev.filter((id) => id !== address.id));
 
                         startTransition(() => {