@redneckz/wildless-cms-uni-blocks 0.14.568 → 0.14.570

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

@@ -1,6 +1,5 @@
 import '../../setup-fixture';
-
-import { type LinkProps } from '../../model/LinkProps';
+import { DialogManager } from '../../ui-kit/DialogManager/DialogManager';
 import { PopupManager } from '../../ui-kit/PopupManager/PopupManager';
 import { ApplicationLeadForm } from './ApplicationLeadForm';
 import { type SubmitButtonProps } from './ApplicationLeadFormContent';
@@ -10,12 +9,6 @@ const button: SubmitButtonProps = {
   version: 'primary',
 };
 
-const link: LinkProps = {
-  text: 'Согласен на обработку персональных данных',
-  href: '/privacy-policy',
-  target: '_blank',
-};
-
 export default {
   default: (
     <div className="container grid grid-cols-12">
@@ -26,17 +19,22 @@ export default {
         endpoint="lead"
         sections={[
           {
+            columns: 2,
             inputs: [
+              { fieldType: 'common', name: 'surname', required: true },
               { fieldType: 'common', name: 'name', required: true },
               { fieldType: 'common', name: 'middleName' },
-              { fieldType: 'common', name: 'consentDataProcessing', required: true },
+              { fieldType: 'common', name: 'birthday', required: true },
+              { fieldType: 'common', name: 'phone', required: true },
+              { fieldType: 'common', name: 'email', required: true },
             ],
           },
+          { inputs: [{ fieldType: 'common', name: 'consentToAllDocs', required: true }] },
         ]}
         button={button}
-        link={link}
       />
       <PopupManager />
+      <DialogManager />
     </div>
   ),
 };

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

@@ -1,22 +1,15 @@
 import '../../setup-fixture';
 
-import { type LinkProps } from '../../model/LinkProps';
 import { DialogManager } from '../../ui-kit/DialogManager/DialogManager';
 import { PopupManager } from '../../ui-kit/PopupManager/PopupManager';
 import { ApplicationLeadForm } from './ApplicationLeadForm';
 import { type SubmitButtonProps } from './ApplicationLeadFormContent';
 
 const button: SubmitButtonProps = {
-  text: 'Отправить заявку',
+  text: 'Оформить',
   version: 'primary',
 };
 
-const link: LinkProps = {
-  text: 'Согласен на обработку персональных данных',
-  href: '/privacy-policy',
-  target: '_blank',
-};
-
 export default {
   default: (
     <div className="container grid grid-cols-12">
@@ -27,15 +20,19 @@ export default {
         endpoint="lead"
         sections={[
           {
+            columns: 2,
             inputs: [
+              { fieldType: 'common', name: 'surname', required: true },
               { fieldType: 'common', name: 'name', required: true },
               { fieldType: 'common', name: 'middleName' },
-              { fieldType: 'common', name: 'consentDataProcessing', required: true },
+              { fieldType: 'common', name: 'birthday', required: true },
+              { fieldType: 'common', name: 'phone', required: true },
+              { fieldType: 'common', name: 'email', required: true },
             ],
           },
+          { inputs: [{ fieldType: 'common', name: 'consentToAllDocs', required: true }] },
         ]}
         button={button}
-        link={link}
       />
       <PopupManager />
       <DialogManager />

package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -3,7 +3,6 @@ import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { LeadServiceAPI } from '../../api/LeadServiceAPI';
 import { useForm } from '../../hooks/useForm';
 import { ApplicationFormLayout } from '../../ui-kit/ApplicationFormLayout/ApplicationFormLayout';
-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';
@@ -16,7 +15,7 @@ import { isValidationSuccess } from '../../validation/validator';
 import { type ApplicationLeadFormContent, type FieldDef } from './ApplicationLeadFormContent';
 import { getFormatData } from './getFormatData';
 import { getInitialFormState, type FormState } from './getInitialFormState';
-import { renderAgreementSubmit } from './renderAgreementSubmit';
+import { renderSubmitButton } from './renderSubmitButton';
 
 interface ApplicationLeadFormProps extends ApplicationLeadFormContent, UniBlockProps {}
 
@@ -24,7 +23,7 @@ const API = LeadServiceAPI();
 
 export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
   // eslint-disable-next-line max-lines-per-function
-  ({ className, title, typeForm = '', sections = [], button, link, endpoint, ...rest }) => {
+  ({ className, title, typeForm = '', sections = [], button, endpoint, ...rest }) => {
     const inputs = (sections?.flatMap((_) => _?.inputs) || []) as FieldDef[];
     const initialFormState = getInitialFormState(inputs, typeForm);
     const [responseType, setResponseType] = useState<'OK' | 'Fail' | ''>('');
@@ -46,7 +45,6 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
     }, []);
 
     const [, { field, onSubmit, reset }] = useForm(initialFormState, { onSubmit: handleSubmit });
-    const fieldName = getConsentDataProcessing(inputs)?.name;
 
     useEffect(() => {
       if (responseType === 'OK') {
@@ -71,11 +69,7 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
               {(_?.inputs || [])?.map(getField(field, typeForm))}
             </div>
           ))}
-          {renderAgreementSubmit(
-            fieldName ? field('consentDataProcessing') : undefined,
-            link,
-            button,
-          )}
+          {renderSubmitButton(button)}
         </form>
       </ApplicationFormLayout>
     );

package/src/components/ApplicationLeadForm/ApplicationLeadFormContent.ts

@@ -52,7 +52,8 @@ export type NameFieldDef =
   | 'product'
   | 'localities'
   | 'partnerComments'
-  | 'consentDataProcessing';
+  | 'consentDataProcessing'
+  | 'consentToAllDocs';
 
 export type ConditionFieldProps = {
   /** @title Условия отображения полей формы */

package/src/ui-kit/Checkbox/CheckboxGroup.tsx

@@ -7,6 +7,7 @@ import { FoldableSection } from '../Foldable/FoldableSection';
 import { Icon } from '../Icon/Icon';
 import { Checkbox } from './Checkbox';
 import { type CheckboxGroupProps } from './CheckboxProps';
+import { CheckboxWithError } from './CheckboxWithError';
 
 export const CheckboxGroup = JSX<CheckboxGroupProps>(({ className, items = [], ...props }) => {
   const isChecked = items.every((_) => _?.value);
@@ -27,7 +28,12 @@ export const CheckboxGroup = JSX<CheckboxGroupProps>(({ className, items = [], .
           </FoldableSection>
         )}
         renderFoldButton={renderGeneralCheckbox(
-          <Checkbox value={isChecked} onChange={handleGeneralToggle} {...props} />,
+          <CheckboxWithError
+            required={true}
+            value={isChecked}
+            onChange={handleGeneralToggle}
+            {...props}
+          />,
         )}
       />
     </div>

package/src/ui-kit/Checkbox/CheckboxProps.ts

@@ -6,7 +6,7 @@ export interface CheckboxProps {
   isRadio?: boolean;
   onChange?: (value: boolean) => void;
   error?: string;
-  subItems?: CheckboxProps[];
+  required?: boolean;
 }
 
 export interface CheckboxGroupProps {

package/src/ui-kit/FormField/Fields/ConsentToAllDocsField.tsx

@@ -0,0 +1,29 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { CheckboxGroup } from '../../Checkbox/CheckboxGroup';
+import { type CustomFieldProps } from '../CustomFieldProps';
+
+const items = [
+  {
+    field: 'processPersonalDataLeadFlg',
+    text: 'Согласие на обработку персональных данных',
+    required: true,
+  },
+  {
+    field: 'consentOtherFlg',
+    text: 'Согласие на информирование о продуктах и услугах Банка',
+    required: true,
+  },
+  {
+    field: 'consentProviderFlg',
+    text: 'Согласие об использовании простой электронной подписи',
+    required: true,
+  },
+  { field: 'consentPfrFlg', text: 'Согласие на запрос в ПФР Открыты по субботам', required: true },
+  { field: 'consentPhotoFlg', text: 'Прочие согласия (согласие на фотографирование)' },
+];
+export const ConsentToAllDocsField = JSX<CustomFieldProps>(({ field }) => (
+  <CheckboxGroup
+    text="Согласие на все документы"
+    items={items.map((_) => ({ ...field(_.field), text: _.text, required: _.required }))}
+  />
+));

package/src/ui-kit/FormField/Fields/ProductField.tsx

@@ -1,15 +1,24 @@
-import { JSX } from '@redneckz/uni-jsx';
+import { type JSONRefObject } from '../../../data/JSONRefObject';
+import { UniBlock } from '../../../UniBlock/UniBlock';
+import { type UniBlockProps } from '../../../UniBlock/UniBlockProps';
 import { withValidator } from '../../../validation/withValidator';
 import { SelectControl } from '../../Select/SelectControl';
-import { PRODUCT_TYPE } from '../constants';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 
-export const ProductField = JSX<CustomFieldProps>(({ field }) => (
+export interface ProductFieldProps extends CustomFieldProps, UniBlockProps {
+  source?: JSONRefObject & {
+    productList?: string[];
+  };
+}
+
+export const ProductField = UniBlock<ProductFieldProps>(({ field, source }) => (
   <SelectControl
     placeholder="Выберите продукт"
     label="Продукт"
-    options={PRODUCT_TYPE}
+    options={arrayToOptions(source?.productList)}
     {...withValidator(field('product'), validatorObj.product)}
   />
 ));
+
+const arrayToOptions = (array?: string[]) => (array ?? []).map((_) => ({ key: _, value: _ }));

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

@@ -26,13 +26,4 @@ export const FEEDBACK_METHOD: Option[] = [
   { key: 'email', text: 'Электронное сообщение' },
 ];
 
-export const PRODUCT_TYPE: Option[] = [
-  { key: 'Карта дебетовая', text: 'Карта дебетовая' },
-  { key: 'Карта кредитная', text: 'Карта кредитная' },
-  { key: 'Потребительский кредит', text: 'Потребительский кредит' },
-  { key: 'Ипотечный кредит', text: 'Ипотечный кредит' },
-  { key: 'Вклад', text: 'Вклад' },
-  { key: 'Накопительный счет', text: 'Накопительный счет' },
-];
-
 export const OUT_SERVICE_URL = '/api/v1/outservice/outserviceregions';

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

@@ -8,6 +8,7 @@ import { AcquiringField } from './Fields/AcquiringField';
 import { AddressBranchField } from './Fields/AddressBranchField';
 import { AmountField } from './Fields/AmountField';
 import { CommentField } from './Fields/CommentField';
+import { ConsentToAllDocsField } from './Fields/ConsentToAllDocsField';
 import { FeedbackMethodField } from './Fields/FeedbackMethodField';
 import { FeedbackTypeField } from './Fields/FeedbackTypeField';
 import { IsClientField } from './Fields/IsClientField';
@@ -31,6 +32,10 @@ import { validatorObj } from './getObjectValidator';
 import { getValidation } from './getValidation';
 import { isRenderField } from './isRenderField';
 
+const PRODUCT_REF = {
+  $ref: '/wcms-resources/outservice-productlist.json',
+};
+
 export const getField =
   // eslint-disable-next-line max-lines-per-function
   (field: FormFieldRegisterer<any>, typeForm: string) => (input: FieldDef, i: number) => {
@@ -82,7 +87,7 @@ export const getField =
           {...getValidation(field('desiredMeetingDate'), validatorObj.meetingDay, required)}
         />
       ),
-      product: <ProductField field={field} />,
+      product: <ProductField field={field} source={PRODUCT_REF} />,
       localities: <LocalitiesField field={field} input={input} />,
       isClient: <IsClientField field={field} />,
       consentToReceiveMaterials: (
@@ -125,6 +130,7 @@ export const getField =
         <InputControl label="Дата и время обращения в Банк" {...field('applicationDate')} />
       ),
       secondaryPhone: <SecondaryPhoneField field={field} />,
+      сonsentToAllDocs: <ConsentToAllDocsField field={field} />,
     };
 
     return isRenderField({ input, field }) ? (

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

@@ -35,6 +35,7 @@ export const validatorObj: Record<string, Validator> = {
   localities: defaultValidator,
   consentDataProcessing: agreementValidator,
   annualRevenue: defaultValidator,
+  consentToAllDocs: agreementValidator,
 };
 
 export const getObjectValidator = (inputs: FieldDef[]): Record<string, Validator> => {