@redneckz/wildless-cms-uni-blocks 0.14.968 → 0.14.970

package/mobile/src/retail/components/Fields/CreditCalcField.tsx

@@ -1,13 +1,21 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { CalculatorCredit } from '../../../components/CalculatorCredit/CalculatorCredit';
-import { type CreditCalculatorUserInputParams } from '../../../components/CalculatorCredit/CalculatorCreditContent';
+import {
+  type CreditCalculatorUserInputParams,
+  type CreditDefaultParams,
+} from '../../../components/CalculatorCredit/CalculatorCreditContent';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 
 const FIELD_NAME = 'calculator';
 
 export const CreditCalcField = JSX<CustomFieldProps>(({ field, params }) => {
-  const defaultCalcSum = params?.calcData?.defaultParams?.sum ?? 0;
+  const calcValue = field(FIELD_NAME)?.value;
+  const defaultParams = calcValue
+    ? defaultValueAdapter(field(FIELD_NAME).value as CreditCalculatorUserInputParams)
+    : params?.calcData?.defaultParams;
+  const defaultCalcSum = defaultParams?.sum ?? 0;
+
   const handleChange = useCallback((_: CreditCalculatorUserInputParams) => {
     field(FIELD_NAME).onChange?.(_);
   }, []);
@@ -16,8 +24,31 @@ export const CreditCalcField = JSX<CustomFieldProps>(({ field, params }) => {
     <CalculatorCredit
       key={defaultCalcSum}
       {...params?.calcData}
+      defaultParams={defaultParams}
       padding="p-0"
       onChange={handleChange}
     />
   );
 });
+
+const PARAMS_MAP = {
+  moneyValue: 'sum',
+  monthsValue: 'period',
+  isInsurance: 'isEnableInsurance',
+  isPensionClient: 'isEnablePensionClient',
+  isStateEmployee: 'isEnableStateEmployee',
+  isSalaryClient: 'isEnableSalaryClient',
+  isAnnuity: 'isAnnuity',
+};
+
+const defaultValueAdapter = (
+  value?: CreditCalculatorUserInputParams,
+  isInverse = false,
+): CreditDefaultParams => {
+  const keysMap = isInverse ? swap(PARAMS_MAP) : PARAMS_MAP;
+
+  return Object.fromEntries(Object.entries(value ?? {}).map(([k, v]) => [keysMap[k], v]));
+};
+
+const swap = (_: Record<string, string>) =>
+  Object.fromEntries(Object.entries(_).map(([k, v]) => [v, k]));

package/mobile/src/retail/components/Fields/CurrencyField.tsx

@@ -28,6 +28,7 @@ export const CurrencyField = JSX<CustomFieldProps>(({ field, input }) => {
       orientation="horizontal"
       items={currencies}
       {...field(input?.name ?? '')}
+      {...input}
     />
   );
 });

package/mobile/src/retail/components/Fields/DulIssueDateField.tsx

@@ -18,6 +18,7 @@ export const DulIssueDateField = JSX<CustomFieldProps>(({ field, input }) => {
       disabled={isEsiaAuthorize(field, input)}
       minDate={startDulIssueDate}
       maxDate={new Date()}
+      {...input}
     />
   );
 });

package/mobile/src/retail/components/Fields/DulNumberField.tsx

@@ -10,5 +10,6 @@ export const DulNumberField = JSX<CustomFieldProps>(({ field, input }) => (
     isInteger={true}
     maxLength={6}
     {...field(input?.name ?? '')}
+    {...input}
   />
 ));

package/mobile/src/retail/components/Fields/DulSerieField.tsx

@@ -10,5 +10,6 @@ export const DulSerieField = JSX<CustomFieldProps>(({ field, input }) => (
     isInteger={true}
     maxLength={4}
     {...field(input?.name ?? '')}
+    {...input}
   />
 ));

package/mobile/src/retail/components/Fields/EducationField.tsx

@@ -12,7 +12,7 @@ export const EducationField = JSX<CustomFieldProps>(({ field, input }) => {
       source={education}
       label="Образование"
       fieldName="education"
-      input={input}
+      {...input}
     />
   );
 });

package/mobile/src/retail/components/Fields/EmployerActivitiesField.tsx

@@ -12,7 +12,7 @@ export const EmployerActivitiesField = JSX<CustomFieldProps>(({ field, input })
       source={store.employerActivities ?? []}
       label="Вид деятельности организации-работодателя"
       fieldName="employerActivities"
-      input={input}
+      {...input}
     />
   );
 });

