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

package/mobile/src/api/RetailAPI/updateUserTask.ts

@@ -36,6 +36,11 @@ type ParticipantIncome = {
   value: number;
 };
 
+export type PaymentType = {
+  key: 'ANNUITY' | 'DIFFERENTIAL';
+  value: string;
+};
+
 export type Participant = {
   birthDate?: string;
   id: number;
@@ -100,6 +105,9 @@ export type Participant = {
   paymentSystemTypeCd?: string;
   classCard?: Option;
   codeWord?: string;
+  loanAmount?: number;
+  creditPeriod?: number;
+  paymentTypeCd?: PaymentType;
 };
 
 export type UpdateUserTaskBody = {

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

@@ -130,6 +130,9 @@ export interface FormState extends FormConsents {
   cardCategory?: { key: ''; text: '' };
   codeWord?: string;
   esiaAccountTypeCd?: Option;
+  moneyValue?: number;
+  monthsValue?: number;
+  isAnnuity?: boolean;
 }
 
 const initialFormState = {

package/mobile/src/components/CreditForm/CreditForm.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { updateRefreshToken } from '../../api/RetailAPI/updateRefreshToken';
 import { type SectionsProps } from '../../model/InputSectionsType';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
@@ -27,6 +28,8 @@ const WIZARD_TITLES = [
 export const CreditForm = JSX<CreditFormWizardProps>(({ className, ...rest }) => {
   const [step, setStep] = useState(0);
 
+  useEffect(updateRefreshToken, []);
+
   const handleNextStep = useCallback(() => {
     setStep((_) => Math.min(_ + 1, WIZARD_STEPS));
   }, []);
@@ -61,9 +64,15 @@ export const CreditForm = JSX<CreditFormWizardProps>(({ className, ...rest }) =>
             finishForm={setIsFormFinished}
             renderStep={
               isStartStep
-                ? ({ registerSubmit }) => (
+                ? ({ registerSubmit, field }) => (
                     <CalculatorCredit
                       {...{
+                        // TODO: Remove "as never"
+                        defaultParams: {
+                          sum: field('moneyValue' as never).value,
+                          period: field('monthsValue' as never).value,
+                          isAnnuity: field('isAnnuity' as never).value,
+                        },
                         title: 'Калькулятор кредита',
                         footnote:
                           'Расчёт является предварительным. Точные условия будут предоставлены в отделении Банка.',

package/mobile/src/components/CreditForm/CreditFormStatusTracker.tsx

@@ -23,6 +23,7 @@ export const CreditFormStatusTracker = JSX(() => {
     }
 
     const trackStatus = () =>
+      taskId &&
       getTaskStatus({ taskId }).then((res) => {
         if (res.statusCd && res.statusCd !== STATUS_TYPE.process) {
           clearInterval(pullingInterval);
@@ -31,6 +32,8 @@ export const CreditFormStatusTracker = JSX(() => {
       });
 
     const pullingInterval = setInterval(trackStatus, 30000);
+
+    return () => clearInterval(pullingInterval);
   }, []);
 
   return renderStatus(status);

package/mobile/src/components/CreditForm/getCreditFormTaskData.ts

@@ -4,6 +4,7 @@ import { getFirstStepData } from './getFirstStepData';
 import { getFourthStepData } from './getFourthStepData';
 import { getSecondStepData } from './getSecondStepData';
 import { getThirdStepData } from './getThirdStepData';
+import { getZeroStepData } from './getZeroStepData';
 
 type getCreditFormTaskDataProps = {
   participantId: number;
@@ -48,6 +49,8 @@ export const getCreditFormTaskData = ({
 
 const getCurrentStepData = (step: number, formData: FormState): Partial<Participant> => {
   switch (step) {
+    case 0:
+      return getZeroStepData(formData);
     case 1:
       return getFirstStepData(formData);
     case 2:

package/mobile/src/components/CreditForm/getZeroStepData.ts

@@ -0,0 +1,17 @@
+import { type Participant, type PaymentType } from '../../api/RetailAPI/updateUserTask';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+
+const PAYMENT_TYPE_DATA: Record<string, PaymentType> = {
+  annuity: { key: 'ANNUITY', value: 'Аннуитетный' },
+  differential: { key: 'DIFFERENTIAL', value: 'Дифференцированный ' },
+};
+
+export const getZeroStepData = (formData: FormState): Partial<Participant> => {
+  const { moneyValue, monthsValue, isAnnuity } = formData;
+
+  return {
+    loanAmount: moneyValue,
+    creditPeriod: monthsValue,
+    paymentTypeCd: PAYMENT_TYPE_DATA[isAnnuity ? 'annuity' : 'differential'],
+  };
+};

package/mobile/src/hooks/useInterval.ts

@@ -0,0 +1,14 @@
+import { useCallback, useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
+
+export const useInterval = (handler: (stop: () => void) => void, period: number) => {
+  const timer = useRef<any | null>(null);
+  const clearTimer = useCallback(() => timer.current && clearInterval(timer.current as number), []);
+
+  useEffect(() => {
+    timer.current = setInterval(() => handler(clearTimer), period);
+
+    return clearTimer;
+  }, [handler, period]);
+
+  return clearTimer;
+};

package/package.json

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

package/src/api/RetailAPI/doRequest.ts

@@ -15,6 +15,7 @@ export async function doRequest<R>(
     body: body ? JSON.stringify(body) : null,
   });
 
+  // TODO: add error handling
   return isJSON(response) ? response.json() : response;
 }
 

package/src/api/RetailAPI/updateRefreshToken.ts

@@ -0,0 +1,42 @@
+import { doRequest } from './doRequest';
+
+interface UpdateRefreshTokenBody {
+  refresh_token: string;
+  access_token: string;
+}
+
+const PORTAL_NATURAL_URL = '/';
+
+const UPDATING_INTERVAL = 60000 * 4;
+
+export const updateRefreshToken = () => {
+  const refreshToken = globalThis.sessionStorage?.getItem('refreshToken');
+  const accessToken = globalThis.sessionStorage?.getItem('accessToken');
+  const taskId = globalThis.localStorage.getItem('taskId');
+
+  if (!accessToken || !refreshToken || !taskId) {
+    globalThis.location.href = PORTAL_NATURAL_URL;
+
+    return () => null;
+  }
+
+  const timer = setInterval(async () => {
+    const res = await doRequest<UpdateRefreshTokenBody | Response>('/auth/refresh', 'POST', {
+      // eslint-disable-next-line camelcase
+      refresh_token: refreshToken,
+      // eslint-disable-next-line camelcase
+      access_token: accessToken,
+    });
+
+    if (res instanceof Response) {
+      globalThis.location.href = PORTAL_NATURAL_URL;
+
+      return;
+    }
+
+    sessionStorage.setItem('refreshToken', res.refresh_token);
+    sessionStorage.setItem('accessToken', res.access_token);
+  }, UPDATING_INTERVAL);
+
+  return () => clearInterval(timer);
+};

package/src/api/RetailAPI/updateUserTask.ts

@@ -36,6 +36,11 @@ type ParticipantIncome = {
   value: number;
 };
 
+export type PaymentType = {
+  key: 'ANNUITY' | 'DIFFERENTIAL';
+  value: string;
+};
+
 export type Participant = {
   birthDate?: string;
   id: number;
@@ -100,6 +105,9 @@ export type Participant = {
   paymentSystemTypeCd?: string;
   classCard?: Option;
   codeWord?: string;
+  loanAmount?: number;
+  creditPeriod?: number;
+  paymentTypeCd?: PaymentType;
 };
 
 export type UpdateUserTaskBody = {

package/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -130,6 +130,9 @@ export interface FormState extends FormConsents {
   cardCategory?: { key: ''; text: '' };
   codeWord?: string;
   esiaAccountTypeCd?: Option;
+  moneyValue?: number;
+  monthsValue?: number;
+  isAnnuity?: boolean;
 }
 
 const initialFormState = {

package/src/components/CreditForm/CreditForm.fixture.tsx

@@ -3,6 +3,13 @@ import { DialogManager } from '../../ui-kit/DialogManager/DialogManager';
 import { PopupManager } from '../../ui-kit/PopupManager/PopupManager';
 import { CreditForm } from './CreditForm';
 
+const MOCK_TOKEN = 'mockKEY';
+const MOCK_TASK_ID = '111111';
+
+globalThis.sessionStorage?.setItem('refreshToken', MOCK_TOKEN);
+globalThis.sessionStorage?.setItem('accessToken', MOCK_TOKEN);
+globalThis.localStorage.setItem('taskId', MOCK_TASK_ID);
+
 export default {
   default: (
     <div>

package/src/components/CreditForm/CreditForm.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { updateRefreshToken } from '../../api/RetailAPI/updateRefreshToken';
 import { type SectionsProps } from '../../model/InputSectionsType';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
@@ -27,6 +28,8 @@ const WIZARD_TITLES = [
 export const CreditForm = JSX<CreditFormWizardProps>(({ className, ...rest }) => {
   const [step, setStep] = useState(0);
 
+  useEffect(updateRefreshToken, []);
+
   const handleNextStep = useCallback(() => {
     setStep((_) => Math.min(_ + 1, WIZARD_STEPS));
   }, []);
@@ -61,9 +64,15 @@ export const CreditForm = JSX<CreditFormWizardProps>(({ className, ...rest }) =>
             finishForm={setIsFormFinished}
             renderStep={
               isStartStep
-                ? ({ registerSubmit }) => (
+                ? ({ registerSubmit, field }) => (
                     <CalculatorCredit
                       {...{
+                        // TODO: Remove "as never"
+                        defaultParams: {
+                          sum: field('moneyValue' as never).value,
+                          period: field('monthsValue' as never).value,
+                          isAnnuity: field('isAnnuity' as never).value,
+                        },
                         title: 'Калькулятор кредита',
                         footnote:
                           'Расчёт является предварительным. Точные условия будут предоставлены в отделении Банка.',

package/src/components/CreditForm/CreditFormStatusTracker.tsx

@@ -23,6 +23,7 @@ export const CreditFormStatusTracker = JSX(() => {
     }
 
     const trackStatus = () =>
+      taskId &&
       getTaskStatus({ taskId }).then((res) => {
         if (res.statusCd && res.statusCd !== STATUS_TYPE.process) {
           clearInterval(pullingInterval);
@@ -31,6 +32,8 @@ export const CreditFormStatusTracker = JSX(() => {
       });
 
     const pullingInterval = setInterval(trackStatus, 30000);
+
+    return () => clearInterval(pullingInterval);
   }, []);
 
   return renderStatus(status);

package/src/components/CreditForm/getCreditFormTaskData.ts

@@ -4,6 +4,7 @@ import { getFirstStepData } from './getFirstStepData';
 import { getFourthStepData } from './getFourthStepData';
 import { getSecondStepData } from './getSecondStepData';
 import { getThirdStepData } from './getThirdStepData';
+import { getZeroStepData } from './getZeroStepData';
 
 type getCreditFormTaskDataProps = {
   participantId: number;
@@ -48,6 +49,8 @@ export const getCreditFormTaskData = ({
 
 const getCurrentStepData = (step: number, formData: FormState): Partial<Participant> => {
   switch (step) {
+    case 0:
+      return getZeroStepData(formData);
     case 1:
       return getFirstStepData(formData);
     case 2:

package/src/components/CreditForm/getZeroStepData.ts

@@ -0,0 +1,17 @@
+import { type Participant, type PaymentType } from '../../api/RetailAPI/updateUserTask';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+
+const PAYMENT_TYPE_DATA: Record<string, PaymentType> = {
+  annuity: { key: 'ANNUITY', value: 'Аннуитетный' },
+  differential: { key: 'DIFFERENTIAL', value: 'Дифференцированный ' },
+};
+
+export const getZeroStepData = (formData: FormState): Partial<Participant> => {
+  const { moneyValue, monthsValue, isAnnuity } = formData;
+
+  return {
+    loanAmount: moneyValue,
+    creditPeriod: monthsValue,
+    paymentTypeCd: PAYMENT_TYPE_DATA[isAnnuity ? 'annuity' : 'differential'],
+  };
+};

package/src/hooks/useInterval.ts

@@ -0,0 +1,14 @@
+import { useCallback, useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
+
+export const useInterval = (handler: (stop: () => void) => void, period: number) => {
+  const timer = useRef<any | null>(null);
+  const clearTimer = useCallback(() => timer.current && clearInterval(timer.current as number), []);
+
+  useEffect(() => {
+    timer.current = setInterval(() => handler(clearTimer), period);
+
+    return clearTimer;
+  }, [handler, period]);
+
+  return clearTimer;
+};