@redneckz/wildless-cms-uni-blocks 0.14.140 → 0.14.142

package/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -103,6 +103,15 @@ export type AntiFraudFormParamsDef = TitleProps &
     formType: 'ApplicationFormAntiFraud';
   };
 
+/**
+ * @title Факты коррупции
+ */
+export type CorruptionFormParamsDef = TitleProps &
+  CommonApplicationFormProps & {
+    /** @default ApplicationFormCorruption */
+    formType: 'ApplicationFormCorruption';
+  };
+
 /**
  * @title Настройки формы
  */
@@ -115,7 +124,8 @@ export type ApplicationFormBlockDef =
   | GrantSupportFormParamsDef
   | IndividualsFormParamsDef
   | FeedbackFormParamsDef
-  | AntiFraudFormParamsDef;
+  | AntiFraudFormParamsDef
+  | CorruptionFormParamsDef;
 
 /**
  * @title Форма заявки

package/src/components/ApplicationForm/ApplicationFormCorruption.tsx

@@ -0,0 +1,103 @@
+/* eslint-disable max-lines-per-function,max-lines */
+
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useForm } from '../../hooks/useForm';
+import { type Option } from '../../ui-kit/Select/Option';
+import { objectValidator } from '../../validation/objectValidator';
+import { isValidationSuccess } from '../../validation/validator';
+import { withValidator } from '../../validation/withValidator';
+import { useGetRegions } from '../SafeDepositRental/useGetRegions';
+import { ApplicationFieldsetLayout } from './ApplicationFieldsetLayout';
+import { type ApplicationFormsProps } from './ApplicationFormsProps';
+import { formStyle, oneColumnFormStyle } from './formStyle';
+import { InputControl } from './InputControl';
+import { PhoneInputControl } from './PhoneInputControl';
+import { renderAgreementWithSubmit } from './renderAgreementWithSubmit';
+import { initialUserFormState, renderUserData, type UserDataState } from './renderUserData';
+import { SelectControl } from './SelectControl';
+import { checkboxValidator, defaultValidator, nameValidator, phoneValidator } from './validators';
+
+export type CorruptionFormState = UserDataState & {
+  typeForm: Option;
+  region?: Option;
+  phone: string;
+  email?: string;
+  comment?: string;
+  consentDataProcessing: boolean;
+};
+
+const initialFormState: CorruptionFormState = {
+  ...initialUserFormState,
+  typeForm: { key: 'CORRUPTION', text: 'Факты коррупции' },
+  phone: '',
+  email: '',
+  comment: '',
+  consentDataProcessing: false,
+};
+
+const feedbackValidator = objectValidator({
+  typeForm: defaultValidator,
+  surname: defaultValidator,
+  name: nameValidator,
+  region: defaultValidator,
+  phone: phoneValidator,
+  email: defaultValidator,
+  comment: defaultValidator,
+  consentDataProcessing: checkboxValidator,
+});
+
+export const ApplicationFormCorruption = JSX<ApplicationFormsProps>(
+  ({ button, link, onSubmit }) => {
+    const handleSubmit = useCallback(
+      (formState: CorruptionFormState) => {
+        const { typeForm, phone, region, ...usedFields } = formState;
+
+        const submitData = {
+          ...usedFields,
+          typeForm: typeForm.key,
+          regionBranch: region?.text,
+          phone: phone.replace(/[^+\d]/g, ''),
+        };
+        isValidationSuccess(feedbackValidator(formState)) && onSubmit(submitData, true);
+      },
+      [onSubmit],
+    );
+
+    const [, { field, ...formProps }] = useForm(initialFormState, handleSubmit);
+    const branch = useGetRegions();
+
+    return (
+      <form className={formStyle} onSubmit={formProps.onSubmit}>
+        <ApplicationFieldsetLayout
+          firstChildren={
+            <div className={oneColumnFormStyle}>
+              {renderUserData<CorruptionFormState>(field, false)}
+              <SelectControl
+                label="Филиал обслуживания*"
+                placeholder="Выберите филиал"
+                isSearch={true}
+                options={branch.map(({ code = '', name = '' }) => ({ key: code, text: name }))}
+                {...withValidator(field('region'), defaultValidator)}
+              />
+              <PhoneInputControl
+                label="Телефон*"
+                {...withValidator(field('phone'), phoneValidator)}
+              />
+              <InputControl
+                label="Электронная почта*"
+                {...withValidator(field('email'), defaultValidator)}
+              />
+              <InputControl
+                {...withValidator(field('comment'), defaultValidator)}
+                placeholder="Ваше сообщение*"
+                isTextarea={true}
+              />
+              {renderAgreementWithSubmit(field('consentDataProcessing'), link, button)}
+            </div>
+          }
+        />
+      </form>
+    );
+  },
+);

package/src/components/ApplicationForm/ApplicationFormFeedback.tsx

@@ -15,7 +15,7 @@ import { handleSubmitIndividual, handleSubmitLegal, handleSubmitQuestion } from
 import { InputControl } from './InputControl';
 import { PhoneInputControl } from './PhoneInputControl';
 import { renderAgreementWithSubmit } from './renderAgreementWithSubmit';
-import { renderUserData, type UserDataState } from './renderUserData';
+import { initialUserFormState, renderUserData, type UserDataState } from './renderUserData';
 import { SelectControl } from './SelectControl';
 import { defaultValidator, innValidator, phoneValidator } from './validators';
 
