@redneckz/wildless-cms-uni-blocks 0.14.967 → 0.14.969

package/mobile/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/mobile/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/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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { type ProductType } from '../../../components/ApplicationLeadForm/ApplicationLeadFormContent';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
@@ -10,11 +10,13 @@ import { useLeadFormData } from '../../hooks/useLeadFormData';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 
 export const RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
-  const { productType } = useRetailFormStore();
+  const { programId, productType } = useRetailFormStore();
   const { data: regions } = useLeadFormData('REGION_RF');
   const { data: regionsDelivery } = useAsyncData('regionsDelivery', getRegionsCardDelivery);
   const { data: productSettings } = useLeadFormData(getCurrentProductSettings(productType));
-  const isEsiaAuth = field('esiaAccountTypeCd')?.value?.key;
+  const isDebit = productType === 'debitCard';
+  const isSalaryCard = programId === '38';
+  const isEsiaAuth = Boolean(field('esiaAccountTypeCd')?.value?.key);
   const formatRegions = regions?.map(({ key, value }) => ({ key, text: value }));
   const isDeliveryActive =
     productSettings?.find((_) => _?.key === 'DELIVERY_ACTIVE')?.value === 'true';
@@ -24,10 +26,12 @@ export const RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
 
   const onChange = useCallback(
     (value: Option) => {
-      const regionHasDelivery =
-        isDeliveryActive &&
-        regionsDelivery?.find((_) => _.regionCode === value.key)?.deliveryFlg &&
-        Boolean(isEsiaAuth);
+      const regionHasDelivery = isDebit
+        ? isEsiaAuth &&
+          !isSalaryCard &&
+          isDeliveryActive &&
+          regionsDelivery?.find((_) => _.regionCode === value.key)?.deliveryFlg
+        : isDeliveryActive && regionsDelivery?.find((_) => _.regionCode === value.key)?.deliveryFlg;
 
       handleChangeRegionHasDelivery?.(regionHasDelivery);
       handleChangeMethodObtain?.(regionHasDelivery ? 'courier' : 'office');
@@ -36,6 +40,13 @@ export const RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
     [regionsDelivery, isDeliveryActive, isEsiaAuth],
   );
 
+  useEffect(() => {
+    if (!isEsiaAuth && isDebit) {
+      handleChangeRegionHasDelivery?.(false);
+      handleChangeMethodObtain?.('office');
+    }
+  }, []);
+
   return (
     <SelectControl
       label="Регион"
@@ -43,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/package.json

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

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

@@ -11,23 +11,34 @@ import { SelectField } from './SelectField';
 export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
   const [cardTypes, setCardTypes] = useState<CardTypeData[]>([]);
   const [programId] = useLocalStorage<string>('programId');
-  const { productType } = useRetailFormStore();
-  const isSalaryCard = programId === '38';
+  const { productType, leadForm } = useRetailFormStore();
   const isDebit = productType === 'debitCard';
   const isEsiaAuth = Boolean(field('esiaAccountTypeCd')?.value?.key);
   const { value: selectedCardCategory, onChange: cardCategoryChange } = field('cardCategory');
   const selectedPaymentSystem = field('paymentSystem')?.value?.key;
-  const handleChangeIsMomentDebitCard = field('isMomentDebitCard')?.onChange;
+  const isOffice = leadForm?.methodObtain === 'office';
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
+  const noop = () => {};
+
+  const handleChangeIsMomentDebitCard = useMemo(() => {
+    const onChange = field('isMomentDebitCard')?.onChange;
+
+    return onChange ?? noop;
+  }, [field]);
+
+  const isInstantSelectedCardCategory = field('cardCategory')
+    ?.value?.text?.toLowerCase()
+    ?.includes('неимен');
 
   const getCardCategoryValue = useCallback(
     (fetchedCardTypes: CardTypeData[]) =>
-      fetchedCardTypes.length === 1
+      fetchedCardTypes.length !== 0
         ? {
             key: fetchedCardTypes[0].key,
             text: fetchedCardTypes[0].value,
           }
         : null,
-    [],
+    [selectedPaymentSystem],
   );
 
   const onChange = useCallback((value: Option) => {
@@ -40,7 +51,7 @@ export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
       (async () => {
         const fetchedCardTypes = await getCardTypes(selectedPaymentSystem as string, programId);
         const actualCardTypes =
-          isDebit && !isEsiaAuth && !isSalaryCard
+          isDebit && (!isEsiaAuth || isOffice)
             ? excludeSomeСategoriesCards(fetchedCardTypes)
             : fetchedCardTypes;
         setCardTypes(actualCardTypes);
@@ -48,9 +59,12 @@ export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
         if (!isValidCardCategory(actualCardTypes, selectedCardCategory as Option)) {
           cardCategoryChange?.(getCardCategoryValue(actualCardTypes));
         }
+        if (isDebit) {
+          handleChangeIsMomentDebitCard(isInstantSelectedCardCategory ?? false);
+        }
       })();
     }
-  }, [selectedPaymentSystem, getCardCategoryValue]);
+  }, [selectedPaymentSystem, getCardCategoryValue, isInstantSelectedCardCategory]);
 
   const description = useMemo(
     () => cardTypes?.find((_) => _.key === selectedCardCategory?.key)?.description,
@@ -64,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}
     />
   );
 });