@redneckz/wildless-cms-uni-blocks 0.14.896 → 0.14.898

package/mobile/lib/ui-kit/FormField/getField.js.map

@@ -1 +1 @@
-{"version":3,"file":"getField.js","sourceRoot":"","sources":["../../../src/ui-kit/FormField/getField.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"getField.js","sourceRoot":"","sources":["../../../src/ui-kit/FormField/getField.tsx"],"names":[],"mappings":"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"}

package/mobile/src/components/ApplicationLeadForm/useInitApplicationLead.ts

@@ -103,9 +103,10 @@ const getLeadQueryParams = (
   const referalData = sessionStore.referalData;
   const marketingInfoFromStorage = sessionStore.marketingInfo;
   const queryStorage = new URLSearchParams(decodeURIComponent(queryFromStorage || ''));
+  const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
 
-  const code = queryStorage.get('code');
-  const state = queryStorage.get('state');
+  const code = params.get('code');
+  const state = params.get('state');
   const referalCode = code ? referalData?.referalCode : queryStorage.get('referalCode');
   const refererCode = code ? referalData?.refererCode : queryStorage.get('refererCode');
   const productId = code ? referalData?.productId : queryStorage.get('productId');

package/mobile/src/hooks/useForm/useForm.ts

@@ -4,7 +4,7 @@ import { type ControlProps } from '../../model/ControlProps';
 import { type PreventableEvent } from '../../ui-kit/PreventableEvent';
 import { type ValidationInfo } from '../../validation/validator';
 import { type FieldOptions } from './FieldOptions';
-import { type FormOptions } from './FormOptions';
+import { type FieldValidatorsMap, type FormOptions } from './FormOptions';
 import { useFormValidator } from './useFormValidator';
 import { useNormalizedFormState } from './useNormalizedFormState';
 
@@ -12,6 +12,8 @@ export interface FieldProps<V> extends ControlProps<V> {
   isDirty?: boolean;
   errors?: ValidationInfo;
   error?: ValidationInfo[0];
+  setFieldRef?: (_: HTMLDivElement) => void;
+  fieldRef?: HTMLDivElement | null;
 }
 
 export type FormFieldRegisterer<FormState> = <N extends keyof FormState, V = FormState[N]>(
@@ -37,9 +39,9 @@ export function useForm<FormState extends Record<string, any>>(
     onChange,
   );
 
+  const fieldRefs = useRef(getRefsObject<FormState>(initialState));
   const [isDirtyForm, { setTrue: markAsDirty, setFalse: markAsClean }] = useBool(false);
   const dirtyFieldsMap = useRef<Record<string, boolean>>({});
-
   const [fieldValidatorsMap, { isValid, errors }] = useFormValidator(formState, formValidator);
 
   const field: FormFieldRegisterer<FormState> = useCallback(
@@ -51,6 +53,12 @@ export function useForm<FormState extends Record<string, any>>(
       const fieldErrors: ValidationInfo = isDirty && fieldValidator ? fieldValidator(value) : [];
 
       return {
+        setFieldRef: (_: HTMLDivElement) => {
+          if (fieldRefs.current) {
+            fieldRefs.current[fieldName] = _;
+          }
+        },
+        fieldRef: fieldRefs.current?.[fieldName],
         value: format ? (format(value) as FormState[any]) : value,
         isDirty,
         errors: fieldValidator && fieldErrors, // TODO Костыль
@@ -88,7 +96,9 @@ export function useForm<FormState extends Record<string, any>>(
         resetOnSubmit && reset();
         onSubmit?.(formState, ev);
       } else {
+        const errorFieldName = getErrorFieldName(formState, fieldValidatorsMap);
         markAsDirty();
+        field(errorFieldName).fieldRef?.scrollIntoView({ behavior: 'smooth' });
       }
     },
     [resetOnSubmit, formState, isValid, reset, onSubmit],
@@ -96,3 +106,22 @@ export function useForm<FormState extends Record<string, any>>(
 
   return [formState, { errors, field, update, reset, onSubmit: handleSubmit }];
 }
+
+const getRefsObject = <FormState extends Record<string, any>>(initialState: FormState) =>
+  Object.keys(initialState).reduce(
+    (acc, key) => ({ ...acc, [key]: null }),
+    {} as Record<keyof FormState, HTMLDivElement | null>,
+  );
+
+const getErrorFieldName = <FormState extends Record<string, any>>(
+  formState: FormState,
+  fieldValidatorsMap: FieldValidatorsMap<FormState> = {},
+) => {
+  const [errorFieldName = ''] =
+    Object.entries(formState).find(([fieldName, value]) => {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+      return fieldValidatorsMap[fieldName]?.(value)?.length;
+    }) ?? [];
+
+  return errorFieldName;
+};

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

@@ -88,8 +88,10 @@ export type EsiaRequestProfileResponse = CheckCodeResponse & {
 
 export const esiaRequestProfile = (body: EsiaRequestProfileBody) =>
   fetchRetailJSON<EsiaRequestProfileResponse>('/esia/requestProfile', 'POST', body).then((res) => {
-    saveToken(res);
-    updateRefreshToken(true);
+    if (res?.access_token && res?.refresh_token) {
+      saveToken(res);
+      updateRefreshToken(true);
+    }
 
     return res;
   });

package/mobile/src/retail/components/DraftDialog/parseDraftTask.ts

@@ -8,7 +8,6 @@ import {
   getParticipantGender,
   getParticipantIncomes,
   getSelectValue,
-  INCOME_CERTIFICATE,
 } from './utils';
 
 export const parseDraftTask = (task: Task): LeadFormState => {
@@ -67,8 +66,6 @@ export const parseDraftTask = (task: Task): LeadFormState => {
     creditInRshbCd,
     payrollCardRshbFlg: isInsurance,
     consentInsuranceFlg: isSalaryClient,
-    incomeCertificateCd,
-    profile,
   } = participant;
 
   return {
@@ -108,7 +105,6 @@ export const parseDraftTask = (task: Task): LeadFormState => {
     familyMembers: familyMembers?.toString(),
     dependents: dependents?.toString(),
     conscription: getSelectValue(conscription),
-    confirmationIncome: getSelectValue(incomeCertificateCd, INCOME_CERTIFICATE),
     snils,
     armyIdFlg,
     bankruptcyFlg,
@@ -122,7 +118,6 @@ export const parseDraftTask = (task: Task): LeadFormState => {
       monthsValue,
       isAnnuity: paymentTypeCd?.key === 'ANNUITY',
     },
-    esiaAccountTypeCd: profile?.esiaAccountTypeCd,
     ...getParticipantIncomes(participantIncomes),
     ...getParticipantAddresses(participantAddresses),
     ...getParticipantContacts(participantContacts),

package/mobile/src/retail/components/DraftDialog/utils.ts

@@ -34,13 +34,6 @@ export const EMPLOYMENT_TYPE = {
   RETIREE: 'Пенсионер',
 };
 
-export const INCOME_CERTIFICATE = {
-  BANK_STATEMENT: 'Получаю зарплату на счет/карту в РСХБ',
-  BANK_STATEMENT_PENS: 'Получаю пенсию на счет/карту в РСХБ',
-  PFR_CERTIFICATE: 'Получаю зарплату на счет/карту в другом банке',
-  OTHER: 'Другое',
-};
-
 export const getParticipantIncomes = (participantIncomes: Participant['participantIncomes']) => {
   const wages = participantIncomes?.find(
     (contact) => contact.incomeTypeCd.key === EIncomesType.WAGES,

package/mobile/src/ui-kit/FormField/RefWrapper.tsx

@@ -0,0 +1,20 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
+import type { VNode } from '../../model/VNode';
+import { noop } from '../../utils/noop';
+
+type RefWrapperProps = {
+  onFieldRef?: (_: HTMLDivElement) => void;
+  children?: VNode;
+};
+
+export const RefWrapper = JSX<RefWrapperProps>(({ onFieldRef = noop, children }) => {
+  const ref = useRef<HTMLDivElement | null>(null);
+  useEffect(() => {
+    if (ref.current) {
+      onFieldRef(ref.current);
+    }
+  }, []);
+
+  return <div ref={ref}>{children}</div>;
+});

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

@@ -44,6 +44,7 @@ import { UltraPremiumField } from './Fields/UltraPremiumField';
 import { VedField } from './Fields/VedField';
 import { ConsentToReceiveMaterialsField } from './Fields/СonsentToReceiveMaterialsField';
 import { getPremium } from './getPremium';
+import { RefWrapper } from './RefWrapper';
 import { shouldRenderField } from './shouldRenderField';
 
 const PRODUCT_REF = {
@@ -119,8 +120,8 @@ export const getField =
     const Component = fieldsRegister[String(input.name)];
 
     return shouldRenderField({ input, field }) && Component ? (
-      <div key={i}>
+      <RefWrapper onFieldRef={field(input.name ?? '').setFieldRef} key={String(i)}>
         <Component field={field} input={input} params={params} />
-      </div>
+      </RefWrapper>
     ) : null;
   };

package/package.json

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

package/src/components/ApplicationLeadForm/useInitApplicationLead.ts

@@ -103,9 +103,10 @@ const getLeadQueryParams = (
   const referalData = sessionStore.referalData;
   const marketingInfoFromStorage = sessionStore.marketingInfo;
   const queryStorage = new URLSearchParams(decodeURIComponent(queryFromStorage || ''));
+  const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
 
-  const code = queryStorage.get('code');
-  const state = queryStorage.get('state');
+  const code = params.get('code');
+  const state = params.get('state');
   const referalCode = code ? referalData?.referalCode : queryStorage.get('referalCode');
   const refererCode = code ? referalData?.refererCode : queryStorage.get('refererCode');
   const productId = code ? referalData?.productId : queryStorage.get('productId');

package/src/hooks/useForm/useForm.ts

@@ -4,7 +4,7 @@ import { type ControlProps } from '../../model/ControlProps';
 import { type PreventableEvent } from '../../ui-kit/PreventableEvent';
 import { type ValidationInfo } from '../../validation/validator';
 import { type FieldOptions } from './FieldOptions';
-import { type FormOptions } from './FormOptions';
+import { type FieldValidatorsMap, type FormOptions } from './FormOptions';
 import { useFormValidator } from './useFormValidator';
 import { useNormalizedFormState } from './useNormalizedFormState';
 
@@ -12,6 +12,8 @@ export interface FieldProps<V> extends ControlProps<V> {
   isDirty?: boolean;
   errors?: ValidationInfo;
   error?: ValidationInfo[0];
+  setFieldRef?: (_: HTMLDivElement) => void;
+  fieldRef?: HTMLDivElement | null;
 }
 
 export type FormFieldRegisterer<FormState> = <N extends keyof FormState, V = FormState[N]>(
@@ -37,9 +39,9 @@ export function useForm<FormState extends Record<string, any>>(
     onChange,
   );
 
+  const fieldRefs = useRef(getRefsObject<FormState>(initialState));
   const [isDirtyForm, { setTrue: markAsDirty, setFalse: markAsClean }] = useBool(false);
   const dirtyFieldsMap = useRef<Record<string, boolean>>({});
-
   const [fieldValidatorsMap, { isValid, errors }] = useFormValidator(formState, formValidator);
 
   const field: FormFieldRegisterer<FormState> = useCallback(
@@ -51,6 +53,12 @@ export function useForm<FormState extends Record<string, any>>(
       const fieldErrors: ValidationInfo = isDirty && fieldValidator ? fieldValidator(value) : [];
 
       return {
+        setFieldRef: (_: HTMLDivElement) => {
+          if (fieldRefs.current) {
+            fieldRefs.current[fieldName] = _;
+          }
+        },
+        fieldRef: fieldRefs.current?.[fieldName],
         value: format ? (format(value) as FormState[any]) : value,
         isDirty,
         errors: fieldValidator && fieldErrors, // TODO Костыль
@@ -88,7 +96,9 @@ export function useForm<FormState extends Record<string, any>>(
         resetOnSubmit && reset();
         onSubmit?.(formState, ev);
       } else {
+        const errorFieldName = getErrorFieldName(formState, fieldValidatorsMap);
         markAsDirty();
+        field(errorFieldName).fieldRef?.scrollIntoView({ behavior: 'smooth' });
       }
     },
     [resetOnSubmit, formState, isValid, reset, onSubmit],
@@ -96,3 +106,22 @@ export function useForm<FormState extends Record<string, any>>(
 
   return [formState, { errors, field, update, reset, onSubmit: handleSubmit }];
 }
+
+const getRefsObject = <FormState extends Record<string, any>>(initialState: FormState) =>
+  Object.keys(initialState).reduce(
+    (acc, key) => ({ ...acc, [key]: null }),
+    {} as Record<keyof FormState, HTMLDivElement | null>,
+  );
+
+const getErrorFieldName = <FormState extends Record<string, any>>(
+  formState: FormState,
+  fieldValidatorsMap: FieldValidatorsMap<FormState> = {},
+) => {
+  const [errorFieldName = ''] =
+    Object.entries(formState).find(([fieldName, value]) => {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+      return fieldValidatorsMap[fieldName]?.(value)?.length;
+    }) ?? [];
+
+  return errorFieldName;
+};

package/src/retail/api/esiaRequestProfile.ts

@@ -88,8 +88,10 @@ export type EsiaRequestProfileResponse = CheckCodeResponse & {
 
 export const esiaRequestProfile = (body: EsiaRequestProfileBody) =>
   fetchRetailJSON<EsiaRequestProfileResponse>('/esia/requestProfile', 'POST', body).then((res) => {
-    saveToken(res);
-    updateRefreshToken(true);
+    if (res?.access_token && res?.refresh_token) {
+      saveToken(res);
+      updateRefreshToken(true);
+    }
 
     return res;
   });

package/src/retail/components/DraftDialog/parseDraftTask.ts

@@ -8,7 +8,6 @@ import {
   getParticipantGender,
   getParticipantIncomes,
   getSelectValue,
-  INCOME_CERTIFICATE,
 } from './utils';
 
 export const parseDraftTask = (task: Task): LeadFormState => {
@@ -67,8 +66,6 @@ export const parseDraftTask = (task: Task): LeadFormState => {
     creditInRshbCd,
     payrollCardRshbFlg: isInsurance,
     consentInsuranceFlg: isSalaryClient,
-    incomeCertificateCd,
-    profile,
   } = participant;
 
   return {
@@ -108,7 +105,6 @@ export const parseDraftTask = (task: Task): LeadFormState => {
     familyMembers: familyMembers?.toString(),
     dependents: dependents?.toString(),
     conscription: getSelectValue(conscription),
-    confirmationIncome: getSelectValue(incomeCertificateCd, INCOME_CERTIFICATE),
     snils,
     armyIdFlg,
     bankruptcyFlg,
@@ -122,7 +118,6 @@ export const parseDraftTask = (task: Task): LeadFormState => {
       monthsValue,
       isAnnuity: paymentTypeCd?.key === 'ANNUITY',
     },
-    esiaAccountTypeCd: profile?.esiaAccountTypeCd,
     ...getParticipantIncomes(participantIncomes),
     ...getParticipantAddresses(participantAddresses),
     ...getParticipantContacts(participantContacts),

package/src/retail/components/DraftDialog/utils.ts

@@ -34,13 +34,6 @@ export const EMPLOYMENT_TYPE = {
   RETIREE: 'Пенсионер',
 };
 
-export const INCOME_CERTIFICATE = {
-  BANK_STATEMENT: 'Получаю зарплату на счет/карту в РСХБ',
-  BANK_STATEMENT_PENS: 'Получаю пенсию на счет/карту в РСХБ',
-  PFR_CERTIFICATE: 'Получаю зарплату на счет/карту в другом банке',
-  OTHER: 'Другое',
-};
-
 export const getParticipantIncomes = (participantIncomes: Participant['participantIncomes']) => {
   const wages = participantIncomes?.find(
     (contact) => contact.incomeTypeCd.key === EIncomesType.WAGES,

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

@@ -0,0 +1,20 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
+import type { VNode } from '../../model/VNode';
+import { noop } from '../../utils/noop';
+
+type RefWrapperProps = {
+  onFieldRef?: (_: HTMLDivElement) => void;
+  children?: VNode;
+};
+
+export const RefWrapper = JSX<RefWrapperProps>(({ onFieldRef = noop, children }) => {
+  const ref = useRef<HTMLDivElement | null>(null);
+  useEffect(() => {
+    if (ref.current) {
+      onFieldRef(ref.current);
+    }
+  }, []);
+
+  return <div ref={ref}>{children}</div>;
+});

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

@@ -44,6 +44,7 @@ import { UltraPremiumField } from './Fields/UltraPremiumField';
 import { VedField } from './Fields/VedField';
 import { ConsentToReceiveMaterialsField } from './Fields/СonsentToReceiveMaterialsField';
 import { getPremium } from './getPremium';
+import { RefWrapper } from './RefWrapper';
 import { shouldRenderField } from './shouldRenderField';
 
 const PRODUCT_REF = {
@@ -119,8 +120,8 @@ export const getField =
     const Component = fieldsRegister[String(input.name)];
 
     return shouldRenderField({ input, field }) && Component ? (
-      <div key={i}>
+      <RefWrapper onFieldRef={field(input.name ?? '').setFieldRef} key={String(i)}>
         <Component field={field} input={input} params={params} />
-      </div>
+      </RefWrapper>
     ) : null;
   };