@redneckz/wildless-cms-uni-blocks 0.14.733 → 0.14.735

package/mobile/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -34,46 +34,15 @@ export type FilledByEsiaProps = {
   filledByEsia?: boolean;
 };
 
-export type FieldDefaultDef = Required &
+export type FieldDef = Required &
   LabelProps &
   ConditionFieldProps &
   FilledByEsiaProps & {
     name?: NameFieldDef;
     dadata?: boolean;
+    defaultValue?: string;
   };
 
-/**
- * @title Поля ввода по умолчанию
- * @default {"fieldType": "common"}
- */
-export type FieldCommonDef = FieldDefaultDef & {
-  /** @default "common" */
-  fieldType: 'common';
-};
-
-/**
- * @title Значение по умолчанию
- * @enumNames ["Валютный контроль","Документарные операции","Конверсионные операции","Иные вопросы ВЭД"]
- */
-type VedTypes = 'currencyControl' | 'documentOperations' | 'conversionTransactions' | 'otherIssues';
-
-/**
- * @title Поле ввода ВЭД
- * @default {"fieldType": "ved", "name": "vedTypes", "defaultValue": "currencyControl"}
- */
-export type FieldVedDef = FieldDefaultDef & {
-  /** @default "ved" */
-  fieldType: 'ved';
-  defaultValue?: VedTypes;
-};
-
-/**
- * @title Поле
- * @default { "fieldType": "common" }
- */
-
-export type FieldDef = FieldCommonDef | FieldVedDef;
-
 /** @hidden */
 export type EndpointType = 'lead' | 'sendcorporatelead';
 

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