package/mobile/src/retail/components/Fields/EmploymentField.tsx

@@ -12,7 +12,7 @@ export const EmploymentField = JSX<CustomFieldProps>(({ field, input }) => {
       source={employment}
       label="Информация о трудоустройстве"
       fieldName="employment"
-      input={input}
+      {...input}
     />
   );
 });

package/mobile/src/retail/components/Fields/FamilyMembersField.tsx

@@ -22,6 +22,7 @@ export const FamilyMembersField = JSX<CustomFieldProps>(({ field, input }) => {
       type="number"
       disabled={true}
       value={value}
+      {...input}
       onChange={onChange}
     />
   );

package/mobile/src/retail/components/Fields/FamilyStatusField.tsx

@@ -12,7 +12,7 @@ export const FamilyStatusField = JSX<CustomFieldProps>(({ field, input }) => {
       source={familyStatus}
       label="Семейное положение"
       fieldName="familyStatus"
-      input={input}
+      {...input}
     />
   );
 });

package/mobile/src/retail/components/Fields/HousingField.tsx

@@ -7,12 +7,6 @@ export const HousingField = JSX<CustomFieldProps>(({ field, input }) => {
   const { data: housing } = useLeadFormData('HOUSE_TYPE');
 
   return (
-    <SelectField
-      field={field}
-      source={housing}
-      label="Тип жилья"
-      fieldName="housing"
-      input={input}
-    />
+    <SelectField field={field} source={housing} label="Тип жилья" fieldName="housing" {...input} />
   );
 });

package/mobile/src/retail/components/Fields/LimitedBirthdayField.tsx

@@ -7,6 +7,7 @@ export const LimitedBirthdayField = JSX<CustomFieldProps>(({ field, input }) =>
   <DatePickerControl
     label="Дата рождения"
     {...field(input?.name ?? '')}
+    {...input}
     disabled={isEsiaAuthorize(field, input)}
   />
 ));

package/mobile/src/retail/components/Fields/ParticipantDateRegistrationField.tsx

@@ -7,5 +7,6 @@ export const ParticipantDateRegistrationField = JSX<CustomFieldProps>(({ field,
     label="Дата регистрации по месту жительства"
     {...field(input?.name ?? '')}
     maxDate={new Date()}
+    {...input}
   />
 ));

package/mobile/src/retail/components/Fields/PaymentSystemField.tsx

@@ -35,6 +35,7 @@ export const PaymentSystemField = JSX<CustomFieldProps>(({ field, input }) => {
         format: optionKey,
         parse: (key?: string) => paymentSystemOptions?.find((_) => _.key === key),
       })}
+      {...input}
     />
   );
 });

package/mobile/src/retail/components/Fields/PositionOrganizationField.tsx

@@ -12,7 +12,7 @@ export const PositionOrganizationField = JSX<CustomFieldProps>(({ field, input }
       source={positionOrganization}
       label="Должность в организации"
       fieldName="positionOrganization"
-      input={input}
+      {...input}
     />
   );
 });

package/mobile/src/retail/components/Fields/RegionRetailField.tsx

@@ -54,6 +54,7 @@ export const RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
       isSearch={true}
       options={formatRegions as Option[]}
       {...field(input?.name ?? '')}
+      {...input}
       onChange={onChange}
     />
   );

package/mobile/src/retail/components/Fields/SexField.tsx

@@ -31,6 +31,7 @@ export const SexField = JSX<CustomFieldProps>(({ field, input }) => {
       orientation="horizontal"
       items={SEX_TYPES}
       {...field(input?.name ?? '')}
+      {...input}
     />
   );
 });

package/mobile/src/retail/components/NoConsentDialog/NoConsentDialog.tsx

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import type { OnCloseProps } from '../../../model/OnCloseProps';
 
+import { type ProductType } from '../../../components/ApplicationLeadForm/ApplicationLeadFormContent';
 import { locationNavigator } from '../../../external/locationNavigator';
 import { Button } from '../../../ui-kit/Button/Button';
 import { Dialog } from '../../../ui-kit/DialogManager/Dialog';
@@ -10,43 +11,52 @@ import { noop } from '../../../utils/noop';
 
 export interface NoConsentDialogProps extends OnCloseProps {
   attempts: number;
+  productType: ProductType;
   onSubmit?: (confirmStatus: string) => void;
 }
 
