@redneckz/wildless-cms-uni-blocks 0.14.917 → 0.14.919

package/src/retail/content.tsx

@@ -6,21 +6,14 @@ export const PERSONAL_DATA: CreditCardSectionsProps[] = [
     title: 'Персональные данные',
     columns: 2,
     inputs: [
-      {
-        name: 'surname',
-        required: true,
-        dadata: true,
-        filledByEsia: true,
-      },
-      { name: 'name', required: true, dadata: true, filledByEsia: true },
-      { name: 'middleName', dadata: true, filledByEsia: true },
-      { name: 'sex', required: true },
       { name: 'limitedBirthday', required: true, filledByEsia: true },
       { name: 'birthPlace', required: true, filledByEsia: true },
-      { name: 'phone', disabled: true, required: true },
-      { name: 'email', required: true, dadata: true },
     ],
   },
+  {
+    columns: 2,
+    inputs: [{ name: 'sex', required: true }],
+  },
   {
     title: 'Паспортные данные',
     columns: 2,

package/src/retail/hooks/useIFrameMode.ts

@@ -0,0 +1,45 @@
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
+import { initializeExternalStylesheet } from '../../hooks/useExternalNS';
+import { isIFrame } from '../../utils/isIFrame';
+
+export type IFrameStore = {
+  frameLocation: string;
+};
+
+export const useIFrameMode = () => {
+  const isFrame = isIFrame();
+  const height = globalThis.document?.body?.scrollHeight;
+  const sessionStore = useSessionStore<IFrameStore>();
+  const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
+
+  const styles = params.get('styles');
+  if (styles) {
+    initializeExternalStylesheet(styles);
+  }
+
+  useEffect(() => {
+    if (isFrame) {
+      globalThis.parent.postMessage({ height: document.body.scrollHeight }, '*');
+    }
+  }, [height, isFrame]);
+
+  useEffect(() => {
+    const handlePostMessage = (event: MessageEvent<{ location: string }>) => {
+      if (!event.data?.location) {
+        return;
+      }
+
+      sessionStore.frameLocation = event.data?.location;
+    };
+    if (isFrame) {
+      globalThis.addEventListener('message', handlePostMessage);
+    }
+
+    return () => {
+      if (isFrame) {
+        globalThis.removeEventListener('message', handlePostMessage);
+      }
+    };
+  }, [isFrame]);
+};

package/src/retail/inputs.tsx

@@ -8,7 +8,7 @@ import { AddressMatchField } from './components/Fields/AddressMatchField';
 import { AddressRetailField } from './components/Fields/AddressRetailField';
 import { AmountWorkersField } from './components/Fields/AmountWorkersField';
 import { ArmyIdFlgField } from './components/Fields/ArmyIdFlgField';
-import { BankEmpoleeCodeField } from './components/Fields/BankEmployeeCodeField';
+import { BankEmployeeCodeField } from './components/Fields/BankEmployeeCodeField';
 import { BankruptcyFlgField } from './components/Fields/BankruptcyFlgField';
 import { BeginDateField } from './components/Fields/BeginDateField';
 import { BirthPlaceField } from './components/Fields/BirthPlaceField';
@@ -136,7 +136,7 @@ export const InputsRetailMap = {
   shareholderFlg: ShareholderFlgField,
   legalEntityName: LegalEntityNameField,
   creditInRshbCd: CreditInRshbCdField,
-  bankEmployeeCode: BankEmpoleeCodeField,
+  bankEmployeeCode: BankEmployeeCodeField,
   partInBusiness: PartInBusinessField,
   regionRetail: RegionRetailField,
   infoCard: InfoCardField,

package/src/retail/model/LeadFormState.ts

@@ -128,6 +128,7 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
   inn?: string;
   legalForm?: string;
   organizationName?: string;
+  isDadataOrganization?: boolean;
   generalSeniority?: string;
   lastJobExperience?: string;
   experience5Years?: string;
@@ -136,7 +137,6 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
   beginDate?: Date | string;
   addressFact?: Address;
   addressBranch?: Option;
-  bankEmpolee?: string;
   applicationDate?: string;
   comment?: string;
   isClient?: boolean;

package/src/retail/model/NameFieldDef.ts

@@ -35,6 +35,7 @@ type NameFieldRetailDef =
   | 'organizationAddress'
   | 'organizationPhone'
   | 'organizationName'
+  | 'isDadataOrganization'
   | 'legalForm'
   | 'generalSeniority'
   | 'lastJobExperience'

package/src/retail/utils/getMainFormStateMap.ts

@@ -43,6 +43,7 @@ export const getMainFormStateMap = (isCredit = false): Partial<LeadFormState>[]
       fiasCode: '',
     },
     organizationName: '',
+    isDadataOrganization: false,
     organizationPhone: '',
     partInBusiness: undefined,
     positionOrganization: { key: '', text: '' },
@@ -59,10 +60,4 @@ export const getMainFormStateMap = (isCredit = false): Partial<LeadFormState>[]
     esiaAccountTypeCd: { key: '', text: '' },
     initiateBankruptcyFlg: isCredit ? false : undefined,
   },
