From 2899517fb3571e2e520484e6b0859af6880825de Mon Sep 17 00:00:00 2001 From: Sayali Joshi Date: Fri, 4 Oct 2024 20:44:30 +0530 Subject: [PATCH] Test Migration button disable changes --- ui/src/components/MigrationFlowHeader/index.tsx | 2 +- .../Stepper/HorizontalStepper/HorizontalStepper.tsx | 2 +- ui/src/components/TestMigration/index.tsx | 9 +++++++-- ui/src/pages/Migration/index.tsx | 3 +-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ui/src/components/MigrationFlowHeader/index.tsx b/ui/src/components/MigrationFlowHeader/index.tsx index 7e7a6767..d1b7ade8 100644 --- a/ui/src/components/MigrationFlowHeader/index.tsx +++ b/ui/src/components/MigrationFlowHeader/index.tsx @@ -67,7 +67,7 @@ const MigrationFlowHeader = ({projectData, handleOnClick, isLoading }: Migration version="v2" aria-label='Save and Continue' isLoading={isLoading} - disabled={newMigrationData?.testStacks?.length > 0} + disabled={newMigrationData?.testStacks?.some((stack) => stack?.isMigrated === false)} > {stepValue} diff --git a/ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx b/ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx index 0c65cb27..23a62462 100644 --- a/ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx +++ b/ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx @@ -190,7 +190,7 @@ const HorizontalStepper = forwardRef( !stepsCompleted.includes(idx) && idx !== showStep && !stepsCompleted?.includes(idx - 1) ? 'disableEvents' : ''; - const completeDisable = stepsCompleted?.includes(idx) && idx < steps?.length - 3 ? 'completed disableEvents' : ''; + const completeDisable = stepsCompleted?.includes(idx) && stepIndex === steps?.length - 1 ? 'completed disableEvents' : ''; return (
diff --git a/ui/src/components/TestMigration/index.tsx b/ui/src/components/TestMigration/index.tsx index 5a1cbf86..682a948e 100644 --- a/ui/src/components/TestMigration/index.tsx +++ b/ui/src/components/TestMigration/index.tsx @@ -1,4 +1,4 @@ -import { useEffect, useState, useRef } from 'react'; +import { useEffect, useState } from 'react'; import { useParams } from 'react-router'; import { Field, FieldLabel, TextInput, Link, Icon, Tooltip, Button, Notification } from '@contentstack/venus-components'; import { useSelector, useDispatch } from 'react-redux'; @@ -30,6 +30,7 @@ import './index.scss'; const TestMigration = () => { const [data, setData] = useState({}); const [isLoading, setIsLoading] = useState(false); + const [isMigrationStarted, setIsMigrationStarted] = useState(false); const newMigrationData = useSelector((state: RootState) => state?.migration?.newMigrationData); const selectedOrganisation = useSelector((state: RootState)=>state?.authentication?.selectedOrganisation); @@ -100,6 +101,10 @@ const TestMigration = () => { newMigrationData?.destination_stack?.selectedOrg?.value, projectId ); + + if (testRes?.status === 200) { + setIsMigrationStarted(true); + } } return ( @@ -154,7 +159,7 @@ const TestMigration = () => { className="ml-8" onClick={handleTestMigration} version="v2" - // size="medium" + disabled={isMigrationStarted} > Start Test Migration diff --git a/ui/src/pages/Migration/index.tsx b/ui/src/pages/Migration/index.tsx index 8de895e0..e948de89 100644 --- a/ui/src/pages/Migration/index.tsx +++ b/ui/src/pages/Migration/index.tsx @@ -8,8 +8,7 @@ import { RootState } from '../../store'; import { updateMigrationData, updateNewMigrationData } from '../../store/slice/migrationDataSlice'; // Services -import { getMigrationData, updateCurrentStepData, updateLegacyCMSData, updateDestinationStack, createTestStack, updateAffixData, fileformatConfirmation, updateFileFormatData, affixConfirmation, updateStackDetails, getOrgDetails, getExistingContentTypes, getExistingGlobalFields } from '../../services/api/migration.service'; -import { getAllStacksInOrg } from '../../services/api/stacks.service'; +import { getMigrationData, updateCurrentStepData, updateLegacyCMSData, updateDestinationStack, updateAffixData, fileformatConfirmation, updateFileFormatData, affixConfirmation, updateStackDetails, getExistingContentTypes, getExistingGlobalFields } from '../../services/api/migration.service'; import { getCMSDataFromFile } from '../../cmsData/cmsSelector'; // Utilities