From 58b45885b6d24b6d73a2891e1627e36e241fed13 Mon Sep 17 00:00:00 2001 From: Nastya Date: Thu, 28 Nov 2024 19:42:24 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B7=D0=B0=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D1=81=20=D1=88=D0=B0=D0=B3=D0=BE=D0=B2=20=D0=B2=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D0=B8=20=D0=BE=D1=82=20=D0=B2=D0=BE=D1=80=D0=BE=D0=BD=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IntegrationsModal/Amo/useAmoIntegration.ts | 14 ++++++++++++-- .../IntegrationsModal/AmoCRMModal.tsx | 0 2 files changed, 12 insertions(+), 2 deletions(-) delete mode 100644 src/pages/IntegrationsPage/IntegrationsModal/AmoCRMModal.tsx diff --git a/src/pages/IntegrationsPage/IntegrationsModal/Amo/useAmoIntegration.ts b/src/pages/IntegrationsPage/IntegrationsModal/Amo/useAmoIntegration.ts index d63bd3bd..5e9a2c60 100644 --- a/src/pages/IntegrationsPage/IntegrationsModal/Amo/useAmoIntegration.ts +++ b/src/pages/IntegrationsPage/IntegrationsModal/Amo/useAmoIntegration.ts @@ -74,6 +74,12 @@ export const useAmoIntegration = ({ isModalOpen, isTryRemoveAccount, quizID, que const [pageOfTags, setPageOfTags] = useState(1); const [pageOfFields, setPageOfFields] = useState(1); + const selectedPipelineHC = (id:string | null) => { + setSelectedPipeline(id); + isReadyGetPipelineStep = true; + setPageOfPipelinesSteps(1); + } + useEffect(() => { const fetchAccountRules = async () => { setIsLoadingPage(true); @@ -93,7 +99,7 @@ export const useAmoIntegration = ({ isModalOpen, isTryRemoveAccount, quizID, que if (!rulesError.includes("Not Found") && !rulesError.includes("first")) enqueueSnackbar(rulesError); } if (settingsResponse) { - if (settingsResponse.PipelineID) setSelectedPipeline(settingsResponse.PipelineID.toString()); + if (settingsResponse.PipelineID) selectedPipelineHC(settingsResponse.PipelineID.toString()); if (settingsResponse.StepID) setSelectedPipelineStep(settingsResponse.StepID.toString()); if (settingsResponse.PerformerID) setSelectedDealPerformer(settingsResponse.PerformerID.toString()); @@ -159,6 +165,8 @@ export const useAmoIntegration = ({ isModalOpen, isTryRemoveAccount, quizID, que }, [isModalOpen, isTryRemoveAccount]); + console.log(selectedPipeline); + useEffect(() => { const transletedQuestions = {} @@ -199,6 +207,8 @@ export const useAmoIntegration = ({ isModalOpen, isTryRemoveAccount, quizID, que } }, [pageOfPipelines]); useEffect(() => { + console.log("isReadyGetPipelineStep") + console.log(isReadyGetPipelineStep) if (isReadyGetPipelineStep) { const oldData = pageOfPipelinesSteps === 1 ? [] : arrayOfPipelinesSteps; if (selectedPipeline !== null) @@ -323,7 +333,7 @@ export const useAmoIntegration = ({ isModalOpen, isTryRemoveAccount, quizID, que arrayOfTags, arrayOfFields, selectedPipeline, - setSelectedPipeline, + setSelectedPipeline: selectedPipelineHC, selectedCurrentFields, selectedPipelineStep, setSelectedPipelineStep, diff --git a/src/pages/IntegrationsPage/IntegrationsModal/AmoCRMModal.tsx b/src/pages/IntegrationsPage/IntegrationsModal/AmoCRMModal.tsx deleted file mode 100644 index e69de29b..00000000