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

package/mobile/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/mobile/src/components/ApplicationLeadForm/ApplicationLeadFormContent.ts

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

package/mobile/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/mobile/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/mobile/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/mobile/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/mobile/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/mobile/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/package.json

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