@redneckz/wildless-cms-uni-blocks 0.14.654 → 0.14.656

package/mobile/src/components/CreditCardForm/formStateMap.tsx

@@ -3,6 +3,15 @@ import { PAYMENT_SYSTEM_TYPES } from '../../ui-kit/FormField/Fields/PaymentSyste
 import type { Option } from '../../ui-kit/Select/Option';
 import { type Address } from '../ApplicationLeadForm/getInitialFormState';
 
+export type FormStateDeliveryType = {
+  regionRetail?: string;
+  bankEmployeeCode?: string;
+  methodObtain?: 'office' | 'courier';
+  deliveryDate?: Date;
+  addressRetail?: Address;
+  addressCourier?: Address;
+};
+
 export interface FormStateMap {
   0: {
     currency?: string;
@@ -28,8 +37,6 @@ export interface FormStateMap {
     participantDateRegistration?: Date;
     addressFact?: Address;
     housing?: string;
-    methodObtain?: string;
-    addressCourier?: Address;
   };
   2: {
     amountWorkers?: Option;
@@ -53,6 +60,7 @@ export interface FormStateMap {
     familyStatus?: Option;
     dependents?: number;
     familyMembers?: number;
+    confirmationIncome?: Option;
     mandatoryIncome?: number;
     otherPayments?: number;
     snils?: string;
@@ -65,14 +73,7 @@ export interface FormStateMap {
     legalEntityName?: string;
     creditInRshbCd?: Option;
   };
-  5: {
-    regionRetail?: string;
-    addressRetail?: Address;
-    bankEmployeeCode?: string;
-    addressCoutier?: Address;
-    methodObtain?: 'office' | 'courier';
-    deliveryDate?: Date;
-  };
+  5: FormStateDeliveryType;
 }
 
 export const formStateMap: FormStateMap = {
@@ -105,11 +106,6 @@ export const formStateMap: FormStateMap = {
       fiasCode: '',
     },
     housing: '',
-    methodObtain: 'office',
-    addressCourier: {
-      fullAddress: '',
-      fiasCode: '',
-    },
   },
   2: {
     amountWorkers: { key: '', text: '' },
@@ -136,6 +132,7 @@ export const formStateMap: FormStateMap = {
     familyStatus: { key: '', text: '' },
     dependents: undefined,
     familyMembers: undefined,
+    confirmationIncome: { key: '', text: '' },
     mandatoryIncome: undefined,
     otherPayments: undefined,
     snils: '',
@@ -154,11 +151,11 @@ export const formStateMap: FormStateMap = {
       fullAddress: '',
       fiasCode: '',
     },
-    bankEmployeeCode: '',
-    addressCoutier: {
+    addressCourier: {
       fullAddress: '',
       fiasCode: '',
     },
+    bankEmployeeCode: '',
     methodObtain: 'office',
     deliveryDate: undefined,
   },

package/mobile/src/components/CreditCardForm/getFilteredInputs.tsx

@@ -0,0 +1,18 @@
+import type { FieldDef } from '../ApplicationForm/ApplicationFormContent';
+import type { FormStateMap } from './formStateMap';
+
+export const getFilteredInputs = (
+  inputs: FieldDef[],
+  data: FormStateMap[keyof FormStateMap],
+): FieldDef[] =>
+  inputs
+    .filter((_) => _)
+    .filter(
+      (input) =>
+        !input?.condition ||
+        input?.condition.values.find((_) => {
+          const dataValue = data?.[input?.condition?.name ?? ''];
+
+          return _ === (dataValue?.key ?? dataValue);
+        }),
+    );

package/mobile/src/components/CreditCardForm/getInitialFormState.tsx

@@ -19,6 +19,9 @@ export const getInitialFormState = <Step extends keyof FormStateMap>(
     localStorageData.beginDate = localStorageData?.beginDate
       ? new Date(localStorageData.beginDate as string)
       : undefined;
+    localStorageData.deliveryDate = localStorageData?.deliveryDate
+      ? new Date(localStorageData.deliveryDate as string)
+      : undefined;
   }
 
   return {

package/mobile/src/components/CreditCardForm/renderInfo.tsx

@@ -1,10 +1,16 @@
 import { InfoCard } from '../../ui-kit/InfoCard/InfoCard';
 import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
+import { type FormStateDeliveryType } from './formStateMap';
+import { getFilteredInputs } from './getFilteredInputs';
 
-export const renderInfo = (inputs: FieldDef[] = []) => {
+export const renderInfo = (state?: FormStateDeliveryType, inputs: FieldDef[] = []) => {
   const infoInputs = inputs.filter((_) => _.fieldType === 'info');
+  const filteredInputs = getFilteredInputs(
+    infoInputs,
+    state as FormStateDeliveryType,
+  ) as FieldDef[];
 
-  return infoInputs.length
-    ? infoInputs.map(({ text, name }, i) => <InfoCard key={`${name}_${i}`} __html={text} />)
+  return filteredInputs.length
+    ? filteredInputs.map(({ text, name }, i) => <InfoCard key={`${name}_${i}`} __html={text} />)
     : null;
 };

package/mobile/src/components/CreditCardForm/renderStep.tsx

@@ -3,7 +3,7 @@ import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
 import { renderTitle } from '../../ui-kit/FormField/renderTitle';
 import { style } from '../../utils/style';
 import { type CreditCardSectionsProps } from './CreditCardFormContent';
-import { type FormStateMap } from './formStateMap';
+import { type FormStateDeliveryType, type FormStateMap } from './formStateMap';
 import { renderInfo } from './renderInfo';
 import { renderInputs } from './renderInputs';
 
@@ -13,31 +13,14 @@ export interface StepProps {
   sections?: CreditCardSectionsProps[];
   field: FormFieldRegisterer<FormStateMap[keyof FormStateMap]>;
   registerSubmit?: (submit: CustomSubmit) => void;
-  isLastStep?: boolean;
-  methodObtain?: string;
+  userInputParams?: FormStateDeliveryType;
 }
 
-const renderLastStep = ({ sections, field, methodObtain }: StepProps) =>
-  sections
-    ?.filter(({ type }) => type === methodObtain || !type)
-    .map(({ inputs, columns, title }, i) => (
-      <div key={`section-${i}`} className={style(inputColumnStyles(columns), 'grid gap-x-m')}>
-        {renderInfo(inputs)}
-        {renderTitle(title)}
-        {renderInputs({ field, inputs })}
-      </div>
-    ));
-
-export const renderStep = ({ sections, field, isLastStep, methodObtain }: StepProps) => {
-  if (isLastStep) {
-    return renderLastStep({ sections, field, methodObtain });
-  }
-
-  return sections?.map(({ inputs, columns, title }, i) => (
+export const renderStep = ({ sections, field, userInputParams }: StepProps) =>
+  sections?.map(({ inputs, columns, title }, i) => (
     <div key={`section-${i}`} className={style(inputColumnStyles(columns), 'grid gap-x-m')}>
-      {renderInfo(inputs)}
+      {renderInfo(userInputParams, inputs)}
       {renderTitle(title)}
       {renderInputs({ field, inputs })}
     </div>
   ));
-};

package/mobile/src/components/CreditCardForm/useCreditCardFormAPI.tsx

@@ -7,6 +7,7 @@ import { isValidationSuccess } from '../../validation/validator';
 import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
 import { type FormStateMap } from './formStateMap';
 import { getCreditCardFormTaskData } from './getCreditCardFormTaskData';
+import { getFilteredInputs } from './getFilteredInputs';
 
 type CreditCardFormApiProps = {
   step: number;
@@ -28,8 +29,9 @@ export const useCreditCardFormAPI = ({
   const [participantId] = useLocalStorage<number>('participantId');
 
   const handleSubmit = useCallback(async (formData: FormStateMap[keyof FormStateMap]) => {
+    const inputsFiltered = getFilteredInputs(inputs, formData);
     const feedbackValidator = objectValidator(
-      getObjectValidator(calculateInputs(formData, inputs, step)),
+      getObjectValidator(calculateInputs(formData, inputsFiltered, step)),
     );
     if (!isValidationSuccess(feedbackValidator(formData))) {
       return console.warn('validation fail');

package/package.json

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

package/src/api/RetailAPI/updateRefreshToken.ts

@@ -20,7 +20,7 @@ export const updateRefreshToken = () => {
     return () => null;
   }
 
-  const timer = setInterval(async () => {
+  const updateTokenRequest = async () => {
     const res = await doRequest<UpdateRefreshTokenBody | Response>('/auth/refresh', 'POST', {
       // eslint-disable-next-line camelcase
       refresh_token: refreshToken,
@@ -29,14 +29,24 @@ export const updateRefreshToken = () => {
     });
 
     if (res instanceof Response) {
-      globalThis.location.href = PORTAL_NATURAL_URL;
+      handleStatus(res.status);
 
       return;
     }
 
-    sessionStorage.setItem('refreshToken', res.refresh_token);
-    sessionStorage.setItem('accessToken', res.access_token);
-  }, UPDATING_INTERVAL);
+    globalThis.sessionStorage.setItem('refreshToken', res.refresh_token);
+    globalThis.sessionStorage.setItem('accessToken', res.access_token);
+  };
+
+  updateTokenRequest();
+
+  const timer = setInterval(updateTokenRequest, UPDATING_INTERVAL);
 
   return () => clearInterval(timer);
 };
+
+const handleStatus = (status: number) => {
+  if (status == 401) {
+    globalThis.location.href = PORTAL_NATURAL_URL;
+  }
+};

package/src/components/CreditCardForm/CreditCardFormStep.tsx

@@ -5,7 +5,7 @@ import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { type SectionsProps } from '../ApplicationForm/ApplicationFormContent';
 import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
 import { CreditCardFormStatusTracker } from './CreditCardFormStatusTracker';
-import { type FormStateMap } from './formStateMap';
+import { type FormStateDeliveryType, type FormStateMap } from './formStateMap';
 import { getInitialFormState } from './getInitialFormState';
 import { renderStep, type CustomSubmit } from './renderStep';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
@@ -40,14 +40,12 @@ export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
       finishForm,
     });
 
-    const [state, { field, onSubmit }] = useForm(initialState, {
+    const [userInputParams, { field, onSubmit }] = useForm(initialState, {
       onSubmit: (formData, ev) => {
         handleSubmit({ ...formData, ...customSubmit.current?.(ev) });
       },
     });
 
-    const methodObtain = 'methodObtain' in state ? state.methodObtain : undefined;
-
     return isFormFinished ? (
       <CreditCardFormStatusTracker />
     ) : (
@@ -56,8 +54,7 @@ export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
           sections,
           field,
           registerSubmit,
-          methodObtain,
-          isLastStep: step === 5,
+          userInputParams: userInputParams as FormStateDeliveryType,
         })}
         <StepsNavigationButtons step={step} onPrevStep={onPrevStep} />
       </form>

package/src/components/CreditCardForm/creditCardFormStepsData.tsx

@@ -256,55 +256,82 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
       inputs: [{ fieldType: 'common', name: 'methodObtain' }],
     },
     {
-      type: 'courier',
       title: 'Адрес',
       columns: 1,
       inputs: [],
     },
     {
-      type: 'courier',
-      inputs: [{ fieldType: 'common', name: 'addressCourier', dadata: true }],
-    },
-    {
-      type: 'courier',
-      inputs: [{ fieldType: 'common', name: 'deliveryDate' }],
-    },
-    {
-      type: 'courier',
-      inputs: [{ fieldType: 'common', name: 'comment' }],
-    },
-    {
-      type: 'office',
-      title: 'Отделение Банка',
-      columns: 1,
-      inputs: [],
-    },
-    {
-      type: 'office',
-      inputs: [{ fieldType: 'common', name: 'regionRetail', required: true }],
-    },
-    {
-      type: 'office',
-      inputs: [{ fieldType: 'common', name: 'addressRetail', required: true }],
+      inputs: [
+        {
+          fieldType: 'common',
+          name: 'addressCourier',
+          dadata: true,
+          condition: {
+            name: 'methodObtain',
+            values: ['courier'],
+          },
+          required: true,
+        },
+        {
+          fieldType: 'common',
+          name: 'deliveryDate',
+          condition: {
+            name: 'methodObtain',
+            values: ['courier'],
+          },
+          required: true,
+        },
+        {
+          fieldType: 'common',
+          name: 'comment',
+          condition: {
+            name: 'methodObtain',
+            values: ['courier'],
+          },
+        },
+      ],
     },
     {
-      type: 'office',
-      title: 'Код представителя Банка',
-      columns: 1,
-      inputs: [],
+      inputs: [
+        {
+          fieldType: 'common',
+          name: 'regionRetail',
+          required: true,
+          condition: {
+            name: 'methodObtain',
+            values: ['office'],
+          },
+        },
+        {
+          fieldType: 'common',
+          name: 'addressRetail',
+          required: true,
+          condition: {
+            name: 'methodObtain',
+            values: ['office'],
+          },
+        },
+      ],
     },
     {
-      type: 'office',
       inputs: [
         {
           fieldType: 'info',
           text: 'Если представитель Банка помогал Вам в заведении заявки, введите здесь его код',
+          condition: {
+            name: 'methodObtain',
+            values: ['office'],
+          },
+        },
+        {
+          fieldType: 'common',
+          name: 'bankEmployeeCode',
+          condition: {
+            name: 'methodObtain',
+            values: ['office'],
+          },
         },
       ],
     },
-    {
-      type: 'office',
-      inputs: [{ fieldType: 'common', name: 'bankEmployeeCode' }],
-    },
   ],
 ];

package/src/components/CreditCardForm/formStateMap.tsx

@@ -3,6 +3,15 @@ import { PAYMENT_SYSTEM_TYPES } from '../../ui-kit/FormField/Fields/PaymentSyste
 import type { Option } from '../../ui-kit/Select/Option';
 import { type Address } from '../ApplicationLeadForm/getInitialFormState';
 
+export type FormStateDeliveryType = {
+  regionRetail?: string;
+  bankEmployeeCode?: string;
+  methodObtain?: 'office' | 'courier';
+  deliveryDate?: Date;
+  addressRetail?: Address;
+  addressCourier?: Address;
+};
+
 export interface FormStateMap {
   0: {
     currency?: string;
@@ -28,8 +37,6 @@ export interface FormStateMap {
     participantDateRegistration?: Date;
     addressFact?: Address;
     housing?: string;
-    methodObtain?: string;
-    addressCourier?: Address;
   };
   2: {
     amountWorkers?: Option;
@@ -53,6 +60,7 @@ export interface FormStateMap {
     familyStatus?: Option;
     dependents?: number;
     familyMembers?: number;
+    confirmationIncome?: Option;
     mandatoryIncome?: number;
     otherPayments?: number;
     snils?: string;
@@ -65,14 +73,7 @@ export interface FormStateMap {
     legalEntityName?: string;
     creditInRshbCd?: Option;
   };
-  5: {
-    regionRetail?: string;
-    addressRetail?: Address;
-    bankEmployeeCode?: string;
-    addressCoutier?: Address;
-    methodObtain?: 'office' | 'courier';
-    deliveryDate?: Date;
-  };
+  5: FormStateDeliveryType;
 }
 
 export const formStateMap: FormStateMap = {
@@ -105,11 +106,6 @@ export const formStateMap: FormStateMap = {
       fiasCode: '',
     },
     housing: '',
-    methodObtain: 'office',
-    addressCourier: {
-      fullAddress: '',
-      fiasCode: '',
-    },
   },
   2: {
     amountWorkers: { key: '', text: '' },
@@ -136,6 +132,7 @@ export const formStateMap: FormStateMap = {
     familyStatus: { key: '', text: '' },
     dependents: undefined,
     familyMembers: undefined,
+    confirmationIncome: { key: '', text: '' },
     mandatoryIncome: undefined,
     otherPayments: undefined,
     snils: '',
@@ -154,11 +151,11 @@ export const formStateMap: FormStateMap = {
       fullAddress: '',
       fiasCode: '',
     },
-    bankEmployeeCode: '',
-    addressCoutier: {
+    addressCourier: {
       fullAddress: '',
       fiasCode: '',
     },
+    bankEmployeeCode: '',
     methodObtain: 'office',
     deliveryDate: undefined,
   },

package/src/components/CreditCardForm/getFilteredInputs.tsx

@@ -0,0 +1,18 @@
+import type { FieldDef } from '../ApplicationForm/ApplicationFormContent';
+import type { FormStateMap } from './formStateMap';
+
+export const getFilteredInputs = (
+  inputs: FieldDef[],
+  data: FormStateMap[keyof FormStateMap],
+): FieldDef[] =>
+  inputs
+    .filter((_) => _)
+    .filter(
+      (input) =>
+        !input?.condition ||
+        input?.condition.values.find((_) => {
+          const dataValue = data?.[input?.condition?.name ?? ''];
+
+          return _ === (dataValue?.key ?? dataValue);
+        }),
+    );

package/src/components/CreditCardForm/getInitialFormState.tsx

@@ -19,6 +19,9 @@ export const getInitialFormState = <Step extends keyof FormStateMap>(
     localStorageData.beginDate = localStorageData?.beginDate
       ? new Date(localStorageData.beginDate as string)
       : undefined;
+    localStorageData.deliveryDate = localStorageData?.deliveryDate
+      ? new Date(localStorageData.deliveryDate as string)
+      : undefined;
   }
 
   return {

package/src/components/CreditCardForm/renderInfo.tsx

@@ -1,10 +1,16 @@
 import { InfoCard } from '../../ui-kit/InfoCard/InfoCard';
 import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
+import { type FormStateDeliveryType } from './formStateMap';
+import { getFilteredInputs } from './getFilteredInputs';
 
-export const renderInfo = (inputs: FieldDef[] = []) => {
+export const renderInfo = (state?: FormStateDeliveryType, inputs: FieldDef[] = []) => {
   const infoInputs = inputs.filter((_) => _.fieldType === 'info');
+  const filteredInputs = getFilteredInputs(
+    infoInputs,
+    state as FormStateDeliveryType,
+  ) as FieldDef[];
 
-  return infoInputs.length
-    ? infoInputs.map(({ text, name }, i) => <InfoCard key={`${name}_${i}`} __html={text} />)
+  return filteredInputs.length
+    ? filteredInputs.map(({ text, name }, i) => <InfoCard key={`${name}_${i}`} __html={text} />)
     : null;
 };

package/src/components/CreditCardForm/renderStep.tsx

@@ -3,7 +3,7 @@ import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
 import { renderTitle } from '../../ui-kit/FormField/renderTitle';
 import { style } from '../../utils/style';
 import { type CreditCardSectionsProps } from './CreditCardFormContent';
-import { type FormStateMap } from './formStateMap';
+import { type FormStateDeliveryType, type FormStateMap } from './formStateMap';
 import { renderInfo } from './renderInfo';
 import { renderInputs } from './renderInputs';
 
@@ -13,31 +13,14 @@ export interface StepProps {
   sections?: CreditCardSectionsProps[];
   field: FormFieldRegisterer<FormStateMap[keyof FormStateMap]>;
   registerSubmit?: (submit: CustomSubmit) => void;
-  isLastStep?: boolean;
-  methodObtain?: string;
+  userInputParams?: FormStateDeliveryType;
 }
 
-const renderLastStep = ({ sections, field, methodObtain }: StepProps) =>
-  sections
-    ?.filter(({ type }) => type === methodObtain || !type)
-    .map(({ inputs, columns, title }, i) => (
-      <div key={`section-${i}`} className={style(inputColumnStyles(columns), 'grid gap-x-m')}>
-        {renderInfo(inputs)}
-        {renderTitle(title)}
-        {renderInputs({ field, inputs })}
-      </div>
-    ));
-
-export const renderStep = ({ sections, field, isLastStep, methodObtain }: StepProps) => {
-  if (isLastStep) {
-    return renderLastStep({ sections, field, methodObtain });
-  }
-
-  return sections?.map(({ inputs, columns, title }, i) => (
+export const renderStep = ({ sections, field, userInputParams }: StepProps) =>
+  sections?.map(({ inputs, columns, title }, i) => (
     <div key={`section-${i}`} className={style(inputColumnStyles(columns), 'grid gap-x-m')}>
-      {renderInfo(inputs)}
+      {renderInfo(userInputParams, inputs)}
       {renderTitle(title)}
       {renderInputs({ field, inputs })}
     </div>
   ));
-};

package/src/components/CreditCardForm/useCreditCardFormAPI.tsx

@@ -7,6 +7,7 @@ import { isValidationSuccess } from '../../validation/validator';
 import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
 import { type FormStateMap } from './formStateMap';
 import { getCreditCardFormTaskData } from './getCreditCardFormTaskData';
+import { getFilteredInputs } from './getFilteredInputs';
 
 type CreditCardFormApiProps = {
   step: number;
@@ -28,8 +29,9 @@ export const useCreditCardFormAPI = ({
   const [participantId] = useLocalStorage<number>('participantId');
 
   const handleSubmit = useCallback(async (formData: FormStateMap[keyof FormStateMap]) => {
+    const inputsFiltered = getFilteredInputs(inputs, formData);
     const feedbackValidator = objectValidator(
-      getObjectValidator(calculateInputs(formData, inputs, step)),
+      getObjectValidator(calculateInputs(formData, inputsFiltered, step)),
     );
     if (!isValidationSuccess(feedbackValidator(formData))) {
       return console.warn('validation fail');