@redneckz/wildless-cms-uni-blocks 0.14.683 → 0.14.685

package/src/components/OfficesAtmsMap/useOfficesAtmsMapData.tsx

@@ -1,5 +1,5 @@
 import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
-import { filterItems } from './OfficesAtmsMapLayout';
+import { filterItems } from './filterItems';
 import { type Atm, type Branch, type RemoteWorkplace } from './OfficesAtmsMapProps';
 import { type BalloonContent } from './YandexMapProps';
 

package/src/hooks/useJSONRef/useJSONRef.ts

@@ -4,15 +4,32 @@ import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { fetchRefs } from './fetchRefs';
 import { resolveBlockProps } from './resolveBlockProps';
 
+type RefsMap = Record<string, JSONNode>;
+
 export const useJSONRef = <C>(content: C, fallback?: Record<string, unknown>): C => {
   const refs = collectRef(content as JSONNode);
 
-  const [refsMap, setRefsMap] = useState<Record<string, JSONNode>>({});
+  const [refsMap, setRefsMap] = useState<RefsMap>({});
   useEffect(() => {
-    if (refs.length) {
-      fetchRefs(refs).then(setRefsMap);
-    }
+    resolveRefs(refs).then(setRefsMap);
   }, [refs.join()]);
 
   return refs.length ? resolveBlockProps(content, { ...fallback, ...refsMap }) : content;
 };
+
+const resolveRefs = async (refs: string[], parentRefsMap: RefsMap = {}): Promise<RefsMap> => {
+  if (refs.length) {
+    const refsMap = await fetchRefs(refs);
+    const unionRefsMap = { ...parentRefsMap, ...refsMap };
+
+    const additRefs = Object.entries(refsMap).flatMap(([, v]) => collectRef(v));
+
+    if (additRefs.length) {
+      return resolveRefs(additRefs, unionRefsMap);
+    }
+
+    return unionRefsMap;
+  }
+
+  return parentRefsMap;
+};

package/src/ui-kit/ConsentBkiDialog/useConsentBkiDialog.tsx

@@ -9,17 +9,21 @@ export const useConsentBkiDialog = (onClose: () => void) => {
   const verifyPhoneDialog = useVerifyPhoneDialog();
 
   const handleSuccessVerify = (profileId?: number) => async (smsCode?: string) => {
-    if (profileId) {
-      await updateUserProfile({
-        profile: {
-          id: profileId,
-          consentBkiFlg: true,
-          smsConsentBki: smsCode,
-        },
-      });
-    }
+    try {
+      if (profileId) {
+        await updateUserProfile({
+          profile: {
+            id: profileId,
+            consentBkiFlg: true,
+            smsConsentBki: smsCode,
+          },
+        });
+      }
 
-    onClose();
+      onClose();
+    } catch (ex) {
+      console.log(ex);
+    }
   };
 
   const handleSubmitBkiConstent =

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

@@ -5,4 +5,5 @@ export interface CustomFieldProps {
   field: FormFieldRegisterer<any>;
   input?: FieldDef;
   url?: string;
+  params?: Record<string, any>;
 }

package/src/ui-kit/FormField/Fields/CardCategoryField.tsx

@@ -1,18 +1,28 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { getCardTypes, type CardTypeData } from '../../../api/RetailAPI/getCardTypes';
+import { useLocalStorage } from '../../../hooks/useLocalStorage';
+import { type Option } from '../../Select/Option';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { SelectField } from '../SelectField';
 
 export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
   const [cardTypes, setCardTypes] = useState<CardTypeData[]>([]);
+  const [programId] = useLocalStorage<string>('programId');
+  const { value: selectedCardCategory, onChange: cardCategoryChange } = field('cardCategory');
   const selectedPaymentSystem = field('paymentSystem').value;
 
   useEffect(() => {
-    (async () => {
-      const fetchedCardTypes = await getCardTypes(selectedPaymentSystem as string);
-      setCardTypes(fetchedCardTypes);
-    })();
+    if (selectedPaymentSystem && programId) {
+      (async () => {
+        const fetchedCardTypes = await getCardTypes(selectedPaymentSystem as string, programId);
+        setCardTypes(fetchedCardTypes);
+
+        if (!isValidCardCategory(fetchedCardTypes, selectedCardCategory as Option)) {
+          cardCategoryChange && cardCategoryChange(null);
+        }
+      })();
+    }
   }, [selectedPaymentSystem]);
 
   return (
@@ -25,3 +35,6 @@ export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
     />
   );
 });
+
+const isValidCardCategory = (cardTypes: CardTypeData[], selectedCardCategory: Option | null) =>
+  cardTypes.some((cardType) => cardType.key === selectedCardCategory?.key);

package/src/ui-kit/FormField/Fields/CreditCalcField.tsx

@@ -0,0 +1,24 @@
+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 { defaultValueAdapter } from '../../../components/CalculatorCredit/defaultValueAdapter';
+import { type CustomFieldProps } from '../CustomFieldProps';
+
+const FIELD_NAME = 'calculator';
+
+export const CreditCalcField = JSX<CustomFieldProps>(({ field, params }) => {
+  const handleChange = useCallback((_: CreditCalculatorUserInputParams) => {
+    field(FIELD_NAME).onChange?.(_);
+  }, []);
+
+  return (
+    <CalculatorCredit
+      {...params?.calcData}
+      defaultParams={defaultValueAdapter(
+        field(FIELD_NAME).value as CreditCalculatorUserInputParams,
+      )}
+      onChange={handleChange}
+    />
+  );
+});

