@redneckz/wildless-cms-uni-blocks 0.14.579 → 0.14.581

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

@@ -1,6 +1,7 @@
 import '../../setup-fixture';
 
 import { type LinkProps } from '../../model/LinkProps';
+import { DialogManager } from '../../ui-kit/DialogManager/DialogManager';
 import { PopupManager } from '../../ui-kit/PopupManager/PopupManager';
 import { ApplicationForm } from './ApplicationForm';
 import { type SubmitButtonProps } from './ApplicationFormContent';
@@ -43,6 +44,7 @@ export default {
         link={link}
       />
       <PopupManager />
+      <DialogManager />
     </div>
   ),
   acquiring: (
@@ -83,6 +85,7 @@ export default {
         link={linkCorp}
       />
       <PopupManager />
+      <DialogManager />
     </div>
   ),
   analytics: (
@@ -111,6 +114,7 @@ export default {
         link={link}
       />
       <PopupManager />
+      <DialogManager />
     </div>
   ),
   antiFraud: (
@@ -143,6 +147,7 @@ export default {
         link={link}
       />
       <PopupManager />
+      <DialogManager />
     </div>
   ),
   brok: (
@@ -182,6 +187,7 @@ export default {
         }}
       />
       <PopupManager />
+      <DialogManager />
     </div>
   ),
   brokAccount: (
@@ -205,6 +211,7 @@ export default {
         link={link}
       />
       <PopupManager />
+      <DialogManager />
     </div>
   ),
   businessCard: (
@@ -232,6 +239,7 @@ export default {
         link={linkCorp}
       />
       <PopupManager />
+      <DialogManager />
     </div>
   ),
   collection: (
@@ -271,6 +279,7 @@ export default {
         link={linkCorp}
       />
       <PopupManager />
+      <DialogManager />
     </div>
   ),
   credit: (
@@ -319,6 +328,7 @@ export default {
         link={linkCorp}
       />
       <PopupManager />
+      <DialogManager />
     </div>
   ),
   corruption: (
@@ -346,6 +356,7 @@ export default {
         link={link}
       />
       <PopupManager />
+      <DialogManager />
     </div>
   ),
   deposit: (
@@ -369,6 +380,7 @@ export default {
         link={link}
       />
       <PopupManager />
+      <DialogManager />
     </div>
   ),
 
@@ -376,31 +388,50 @@ export default {
     <div className="container grid grid-cols-12">
       <ApplicationForm
         className="col-span-12"
-        title="Обратная связь"
+        title="Задать вопрос по продуктам и услугам"
         typeForm="FEEDBACK"
         endpoint="lead"
         sections={[
           {
             inputs: [
-              { fieldType: 'common', name: 'feedbackType', required: true },
-              {
-                fieldType: 'common',
-                name: 'serviceDirection',
-                condition: {
-                  name: 'feedbackType',
-                  values: ['FEEDBACK_QS'],
-                },
-              },
               { fieldType: 'common', name: 'region', required: true },
+              { fieldType: 'common', name: 'surname', required: true },
+              { fieldType: 'common', name: 'name', required: true },
+              { fieldType: 'common', name: 'middleName' },
               {
                 fieldType: 'common',
-                name: 'addressBranch',
+                name: 'birthday',
                 required: true,
-                condition: {
-                  name: 'feedbackType',
-                  values: ['FEEDBACK_QS'],
-                },
               },
+              { fieldType: 'common', name: 'feedbackMethod', required: true },
+              { fieldType: 'common', name: 'phone', required: true },
+              { fieldType: 'common', name: 'email', required: true },
+              { fieldType: 'common', name: 'comment', required: true },
+              { fieldType: 'common', name: 'consentDataProcessing', required: true },
+            ],
+          },
+        ]}
+        button={button}
+        link={link}
+      />
+      <PopupManager />
+      <DialogManager />
+    </div>
+  ),
+
+  feedbackQs: (
+    <div className="container grid grid-cols-12">
+      <ApplicationForm
+        className="col-span-12"
+        title="Качество обслуживания"
+        typeForm="FEEDBACK_QS"
+        endpoint="lead"
+        sections={[
+          {
+            inputs: [
+              { fieldType: 'common', name: 'serviceDirection' },
+              { fieldType: 'common', name: 'region', required: true },
+              { fieldType: 'common', name: 'addressBranch', required: true },
               { fieldType: 'common', name: 'surname', required: true },
               { fieldType: 'common', name: 'name', required: true },
               { fieldType: 'common', name: 'middleName' },
@@ -422,43 +453,12 @@ export default {
                   values: ['Юридическое лицо / ИП'],
                 },
               },
-              {
-                fieldType: 'common',
-                name: 'birthday',
-                required: true,
-                condition: {
-                  name: 'feedbackType',
-                  values: ['FEEDBACK'],
-                },
-              },
               { fieldType: 'common', name: 'feedbackMethod', required: true },
               { fieldType: 'common', name: 'phone', required: true },
-              {
-                fieldType: 'common',
-                name: 'secondaryPhone',
-                required: true,
-                condition: {
-                  name: 'feedbackType',
-                  values: ['FEEDBACK_QS'],
-                },
-              },
+              { fieldType: 'common', name: 'secondaryPhone', required: true },
               { fieldType: 'common', name: 'email', required: true },
-              {
-                fieldType: 'common',
-                name: 'bankEmpolee',
-                condition: {
-                  name: 'feedbackType',
-                  values: ['FEEDBACK_QS'],
-                },
-              },
-              {
-                fieldType: 'common',
-                name: 'applicationDate',
-                condition: {
-                  name: 'feedbackType',
-                  values: ['FEEDBACK_QS'],
-                },
-              },
+              { fieldType: 'common', name: 'bankEmpolee' },
+              { fieldType: 'common', name: 'applicationDate' },
               { fieldType: 'common', name: 'comment', required: true },
               { fieldType: 'common', name: 'consentDataProcessing', required: true },
             ],
@@ -468,6 +468,7 @@ export default {
         link={link}
       />
       <PopupManager />
+      <DialogManager />
     </div>
   ),
 
@@ -500,6 +501,7 @@ export default {
         link={link}
       />
       <PopupManager />
+      <DialogManager />
     </div>
   ),
 
@@ -524,6 +526,7 @@ export default {
         link={link}
       />
       <PopupManager />
+      <DialogManager />
     </div>
   ),
   ultraPremium: (
@@ -561,6 +564,7 @@ export default {
         link={link}
       />
       <PopupManager />
+      <DialogManager />
     </div>
   ),
   ved: (
@@ -600,7 +604,7 @@ export default {
                 required: true,
                 condition: {
                   name: 'vedTypes',
-                  values: ['currencyControl'],
+                  values: ['currencyControl', 'documentOperations'],
                 },
               },
               {
@@ -633,6 +637,41 @@ export default {
         isContacts={true}
       />
       <PopupManager />
+      <DialogManager />
+    </div>
+  ),
+  outservice: (
+    <div className="container grid grid-cols-12">
+      <ApplicationForm
+        className="col-span-12"
+        title="Заявка на консультацию OUTSEVICE"
+        typeForm="OUTSERVICE"
+        endpoint="lead"
+        sections={[
+          {
+            inputs: [
+              { fieldType: 'common', name: 'product', required: true },
+              { fieldType: 'common', name: 'region', required: true },
+              { fieldType: 'common', name: 'localities', required: true },
+              { fieldType: 'common', name: 'fullName', required: true },
+            ],
+          },
+          {
+            columns: 2,
+            inputs: [
+              { fieldType: 'common', name: 'birthday', required: true },
+              { fieldType: 'common', name: 'phone', required: true },
+              { fieldType: 'common', name: 'email' },
+              { fieldType: 'common', name: 'desiredMeetingDate' },
+            ],
+          },
+          { inputs: [{ fieldType: 'common', name: 'consentDataProcessing', required: true }] },
+        ]}
+        button={button}
+        link={link}
+      />
+      <PopupManager />
+      <DialogManager />
     </div>
   ),
 };

package/src/components/ApplicationForm/ApplicationForm.fixture.tsx

@@ -388,31 +388,50 @@ export default {
     <div className="container grid grid-cols-12">
       <ApplicationForm
         className="col-span-12"
-        title="Обратная связь"
+        title="Задать вопрос по продуктам и услугам"
         typeForm="FEEDBACK"
         endpoint="lead"
         sections={[
           {
             inputs: [
-              { fieldType: 'common', name: 'feedbackType', required: true },
-              {
-                fieldType: 'common',
-                name: 'serviceDirection',
-                condition: {
-                  name: 'feedbackType',
-                  values: ['FEEDBACK_QS'],
-                },
-              },
               { fieldType: 'common', name: 'region', required: true },
+              { fieldType: 'common', name: 'surname', required: true },
+              { fieldType: 'common', name: 'name', required: true },
+              { fieldType: 'common', name: 'middleName' },
               {
                 fieldType: 'common',
-                name: 'addressBranch',
+                name: 'birthday',
                 required: true,
-                condition: {
-                  name: 'feedbackType',
-                  values: ['FEEDBACK_QS'],
-                },
               },
+              { fieldType: 'common', name: 'feedbackMethod', required: true },
+              { fieldType: 'common', name: 'phone', required: true },
+              { fieldType: 'common', name: 'email', required: true },
+              { fieldType: 'common', name: 'comment', required: true },
+              { fieldType: 'common', name: 'consentDataProcessing', required: true },
+            ],
+          },
+        ]}
+        button={button}
+        link={link}
+      />
+      <PopupManager />
+      <DialogManager />
+    </div>
+  ),
+
+  feedbackQs: (
+    <div className="container grid grid-cols-12">
+      <ApplicationForm
+        className="col-span-12"
+        title="Качество обслуживания"
+        typeForm="FEEDBACK_QS"
+        endpoint="lead"
+        sections={[
+          {
+            inputs: [
+              { fieldType: 'common', name: 'serviceDirection' },
+              { fieldType: 'common', name: 'region', required: true },
+              { fieldType: 'common', name: 'addressBranch', required: true },
               { fieldType: 'common', name: 'surname', required: true },
               { fieldType: 'common', name: 'name', required: true },
               { fieldType: 'common', name: 'middleName' },
@@ -434,43 +453,12 @@ export default {
                   values: ['Юридическое лицо / ИП'],
                 },
               },
-              {
-                fieldType: 'common',
-                name: 'birthday',
-                required: true,
-                condition: {
-                  name: 'feedbackType',
-                  values: ['FEEDBACK'],
-                },
-              },
               { fieldType: 'common', name: 'feedbackMethod', required: true },
               { fieldType: 'common', name: 'phone', required: true },
-              {
-                fieldType: 'common',
-                name: 'secondaryPhone',
-                required: true,
-                condition: {
-                  name: 'feedbackType',
-                  values: ['FEEDBACK_QS'],
-                },
-              },
+              { fieldType: 'common', name: 'secondaryPhone', required: true },
               { fieldType: 'common', name: 'email', required: true },
-              {
-                fieldType: 'common',
-                name: 'bankEmpolee',
-                condition: {
-                  name: 'feedbackType',
-                  values: ['FEEDBACK_QS'],
-                },
-              },
-              {
-                fieldType: 'common',
-                name: 'applicationDate',
-                condition: {
-                  name: 'feedbackType',
-                  values: ['FEEDBACK_QS'],
-                },
-              },
+              { fieldType: 'common', name: 'bankEmpolee' },
+              { fieldType: 'common', name: 'applicationDate' },
               { fieldType: 'common', name: 'comment', required: true },
               { fieldType: 'common', name: 'consentDataProcessing', required: true },
             ],

package/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -47,7 +47,6 @@ export type NameFieldDef =
   | 'posTerminal'
   | 'serviceDirection'
   | 'serviceType'
-  | 'feedbackType'
   | 'feedbackMethod'
   | 'bankEmpolee'
   | 'applicationDate'
@@ -143,6 +142,7 @@ type TypeFormFieldDef =
   | 'ULTRASERVICE'
   | 'PREMIUMSERVICE'
   | 'FEEDBACK'
+  | 'FEEDBACK_QS'
   | 'OUTSERVICE';
 
 /**

package/src/components/ApplicationForm/getFormatData.tsx

@@ -14,7 +14,6 @@ export const getFormatData = (data: FormState): Record<string, any> => {
     term,
     annualRevenue,
     serviceType,
-    feedbackType,
     vedTypes,
     region,
     ...usedData
@@ -26,7 +25,6 @@ export const getFormatData = (data: FormState): Record<string, any> => {
     ...getRegion(region),
     ...(partnerComments ? { partnerComments } : {}),
     ...(serviceType ? { typeForm: serviceType } : {}),
-    ...(feedbackType ? { typeForm: feedbackType } : {}),
   };
 
   return Object.fromEntries(

package/src/components/ApplicationForm/getInitialFormState.tsx

@@ -1,6 +1,5 @@
 import {
   FEEDBACK_METHOD,
-  FEEDBACK_TYPES,
   SERVICE_DIRECTIONS,
   SERVICE_TYPES,
 } from '../../ui-kit/FormField/constants';
@@ -20,7 +19,6 @@ export interface FormState {
   email?: string;
   acquiringType?: Option;
   serviceType?: Option;
-  feedbackType?: Option;
   vedTypes?: string;
   region?: Option;
   onlineCheckout?: boolean;
@@ -47,7 +45,6 @@ const initialFormState = {
   amount: 100000,
   acquiringType: ACQUIRING_TYPES[0],
   serviceType: SERVICE_TYPES[0],
-  feedbackType: FEEDBACK_TYPES[0],
   feedbackMethod: FEEDBACK_METHOD[0],
   serviceDirection: SERVICE_DIRECTIONS[0],
   vedTypes: VED_TYPES[0],

package/src/components/ApplicationLeadForm/ApplicationLeadFormContent.ts

@@ -56,7 +56,6 @@ export type NameFieldDef =
   | 'posTerminal'
   | 'serviceDirection'
   | 'serviceType'
-  | 'feedbackType'
   | 'feedbackMethod'
   | 'bankEmpolee'
   | 'applicationDate'

package/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -1,6 +1,5 @@
 import {
   FEEDBACK_METHOD,
-  FEEDBACK_TYPES,
   SERVICE_DIRECTIONS,
   SERVICE_TYPES,
 } from '../../ui-kit/FormField/constants';
@@ -29,7 +28,6 @@ export interface FormState {
   email?: string;
   acquiringType?: Option;
   serviceType?: Option;
-  feedbackType?: Option;
   vedTypes?: string;
   region?: Option;
   onlineCheckout?: boolean;
@@ -85,7 +83,6 @@ const initialFormState = {
   amount: 100000,
   acquiringType: ACQUIRING_TYPES[0],
   serviceType: SERVICE_TYPES[0],
-  feedbackType: FEEDBACK_TYPES[0],
   feedbackMethod: FEEDBACK_METHOD[0],
   serviceDirection: SERVICE_DIRECTIONS[0],
   vedTypes: VED_TYPES[0],

package/src/hooks/useLeadFormData.ts

@@ -2,17 +2,24 @@ import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { type LeadProps } from '../ui-kit/FormField/SelectField';
 import { fetchJSON } from '../utils/fetchJSON';
 
+type ErrorProps = {
+  errorMessage?: string;
+};
+
 export const useLeadFormData = (typeField: string) => {
   const { data, error } = useAsyncData(
     `https://portal-ui-cc.cprb.dev.rshbdev.ru/light-api-cash/v1/dictionary?dictionaryType=${typeField}`,
     fetchData,
   );
+  if (data && 'errorMessage' in data) {
+    return { error };
+  }
 
-  return { data, error };
+  return { data: data as LeadProps[], error };
 };
 
-const fetchData = async (url: string): Promise<LeadProps[]> => {
-  const result = await fetchJSON<LeadProps[]>(url, { method: 'POST' });
+const fetchData = async (url: string): Promise<LeadProps[] | ErrorProps> => {
+  const result = await fetchJSON<LeadProps[] | ErrorProps>(url, { method: 'POST' });
 
   return result || [];
 };

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

@@ -6,7 +6,7 @@ import { getValidation } from '../getValidation';
 
 export const DesiredMeetingDateField = JSX<CustomFieldProps>(({ field, input }) => (
   <DatePickerControl
-    label="Дата рождения"
-    {...getValidation(field('birthday'), validatorObj.birthday, input?.required)}
+    label="Желаемая дата встречи"
+    {...getValidation(field('desiredMeetingDate'), validatorObj.meetingDay, input?.required)}
   />
 ));

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

@@ -1,25 +0,0 @@
-import { JSX } from '@redneckz/uni-jsx';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
-import { SelectControl } from '../../Select/SelectControl';
-import { FEEDBACK_TYPES, SERVICE_DIRECTIONS } from '../constants';
-import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
-
-export const FeedbackTypeField = JSX<CustomFieldProps>(({ field, input }) => {
-  const feedbackType = field('feedbackType');
-  useEffect(() => {
-    if (feedbackType?.value?.key === 'FEEDBACK') {
-      field('serviceDirection')?.onChange?.(SERVICE_DIRECTIONS[0]);
-    }
-  }, [feedbackType?.value]);
-
-  return (
-    <SelectControl
-      label="Тема"
-      placeholder="Выберите тему"
-      options={FEEDBACK_TYPES}
-      {...getValidation(feedbackType, validatorObj.feedbackType, input?.required)}
-    />
-  );
-});

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

@@ -27,7 +27,6 @@ import { EmployerOrganizationField } from './Fields/EmployerOrganizationField';
 import { EmploymentField } from './Fields/EmploymentField';
 import { Experience5YearsField } from './Fields/Experience5YearsField';
 import { FeedbackMethodField } from './Fields/FeedbackMethodField';
-import { FeedbackTypeField } from './Fields/FeedbackTypeField';
 import { FullAddressField } from './Fields/FullAddressField';
 import { FullNameField } from './Fields/FullNameField';
 import { GeneralSeniorityField } from './Fields/GeneralSeniorityField';
@@ -101,7 +100,6 @@ export const getField =
       amount: <AmountField field={field} />,
       annualRevenue: <AnnualRevenueField field={field} input={input} />,
       vedTypes: <VedField field={field} />,
-      feedbackType: <FeedbackTypeField field={field} input={input} />,
       feedbackMethod: <FeedbackMethodField field={field} input={input} />,
       serviceDirection: <ServiceDirectionField field={field} input={input} />,
       bankEmpolee: <BankEmpoleeField field={field} />,

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

@@ -42,7 +42,6 @@ export const validatorObj: Record<string, Validator> = {
   collectionCount: defaultValidator,
   comment: defaultValidator,
   acquiringType: defaultSelectValidator,
-  feedbackType: defaultSelectValidator,
   feedbackMethod: defaultSelectValidator,
   serviceType: defaultSelectValidator,
   serviceDirection: defaultSelectValidator,

package/bundle/ui-kit/FormField/Fields/FeedbackTypeField.d.ts

@@ -1,2 +0,0 @@
-import { type CustomFieldProps } from '../CustomFieldProps';
-export declare const FeedbackTypeField: import("@redneckz/uni-jsx").UNIComponent<CustomFieldProps, any, any>;

package/mobile/bundle/ui-kit/FormField/Fields/FeedbackTypeField.d.ts

@@ -1,2 +0,0 @@
-import { type CustomFieldProps } from '../CustomFieldProps';
-export declare const FeedbackTypeField: import("@redneckz/uni-jsx").UNIComponent<CustomFieldProps, any, any>;