@redneckz/wildless-cms-uni-blocks 0.14.1040 → 0.14.1041

package/mobile/src/retail/components/DraftDialog/utils.ts

@@ -130,23 +130,25 @@ export const getSelectValue = (
 };
 
 export const getProductData = (taskType?: DraftTaskType) => {
-  if (taskType === 'debit') {
-    return {
-      nextStepLink: '/debit-card-lead',
-      newTaskLink: '/natural/debetcards',
-      description: 'На дебетовую карту',
-    };
-  } else if (taskType === 'credit') {
-    return {
-      nextStepLink: '/credit-lead',
-      newTaskLink: '/natural/loans/all-goals',
-      description: 'На получение кредита',
-    };
+  switch (taskType) {
+    case 'debit':
+      return {
+        nextStepLink: '/debit-card-lead',
+        newTaskLink: '/natural/debetcards',
+        description: 'На дебетовую карту',
+      };
+    case 'credit':
+      return {
+        nextStepLink: '/credit-lead',
+        newTaskLink: '/natural/loans/all-goals',
+        description: 'На получение кредита',
+      };
+    case 'card':
+    default:
+      return {
+        nextStepLink: '/credit-card-lead',
+        newTaskLink: '/natural/creditcards/svoya',
+        description: 'На получение кредитной карты',
+      };
   }
-
-  return {
-    nextStepLink: '/credit-card-lead',
-    newTaskLink: '/natural/creditcards/svoya',
-    description: 'На получение кредитной карты',
-  };
 };

package/mobile/src/retail/utils/productTypeToTaskType.ts

@@ -0,0 +1,13 @@
+import { type ProductType } from '../model/ApplicationLeadFormTypes';
+import { type DraftTaskType } from '../model/DraftTaskType';
+
+export const productTypeToTaskType = (productType: ProductType): DraftTaskType => {
+  if (productType === 'debitCard') {
+    return 'debit';
+  }
+  if (productType === 'creditCard') {
+    return 'card';
+  }
+
+  return 'credit';
+};

package/package.json

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

package/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx

@@ -8,7 +8,6 @@ import { createDraftTask } from '../../retail/api/createDraftTask';
 import { createParticipant } from '../../retail/api/createParticipant';
 import { createUserProfile } from '../../retail/api/createUserProfile';
 import { createUserTaskDebit } from '../../retail/api/createUserTaskDebit';
-import { type Task } from '../../retail/api/draftTasksKZO';
 import { getClaimChannel } from '../../retail/api/getClaimChannel';
 import { getLastTaskStatus } from '../../retail/api/getLastTaskStatus';
 import { getTaskById } from '../../retail/api/getTaskById';
@@ -18,7 +17,6 @@ import { updateUserTask } from '../../retail/api/updateUserTask';
 import { useConsentBkiDialog } from '../../retail/components/ConsentBkiDialog/useConsentBkiDialog';
 import { useDraftDialog } from '../../retail/components/DraftDialog/useDraftDialog';
 import { VerifyPhoneDialog } from '../../retail/components/VerifyPhoneDialog/VerifyPhoneDialog';
-import { useDraftSearch } from '../../retail/hooks/useDraftSearch';
 import {
   type CommonLeadProps,
   type ProductType,
@@ -26,9 +24,9 @@ import {
   type UpdateUserDataNewMicroserviceProps,
   type UpdateUserDataProps,
 } from '../../retail/model/ApplicationLeadFormTypes';
-import { type DraftTaskType } from '../../retail/model/DraftTaskType';
 import { type FormRetailConsents, type LeadFormState } from '../../retail/model/LeadFormState';
 import { getUpdateUserProfileData } from '../../retail/utils/getUpdateUserProfile';
+import { productTypeToTaskType } from '../../retail/utils/productTypeToTaskType';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
 import { formatPhone } from '../../utils/formatPhone';
 import { productTypeToConsentsMap } from './consents';
@@ -70,7 +68,6 @@ export const useApplicationLeadApi = ({
   const consentBkiDialog = useConsentBkiDialog(goToNextStep);
   const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
   const draftDialog = useDraftDialog();
-  const { searchDrafts } = useDraftSearch();
 
   const handleFailSendForm = () => {
     verifyPhoneDialog.close();
@@ -124,7 +121,7 @@ export const useApplicationLeadApi = ({
             draftDialog.open({
               task,
               isFromLead: true,
-              taskType: productType === 'debitCard' ? 'debit' : 'credit',
+              taskType: productTypeToTaskType(productType),
               sendAspects,
               onClose: sendCurrentTask,
             });
@@ -199,7 +196,6 @@ export const useApplicationLeadApi = ({
         common,
         draftDialog,
         sendCurrentTask,
-        searchDrafts,
       });
 
       const acceptedConsents = getAcceptedConsents(transformedFormData, productType);
@@ -263,35 +259,30 @@ const createHandleSuccessVerifyNew =
     common,
     draftDialog,
     sendCurrentTask,
-    searchDrafts,
   }: {
     common: CommonLeadProps;
     draftDialog: any;
     sendCurrentTask: () => Promise<void>;
-    searchDrafts: () => Promise<{ draft: Task | null; taskType: DraftTaskType | undefined }>;
   }) =>
   async () => {
-    const { verifyPhoneDialog, sendAspects, handleFailSendForm } = common;
+    const { verifyPhoneDialog, sendAspects, handleFailSendForm, userId, programId, productType } =
+      common;
     try {
-      const { draft, taskType } = await searchDrafts();
-
-      verifyPhoneDialog.close();
+      const lastTaskId = await getLastTaskStatus({ userId, programId });
 
-      if (!draft) {
+      if (lastTaskId) {
+        const task = await getTaskById({ taskId: lastTaskId });
+        verifyPhoneDialog.close();
         draftDialog.open({
-          task: undefined,
-          taskType: null,
+          task,
+          isFromLead: true,
+          taskType: productTypeToTaskType(productType),
+          sendAspects,
+          onClose: sendCurrentTask,
         });
-
-        return;
+      } else {
+        await sendCurrentTask();
       }
-      draftDialog.open({
-        task: draft,
-        taskType,
-        isFromLead: true,
-        sendAspects,
-        onClose: sendCurrentTask,
-      });
     } catch {
       handleFailSendForm();
     }

package/src/retail/api/getTaskById.ts

@@ -1,12 +1,17 @@
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 import { fetchRetailJSON } from './doRequest';
 import { type Task } from './draftTasksKZO';
 
 type GetTaskByIdBody = {
-  taskId: number;
+  taskId: string | number;
 };
 
 export const getTaskById = async (body: GetTaskByIdBody): Promise<Task | undefined> => {
-  const res = await fetchRetailJSON<Task>('/user-data/getTaskById', 'POST', body);
+  const isNewMicroservice = checkNewMicroservice();
+
+  const endpoint = isNewMicroservice ? '/public-data/getTaskById' : '/user-data/getTaskById';
+
+  const res = await fetchRetailJSON<Task>(endpoint, 'POST', body);
 
   return res || undefined;
 };

package/src/retail/components/DraftDialog/utils.ts

@@ -130,23 +130,25 @@ export const getSelectValue = (
 };
 
 export const getProductData = (taskType?: DraftTaskType) => {
-  if (taskType === 'debit') {
-    return {
-      nextStepLink: '/debit-card-lead',
-      newTaskLink: '/natural/debetcards',
-      description: 'На дебетовую карту',
-    };
-  } else if (taskType === 'credit') {
-    return {
-      nextStepLink: '/credit-lead',
-      newTaskLink: '/natural/loans/all-goals',
-      description: 'На получение кредита',
-    };
+  switch (taskType) {
+    case 'debit':
+      return {
+        nextStepLink: '/debit-card-lead',
+        newTaskLink: '/natural/debetcards',
+        description: 'На дебетовую карту',
+      };
+    case 'credit':
+      return {
+        nextStepLink: '/credit-lead',
+        newTaskLink: '/natural/loans/all-goals',
+        description: 'На получение кредита',
+      };
+    case 'card':
+    default:
+      return {
+        nextStepLink: '/credit-card-lead',
+        newTaskLink: '/natural/creditcards/svoya',
+        description: 'На получение кредитной карты',
+      };
   }
-
-  return {
-    nextStepLink: '/credit-card-lead',
-    newTaskLink: '/natural/creditcards/svoya',
-    description: 'На получение кредитной карты',
-  };
 };

package/src/retail/utils/productTypeToTaskType.ts

@@ -0,0 +1,13 @@
+import { type ProductType } from '../model/ApplicationLeadFormTypes';
+import { type DraftTaskType } from '../model/DraftTaskType';
+
+export const productTypeToTaskType = (productType: ProductType): DraftTaskType => {
+  if (productType === 'debitCard') {
+    return 'debit';
+  }
+  if (productType === 'creditCard') {
+    return 'card';
+  }
+
+  return 'credit';
+};