@redneckz/wildless-cms-uni-blocks 0.14.684 → 0.14.685

package/mobile/src/api/RetailAPI/updateUserProfile.ts

@@ -1,5 +1,4 @@
-import { fetchRetailJSON } from './doRequest';
-import { type CreateUserProfileResponse } from './updateUserTask';
+import { doRequest } from './doRequest';
 
 export type UpdateUserProfileBody = {
   profile: {
@@ -23,4 +22,4 @@ export type UpdateUserProfileBody = {
 };
 
 export const updateUserProfile = (body: UpdateUserProfileBody) =>
-  fetchRetailJSON<CreateUserProfileResponse>('/user-data/updateUserProfile', 'PUT', body);
+  doRequest('/user-data/updateUserProfile', 'PUT', body);

package/mobile/src/api/RetailAPI/utils/getUpdateUserProfile.ts

@@ -11,7 +11,7 @@ export const getUpdateUserProfileData = (
     name = '',
     surname = '',
     middleName = '',
-    birthday = '',
+    limitedBirthday = '',
     phone = '',
     email = '',
     processPersonalDataFlg,
@@ -29,7 +29,7 @@ export const getUpdateUserProfileData = (
       name,
       surname,
       midname: middleName,
-      birthDate: birthday && formatDate(birthday, true),
+      birthDate: limitedBirthday && formatDate(limitedBirthday, true),
       email,
       phone: formatPhone(phone),
       processPersonalDataFlg: Boolean(processPersonalDataFlg),

package/mobile/src/components/ApplicationLeadForm/useApplicationLeadApi.ts

@@ -127,14 +127,18 @@ const updateUserData = async ({
     programId,
   });
 
-  await updateUserTask(
-    getLeadFormTaskData({
-      participantId,
-      taskId,
-      profileId,
-      formData: transformedForm,
-    }),
-  );
+  try {
+    await updateUserTask(
+      getLeadFormTaskData({
+        participantId,
+        taskId,
+        profileId,
+        formData: transformedForm,
+      }),
+    );
+  } catch (ex) {
+    console.log(ex);
+  }
 
   saveUserData({ participantId, taskId, profileId, programId });
   saveForm(formData);

package/mobile/src/ui-kit/FormField/Fields/CardCategoryField.tsx

@@ -1,18 +1,28 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { getCardTypes, type CardTypeData } from '../../../api/RetailAPI/getCardTypes';
+import { useLocalStorage } from '../../../hooks/useLocalStorage';
+import { type Option } from '../../Select/Option';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { SelectField } from '../SelectField';
 
 export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
   const [cardTypes, setCardTypes] = useState<CardTypeData[]>([]);
+  const [programId] = useLocalStorage<string>('programId');
+  const { value: selectedCardCategory, onChange: cardCategoryChange } = field('cardCategory');
   const selectedPaymentSystem = field('paymentSystem').value;
 
   useEffect(() => {
-    (async () => {
-      const fetchedCardTypes = await getCardTypes(selectedPaymentSystem as string);
-      setCardTypes(fetchedCardTypes);
-    })();
+    if (selectedPaymentSystem && programId) {
+      (async () => {
+        const fetchedCardTypes = await getCardTypes(selectedPaymentSystem as string, programId);
+        setCardTypes(fetchedCardTypes);
+
+        if (!isValidCardCategory(fetchedCardTypes, selectedCardCategory as Option)) {
+          cardCategoryChange && cardCategoryChange(null);
+        }
+      })();
+    }
   }, [selectedPaymentSystem]);
 
   return (
@@ -25,3 +35,6 @@ export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
     />
   );
 });
+
+const isValidCardCategory = (cardTypes: CardTypeData[], selectedCardCategory: Option | null) =>
+  cardTypes.some((cardType) => cardType.key === selectedCardCategory?.key);

package/mobile/src/ui-kit/FormField/Fields/PaymentSystemField.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { getPaymentSystems } from '../../../api/RetailAPI/getPaymentSystems';
+import { useLocalStorage } from '../../../hooks/useLocalStorage';
 import { type RadioButtonItem } from '../../RadioButtonGroup/RadioButtonGroup';
 import { RadioButtonGroupControl } from '../../RadioButtonGroup/RadioButtonGroupControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
@@ -9,14 +10,17 @@ import { getValidation } from '../getValidation';
 
 export const PaymentSystemField = JSX<CustomFieldProps>(({ field, input }) => {
   const { value, onChange } = field('paymentSystem');
+  const [programId] = useLocalStorage<string>('programId');
 
   const [paymentSystemOptions, setPaymentSystemOptions] = useState<RadioButtonItem[]>([]);
 
   useEffect(() => {
-    (async () => {
-      const fetchedPaymentSystems = await getPaymentSystems();
-      setPaymentSystemOptions(fetchedPaymentSystems || []);
-    })();
+    if (programId) {
+      (async () => {
+        const fetchedPaymentSystems = await getPaymentSystems(programId);
+        setPaymentSystemOptions(fetchedPaymentSystems || []);
+      })();
+    }
   }, []);
 
   return (

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

@@ -105,6 +105,8 @@ export const validatorObj: Record<string, Validator> = {
   confirmationIncome: defaultValidator(),
   deliveryDate: defaultValidator('Укажите дату доставки'),
   addressCourier: addressDaDataValidator(),
+  cardCategory: defaultValidator('Укажите категорию карты'),
+  paymentSystem: defaultValidator('Укажите тип платежной системы'),
 };
 
 export const getObjectValidator = (inputs: FieldDef[]): Record<string, Validator> => {

package/package.json

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

package/src/api/RetailAPI/getCardTypes.ts

@@ -1,4 +1,4 @@
-import { doRequest } from './doRequest';
+import { fetchRetailJSON } from './doRequest';
 
 export type CardTypeData = {
   type: string;
@@ -8,13 +8,11 @@ export type CardTypeData = {
   description: string;
 };
 
-export const getCardTypes = async (paymentSystemType: string) => {
-  const response: Response = await doRequest('/dictionaryFiltered', 'POST', {
+export const getCardTypes = async (paymentSystemTypeCd: string, creditProgramId: string) => {
+  const data = await fetchRetailJSON<CardTypeData[]>('/dictionaryFiltered', 'POST', {
     type: 'CARD_TYPE',
-    presets: { paymentSystemType, creditProgramId: 13 },
+    presets: { paymentSystemTypeCd, creditProgramId },
   });
 
-  const data: CardTypeData[] = await response?.json();
-
   return Array.isArray(data) ? data : [];
 };

package/src/api/RetailAPI/getPaymentSystems.ts

@@ -1,4 +1,4 @@
-import { doRequest } from './doRequest';
+import { fetchRetailJSON } from './doRequest';
 
 type PaymentSystemResponse = {
   paymentSystems?: {
@@ -7,12 +7,14 @@ type PaymentSystemResponse = {
   }[];
 };
 
-export const getPaymentSystems = async () => {
-  const response: Response = await doRequest('/public-data/creditProgramConditions', 'POST', {
-    creditProgramId: 13,
-  });
-
-  const data: PaymentSystemResponse = await response?.json();
+export const getPaymentSystems = async (creditProgramId: string) => {
+  const data = await fetchRetailJSON<PaymentSystemResponse>(
+    '/public-data/creditProgramConditions',
+    'POST',
+    {
+      creditProgramId,
+    },
+  );
 
   return (
     data?.paymentSystems?.map((paymentSystem) => ({

package/src/api/RetailAPI/updateUserProfile.ts

@@ -1,5 +1,4 @@
-import { fetchRetailJSON } from './doRequest';
-import { type CreateUserProfileResponse } from './updateUserTask';
+import { doRequest } from './doRequest';
 
 export type UpdateUserProfileBody = {
   profile: {
@@ -23,4 +22,4 @@ export type UpdateUserProfileBody = {
 };
 
 export const updateUserProfile = (body: UpdateUserProfileBody) =>
-  fetchRetailJSON<CreateUserProfileResponse>('/user-data/updateUserProfile', 'PUT', body);
+  doRequest('/user-data/updateUserProfile', 'PUT', body);

package/src/api/RetailAPI/utils/getUpdateUserProfile.ts

@@ -11,7 +11,7 @@ export const getUpdateUserProfileData = (
     name = '',
     surname = '',
     middleName = '',
-    birthday = '',
+    limitedBirthday = '',
     phone = '',
     email = '',
     processPersonalDataFlg,
@@ -29,7 +29,7 @@ export const getUpdateUserProfileData = (
       name,
       surname,
       midname: middleName,
-      birthDate: birthday && formatDate(birthday, true),
+      birthDate: limitedBirthday && formatDate(limitedBirthday, true),
       email,
       phone: formatPhone(phone),
       processPersonalDataFlg: Boolean(processPersonalDataFlg),

package/src/components/ApplicationLeadForm/useApplicationLeadApi.ts

@@ -127,14 +127,18 @@ const updateUserData = async ({
     programId,
   });
 
-  await updateUserTask(
-    getLeadFormTaskData({
-      participantId,
-      taskId,
-      profileId,
-      formData: transformedForm,
-    }),
-  );
+  try {
+    await updateUserTask(
+      getLeadFormTaskData({
+        participantId,
+        taskId,
+        profileId,
+        formData: transformedForm,
+      }),
+    );
+  } catch (ex) {
+    console.log(ex);
+  }
 
   saveUserData({ participantId, taskId, profileId, programId });
   saveForm(formData);

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

@@ -1,18 +1,28 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { getCardTypes, type CardTypeData } from '../../../api/RetailAPI/getCardTypes';
+import { useLocalStorage } from '../../../hooks/useLocalStorage';
+import { type Option } from '../../Select/Option';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { SelectField } from '../SelectField';
 
 export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
   const [cardTypes, setCardTypes] = useState<CardTypeData[]>([]);
+  const [programId] = useLocalStorage<string>('programId');
+  const { value: selectedCardCategory, onChange: cardCategoryChange } = field('cardCategory');
   const selectedPaymentSystem = field('paymentSystem').value;
 
   useEffect(() => {
-    (async () => {
-      const fetchedCardTypes = await getCardTypes(selectedPaymentSystem as string);
-      setCardTypes(fetchedCardTypes);
-    })();
+    if (selectedPaymentSystem && programId) {
+      (async () => {
+        const fetchedCardTypes = await getCardTypes(selectedPaymentSystem as string, programId);
+        setCardTypes(fetchedCardTypes);
+
+        if (!isValidCardCategory(fetchedCardTypes, selectedCardCategory as Option)) {
+          cardCategoryChange && cardCategoryChange(null);
+        }
+      })();
+    }
   }, [selectedPaymentSystem]);
 
   return (
@@ -25,3 +35,6 @@ export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
     />
   );
 });
+
+const isValidCardCategory = (cardTypes: CardTypeData[], selectedCardCategory: Option | null) =>
+  cardTypes.some((cardType) => cardType.key === selectedCardCategory?.key);

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

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { getPaymentSystems } from '../../../api/RetailAPI/getPaymentSystems';
+import { useLocalStorage } from '../../../hooks/useLocalStorage';
 import { type RadioButtonItem } from '../../RadioButtonGroup/RadioButtonGroup';
 import { RadioButtonGroupControl } from '../../RadioButtonGroup/RadioButtonGroupControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
@@ -9,14 +10,17 @@ import { getValidation } from '../getValidation';
 
 export const PaymentSystemField = JSX<CustomFieldProps>(({ field, input }) => {
   const { value, onChange } = field('paymentSystem');
+  const [programId] = useLocalStorage<string>('programId');
 
   const [paymentSystemOptions, setPaymentSystemOptions] = useState<RadioButtonItem[]>([]);
 
   useEffect(() => {
-    (async () => {
-      const fetchedPaymentSystems = await getPaymentSystems();
-      setPaymentSystemOptions(fetchedPaymentSystems || []);
-    })();
+    if (programId) {
+      (async () => {
+        const fetchedPaymentSystems = await getPaymentSystems(programId);
+        setPaymentSystemOptions(fetchedPaymentSystems || []);
+      })();
+    }
   }, []);
 
   return (

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

@@ -105,6 +105,8 @@ export const validatorObj: Record<string, Validator> = {
   confirmationIncome: defaultValidator(),
   deliveryDate: defaultValidator('Укажите дату доставки'),
   addressCourier: addressDaDataValidator(),
+  cardCategory: defaultValidator('Укажите категорию карты'),
+  paymentSystem: defaultValidator('Укажите тип платежной системы'),
 };
 
 export const getObjectValidator = (inputs: FieldDef[]): Record<string, Validator> => {