package/src/ui-kit/FormField/Fields/PaymentSystemField.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { getPaymentSystems } from '../../../api/RetailAPI/getPaymentSystems';
+import { useLocalStorage } from '../../../hooks/useLocalStorage';
 import { type RadioButtonItem } from '../../RadioButtonGroup/RadioButtonGroup';
 import { RadioButtonGroupControl } from '../../RadioButtonGroup/RadioButtonGroupControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
@@ -9,14 +10,17 @@ import { getValidation } from '../getValidation';
 
 export const PaymentSystemField = JSX<CustomFieldProps>(({ field, input }) => {
   const { value, onChange } = field('paymentSystem');
+  const [programId] = useLocalStorage<string>('programId');
 
   const [paymentSystemOptions, setPaymentSystemOptions] = useState<RadioButtonItem[]>([]);
 
   useEffect(() => {
-    (async () => {
-      const fetchedPaymentSystems = await getPaymentSystems();
-      setPaymentSystemOptions(fetchedPaymentSystems || []);
-    })();
+    if (programId) {
+      (async () => {
+        const fetchedPaymentSystems = await getPaymentSystems(programId);
+        setPaymentSystemOptions(fetchedPaymentSystems || []);
+      })();
+    }
   }, []);
 
   return (

package/src/ui-kit/FormField/Fields/RegionField.tsx

@@ -1,12 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
+import { getRegionUrl } from '../../../components/ApplicationForm/getRegionUrl';
 import { useRegions } from '../../../hooks/useRegions';
 import { SelectControl } from '../../Select/SelectControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const RegionField = JSX<CustomFieldProps>(({ field, input, url }) => {
+export const RegionField = JSX<CustomFieldProps>(({ field, input, params }) => {
+  const url = getRegionUrl(params?.typeForm as string | undefined);
+
   const regions = useRegions(url);
 
   return (

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

@@ -100,4 +100,5 @@ export type NameFieldDef =
   | 'currency'
   | 'cardCategory'
   | 'codeWord'
+  | 'calculator'
   | 'confirmationIncome';

package/src/ui-kit/FormField/SelectField.tsx

@@ -33,12 +33,10 @@ export const SelectField = UniBlock<SelectFieldProps>(
     isSearch = false,
   }) => {
     const leadOptions: Option[] =
-      (source &&
-        source?.map((_: LeadProps) => ({
-          key: _.key || '',
-          text: _.value,
-        }))) ||
-      [];
+      source?.map((_: LeadProps) => ({
+        key: _.key || '',
+        text: _.value,
+      })) || [];
 
     return (
       <SelectControl

package/src/ui-kit/FormField/getField.tsx

@@ -2,7 +2,6 @@
 /* eslint-disable max-lines-per-function */
 //TODO: Убрать обращение к компонентам т.к. ApplicationForm
 import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
-import { getRegionUrl } from '../../components/ApplicationForm/getRegionUrl';
 import { type FormFieldRegisterer } from '../../hooks/useForm';
 import { InputControl } from '../Input/InputControl';
 import { AcquiringField } from './Fields/AcquiringField';
@@ -29,6 +28,7 @@ import { CommentField } from './Fields/CommentField';
 import { ConfirmationIncomeField } from './Fields/ConfirmationIncomeField';
 import { ConscriptionField } from './Fields/ConscriptionField';
 import { ConsentField } from './Fields/ConsentField';
+import { CreditCalcField } from './Fields/CreditCalcField';
 import { CreditInRshbCdField } from './Fields/CreditInRshbCdField';
 import { CurrencyField } from './Fields/CurrencyField';
 import { DeliveryDateFiels } from './Fields/DeliveryDateFiels';
@@ -99,9 +99,9 @@ const PRODUCT_REF = {
 };
 
 export const getField =
-  (field: FormFieldRegisterer<any>, typeForm = '') =>
+  (field: FormFieldRegisterer<any>, params?: Record<string, any>) =>
   (input: FieldDef, i: number) => {
-    const isPremium = typeForm === 'ULTRASERVICE' || typeForm === 'PREMIUMSERVICE';
+    const isPremium = params?.typeForm === 'ULTRASERVICE' || params?.typeForm === 'PREMIUMSERVICE';
 
     const InputsMap = {
       surname: <SurnameField field={field} input={input} />,
@@ -157,7 +157,7 @@ export const getField =
       region: isPremium ? (
         <RegionPremiumField field={field} />
       ) : (
-        <RegionField field={field} input={input} url={getRegionUrl(typeForm)} />
+        <RegionField field={field} input={input} params={params} />
       ),
       education: <EducationField field={field} input={input} />,
       housing: <HousingField field={field} input={input} />,
@@ -205,6 +205,7 @@ export const getField =
       confirmationIncome: <ConfirmationIncomeField field={field} input={input} />,
       methodObtain: <MethodObtainField field={field} input={input} />,
       deliveryDate: <DeliveryDateFiels field={field} input={input} />,
+      calculator: <CreditCalcField field={field} params={params} />,
     };
 
     return isRenderField({ input, field }) ? (

package/src/ui-kit/FormField/getObjectValidator.tsx

@@ -105,6 +105,8 @@ export const validatorObj: Record<string, Validator> = {
   confirmationIncome: defaultValidator(),
   deliveryDate: defaultValidator('Укажите дату доставки'),
   addressCourier: addressDaDataValidator(),
+  cardCategory: defaultValidator('Укажите категорию карты'),
+  paymentSystem: defaultValidator('Укажите тип платежной системы'),
 };
 
 export const getObjectValidator = (inputs: FieldDef[]): Record<string, Validator> => {