@redneckz/wildless-cms-uni-blocks 0.14.739 → 0.14.741

package/mobile/src/components/CreditForm/CreditFormStep.tsx

@@ -6,7 +6,6 @@ import { type SectionsRetailProps } from '../../model/InputSectionsType';
 import type { LeadFormState } from '../../services/retail/model/LeadFormState';
 import { calculateInputs } from '../../services/retail/utils/calculateInputs';
 import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
-import { CreditFormStatusTracker } from './CreditFormStatusTracker';
 import { type ProgramsSourceProps } from './ProgramsSourceProps';
 import { renderStep } from './renderStep';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
@@ -15,7 +14,6 @@ import { useCreditFormAPI } from './useCreditFormAPI';
 export interface CreditFormStepProps {
   step: number;
   sections: SectionsRetailProps[];
-  isFormFinished?: boolean;
   programsSource?: ProgramsSourceProps;
   onNextStep: () => void;
   onPrevStep: () => void;
@@ -23,7 +21,7 @@ export interface CreditFormStepProps {
 }
 
 export const CreditFormStep = JSX<CreditFormStepProps>(
-  ({ step, sections, isFormFinished, programsSource, onPrevStep, onNextStep, onFinish }) => {
+  ({ step, sections, programsSource, onPrevStep, onNextStep, onFinish }) => {
     const { programId } = useRetailFormStore();
     const calcData = programsSource?.[programId ?? '']; // Need normalizator useForm, to be save defaultParams
 
@@ -50,9 +48,7 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
       onSubmit,
     });
 
-    return isFormFinished ? (
-      <CreditFormStatusTracker />
-    ) : (
+    return (
       <form onSubmit={handleSubmit} className="space-y-m">
         {renderStep({ sections, field, step, params: { calcData } })}
         <StepsNavigationButtons step={step} isSending={isSending} onPrevStep={onPrevStep} />

package/mobile/src/ui-kit/FormField/validators.ts

@@ -16,9 +16,7 @@ export const defaultSelectValidator = (errorMsg?: string) =>
   validator((_) => _?.key && _?.key !== '')(errorMsg ?? ERROR_MESSAGE);
 
 export const jobNumberValidator = (errorMsg?: string) =>
-  validator((_) => typeof _ === 'string' && _.length > 0 && _.length <= 2)(
-    errorMsg ?? ERROR_MESSAGE,
-  );
+  validator((_) => typeof _ === 'string' && /^[0-9]{1,2}$/g.test(_))(errorMsg ?? ERROR_MESSAGE);
 
 export const nameValidator = (errorMsg?: string) =>
   validator((_) => typeof _ === 'string' && _.length > 1 && isCyrillic(_))(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.739",
+  "version": "0.14.741",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/CreditCardForm/CreditCardForm.tsx

@@ -6,6 +6,7 @@ import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { type CreditCardFormContent } from './CreditCardFormContent';
 import { CreditCardFormProgress } from './CreditCardFormProgress';
+import { CreditCardFormStatusTracker } from './CreditCardFormStatusTracker';
 import { CreditCardFormStep } from './CreditCardFormStep';
 import { stepsSectionsMap } from './creditCardFormStepsData';
 
@@ -55,15 +56,18 @@ export const CreditCardForm = JSX<CreditCardFormWizardProps>(({ className, ...re
           <CreditCardFormProgress stepsTitles={TITLES} step={step} totalSteps={STEPS} />
         )}
         <div className="py-lg px-5xl mt-2xs bg-white col-span-12">
-          <CreditCardFormStep
-            key={String(step)}
-            step={step}
-            sections={sections}
-            isFormFinished={isFormFinished}
-            onNextStep={handleNextStep}
-            onPrevStep={handlePrevStep}
-            onFinish={handleFinish}
-          />
+          {isFormFinished ? (
+            <CreditCardFormStatusTracker />
+          ) : (
+            <CreditCardFormStep
+              key={String(step)}
+              step={step}
+              sections={sections}
+              onNextStep={handleNextStep}
+              onPrevStep={handlePrevStep}
+              onFinish={handleFinish}
+            />
+          )}
         </div>
       </div>
     </BlockWrapper>

package/src/components/CreditCardForm/CreditCardFormStep.tsx

@@ -5,7 +5,6 @@ import { type SectionsRetailProps } from '../../model/InputSectionsType';
 import { type LeadFormState } from '../../services/retail/model/LeadFormState';
 import { calculateInputs } from '../../services/retail/utils/calculateInputs';
 import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
-import { CreditCardFormStatusTracker } from './CreditCardFormStatusTracker';
 import { renderStep } from './renderStep';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
 import { useCreditCardFormAPI } from './useCreditCardFormAPI';
@@ -13,14 +12,13 @@ import { useCreditCardFormAPI } from './useCreditCardFormAPI';
 export interface CreditCardFormStepProps {
   step: number;
   sections: SectionsRetailProps[];
-  isFormFinished: boolean;
   onNextStep: () => void;
   onPrevStep: () => void;
   onFinish?: () => void;
 }
 
 export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
-  ({ step, sections, isFormFinished, onPrevStep, onNextStep, onFinish }) => {
+  ({ step, sections, onPrevStep, onNextStep, onFinish }) => {
     const inputs = useMemo(
       () => sections?.flatMap((_: SectionsRetailProps) => _?.inputs || []),
       [sections],
@@ -44,9 +42,7 @@ export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
       onSubmit,
     });
 
-    return isFormFinished ? (
-      <CreditCardFormStatusTracker />
-    ) : (
+    return (
       <form onSubmit={handleSubmit} className="space-y-m">
         {renderStep({ sections, field, step })}
         <StepsNavigationButtons isSending={isSending} step={step} onPrevStep={onPrevStep} />

package/src/components/CreditCardForm/useCreditCardFormAPI.tsx

@@ -63,10 +63,7 @@ export const useCreditCardFormAPI = ({
           resetForm(response);
         }
 
-        onNextStep();
-        if (isFinalStep) {
-          onFinish?.();
-        }
+        isFinalStep ? onFinish?.() : onNextStep();
       } catch (ex) {
         // Do nothing
       } finally {

package/src/components/CreditForm/CreditForm.tsx

@@ -7,6 +7,7 @@ import { UniBlock } from '../../UniBlock/UniBlock';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { type CreditFormContent } from './CreditFormContent';
 import { CreditFormProgress } from './CreditFormProgress';
+import { CreditFormStatusTracker } from './CreditFormStatusTracker';
 import { CreditFormStep } from './CreditFormStep';
 import { stepsSectionsMap } from './creditFormStepsData';
 import { type ProgramsSourceProps } from './ProgramsSourceProps';
@@ -60,16 +61,19 @@ export const CreditForm = UniBlock<CreditFormProps>(({ className, programsSource
           <CreditFormProgress stepsTitles={STEP_TITLES} step={step} totalSteps={STEPS} />
         )}
         <div className="py-lg px-5xl mt-2xs bg-white col-span-12">
-          <CreditFormStep
-            key={String(step)}
-            step={step}
-            sections={sections}
-            isFormFinished={isFormFinished}
-            programsSource={programsSource as ProgramsSourceProps}
-            onNextStep={handleNextStep}
-            onPrevStep={handlePrevStep}
-            onFinish={handleFinish}
-          />
+          {isFormFinished ? (
+            <CreditFormStatusTracker />
+          ) : (
+            <CreditFormStep
+              key={String(step)}
+              step={step}
+              sections={sections}
+              programsSource={programsSource as ProgramsSourceProps}
+              onNextStep={handleNextStep}
+              onPrevStep={handlePrevStep}
+              onFinish={handleFinish}
+            />
+          )}
         </div>
       </div>
     </BlockWrapper>

package/src/components/CreditForm/CreditFormStep.tsx

@@ -6,7 +6,6 @@ import { type SectionsRetailProps } from '../../model/InputSectionsType';
 import type { LeadFormState } from '../../services/retail/model/LeadFormState';
 import { calculateInputs } from '../../services/retail/utils/calculateInputs';
 import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
-import { CreditFormStatusTracker } from './CreditFormStatusTracker';
 import { type ProgramsSourceProps } from './ProgramsSourceProps';
 import { renderStep } from './renderStep';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
@@ -15,7 +14,6 @@ import { useCreditFormAPI } from './useCreditFormAPI';
 export interface CreditFormStepProps {
   step: number;
   sections: SectionsRetailProps[];
-  isFormFinished?: boolean;
   programsSource?: ProgramsSourceProps;
   onNextStep: () => void;
   onPrevStep: () => void;
@@ -23,7 +21,7 @@ export interface CreditFormStepProps {
 }
 
 export const CreditFormStep = JSX<CreditFormStepProps>(
-  ({ step, sections, isFormFinished, programsSource, onPrevStep, onNextStep, onFinish }) => {
+  ({ step, sections, programsSource, onPrevStep, onNextStep, onFinish }) => {
     const { programId } = useRetailFormStore();
     const calcData = programsSource?.[programId ?? '']; // Need normalizator useForm, to be save defaultParams
 
@@ -50,9 +48,7 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
       onSubmit,
     });
 
-    return isFormFinished ? (
-      <CreditFormStatusTracker />
-    ) : (
+    return (
       <form onSubmit={handleSubmit} className="space-y-m">
         {renderStep({ sections, field, step, params: { calcData } })}
         <StepsNavigationButtons step={step} isSending={isSending} onPrevStep={onPrevStep} />

package/src/ui-kit/FormField/validators.ts

@@ -16,9 +16,7 @@ export const defaultSelectValidator = (errorMsg?: string) =>
   validator((_) => _?.key && _?.key !== '')(errorMsg ?? ERROR_MESSAGE);
 
 export const jobNumberValidator = (errorMsg?: string) =>
-  validator((_) => typeof _ === 'string' && _.length > 0 && _.length <= 2)(
-    errorMsg ?? ERROR_MESSAGE,
-  );
+  validator((_) => typeof _ === 'string' && /^[0-9]{1,2}$/g.test(_))(errorMsg ?? ERROR_MESSAGE);
 
 export const nameValidator = (errorMsg?: string) =>
   validator((_) => typeof _ === 'string' && _.length > 1 && isCyrillic(_))(