@redneckz/wildless-cms-uni-blocks 0.14.688 → 0.14.690

package/mobile/src/ui-kit/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.tsx

@@ -1,71 +1,58 @@
-import { useCallback, useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { checkCode } from '../../api/RetailAPI/checkCode';
 
 type useVerifyPhoneDialogSubmitProps = {
   values: string[];
-  close?: (smsCode?: string) => void;
+  onSuccess?: (smsCode?: string) => void;
 };
 
-export const useVerifyPhoneDialogSubmit = ({ close, values }: useVerifyPhoneDialogSubmitProps) => {
-  const [hasError, setHasError] = useState(false);
+export const useVerifyPhoneDialogSubmit = ({
+  values,
+  onSuccess,
+}: useVerifyPhoneDialogSubmitProps) => {
   const [errorText, setErrorText] = useState('');
   const [isLoading, setIsLoading] = useState(false);
-  const [timeNextReq, setTimeNextReq] = useState<number>(0);
+  const [timeNextReq, setTimeNextReq] = useState(0);
   const [isTimerStarted, setIsTimerStarted] = useState(false);
-  const [attemps, setAttemps] = useState(0);
+  const [attempts, setAttempts] = useState(0);
 
-  const resetError = useCallback(() => {
-    setHasError(false);
-    setErrorText('');
-  }, []);
+  const resetError = useCallback(() => setErrorText(''), []);
 
-  const isTimeExpired = useMemo(
-    () => timeNextReq === 0 && isTimerStarted,
-    [timeNextReq, isTimerStarted],
-  );
-
-  const isSubmitButtonDisabled = useMemo(
-    () => attemps > 2 || !values.every(Boolean) || isTimeExpired,
-    [values],
-  );
+  const isTimeExpired = Boolean(timeNextReq === 0 && isTimerStarted);
+  const isSubmitButtonDisabled = attempts > 2 || isTimeExpired || !values.every(Boolean);
 
   const handleSubmit = useCallback(async () => {
     try {
       setIsTimerStarted(false);
       setTimeNextReq(0);
-      setAttemps(attemps + 1);
+      setAttempts((_) => _ + 1);
       setIsLoading(true);
       await checkCode({
         smsText: values.join(''),
         smsCodesSetName: { key: 'AUTHENTICATION' },
       });
       resetError();
-      close && close(values.join(''));
+      onSuccess?.(values.join(''));
     } catch {
+      setErrorText(attempts > 1 ? 'Исчерпан лимит ввода смс-кода' : 'Неверный код');
+    } finally {
       setIsLoading(false);
-      attemps > 1 ? setErrorText('Исчерпан лимит ввода смс-кода') : setErrorText('Неверный код');
-      setHasError(true);
     }
-  }, [values, attemps]);
+  }, [values, attempts]);
 
   useEffect(() => {
-    if (isTimeExpired) {
-      setHasError(true);
-      setErrorText('Код просрочен');
-    } else {
-      setHasError(false);
-    }
+    setErrorText(isTimeExpired ? 'Код просрочен' : '');
   }, [isTimeExpired]);
 
   return {
     handleSubmit,
-    hasError,
+    hasError: Boolean(errorText),
     errorText,
     isLoading,
     timeNextReq,
     isSubmitButtonDisabled,
     setTimeNextReq,
     setIsTimerStarted,
-    setAttemps,
+    setAttempts,
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.688",
+  "version": "0.14.690",
   "private": false,
   "license": "MIT",
   "author": "ЦК",
@@ -139,7 +139,7 @@
   "dependencies": {
     "@redneckz/json-op": "^0.0.12",
     "@redneckz/json-ref": "^0.0.14",
-    "@redneckz/uni-jsx": "^2.6.3",
+    "@redneckz/uni-jsx": "^2.6.4",
     "@tailwindcss/container-queries": "^0.1.0",
     "@types/json-schema": "^7.0.11",
     "glob": "^8.0.3",

package/src/components/ApplicationForm/ApplicationForm.tsx

@@ -5,13 +5,14 @@ import { handleAspects } from '../../hooks/useAspects/handleAspects';
 import { useAspects } from '../../hooks/useAspects/useAspects';
 import { useForm } from '../../hooks/useForm';
 import { ApplicationFormLayout } from '../../ui-kit/ApplicationFormLayout/ApplicationFormLayout';
+import { useDialog } from '../../ui-kit/DialogManager/useDialog';
 import { getConsentDataProcessing } from '../../ui-kit/FormField/getConsentDataProcessing';
 import { getField } from '../../ui-kit/FormField/getField';
 import { getObjectValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
 import { renderTitle } from '../../ui-kit/FormField/renderTitle';
 import { type PreventableEventWithTarget } from '../../ui-kit/PreventableEvent';
-import { useResponseTypeDialog } from '../../ui-kit/ResponseTypeDialog/useResponseTypeDialog';
+import { ResponseTypeDialog } from '../../ui-kit/ResponseTypeDialog/ResponseTypeDialog';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 import { objectValidator } from '../../validation/objectValidator';
@@ -44,7 +45,9 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
     const inputs = (sections?.flatMap((_) => _?.inputs) || []) as FieldDef[];
     const initialFormState = getInitialFormState(inputs, typeForm);
     const [responseType, setResponseType] = useState<'OK' | 'Fail' | ''>('');
-    const responseTypeDialog = useResponseTypeDialog({ typeForm });
+
+    const responseTypeDialog = useDialog(ResponseTypeDialog);
+
     const handleSubmit = useCallback(
       async (formData: FormState, ev: PreventableEventWithTarget) => {
         const inputsFiltered = getFilteredInputs(inputs, formData);
@@ -57,7 +60,7 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
         setResponseType(status);
 
         if (status) {
-          responseTypeDialog.open({ responseType: status });
+          responseTypeDialog.open({ typeForm, responseType: status });
         }
         if (status === 'OK' && data) {
           const aspects = useAspects();
@@ -66,7 +69,7 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
 
         return status;
       },
-      [],
+      [typeForm],
     );
 
     const [, { field, onSubmit, reset }] = useForm(initialFormState, { onSubmit: handleSubmit });

package/src/components/ApplicationLeadForm/ApplicationLeadForm.fixture.tsx

@@ -23,4 +23,17 @@ export default {
       <DialogManager />
     </div>
   ),
+
+  creditCard: (
+    <div className="container grid grid-cols-12">
+      <ApplicationLeadForm
+        className="col-span-12"
+        title="Заявка на кредит"
+        programId="13"
+        button={button}
+      />
+      <PopupManager />
+      <DialogManager />
+    </div>
+  ),
 };

package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -1,12 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { ApplicationFormLayout } from '../../ui-kit/ApplicationFormLayout/ApplicationFormLayout';
+import { useDialog } from '../../ui-kit/DialogManager/useDialog';
 import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
 import { renderTitle } from '../../ui-kit/FormField/renderTitle';
 import { Loader } from '../../ui-kit/Loader/Loader';
-import { useResponseTypeDialog } from '../../ui-kit/ResponseTypeDialog/useResponseTypeDialog';
+import { ResponseTypeDialog } from '../../ui-kit/ResponseTypeDialog/ResponseTypeDialog';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 import { renderInputs } from '../ApplicationForm/renderInputs';
@@ -22,7 +23,6 @@ interface ApplicationLeadFormProps extends ApplicationLeadFormContent, UniBlockP
 export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
   ({ className, title, programId = '', nextStepLink = '/credit-lead', button, ...rest }) => {
     const inputs = (applicationFormData?.flatMap((_) => _?.inputs) || []) as FieldDef[];
-    const [responseType, setResponseType] = useState<'OK' | 'Fail' | ''>('');
 
     const { isLoading } = useInitApplicationLead(nextStepLink);
     const [leadForm, setLeadForm] = useLocalStorage<FormState>('leadForm');
@@ -34,19 +34,14 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
       saveForm: setLeadForm,
     });
 
-    if (responseStatus) {
-      const responseTypeDialog = useResponseTypeDialog({ responseType: responseStatus });
-      responseTypeDialog.open();
-    }
-
-    const [, { field, onSubmit, reset }] = useForm(initialFormState, { onSubmit: handleSubmit });
+    const [, { field, onSubmit }] = useForm(initialFormState, { onSubmit: handleSubmit });
 
+    const responseTypeDialog = useDialog(ResponseTypeDialog);
     useEffect(() => {
-      if (responseType === 'OK') {
-        setResponseType('');
-        reset();
+      if (responseStatus) {
+        responseTypeDialog.open({ responseType: responseStatus });
       }
-    }, [responseType]);
+    }, [responseStatus]);
 
     return (
       <ApplicationFormLayout

package/src/components/ApplicationLeadForm/useApplicationLeadApi.ts

@@ -6,9 +6,10 @@ import { updateUserTask } from '../../api/RetailAPI/updateUserTask';
 import { getUpdateUserProfileData } from '../../api/RetailAPI/utils/getUpdateUserProfile';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { useConsentBkiDialog } from '../../ui-kit/ConsentBkiDialog/useConsentBkiDialog';
+import { useDialog } from '../../ui-kit/DialogManager/useDialog';
 import { useEsiaLoginDialog } from '../../ui-kit/EsiaLoginDialog/useEsiaLoginDialog';
 import { getObjectValidator } from '../../ui-kit/FormField/getObjectValidator';
-import { useVerifyPhoneDialog } from '../../ui-kit/VerifyPhoneDialog/useVerifyPhoneDialog';
+import { VerifyPhoneDialog } from '../../ui-kit/VerifyPhoneDialog/VerifyPhoneDialog';
 import { formatPhone } from '../../utils/formatPhone';
 import { objectValidator } from '../../validation/objectValidator';
 import { isValidationSuccess } from '../../validation/validator';
@@ -42,9 +43,10 @@ export const useApplicationLeadApi = ({
   const [, setProfileId] = useLocalStorage<number>('profileId');
   const [, setParticipantId] = useLocalStorage<number>('participantId');
   const [, setProgramId] = useLocalStorage<string>('programId');
-  const esiaLoginDialog = useEsiaLoginDialog(nextStepLink);
-  const consentBkiDialog = useConsentBkiDialog(esiaLoginDialog.open);
-  const verifyPhoneDialog = useVerifyPhoneDialog();
+
+  const openEsiaLoginDialog = useEsiaLoginDialog(nextStepLink);
+  const consentBkiDialog = useConsentBkiDialog(openEsiaLoginDialog);
+  const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
 
   const saveUserData = useCallback(
     ({ participantId, taskId, profileId, programId: programNumber }: UserData) => {
@@ -60,7 +62,7 @@ export const useApplicationLeadApi = ({
   const handleSubmit = useCallback(async (formData: FormState) => {
     const feedbackValidator = objectValidator(getObjectValidator(inputs));
     if (!isValidationSuccess(feedbackValidator(formData))) {
-      return console.warn('validation fail');
+      return;
     }
 
     try {
@@ -89,10 +91,10 @@ export const useApplicationLeadApi = ({
           .filter((_) => formData[_])
           .map((_) => CONSENTS[_]?.text);
 
-        verifyPhoneDialog.open(
-          handleSuccessVerify,
-          verifyPhoneContent(formData?.phone, acceptedConsents),
-        );
+        verifyPhoneDialog.open({
+          ...verifyPhoneContent(formData?.phone, acceptedConsents),
+          onSuccess: handleSuccessVerify,
+        });
       }
     } catch {
       setResponseStatus('Fail');

package/src/components/ApplicationLeadForm/useInitApplicationLead.ts

@@ -1,5 +1,5 @@
-import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-
+import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { updateProfileEsia } from '../../api/RetailAPI/updateProfileEsia';
 import { locationNavigator } from '../../external/locationNavigator';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
@@ -8,36 +8,43 @@ import { parseEsiaProfile } from './pasreEsiaProfile';
 
 export const useInitApplicationLead = (nextStepLink: string) => {
   const navigator = locationNavigator();
-  const [isLoading, setIsLoading] = useState(false);
-  const [profileId] = useLocalStorage<string>('profileId');
-  const [leadForm, setLeadForm] = useLocalStorage<FormState>('leadForm');
-  const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
-  const code = params.get('code');
-  const state = params.get('state');
-
-  const updateEsiaProfile = useCallback(async () => {
-    if (profileId && code && state) {
-      const data = await updateProfileEsia({
-        profileId: profileId,
-        code,
-        state,
-        redirectUri: navigator.href,
-      });
+  const [isLoading, { setTrue: startLoading, setFalse: endLoading }] = useBool(false);
+  const [, setLeadForm] = useLocalStorage<FormState>('leadForm');
 
-      data &&
-        setLeadForm({
-          ...leadForm,
-          ...parseEsiaProfile(data),
+  const updateEsiaProfile = useCallback(
+    async (profileId: string, code: string, state: string) => {
+      startLoading();
+      try {
+        const data = await updateProfileEsia({
+          profileId,
+          code,
+          state,
+          redirectUri: globalThis.location?.href,
         });
 
-      navigator.assign(nextStepLink);
-    }
-  }, []);
+        if (data) {
+          setLeadForm((_) => ({
+            ..._,
+            ...parseEsiaProfile(data),
+          }));
+        }
+
+        navigator.assign(nextStepLink);
+      } finally {
+        endLoading();
+      }
+    },
+    [nextStepLink],
+  );
 
   useEffect(() => {
-    if (code) {
-      setIsLoading(true);
-      updateEsiaProfile();
+    const profileId: string = JSON.parse(globalThis.localStorage?.getItem('profileId') ?? 'null');
+    const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
+    const code = params.get('code');
+    const state = params.get('state');
+
+    if (profileId && code && state) {
+      updateEsiaProfile(profileId, code, state);
     } else {
       sessionStorage.removeItem('accessToken');
       sessionStorage.removeItem('refreshToken');

package/src/components/CreditCardForm/StepsNavigationButtons.tsx

@@ -8,7 +8,7 @@ export interface StepsNavigationButtonsProps {
 
 export const StepsNavigationButtons = JSX<StepsNavigationButtonsProps>(({ step, onPrevStep }) => {
   const isFirstStep = step === 0;
-  const isFinalStep = step === 6;
+  const isFinalStep = step === 5;
 
   return (
     <div className="flex justify-between gap-m">

package/src/components/CreditCardForm/calculateInputs.ts

@@ -30,9 +30,6 @@ const checkIsRetiree = (step: number, getValue: GetValue) =>
 const checkBusinessOwner = ({ name }: FieldDef, getValue: GetValue) =>
   name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
 
-const checkConsentPfrFlg = ({ name }: FieldDef, getValue: GetValue) =>
-  name === 'snils' && !getValue('consentPfrFlg');
-
 const checkAddressFillFromESIA = ({ name, filledByEsia }: FieldDef, getValue: GetValue) =>
   name?.startsWith('address') && getValue('esiaAccountTypeCd')?.key && filledByEsia;
 
@@ -46,3 +43,9 @@ export const checkCondition = ({ condition }: FieldDef, getValue: GetValue) =>
 
     return _ !== ((dataValue as Option)?.key ?? dataValue);
   });
+
+const checkConsentPfrFlg = ({ name }: FieldDef, getValue: GetValue) =>
+  name === 'snils' && isSnilsRequired(getValue);
+
+const isSnilsRequired = (getValue: GetValue) =>
+  getValue('confirmationIncome')?.key !== 'PFR_CERTIFICATE';

package/src/components/CreditCardForm/creditCardFormStepsData.tsx

@@ -34,8 +34,8 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
         { fieldType: 'common', name: 'middleName', dadata: true, filledByEsia: true },
         { fieldType: 'common', name: 'sex', required: true },
         { fieldType: 'common', name: 'limitedBirthday', required: true, filledByEsia: true },
-        { fieldType: 'common', name: 'birthPlace', required: true },
-        { fieldType: 'common', name: 'phone', required: true },
+        { fieldType: 'common', name: 'birthPlace', required: true, filledByEsia: true },
+        { fieldType: 'common', name: 'phone', required: true, filledByEsia: true },
         { fieldType: 'common', name: 'email', required: true, dadata: true },
       ],
     },
@@ -119,7 +119,7 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
     },
     {
       inputs: [
-        { fieldType: 'common', name: 'employment' },
+        { fieldType: 'common', name: 'employment', required: true },
         { fieldType: 'common', name: 'organizationName', required: true, dadata: true },
       ],
     },
@@ -132,15 +132,15 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
     },
     {
       inputs: [
-        { fieldType: 'common', name: 'organization', required: false },
-        { fieldType: 'common', name: 'amountWorkers', required: false },
+        { fieldType: 'common', name: 'organization', required: true },
+        { fieldType: 'common', name: 'amountWorkers', required: true },
       ],
     },
     {
       columns: 2,
       inputs: [
-        { fieldType: 'common', name: 'employerActivities', required: false },
-        { fieldType: 'common', name: 'employerOrganization', required: false },
+        { fieldType: 'common', name: 'employerActivities', required: true },
+        { fieldType: 'common', name: 'employerOrganization', required: true },
         { fieldType: 'common', name: 'generalSeniority', required: true },
         { fieldType: 'common', name: 'lastJobExperience', required: true },
         { fieldType: 'common', name: 'experience5Years', required: true },
@@ -161,7 +161,7 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
     {
       columns: 2,
       inputs: [
-        { fieldType: 'common', name: 'positionOrganization', required: false },
+        { fieldType: 'common', name: 'positionOrganization', required: true },
         {
           fieldType: 'common',
           name: 'partInBusiness',
@@ -208,6 +208,10 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
         },
       ],
     },
+    {
+      columns: 1,
+      inputs: [{ fieldType: 'common', name: 'confirmationIncome', required: true }],
+    },
     {
       columns: 1,
       inputs: [{ fieldType: 'common', name: 'wages', required: true }],
@@ -245,7 +249,12 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
       inputs: [{ fieldType: 'common', name: 'shareholderFlg' }],
     },
     {
-      inputs: [{ fieldType: 'common', name: 'legalEntityName' }],
+      inputs: [
+        {
+          fieldType: 'common',
+          name: 'legalEntityName',
+        },
+      ],
     },
     {
       inputs: [{ fieldType: 'common', name: 'creditInRshbCd' }],

package/src/components/CreditCardForm/{getFirstStepData.tsx → getCardData.tsx}

@@ -1,7 +1,7 @@
 import { type Participant } from '../../api/RetailAPI/updateUserTask';
 import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
 
-export const getFirstStepData = (formData: FormState): Partial<Participant> => {
+export const getCardData = (formData: FormState): Partial<Participant> => {
   const { currency, paymentSystem, cardCategory, codeWord } = formData;
 
   return {

package/src/components/CreditCardForm/getCreditCardFormTaskData.ts

@@ -1,8 +1,8 @@
 import { type Participant, type UpdateUserTaskBody } from '../../api/RetailAPI/updateUserTask';
 import { locationNavigator } from '../../external/locationNavigator';
 import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { getCardData } from './getCardData';
 import { getFifthStepData } from './getFifthStepData';
-import { getFirstStepData } from './getFirstStepData';
 import { getFourthStepData } from './getFourthStepData';
 import { getSecondStepData } from './getSecondStepData';
 import { getDeliveryData, getOfficeCode, getSixthStepData } from './getSixthStepData';
@@ -46,6 +46,7 @@ export const getCreditCardFormTaskData = ({
           ...getCurrentStepData(step, formData),
         },
       ],
+      ...getCardData(formData),
       ...getDeliveryData(formData),
     },
   };
@@ -54,7 +55,7 @@ export const getCreditCardFormTaskData = ({
 const getCurrentStepData = (step: number, formData: FormState): Partial<Participant> => {
   switch (step) {
     case 0:
-      return getFirstStepData(formData);
+      return {};
     case 1:
       return getSecondStepData(formData);
     case 2:

package/src/components/CreditForm/calculateInputs.ts

@@ -30,9 +30,6 @@ const checkIsRetiree = (step: number, getValue: GetValue) =>
 const checkBusinessOwner = ({ name }: FieldDef, getValue: GetValue) =>
   name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
 
-const checkConsentPfrFlg = ({ name }: FieldDef, getValue: GetValue) =>
-  name === 'snils' && isSnilsRequired(getValue);
-
 const checkAddressFillFromESIA = ({ name, filledByEsia }: FieldDef, getValue: GetValue) =>
   name?.startsWith('address') && getValue('esiaAccountTypeCd')?.key && filledByEsia;
 
@@ -47,5 +44,8 @@ export const checkCondition = ({ condition }: FieldDef, getValue: GetValue) =>
     return _ !== ((dataValue as Option)?.key ?? dataValue);
   });
 
+const checkConsentPfrFlg = ({ name }: FieldDef, getValue: GetValue) =>
+  name === 'snils' && isSnilsRequired(getValue);
+
 const isSnilsRequired = (getValue: GetValue) =>
   getValue('confirmationIncome')?.key !== 'PFR_CERTIFICATE';

package/src/components/CreditForm/creditFormStepsData.tsx

@@ -116,7 +116,7 @@ export const stepsSectionsMap: SectionsProps[][] = [
     },
     {
       inputs: [
-        { fieldType: 'common', name: 'employment' },
+        { fieldType: 'common', name: 'employment', required: true },
         { fieldType: 'common', name: 'organizationName', required: true, dadata: true },
       ],
     },
@@ -129,15 +129,15 @@ export const stepsSectionsMap: SectionsProps[][] = [
     },
     {
       inputs: [
-        { fieldType: 'common', name: 'organization', required: false },
-        { fieldType: 'common', name: 'amountWorkers', required: false },
+        { fieldType: 'common', name: 'organization', required: true },
+        { fieldType: 'common', name: 'amountWorkers', required: true },
       ],
     },
     {
       columns: 2,
       inputs: [
-        { fieldType: 'common', name: 'employerActivities', required: false },
-        { fieldType: 'common', name: 'employerOrganization', required: false },
+        { fieldType: 'common', name: 'employerActivities', required: true },
+        { fieldType: 'common', name: 'employerOrganization', required: true },
         { fieldType: 'common', name: 'generalSeniority', required: true },
         { fieldType: 'common', name: 'lastJobExperience', required: true },
         { fieldType: 'common', name: 'experience5Years', required: true },
@@ -158,7 +158,7 @@ export const stepsSectionsMap: SectionsProps[][] = [
     {
       columns: 2,
       inputs: [
-        { fieldType: 'common', name: 'positionOrganization', required: false },
+        { fieldType: 'common', name: 'positionOrganization', required: true },
         {
           fieldType: 'common',
           name: 'partInBusiness',

package/src/components/Header/HeaderSecondaryMenu.tsx

@@ -7,8 +7,9 @@ import { getAspectsWithInclude } from '../../hooks/useAspects/aspects/getAspects
 import { useLocation } from '../../hooks/useLocation';
 import { type BlockVersion } from '../../model/BlockVersion';
 import { type IconVersion } from '../../model/IconVersion';
-import { useLocationDialog } from '../../ui-kit/LocationDialog/useLocationDialog';
-import { useSearchDialog } from '../../ui-kit/SearchDialog/useSearchDialog';
+import { useDialog } from '../../ui-kit/DialogManager/useDialog';
+import { LocationDialog } from '../../ui-kit/LocationDialog/LocationDialog';
+import { SearchDialog } from '../../ui-kit/SearchDialog/SearchDialog';
 import { TopItem } from '../../ui-kit/TopItem/TopItem';
 import { style } from '../../utils/style';
 import { HeaderSecondaryMenuButton } from './HeaderSecondaryMenuButton';
@@ -24,11 +25,11 @@ export const HeaderSecondaryMenu = JSX<HeaderSecondaryMenuProps>(
 
     const currentLocation = useLocation(rest?.branches?.default);
 
-    const searchDialog = useSearchDialog(rest);
-    const locationDialog = useLocationDialog(rest);
+    const searchDialog = useDialog(SearchDialog, rest);
+    const locationDialog = useDialog(LocationDialog, rest);
 
-    const openSearchDialog = useCallback(() => searchDialog.open(), [searchDialog]);
-    const openLocationDialog = useCallback(() => locationDialog.open(), [locationDialog]);
+    const openSearchDialog = useCallback(() => searchDialog.open({}), [searchDialog]);
+    const openLocationDialog = useCallback(() => locationDialog.open({}), [locationDialog]);
 
     return (
       <div

package/src/components/LinkDocs/LinkDocs.tsx

@@ -14,7 +14,7 @@ import {
   type LinkDocsContent,
 } from './LinkDocsContent';
 import { renderDefaultItem } from './renderDefaultItem';
-import { ReportDialogButton } from './RepordDialogButton';
+import { ReportDialogButton } from './ReportDialogButton';
 
 const linkColumnsModeStyleMap: Record<LinkColumnsMode, string> = {
   double: 'sm:flex-wrap sm:flex-row',

package/src/components/LinkDocs/{RepordDialogButton.tsx → ReportDialogButton.tsx}

@@ -1,18 +1,18 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
-import { type ReportDialogProps } from '../../ui-kit/ReportDialog/ReportDialog';
-import { useReportDialog } from '../../ui-kit/ReportDialog/useReportDialog';
+import { useDialog } from '../../ui-kit/DialogManager/useDialog';
+import { ReportDialog, type ReportDialogProps } from '../../ui-kit/ReportDialog/ReportDialog';
 import { Text } from '../../ui-kit/Text/Text';
 import { renderImg } from './renderDefaultItem';
 
 export const ReportDialogButton = JSX<ReportDialogProps>(({ text, href, target, __html, icon }) => {
-  if (!text && !__html) {
-    return null;
-  }
-  const reportDialog = useReportDialog({ __html, href, target });
-  const openReportDialog = useCallback(() => reportDialog.open(), [reportDialog]);
+  const { open } = useDialog(ReportDialog);
+  const openReportDialog = useCallback(
+    () => open({ __html, href, target }),
+    [__html, href, target],
+  );
 
-  return (
+  return text ? (
     <button
       className="flex gap-s text-primary-text no-underline hover:text-primary-main"
       onClick={openReportDialog}
@@ -20,5 +20,5 @@ export const ReportDialogButton = JSX<ReportDialogProps>(({ text, href, target,
       {renderImg(icon)}
       <Text font="font-light">{text}</Text>
     </button>
-  );
+  ) : null;
 });