-  {
-    bankruptcyFlg: false,
-    shareholderFlg: false,
-    legalEntityName: '',
-    creditInRshbCd: undefined,
-  },
 ];

package/src/retail/utils/getOrganizationParams.ts

@@ -129,3 +129,10 @@ const getOptionOp = (options: DictionaryItem[]) => (key: string) =>
   options
     .map((_): Option => ({ key: _.key as string, text: _.value as string }))
     .find((_) => _.key === key) ?? null;
+
+export const organizationDictionaries = {
+  amountWorkers: 'EMPLOYEES_NUMBER',
+  employerOrganization: 'ORGANIZATION_KIND',
+  employerActivities: 'ORGANIZATION_ACTIVITY_TYPE',
+  organization: 'ORGANIZATION_TYPE',
+};

package/src/retail/utils/updateOrganizationFields.ts

@@ -28,6 +28,8 @@ export const updateOrganizationFields = (
     organization: getOrganizationType(store?.organization ?? [], okopf, inn),
     employerOrganization: getOrganizationKind(store?.employerOrganization ?? [], okopf),
     organizationName,
+    inn,
+    isDadataOrganization: true,
   };
 
   for (const fieldName in organizationData) {

package/src/retail/validator/getRetailFormValidator.ts

@@ -8,6 +8,8 @@ import { validatorObj } from './validatorObj';
 import {
   dateRegistrationValidator,
   generalSeniorityValidator,
+  organizationInnValidator,
+  organizationNameValidator,
   passportValidator,
   workBeginDateValidator,
 } from './validators';
@@ -32,4 +34,6 @@ export const getRetailFormValidator = ({
     generalSeniority: generalSeniorityValidator(formState.lastJobExperience as string),
     beginDate: workBeginDateValidator(formState.limitedBirthday as Date),
     participantDateRegistration: dateRegistrationValidator(formState.limitedBirthday as Date),
+    organizationName: organizationNameValidator(formState.isDadataOrganization),
+    inn: organizationInnValidator(formState.isDadataOrganization),
   })(formState);

package/src/retail/validator/validators.ts

@@ -1,3 +1,4 @@
+import { isValidInnLength } from '../../ui-kit/FormField/validators';
 import { isCyrillic } from '../../utils/isCyrilic';
 import { validator } from '../../validation/validator';
 import { type Address } from '../model/LeadFormState';
@@ -135,3 +136,11 @@ export const validateDateFromBirth = (age: number, birthDate?: Date) =>
 
     return false;
   });
+
+export const organizationNameValidator = (isDadataOrganization?: boolean) =>
+  validator((_: string) => Boolean(_) && Boolean(isDadataOrganization))(
+    'Укажите наименование организации',
+  );
+
+export const organizationInnValidator = (isDadataOrganization?: boolean) =>
+  validator((_: string) => isValidInnLength(_) && Boolean(isDadataOrganization))('Укажите ИНН');

package/src/ui-kit/DatePicker/DatePickerInput.tsx

@@ -70,7 +70,7 @@ export const DatePickerInput = JSX<DatePickerInputProps>(
       <div onClick={onInputClick} className={style('relative', className)}>
         <input
           ref={ref}
-          className="h-full w-full px-m text-l text-black focus-visible:outline-none"
+          className="h-full w-full px-m text-l text-black focus-visible:outline-none rounded-none"
           value={inputValue}
           type="text"
           onChange={handleChange}

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

@@ -43,5 +43,5 @@ const emailValidate = (email: string) => /^[^\s@]+@[^\s@]+\.[a-zA-Z]{2,4}$/.test
 export const emailValidator = (errorMsg: string) =>
   validator((_: string) => emailValidate(_))(errorMsg);
 
-const isValidInnLength = (value: string | undefined): boolean =>
+export const isValidInnLength = (value: string | undefined): boolean =>
   typeof value === 'string' && (value.length === 10 || value.length === 12);

package/src/ui-kit/TabsControl/TabItemInner.tsx

@@ -50,6 +50,7 @@ export const TabItemInner = JSX<TabItemInnerProps>(
           'h-12',
           'block flex-1',
           'cursor-pointer',
+          'rounded-none',
           tabPaddingStyleMap[type],
           isActive ? activeTabBgStyleMap[type] : tabBgStyleMap[type],
         )}

package/src/utils/isIFrame.ts

@@ -0,0 +1 @@
+export const isIFrame = () => globalThis.location !== globalThis?.top?.location;

package/tailwind.config.cjs

@@ -266,6 +266,9 @@ module.exports = {
       },
       borderRadius: {
         icon: '50%',
+        md: 'var(--border-radius-md)',
+        lg: 'var(--border-radius-lg)',
+        none: 'var(--border-radius-none)',
       },
     },
   },