@@ -48,7 +48,7 @@ const initialFormState = {
   serviceType: SERVICE_TYPES[0],
   feedbackMethod: FEEDBACK_METHOD[0],
   serviceDirection: SERVICE_DIRECTIONS[0],
-  vedTypes: VED_TYPES[0],
+  vedTypes: VED_TYPES[0].id,
   birthday: undefined,
   isClient: false,
   onlineCheckout: false,
@@ -62,7 +62,7 @@ export const getInitialFormState = (inputs: FieldDef[], typeForm = ''): FormStat
   const formState = Object.fromEntries(
     inputs.map((_) => [
       _.name,
-      (_.fieldType === 'ved' && _?.defaultValue) || initialFormState[_.name || ''],
+      (_?.name === 'vedTypes' && _?.defaultValue) || initialFormState[_.name || ''],
     ]),
   );
 

package/mobile/src/components/ApplicationLeadForm/ApplicationLeadForm.example.json

@@ -13,31 +13,25 @@
             "columns": 2,
             "inputs": [
               {
-                "fieldType": "common",
                 "name": "surname",
                 "required": true
               },
               {
-                "fieldType": "common",
                 "name": "name",
                 "required": true
               },
               {
-                "fieldType": "common",
                 "name": "middleName"
               },
               {
-                "fieldType": "common",
                 "name": "limitedBirthday",
                 "required": true
               },
               {
-                "fieldType": "common",
                 "name": "phone",
                 "required": true
               },
               {
-                "fieldType": "common",
                 "name": "email",
                 "required": true
               }
@@ -46,26 +40,21 @@
           {
             "inputs": [
               {
-                "fieldType": "common",
                 "name": "processPersonalDataFlg",
                 "required": true
               },
               {
-                "fieldType": "common",
                 "name": "consentProviderFlg",
                 "required": true
               },
               {
-                "fieldType": "common",
                 "name": "consentOthersFlg",
                 "required": true
               },
               {
-                "fieldType": "common",
                 "name": "consentInformFlg"
               },
               {
-                "fieldType": "common",
                 "name": "consentPfrFlg"
               }
             ]

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

@@ -4,21 +4,21 @@ export const applicationFormData: SectionsRetailProps[] = [
   {
     columns: 2,
     inputs: [
-      { fieldType: 'common', name: 'surname', required: true, dadata: true },
-      { fieldType: 'common', name: 'name', required: true, dadata: true },
-      { fieldType: 'common', name: 'middleName', dadata: true },
-      { fieldType: 'common', name: 'limitedBirthday', required: true },
-      { fieldType: 'common', name: 'phone', required: true },
-      { fieldType: 'common', name: 'email', required: true, dadata: true },
+      { name: 'surname', required: true, dadata: true },
+      { name: 'name', required: true, dadata: true },
+      { name: 'middleName', dadata: true },
+      { name: 'limitedBirthday', required: true },
+      { name: 'phone', required: true },
+      { name: 'email', required: true, dadata: true },
     ],
   },
   {
     inputs: [
-      { fieldType: 'common', name: 'processPersonalDataFlg', required: true },
-      { fieldType: 'common', name: 'consentProviderFlg', required: true },
-      { fieldType: 'common', name: 'consentOthersFlg', required: true },
-      { fieldType: 'common', name: 'consentInformFlg' },
-      { fieldType: 'common', name: 'consentPfrFlg' },
+      { name: 'processPersonalDataFlg', required: true },
+      { name: 'consentProviderFlg', required: true },
+      { name: 'consentOthersFlg', required: true },
+      { name: 'consentInformFlg' },
+      { name: 'consentPfrFlg' },
     ],
   },
 ];

package/mobile/src/components/CreditCardForm/getDeliveryCreditCardData.ts

@@ -1,5 +1,4 @@
 import { type LeadFormState } from '../../services/retail/model/LeadFormState';
-import { dateToISO } from '../../utils/dateToISO';
 import { getParticipantAddresses } from '../CreditForm/utils';
 
 export const getDeliveryData = (formData: LeadFormState) => {
@@ -10,7 +9,7 @@ export const getDeliveryData = (formData: LeadFormState) => {
   return isCourierDelivery
     ? {
         courierDeliveryFlg: isCourierDelivery,
-        deliveryDate: dateToISO(deliveryDate),
+        deliveryDate: deliveryDate.toString().replace(/(GMT)[+-]\d{4}/, 'GMT+0000'),
         deliveryTimeCd: { value: 'TIME_2' },
         //TODO временный хардкод для тестирования, не забыть удалить
         office: { id: '3' },

package/mobile/src/services/retail/content.tsx

@@ -7,30 +7,28 @@ const PERSONAL_INFO_CONTENT: CreditCardSectionsProps[] = [
     columns: 2,
     inputs: [
       {
-        fieldType: 'common',
         name: 'surname',
         required: true,
         dadata: true,
         filledByEsia: true,
       },
-      { fieldType: 'common', name: 'name', required: true, dadata: true, filledByEsia: true },
-      { 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, filledByEsia: true },
-      { fieldType: 'common', name: 'phone', required: true, filledByEsia: true },
-      { fieldType: 'common', name: 'email', required: true, dadata: 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', required: true, filledByEsia: true },
+      { name: 'email', required: true, dadata: true },
     ],
   },
   {
     title: 'Паспортные данные',
     columns: 2,
     inputs: [
-      { fieldType: 'common', name: 'dulSerie', required: true, filledByEsia: true },
-      { fieldType: 'common', name: 'dulNumber', required: true, filledByEsia: true },
-      { fieldType: 'common', name: 'dulIssueDateField', required: true, filledByEsia: true },
+      { name: 'dulSerie', required: true, filledByEsia: true },
+      { name: 'dulNumber', required: true, filledByEsia: true },
+      { name: 'dulIssueDateField', required: true, filledByEsia: true },
       {
-        fieldType: 'common',
         name: 'dulSubdivisionCode',
         required: true,
         dadata: true,
@@ -41,14 +39,12 @@ const PERSONAL_INFO_CONTENT: CreditCardSectionsProps[] = [
   {
     inputs: [
       {
-        fieldType: 'common',
         name: 'dulIssuedBy',
         required: true,
         dadata: true,
         filledByEsia: true,
       },
       {
-        fieldType: 'common',
         name: 'education',
         required: true,
       },
@@ -62,18 +58,17 @@ const PERSONAL_INFO_CONTENT: CreditCardSectionsProps[] = [
   {
     inputs: [
       {
-        fieldType: 'common',
         name: 'addressRegistration',
         required: true,
         dadata: true,
         filledByEsia: true,
       },
-      { fieldType: 'common', name: 'addressMatch' },
+      { name: 'addressMatch' },
     ],
   },
   {
     columns: 2,
-    inputs: [{ fieldType: 'common', name: 'participantDateRegistration', required: true }],
+    inputs: [{ name: 'participantDateRegistration', required: true }],
   },
   {
     title: 'Адрес фактического проживания (место пребывания РФ)',
@@ -81,10 +76,10 @@ const PERSONAL_INFO_CONTENT: CreditCardSectionsProps[] = [
   },
   {
     columns: 2,
-    inputs: [{ fieldType: 'common', name: 'housing', required: true }],
+    inputs: [{ name: 'housing', required: true }],
   },
   {
-    inputs: [{ fieldType: 'common', name: 'addressFact', required: true, dadata: true }],
+    inputs: [{ name: 'addressFact', required: true, dadata: true }],
   },
 ];
 const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
@@ -95,7 +90,6 @@ const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
   {
     inputs: [
       {
-        fieldType: 'common',
         name: 'infoCard',
         label:
           'Клиент на момент оформления заявки на кредит должен быть: официально трудоустроен более 6 месяцев, ' +
@@ -105,51 +99,49 @@ const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
   },
   {
     inputs: [
-      { fieldType: 'common', name: 'employment', required: true },
-      { fieldType: 'common', name: 'organizationName', required: true, dadata: true },
+      { name: 'employment', required: true },
+      { name: 'organizationName', required: true, dadata: true },
     ],
   },
   {
     columns: 2,
     inputs: [
-      { fieldType: 'common', name: 'inn', required: true, dadata: true },
-      { fieldType: 'common', name: 'legalForm', required: true },
+      { name: 'inn', required: true, dadata: true },
+      { name: 'legalForm', required: true },
     ],
   },
   {
     inputs: [
-      { fieldType: 'common', name: 'organization', required: true },
-      { fieldType: 'common', name: 'amountWorkers', required: true },
+      { name: 'organization', required: true },
+      { name: 'amountWorkers', required: true },
     ],
   },
   {
     columns: 2,
     inputs: [
-      { 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 },
-      { fieldType: 'common', name: 'jobsNumber', required: true },
+      { name: 'employerActivities', required: true },
+      { name: 'employerOrganization', required: true },
+      { name: 'generalSeniority', required: true },
+      { name: 'lastJobExperience', required: true },
+      { name: 'experience5Years', required: true },
+      { name: 'jobsNumber', required: true },
     ],
   },
   {
     inputs: [
       {
-        fieldType: 'common',
         name: 'organizationPhone',
         label: 'Телефон работодателя',
         required: true,
       },
-      { fieldType: 'common', name: 'beginDate', required: true },
+      { name: 'beginDate', required: true },
     ],
   },
   {
     columns: 2,
     inputs: [
-      { fieldType: 'common', name: 'positionOrganization', required: true },
+      { name: 'positionOrganization', required: true },
       {
-        fieldType: 'common',
         name: 'partInBusiness',
         required: true,
         condition: { name: 'positionOrganization', values: ['BUSINESS_OWNER'] },
@@ -161,7 +153,7 @@ const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
     inputs: [],
   },
   {
-    inputs: [{ fieldType: 'common', name: 'organizationAddress', required: true, dadata: true }],
+    inputs: [{ name: 'organizationAddress', required: true, dadata: true }],
   },
 ];
 const FAMILY_STATUS_AND_INCOME_CONTENT: CreditCardSectionsProps[] = [
@@ -170,18 +162,15 @@ const FAMILY_STATUS_AND_INCOME_CONTENT: CreditCardSectionsProps[] = [
   },
   {
     columns: 1,
-    inputs: [{ fieldType: 'common', name: 'familyStatus', required: true }],
+    inputs: [{ name: 'familyStatus', required: true }],
   },
   {
     columns: 1,
-    inputs: [{ fieldType: 'common', name: 'dependents', required: true }],
+    inputs: [{ name: 'dependents', required: true }],
   },
   {
     columns: 2,
-    inputs: [
-      { fieldType: 'common', name: 'familyMembers' },
-      { fieldType: 'common', name: 'children', required: true },
-    ],
+    inputs: [{ name: 'familyMembers' }, { name: 'children', required: true }],
   },
   {
     title: 'Совокупный доход',
@@ -189,7 +178,6 @@ const FAMILY_STATUS_AND_INCOME_CONTENT: CreditCardSectionsProps[] = [
   {
     inputs: [
       {
-        fieldType: 'common',
         name: 'infoCard',
         label: 'Сумма основного и дополнительных доходов после вычета налога',
       },
@@ -197,27 +185,27 @@ const FAMILY_STATUS_AND_INCOME_CONTENT: CreditCardSectionsProps[] = [
   },
   {
     columns: 1,
-    inputs: [{ fieldType: 'common', name: 'confirmationIncome', required: true }],
+    inputs: [{ name: 'confirmationIncome', required: true }],
   },
   {
     columns: 1,
-    inputs: [{ fieldType: 'common', name: 'wages', required: true }],
+    inputs: [{ name: 'wages', required: true }],
   },
   {
     columns: 1,
-    inputs: [{ fieldType: 'common', name: 'mandatoryPayments', required: true }],
+    inputs: [{ name: 'mandatoryPayments', required: true }],
   },
   {
     columns: 1,
-    inputs: [{ fieldType: 'common', name: 'snils', required: true }],
+    inputs: [{ name: 'snils', required: true }],
   },
   {
     columns: 1,
-    inputs: [{ fieldType: 'common', name: 'conscription', required: true }],
+    inputs: [{ name: 'conscription', required: true }],
   },
   {
     columns: 2,
-    inputs: [{ fieldType: 'common', name: 'armyIdFlg' }],
+    inputs: [{ name: 'armyIdFlg' }],
   },
 ];
 const ADDITIONAL_CONTENT: CreditCardSectionsProps[] = [
@@ -227,19 +215,19 @@ const ADDITIONAL_CONTENT: CreditCardSectionsProps[] = [
     inputs: [],
   },
   {
-    inputs: [{ fieldType: 'common', name: 'disablePeopleFlg' }],
+    inputs: [{ name: 'disablePeopleFlg' }],
   },
   {
-    inputs: [{ fieldType: 'common', name: 'bankruptcyFlg' }],
+    inputs: [{ name: 'bankruptcyFlg' }],
   },
   {
-    inputs: [{ fieldType: 'common', name: 'shareholderFlg' }],
+    inputs: [{ name: 'shareholderFlg' }],
   },
   {
-    inputs: [{ fieldType: 'common', name: 'legalEntityName' }],
+    inputs: [{ name: 'legalEntityName' }],
   },
   {
-    inputs: [{ fieldType: 'common', name: 'creditInRshbCd' }],
+    inputs: [{ name: 'creditInRshbCd' }],
   },
 ];
 export const COMMON_RETAIL_CONTENT: CreditCardSectionsProps[][] = [
@@ -255,10 +243,10 @@ export const DELIVERY_CREDIT_CONTENT: CreditCardSectionsProps[] = [
     inputs: [],
   },
   {
-    inputs: [{ fieldType: 'common', name: 'regionRetail', required: true }],
+    inputs: [{ name: 'regionRetail', required: true }],
   },
   {
-    inputs: [{ fieldType: 'common', name: 'addressRetail', required: true }],
+    inputs: [{ name: 'addressRetail', required: true }],
   },
   {
     title: 'Код представителя Банка',
@@ -268,14 +256,13 @@ export const DELIVERY_CREDIT_CONTENT: CreditCardSectionsProps[] = [
   {
     inputs: [
       {
-        fieldType: 'common',
         name: 'infoCard',
         label: 'Если представитель Банка помогал Вам в заведении заявки, введите здесь его код',
       },
     ],
   },
   {
-    inputs: [{ fieldType: 'common', name: 'bankEmployeeCode' }],
+    inputs: [{ name: 'bankEmployeeCode' }],
   },
 ];
 export const DELIVERY_CREDIT_CARD_CONTENT: CreditCardSectionsProps[] = [
@@ -285,7 +272,7 @@ export const DELIVERY_CREDIT_CARD_CONTENT: CreditCardSectionsProps[] = [
     inputs: [],
   },
   {
-    inputs: [{ fieldType: 'common', name: 'methodObtain' }],
+    inputs: [{ name: 'methodObtain' }],
   },
   {
     title: 'Адрес',
@@ -295,7 +282,6 @@ export const DELIVERY_CREDIT_CARD_CONTENT: CreditCardSectionsProps[] = [
   {
     inputs: [
       {
-        fieldType: 'common',
         name: 'addressCourier',
         dadata: true,
         condition: {
@@ -305,7 +291,6 @@ export const DELIVERY_CREDIT_CARD_CONTENT: CreditCardSectionsProps[] = [
         required: true,
       },
       {
-        fieldType: 'common',
         name: 'deliveryDate',
         condition: {
           name: 'methodObtain',
@@ -314,7 +299,6 @@ export const DELIVERY_CREDIT_CARD_CONTENT: CreditCardSectionsProps[] = [
         required: true,
       },
       {
-        fieldType: 'common',
         name: 'comment',
         condition: {
           name: 'methodObtain',
@@ -326,7 +310,6 @@ export const DELIVERY_CREDIT_CARD_CONTENT: CreditCardSectionsProps[] = [
   {
     inputs: [
       {
-        fieldType: 'common',
         name: 'regionRetail',
         required: true,
         condition: {
@@ -335,7 +318,6 @@ export const DELIVERY_CREDIT_CARD_CONTENT: CreditCardSectionsProps[] = [
         },
       },
       {
-        fieldType: 'common',
         name: 'addressRetail',
         required: true,
         condition: {
@@ -348,7 +330,6 @@ export const DELIVERY_CREDIT_CARD_CONTENT: CreditCardSectionsProps[] = [
   {
     inputs: [
       {
-        fieldType: 'common',
         name: 'infoCard',
         label: 'Если представитель Банка помогал Вам в заведении заявки, введите здесь его код',
         condition: {
@@ -357,7 +338,6 @@ export const DELIVERY_CREDIT_CARD_CONTENT: CreditCardSectionsProps[] = [
         },
       },
       {
-        fieldType: 'common',
         name: 'bankEmployeeCode',
         condition: {
           name: 'methodObtain',
@@ -375,10 +355,10 @@ export const CREDIT_CARD_CONTENT: CreditCardSectionsProps[] = [
   },
   {
     inputs: [
-      { fieldType: 'common', name: 'currency', required: true },
-      { fieldType: 'common', name: 'paymentSystem', required: true },
-      { fieldType: 'common', name: 'cardCategory', required: true },
-      { fieldType: 'common', name: 'codeWord', required: true },
+      { name: 'currency', required: true },
+      { name: 'paymentSystem', required: true },
+      { name: 'cardCategory', required: true },
+      { name: 'codeWord', required: true },
     ],
   },
 ];
@@ -387,7 +367,6 @@ export const CALCULATOR_CONTENT: CreditCardSectionsProps[] = [
     columns: 1,
     inputs: [
       {
-        fieldType: 'common',
         name: 'calculator',
       },
     ],

package/mobile/src/services/retail/model/RetailFormContent.ts

@@ -24,7 +24,7 @@ export type FilledByEsiaProps = {
   filledByEsia?: boolean;
 };
 
-export type FieldDefaultDef = Required &
+export type FieldRetailDef = Required &
   TextProps &
   LabelProps &
   ConditionFieldProps &
@@ -32,13 +32,3 @@ export type FieldDefaultDef = Required &
     name?: NameFieldDef;
     dadata?: boolean;
   };
-
-/**
- * @title Поле ввода
- * @default { "fieldType": "common" }
- */
-
-export type FieldRetailDef = FieldDefaultDef &
-  TextProps & {
-    fieldType: 'common';
-  };

package/package.json

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