-export const NoConsentDialog = JSX<NoConsentDialogProps>(({ attempts, onClose = noop }) => {
-  const navigator = locationNavigator();
-  const isMaxAttempts = attempts > 1;
+const mapProductTypeToName = {
+  creditCard: 'кредитной карты',
+  debitCard: 'дебетовой карты',
+  credit: 'кредита',
+};
 
-  const returnToMainPage = useCallback(() => {
-    navigator.assign('/natural');
-  }, []);
+export const NoConsentDialog = JSX<NoConsentDialogProps>(
+  ({ attempts, productType, onClose = noop }) => {
+    const navigator = locationNavigator();
+    const isMaxAttempts = attempts > 1;
 
-  const handleClose = useCallback(() => {
-    if (isMaxAttempts) {
-      returnToMainPage();
-    } else {
-      onClose();
-    }
-  }, [isMaxAttempts]);
+    const returnToMainPage = useCallback(() => {
+      navigator.assign('/natural');
+    }, []);
 
-  return (
-    <Dialog onClose={handleClose}>
-      <div className="flex flex-col gap-xl items-center">
-        <Paragraph align="text-center">Уважаемый клиент!</Paragraph>
-        <Paragraph align="text-center">
-          Для получения кредита Вам необходимо обратиться в офис Банка
-        </Paragraph>
-        <div className="flex flex-col sm:flex-row gap-xl items-center">
-          <Button type="button" version="secondary" onClick={returnToMainPage}>
-            Завершить
-          </Button>
-          {isMaxAttempts ? null : (
-            <Button type="button" onClick={onClose}>
-              Продолжить
+    const handleClose = useCallback(() => {
+      if (isMaxAttempts) {
+        returnToMainPage();
+      } else {
+        onClose();
+      }
+    }, [isMaxAttempts]);
+
+    return (
+      <Dialog onClose={handleClose}>
+        <div className="flex flex-col gap-xl items-center">
+          <Paragraph align="text-center">Уважаемый клиент!</Paragraph>
+          <Paragraph align="text-center">
+            {`Для получения ${mapProductTypeToName[productType]} Вам необходимо обратиться в офис Банка`}
+          </Paragraph>
+          <div className="flex flex-col sm:flex-row gap-xl items-center">
+            <Button type="button" version="secondary" onClick={returnToMainPage}>
+              Завершить
             </Button>
-          )}
+            {isMaxAttempts ? null : (
+              <Button type="button" onClick={onClose}>
+                Продолжить
+              </Button>
+            )}
+          </div>
         </div>
-      </div>
-    </Dialog>
-  );
-});
+      </Dialog>
+    );
+  },
+);

package/package.json

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

package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -91,6 +91,7 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
         setAttemptsWithoutConsents((prev) => prev + 1);
         attemptsWithoutConsents > 0 &&
           noConsentDialog.open({
+            productType,
             attempts: attemptsWithoutConsents,
           });
       }

package/src/components/CreditForm/formStateMap.tsx