@@ -37,11 +37,9 @@ export type FeedbackFormState = UserDataState & {
 };
 
 const initialFormState: FeedbackFormState = {
+  ...initialUserFormState,
   typeForm: { key: 'FEEDBACK', text: 'Задать вопрос по продуктам и услугам' },
   serviceDirection: { key: 'Физическое лицо' },
-  surname: '',
-  name: '',
-  middleName: '',
   birthday: undefined,
   feedbackMethod: { key: 'Телефонный звонок' },
   phone: '',
@@ -115,7 +113,7 @@ export const ApplicationFormFeedback = JSX<ApplicationFormsProps>(({ button, lin
                 {...withValidator(field('addressBranch'), defaultValidator)}
               />
             ) : null}
-            {renderUserData<FeedbackFormState>(field)}
+            {renderUserData<FeedbackFormState>(field, true)}
             {isLegalEntity ? (
               <div>
                 <InputControl label="ИНН*" {...withValidator(field('inn'), innValidator)} />

package/src/components/ApplicationForm/ApplicationFormIndividuals.tsx

@@ -11,32 +11,26 @@ import { formStyle } from './formStyle';
 import { InputControl } from './InputControl';
 import { PhoneInputControl } from './PhoneInputControl';
 import { renderAgreementWithSubmit } from './renderAgreementWithSubmit';
+import { initialUserFormState, type UserDataState } from './renderUserData';
 import { defaultValidator, nameValidator, phoneValidator } from './validators';
 
-export interface IndividualsFormState {
-  surname: string;
-  name: string;
-  middleName: string;
+export type IndividualsFormState = UserDataState & {
   phone: string;
   email: string;
-  birthday: Date | undefined;
   consentDataProcessing: boolean;
-}
+};
 
 const initialFormState: IndividualsFormState = {
-  surname: '',
-  name: '',
-  middleName: '',
+  ...initialUserFormState,
   phone: '',
   email: '',
   birthday: undefined,
-  consentDataProcessing: true,
+  consentDataProcessing: false,
 };
 
 const individualsValidator = objectValidator({
   surname: nameValidator,
   name: nameValidator,
-  middleName: nameValidator,
   phone: phoneValidator,
   email: defaultValidator,
   birthday: defaultValidator,

package/src/components/ApplicationForm/EmbeddableForms.tsx

@@ -1,6 +1,7 @@
 import { ApplicationFormAcquiring } from './ApplicationFormAcquiring';
 import { ApplicationFormAntiFraud } from './ApplicationFormAntiFraud';
 import { ApplicationFormBusinessCard } from './ApplicationFormBusinessCard';
+import { ApplicationFormCorruption } from './ApplicationFormCorruption';
 import { ApplicationFormCredit } from './ApplicationFormCredit';
 import { ApplicationFormDeposit } from './ApplicationFormDeposit';
 import { ApplicationFormFeedback } from './ApplicationFormFeedback';
@@ -18,4 +19,5 @@ export const EmbeddableForms = {
   ApplicationFormIndividuals,
   ApplicationFormFeedback,
   ApplicationFormAntiFraud,
+  ApplicationFormCorruption,
 };

package/src/components/ApplicationForm/renderUserData.tsx

@@ -1,6 +1,7 @@
 import { type FormFieldRegisterer } from '../../hooks/useForm';
 import { withValidator } from '../../validation/withValidator';
 import { type AntiFraudFormState } from './ApplicationFormAntiFraud';
+import { type CorruptionFormState } from './ApplicationFormCorruption';
 import { type FeedbackFormState } from './ApplicationFormFeedback';
 import { DatePickerControl } from './DatePickerControl';
 import { InputControl } from './InputControl';
@@ -10,19 +11,30 @@ export interface UserDataState {
   surname: string;
   name: string;
   middleName?: string;
-  birthday: Date | undefined;
+  birthday?: Date | undefined;
 }
 
-export const renderUserData = <T extends AntiFraudFormState | FeedbackFormState>(
+export const initialUserFormState = {
+  surname: '',
+  name: '',
+  middleName: '',
+};
+
+export const renderUserData = <
+  T extends AntiFraudFormState | FeedbackFormState | CorruptionFormState,
+>(
   field: FormFieldRegisterer<T>,
+  isBirthday = true,
 ) => (
   <div>
     <InputControl label="Фамилия*" {...withValidator(field('surname'), nameValidator)} />
     <InputControl label="Имя*" {...withValidator(field('name'), nameValidator)} />
     <InputControl label="Отчество (Обязательно, при наличии)" {...field('middleName')} />
-    <DatePickerControl
-      label="Дата рождения*"
-      {...withValidator(field('birthday'), defaultValidator)}
-    />
+    {isBirthday ? (
+      <DatePickerControl
+        label="Дата рождения*"
+        {...withValidator(field('birthday'), defaultValidator)}
+      />
+    ) : null}
   </div>
 );

package/src/ui-kit/BlockWrapper.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { defaultEventBus } from '../EventBus/defaultEventBus';
+import { useRouter } from '../hooks/useRouter';
 import { type BlockVersion } from '../model/BlockVersion';
 import { type UniBlockProps } from '../model/JSXBlock';
 import { style } from '../utils/style';
@@ -33,6 +34,7 @@ export const BlockWrapper = JSX<BlockWrapperProps>(
     style: inlineStyles,
   }) => {
     const Tag: any = tag;
+    const router = useRouter();
 
     const [isHidden, setHidden] = useState(false);
 
@@ -45,7 +47,7 @@ export const BlockWrapper = JSX<BlockWrapperProps>(
             );
           }
         }),
-      [block],
+      [block, router],
     );
 
     const isGroup = version && isTheme;