@redneckz/wildless-cms-uni-blocks 0.14.985 → 0.14.987

package/mobile/src/retail/api/getClaimChannel.ts

@@ -12,13 +12,15 @@ export const getClaimChannel = async (): Promise<string | undefined> => {
   const claimChannelCode = await fetchRetailJSON<GetClaimChannelResponse[]>(
     '/claim-channel/',
     'GET',
-  ).then((res) => {
-    const url = globalThis.location.href;
-    const code = res?.find((_) => _ && url.includes(_.key))?.code;
-    globalThis.sessionStorage.setItem('claimChannelCode', code ?? '');
+  )
+    .then((res) => {
+      const url = globalThis.location.href;
+      const code = res?.find((_) => _ && url.includes(_.key))?.code;
+      globalThis.sessionStorage.setItem('claimChannelCode', code ?? '');
 
-    return code;
-  });
+      return code;
+    })
+    .catch(() => undefined);
 
   return claimChannelCode;
 };

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

@@ -1,33 +1,49 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { CalculatorCredit } from '../../../components/CalculatorCredit/CalculatorCredit';
 import {
   type CreditCalculatorUserInputParams,
   type CreditDefaultParams,
 } from '../../../components/CalculatorCredit/CalculatorCreditContent';
+import { getCalcParams } from '../../../components/CalculatorCredit/utils';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { Loader } from '../../../ui-kit/Loader/Loader';
 
 const FIELD_NAME = 'calculator';
 
 export const CreditCalcField = JSX<CustomFieldProps>(({ field, params }) => {
+  const [defaultParams, setDefaultParams] = useState<CreditDefaultParams>();
   const calcValue = field(FIELD_NAME)?.value;
-  const defaultParams = calcValue
-    ? defaultValueAdapter(field(FIELD_NAME).value as CreditCalculatorUserInputParams)
-    : params?.calcData?.defaultParams;
-  const defaultCalcSum = params?.calcData?.defaultParams?.sum ?? 0;
 
   const handleChange = useCallback((_: CreditCalculatorUserInputParams) => {
     field(FIELD_NAME).onChange?.(_);
   }, []);
 
-  return (
+  useEffect(() => {
+    if (params?.calcData?.defaultParams) {
+      setDefaultParams(
+        calcValue
+          ? defaultValueAdapter(field(FIELD_NAME).value as CreditCalculatorUserInputParams)
+          : (params?.calcData?.defaultParams as CreditDefaultParams),
+      );
+    }
+  }, [params?.calcData?.defaultParams]);
+
+  useEffect(() => {
+    if (defaultParams) {
+      handleChange(getCalcParams(defaultParams));
+    }
+  }, [defaultParams]);
+
+  return defaultParams ? (
     <CalculatorCredit
-      key={defaultCalcSum}
       {...params?.calcData}
       defaultParams={defaultParams}
       padding="p-0"
       onChange={handleChange}
     />
+  ) : (
+    <Loader />
   );
 });
 

package/package.json

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

package/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx

@@ -8,7 +8,7 @@ import { createDraftTask } from '../../retail/api/createDraftTask';
 import { createParticipant } from '../../retail/api/createParticipant';
 import { createUserProfile } from '../../retail/api/createUserProfile';
 import { createUserTaskDebit } from '../../retail/api/createUserTaskDebit';
-// import { getClaimChannel } from '../../retail/api/getClaimChannel';
+import { getClaimChannel } from '../../retail/api/getClaimChannel';
 import { getLastTaskStatus } from '../../retail/api/getLastTaskStatus';
 import { getTaskById } from '../../retail/api/getTaskById';
 import { saveReferalInfo } from '../../retail/api/saveReferalInfo';
@@ -242,13 +242,13 @@ const updateUserData = async ({
 
   try {
     if (productType === 'debitCard') {
-      // const claimChannelCode = await getClaimChannel();
+      const claimChannelCode = await getClaimChannel();
       const debitData = await createUserTaskDebit(
         getDebitLeadFormTaskData({
           formData,
           programId,
           marketingInfo,
-          // claimChannelCode,
+          claimChannelCode,
         }),
       );
 

package/src/components/CalculatorCredit/CalculatorCredit.tsx

@@ -2,15 +2,10 @@
 import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type JSONRefObject } from '../../data/JSONRefObject';
 import { useForm, type FormFieldRegisterer } from '../../hooks/useForm/useForm';
-import { DEFAULT_MONTHS } from '../../ui-kit/Calculator/calculatorConstants';
 import { CalculatorLayout } from '../../ui-kit/Calculator/CalculatorLayout';
 import { CalculatorStyle } from '../../ui-kit/Calculator/CalculatorStyle';
 import { CalculatorValue } from '../../ui-kit/Calculator/CalculatorValue';
 import { getDefaultParamsMin } from '../../ui-kit/Calculator/getDefaultParams';
-import {
-  getMoneyDefaultValue,
-  getMonthsDefaultValue,
-} from '../../ui-kit/Calculator/getDefaultValues';
 import { renderFootnote } from '../../ui-kit/Calculator/renderFootnote';
 import { renderMonthsInput } from '../../ui-kit/Calculator/renderMonthsInput';
 import { renderPaymentType } from '../../ui-kit/Calculator/renderPaymentType';
@@ -32,8 +27,7 @@ import {
 } from './CalculatorCreditContent';
 import { getCreditCalculatorParams } from './getCreditCalculatorParams';
 import { isDefaultParams } from './isDefaultParams';
-
-const CREDIT_DEFAULT_SUM = 200000;
+import { getCalcParams } from './utils';
 
 const MAP = {
   isSalaryClient: 'isSalaryClient',
@@ -74,20 +68,9 @@ export const CalculatorCredit = UniBlock<CalculatorDepositProps>(
       [paramsViewSettings, calcSource],
     );
 
-    const [userInputParams, { field }] = useForm(
-      {
-        moneyValue: getMoneyDefaultValue(defaultParams, CREDIT_DEFAULT_SUM),
-        monthsValue: getMonthsDefaultValue(defaultParams, DEFAULT_MONTHS),
-        monthlyPayment: 0,
-        rate: 0,
-        isAnnuity: Boolean(defaultParams?.isAnnuity),
-        isInsurance: Boolean(defaultParams?.isEnableInsurance),
-        isSalaryClient: Boolean(defaultParams?.isEnableSalaryClient),
-        isPensionClient: Boolean(defaultParams?.isEnablePensionClient),
-        isStateEmployee: Boolean(defaultParams?.isEnableStateEmployee),
-      },
-      { onChange: handleChange },
-    );
+    const [userInputParams, { field }] = useForm(getCalcParams(defaultParams), {
+      onChange: handleChange,
+    });
 
     const calcParams = getCreditCalculatorParams(userInputParams, calcSource, paramsViewSettings);
     const paymentTypeElement = renderPaymentType({

package/src/components/CalculatorCredit/utils.ts

@@ -0,0 +1,20 @@
+import { DEFAULT_MONTHS } from '../../ui-kit/Calculator/calculatorConstants';
+import {
+  getMoneyDefaultValue,
+  getMonthsDefaultValue,
+} from '../../ui-kit/Calculator/getDefaultValues';
+import { type CreditDefaultParams } from './CalculatorCreditContent';
+
+const CREDIT_DEFAULT_SUM = 200000;
+
+export const getCalcParams = (defaultParams?: CreditDefaultParams) => ({
+  moneyValue: getMoneyDefaultValue(defaultParams, CREDIT_DEFAULT_SUM),
+  monthsValue: getMonthsDefaultValue(defaultParams, DEFAULT_MONTHS),
+  monthlyPayment: 0,
+  rate: 0,
+  isAnnuity: Boolean(defaultParams?.isAnnuity),
+  isInsurance: Boolean(defaultParams?.isEnableInsurance),
+  isSalaryClient: Boolean(defaultParams?.isEnableSalaryClient),
+  isPensionClient: Boolean(defaultParams?.isEnablePensionClient),
+  isStateEmployee: Boolean(defaultParams?.isEnableStateEmployee),
+});

package/src/retail/api/getClaimChannel.ts

@@ -12,13 +12,15 @@ export const getClaimChannel = async (): Promise<string | undefined> => {
   const claimChannelCode = await fetchRetailJSON<GetClaimChannelResponse[]>(
     '/claim-channel/',
     'GET',
-  ).then((res) => {
-    const url = globalThis.location.href;
-    const code = res?.find((_) => _ && url.includes(_.key))?.code;
-    globalThis.sessionStorage.setItem('claimChannelCode', code ?? '');
+  )
+    .then((res) => {
+      const url = globalThis.location.href;
+      const code = res?.find((_) => _ && url.includes(_.key))?.code;
+      globalThis.sessionStorage.setItem('claimChannelCode', code ?? '');
 
-    return code;
-  });
+      return code;
+    })
+    .catch(() => undefined);
 
   return claimChannelCode;
 };

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

@@ -1,33 +1,49 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { CalculatorCredit } from '../../../components/CalculatorCredit/CalculatorCredit';
 import {
   type CreditCalculatorUserInputParams,
   type CreditDefaultParams,
 } from '../../../components/CalculatorCredit/CalculatorCreditContent';
+import { getCalcParams } from '../../../components/CalculatorCredit/utils';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { Loader } from '../../../ui-kit/Loader/Loader';
 
 const FIELD_NAME = 'calculator';
 
 export const CreditCalcField = JSX<CustomFieldProps>(({ field, params }) => {
+  const [defaultParams, setDefaultParams] = useState<CreditDefaultParams>();
   const calcValue = field(FIELD_NAME)?.value;
-  const defaultParams = calcValue
-    ? defaultValueAdapter(field(FIELD_NAME).value as CreditCalculatorUserInputParams)
-    : params?.calcData?.defaultParams;
-  const defaultCalcSum = params?.calcData?.defaultParams?.sum ?? 0;
 
   const handleChange = useCallback((_: CreditCalculatorUserInputParams) => {
     field(FIELD_NAME).onChange?.(_);
   }, []);
 
-  return (
+  useEffect(() => {
+    if (params?.calcData?.defaultParams) {
+      setDefaultParams(
+        calcValue
+          ? defaultValueAdapter(field(FIELD_NAME).value as CreditCalculatorUserInputParams)
+          : (params?.calcData?.defaultParams as CreditDefaultParams),
+      );
+    }
+  }, [params?.calcData?.defaultParams]);
+
+  useEffect(() => {
+    if (defaultParams) {
+      handleChange(getCalcParams(defaultParams));
+    }
+  }, [defaultParams]);
+
+  return defaultParams ? (
     <CalculatorCredit
-      key={defaultCalcSum}
       {...params?.calcData}
       defaultParams={defaultParams}
       padding="p-0"
       onChange={handleChange}
     />
+  ) : (
+    <Loader />
   );
 });