@@ -3,17 +3,7 @@ import { getMainFormStateMap } from '../../retail/utils/getMainFormStateMap';
 
 export const formStateMap: Partial<LeadFormState>[] = [
   {
-    calculator: {
-      moneyValue: 0,
-      monthsValue: 0,
-      monthlyPayment: 0,
-      rate: 0,
-      isAnnuity: false,
-      isInsurance: false,
-      isSalaryClient: false,
-      isPensionClient: false,
-      isStateEmployee: false,
-    },
+    calculator: undefined,
   },
   ...getMainFormStateMap(true),
   {

package/src/retail/components/Fields/AmountWorkersField.tsx

@@ -12,7 +12,7 @@ export const AmountWorkersField = JSX<CustomFieldProps>(({ field, input }) => {
       source={store.amountWorkers ?? []}
       label="Количество работающих в организации"
       fieldName="amountWorkers"
-      input={input}
+      {...input}
     />
   );
 });

package/src/retail/components/Fields/CardCategoryField.tsx

@@ -78,7 +78,7 @@ export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
         source={cardTypes}
         label="Категория карты"
         fieldName="cardCategory"
-        input={input}
+        {...input}
         onChange={onChange}
       />
       {description ? <InfoCard __html={description} /> : null}

package/src/retail/components/Fields/ConfirmationIncomeField.tsx

@@ -19,7 +19,7 @@ export const ConfirmationIncomeField = JSX<CustomFieldProps>(({ field, input })
         source={confirmationIncome}
         label="Способ подтверждения дохода"
         fieldName="confirmationIncome"
-        input={input}
+        {...input}
         disabled={filledByEsia}
       />
     </div>

package/src/retail/components/Fields/ConscriptionField.tsx

@@ -12,7 +12,7 @@ export const ConscriptionField = JSX<CustomFieldProps>(({ field, input }) => {
       source={conscription}
       label="Статус военнообязанного"
       fieldName="conscription"
-      input={input}
+      {...input}
     />
   );
 });

package/src/retail/components/Fields/CreditCalcField.tsx

@@ -1,13 +1,21 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { CalculatorCredit } from '../../../components/CalculatorCredit/CalculatorCredit';
-import { type CreditCalculatorUserInputParams } from '../../../components/CalculatorCredit/CalculatorCreditContent';
+import {
+  type CreditCalculatorUserInputParams,
+  type CreditDefaultParams,
+} from '../../../components/CalculatorCredit/CalculatorCreditContent';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 
 const FIELD_NAME = 'calculator';
 
 export const CreditCalcField = JSX<CustomFieldProps>(({ field, params }) => {
-  const defaultCalcSum = params?.calcData?.defaultParams?.sum ?? 0;
+  const calcValue = field(FIELD_NAME)?.value;
+  const defaultParams = calcValue
+    ? defaultValueAdapter(field(FIELD_NAME).value as CreditCalculatorUserInputParams)
+    : params?.calcData?.defaultParams;
+  const defaultCalcSum = defaultParams?.sum ?? 0;
+
   const handleChange = useCallback((_: CreditCalculatorUserInputParams) => {
     field(FIELD_NAME).onChange?.(_);
   }, []);
@@ -16,8 +24,31 @@ export const CreditCalcField = JSX<CustomFieldProps>(({ field, params }) => {
     <CalculatorCredit
       key={defaultCalcSum}
       {...params?.calcData}
+      defaultParams={defaultParams}
       padding="p-0"
       onChange={handleChange}
     />
   );
 });
+
+const PARAMS_MAP = {
+  moneyValue: 'sum',
+  monthsValue: 'period',
+  isInsurance: 'isEnableInsurance',
+  isPensionClient: 'isEnablePensionClient',
+  isStateEmployee: 'isEnableStateEmployee',
+  isSalaryClient: 'isEnableSalaryClient',
+  isAnnuity: 'isAnnuity',
+};
+
+const defaultValueAdapter = (
+  value?: CreditCalculatorUserInputParams,
+  isInverse = false,
+): CreditDefaultParams => {
+  const keysMap = isInverse ? swap(PARAMS_MAP) : PARAMS_MAP;
+
+  return Object.fromEntries(Object.entries(value ?? {}).map(([k, v]) => [keysMap[k], v]));
+};
+
+const swap = (_: Record<string, string>) =>
+  Object.fromEntries(Object.entries(_).map(([k, v]) => [v, k]));

package/src/retail/components/Fields/CurrencyField.tsx

@@ -28,6 +28,7 @@ export const CurrencyField = JSX<CustomFieldProps>(({ field, input }) => {
       orientation="horizontal"
       items={currencies}
       {...field(input?.name ?? '')}
+      {...input}
     />
   );
 });

package/src/retail/components/Fields/DulIssueDateField.tsx

@@ -18,6 +18,7 @@ export const DulIssueDateField = JSX<CustomFieldProps>(({ field, input }) => {
       disabled={isEsiaAuthorize(field, input)}
       minDate={startDulIssueDate}
       maxDate={new Date()}
+      {...input}
     />
   );
 });

package/src/retail/components/Fields/DulNumberField.tsx

@@ -10,5 +10,6 @@ export const DulNumberField = JSX<CustomFieldProps>(({ field, input }) => (
     isInteger={true}
     maxLength={6}
     {...field(input?.name ?? '')}
+    {...input}
   />
 ));

package/src/retail/components/Fields/DulSerieField.tsx

@@ -10,5 +10,6 @@ export const DulSerieField = JSX<CustomFieldProps>(({ field, input }) => (
     isInteger={true}
     maxLength={4}
     {...field(input?.name ?? '')}
+    {...input}
   />
 ));

package/src/retail/components/Fields/EducationField.tsx

