@redneckz/wildless-cms-uni-blocks 0.14.1033 → 0.14.1035

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

@@ -286,7 +286,6 @@ const createHandleSuccessVerifyNew =
     try {
       const lastTaskId = await getLastTaskStatus({
         userId,
-        profileId: userId,
         programId,
       });
 

package/mobile/src/hooks/useForm/useForm.ts

@@ -90,11 +90,11 @@ export function useForm<FormState extends Record<string, any>>(
   }, [initialState, setFormState]);
 
   const handleSubmit = useCallback(
-    (ev: PreventableEvent) => {
+    async (ev: PreventableEvent) => {
       ev.preventDefault();
       if (isValid) {
+        await onSubmit?.(formState, ev);
         resetOnSubmit && reset();
-        onSubmit?.(formState, ev);
       } else {
         const errorFieldName = getErrorFieldName(formState, fieldValidatorsMap);
         markAsDirty();

package/mobile/src/retail/api/getLastTaskStatus.ts

@@ -1,3 +1,4 @@
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 import { fetchRetailJSON } from './doRequest';
 
 type GetLastTaskStatusBody = {
@@ -12,11 +13,11 @@ type GetLastTaskStatusResponse = {
 };
 
 export const getLastTaskStatus = async (body: GetLastTaskStatusBody): Promise<number | null> => {
-  const res = await fetchRetailJSON<GetLastTaskStatusResponse>(
-    '/user-data/getLastStatus',
-    'POST',
-    body,
-  );
+  const isNewMicroservice = checkNewMicroservice();
+
+  const endpoint = isNewMicroservice ? '/public-data/getLastStatus' : '/user-data/getLastStatus';
+
+  const res = await fetchRetailJSON<GetLastTaskStatusResponse>(endpoint, 'POST', body);
 
   return res?.statusCd === 'DRAFT' ? res?.taskId : null;
 };

package/mobile/src/retail/components/ConsentBkiDialog/useConsentBkiDialog.tsx

@@ -7,7 +7,6 @@ import { ConsentBkiDialog } from './ConsentBkiDialog';
 type SubmitBkiConsentProps = {
   phone?: string;
   profileId?: number;
-  userId?: string | number;
   onFail?: () => void;
   taskId?: number;
   participantId?: string | number;
@@ -66,12 +65,11 @@ export const useConsentBkiDialog = (onClose: () => void) => {
     };
 
   return {
-    open: ({ phone, profileId, userId, onFail, taskId, participantId }: SubmitBkiConsentProps) =>
+    open: ({ phone, profileId, onFail, taskId, participantId }: SubmitBkiConsentProps) =>
       open({
         onSubmit: handleSubmitBkiConsent({
           phone,
           profileId,
-          userId,
           onFail,
           taskId,
           participantId,

package/package.json

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

package/src/components/ApplicationForm/ApplicationForm.tsx

@@ -1,4 +1,5 @@
 import { useCallback, useMemo } from '@redneckz/uni-jsx/lib/hooks';
+import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { useRouter } from '../../external/useRouter';
 import { useAspects } from '../../hooks/useAspects/useAspects';
 import { useForm } from '../../hooks/useForm/useForm';
@@ -74,9 +75,11 @@ export const ApplicationForm = UniBlock<ApplicationFormProps>(
     const responseTypeDialog = useDialog(ResponseTypeDialog);
     const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
     const openUserSurvey = useUserSurveyDialog(true);
+    const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
 
     const handleSubmit = useCallback(
       async (formData: FormState, ev: PreventableEventWithTarget) => {
+        startSending();
         const formatData = getFormatData({ ...formData, ...additionalParams });
 
         await executeHandler(
@@ -95,6 +98,7 @@ export const ApplicationForm = UniBlock<ApplicationFormProps>(
           },
           endpoint,
         );
+        endSending();
       },
       [typeForm],
     );
@@ -121,6 +125,7 @@ export const ApplicationForm = UniBlock<ApplicationFormProps>(
             additionalLink,
             button,
             typeForm,
+            isSending,
           })}
         </form>
         {isContacts ? renderContacts() : null}

package/src/components/ApplicationForm/renderAgreementSubmit.tsx

@@ -11,19 +11,23 @@ import { Footnote } from './Footnote';
 const agreementText = 'Нажимая кнопку, вы подтверждаете согласие с ';
 const agreementTextPF = 'Нажимая на кнопку, вы подтверждаете, что клиент дал согласие на ';
 
+type renderAgreementSubmitProps = {
+  consentDataProcessing?: FieldProps<boolean>;
+  link?: LinkProps;
+  additionalLink?: LinkProps;
+  button?: SubmitButtonProps;
+  typeForm?: string;
+  isSending?: boolean;
+};
+
 export const renderAgreementSubmit = ({
   consentDataProcessing,
   link,
   additionalLink,
   button,
   typeForm,
-}: {
-  consentDataProcessing?: FieldProps<boolean>;
-  link?: LinkProps;
-  additionalLink?: LinkProps;
-  button?: SubmitButtonProps;
-  typeForm?: string;
-}) => (
+  isSending = false,
+}: renderAgreementSubmitProps) => (
   <div className="flex col-span-2 gap-xs flex-col w-full items-baseline">
     {consentDataProcessing ? (
       <div>
@@ -40,7 +44,7 @@ export const renderAgreementSubmit = ({
         additionalLink={additionalLink}
       />
     )}
-    <SubmitButton className="w-full @xl:w-auto">
+    <SubmitButton className="w-full @xl:w-auto" isLoading={isSending}>
       {button?.text ? button.text : 'Отправить заявку'}
     </SubmitButton>
   </div>

package/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx

@@ -286,7 +286,6 @@ const createHandleSuccessVerifyNew =
     try {
       const lastTaskId = await getLastTaskStatus({
         userId,
-        profileId: userId,
         programId,
       });
 

package/src/hooks/useForm/useForm.ts

@@ -90,11 +90,11 @@ export function useForm<FormState extends Record<string, any>>(
   }, [initialState, setFormState]);
 
   const handleSubmit = useCallback(
-    (ev: PreventableEvent) => {
+    async (ev: PreventableEvent) => {
       ev.preventDefault();
       if (isValid) {
+        await onSubmit?.(formState, ev);
         resetOnSubmit && reset();
-        onSubmit?.(formState, ev);
       } else {
         const errorFieldName = getErrorFieldName(formState, fieldValidatorsMap);
         markAsDirty();

package/src/retail/api/getLastTaskStatus.ts

@@ -1,3 +1,4 @@
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 import { fetchRetailJSON } from './doRequest';
 
 type GetLastTaskStatusBody = {
@@ -12,11 +13,11 @@ type GetLastTaskStatusResponse = {
 };
 
 export const getLastTaskStatus = async (body: GetLastTaskStatusBody): Promise<number | null> => {
-  const res = await fetchRetailJSON<GetLastTaskStatusResponse>(
-    '/user-data/getLastStatus',
-    'POST',
-    body,
-  );
+  const isNewMicroservice = checkNewMicroservice();
+
+  const endpoint = isNewMicroservice ? '/public-data/getLastStatus' : '/user-data/getLastStatus';
+
+  const res = await fetchRetailJSON<GetLastTaskStatusResponse>(endpoint, 'POST', body);
 
   return res?.statusCd === 'DRAFT' ? res?.taskId : null;
 };

package/src/retail/components/ConsentBkiDialog/useConsentBkiDialog.tsx

@@ -7,7 +7,6 @@ import { ConsentBkiDialog } from './ConsentBkiDialog';
 type SubmitBkiConsentProps = {
   phone?: string;
   profileId?: number;
-  userId?: string | number;
   onFail?: () => void;
   taskId?: number;
   participantId?: string | number;
@@ -66,12 +65,11 @@ export const useConsentBkiDialog = (onClose: () => void) => {
     };
 
   return {
-    open: ({ phone, profileId, userId, onFail, taskId, participantId }: SubmitBkiConsentProps) =>
+    open: ({ phone, profileId, onFail, taskId, participantId }: SubmitBkiConsentProps) =>
       open({
         onSubmit: handleSubmitBkiConsent({
           phone,
           profileId,
-          userId,
           onFail,
           taskId,
           participantId,