@@ -12,7 +12,7 @@ export const EducationField = JSX<CustomFieldProps>(({ field, input }) => {
       source={education}
       label="Образование"
       fieldName="education"
-      input={input}
+      {...input}
     />
   );
 });

package/src/retail/components/Fields/EmployerActivitiesField.tsx

@@ -12,7 +12,7 @@ export const EmployerActivitiesField = JSX<CustomFieldProps>(({ field, input })
       source={store.employerActivities ?? []}
       label="Вид деятельности организации-работодателя"
       fieldName="employerActivities"
-      input={input}
+      {...input}
     />
   );
 });

package/src/retail/components/Fields/EmploymentField.tsx

@@ -12,7 +12,7 @@ export const EmploymentField = JSX<CustomFieldProps>(({ field, input }) => {
       source={employment}
       label="Информация о трудоустройстве"
       fieldName="employment"
-      input={input}
+      {...input}
     />
   );
 });

package/src/retail/components/Fields/FamilyMembersField.tsx

@@ -22,6 +22,7 @@ export const FamilyMembersField = JSX<CustomFieldProps>(({ field, input }) => {
       type="number"
       disabled={true}
       value={value}
+      {...input}
       onChange={onChange}
     />
   );

package/src/retail/components/Fields/FamilyStatusField.tsx

@@ -12,7 +12,7 @@ export const FamilyStatusField = JSX<CustomFieldProps>(({ field, input }) => {
       source={familyStatus}
       label="Семейное положение"
       fieldName="familyStatus"
-      input={input}
+      {...input}
     />
   );
 });

package/src/retail/components/Fields/HousingField.tsx

@@ -7,12 +7,6 @@ export const HousingField = JSX<CustomFieldProps>(({ field, input }) => {
   const { data: housing } = useLeadFormData('HOUSE_TYPE');
 
   return (
-    <SelectField
-      field={field}
-      source={housing}
-      label="Тип жилья"
-      fieldName="housing"
-      input={input}
-    />
+    <SelectField field={field} source={housing} label="Тип жилья" fieldName="housing" {...input} />
   );
 });

package/src/retail/components/Fields/LimitedBirthdayField.tsx

@@ -7,6 +7,7 @@ export const LimitedBirthdayField = JSX<CustomFieldProps>(({ field, input }) =>
   <DatePickerControl
     label="Дата рождения"
     {...field(input?.name ?? '')}
+    {...input}
     disabled={isEsiaAuthorize(field, input)}
   />
 ));

package/src/retail/components/Fields/ParticipantDateRegistrationField.tsx

@@ -7,5 +7,6 @@ export const ParticipantDateRegistrationField = JSX<CustomFieldProps>(({ field,
     label="Дата регистрации по месту жительства"
     {...field(input?.name ?? '')}
     maxDate={new Date()}
+    {...input}
   />
 ));

package/src/retail/components/Fields/PaymentSystemField.tsx

@@ -35,6 +35,7 @@ export const PaymentSystemField = JSX<CustomFieldProps>(({ field, input }) => {
         format: optionKey,
         parse: (key?: string) => paymentSystemOptions?.find((_) => _.key === key),
       })}
+      {...input}
     />
   );
 });

package/src/retail/components/Fields/PositionOrganizationField.tsx

@@ -12,7 +12,7 @@ export const PositionOrganizationField = JSX<CustomFieldProps>(({ field, input }
       source={positionOrganization}
       label="Должность в организации"
       fieldName="positionOrganization"
-      input={input}
+      {...input}
     />
   );
 });

package/src/retail/components/Fields/RegionRetailField.tsx

@@ -54,6 +54,7 @@ export const RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
       isSearch={true}
       options={formatRegions as Option[]}
       {...field(input?.name ?? '')}
+      {...input}
       onChange={onChange}
     />
   );

package/src/retail/components/Fields/SexField.tsx

@@ -31,6 +31,7 @@ export const SexField = JSX<CustomFieldProps>(({ field, input }) => {
       orientation="horizontal"
       items={SEX_TYPES}
       {...field(input?.name ?? '')}
+      {...input}
     />
   );
 });

package/src/retail/components/NoConsentDialog/NoConsentDialog.fixture.tsx

@@ -3,5 +3,5 @@ import '../../../setup-fixture';
 import { NoConsentDialog } from './NoConsentDialog';
 
 export default {
-  default: <NoConsentDialog attempts={1} />,
+  default: <NoConsentDialog productType="credit" attempts={1} />,
 };