Skip to content

Feature/test migration #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RohitKini merged 3 commits into from
Oct 4, 2024
Merged

Feature/test migration #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
418bb4d
Test Migration API integrated
sayalijoshi27 Oct 3, 2024
cf19a63
Merge branch 'dev' of https://github.com/contentstack/migration-v2-no…
sayalijoshi27 Oct 4, 2024
8d34f28
Test migration button disabld and loader aaded
sayalijoshi27 Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ui/src/components/MigrationFlowHeader/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ const MigrationFlowHeader = ({projectData, handleOnClick, isLoading }: Migration
const params: Params<string> = useParams();

const selectedOrganisation = useSelector((state: RootState)=>state?.authentication?.selectedOrganisation);
const newMigrationData = useSelector((state: RootState) => state?.migration?.newMigrationData);


useEffect(() => {
fetchProject();
Expand Down Expand Up @@ -65,6 +67,7 @@ const MigrationFlowHeader = ({projectData, handleOnClick, isLoading }: Migration
version="v2"
aria-label='Save and Continue'
isLoading={isLoading}
disabled={newMigrationData?.testStacks?.length > 0}
>
{stepValue}
</Button>
Expand Down
5 changes: 1 addition & 4 deletions ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,6 @@ const HorizontalStepper = forwardRef(

useEffect(() => {
const stepIndex = parseInt(stepId || '', 10) - 1;

console.log("stepIndex", stepIndex);


if (!Number.isNaN(stepIndex) && stepIndex >= 0 && stepIndex < steps?.length) {
setShowStep(stepIndex);
Expand Down Expand Up @@ -193,7 +190,7 @@ const HorizontalStepper = forwardRef(
!stepsCompleted.includes(idx) && idx !== showStep && !stepsCompleted?.includes(idx - 1)
? 'disableEvents'
: '';
const completeDisable = stepsCompleted?.includes(idx) && idx < steps?.length - 1 ? 'completed disableEvents' : '';
const completeDisable = stepsCompleted?.includes(idx) && idx < steps?.length - 3 ? 'completed disableEvents' : '';
return (
<React.Fragment key={id}>
<div className="stepWrapperContainer">
Expand Down
32 changes: 17 additions & 15 deletions ui/src/components/TestMigration/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { CS_ENTRIES } from '../../utilities/constants';

// Interface
import { MigrationType } from './testMigration.interface';
import { INewMigration } from '../../context/app/app.interface';
import { INewMigration, TestStacks } from '../../context/app/app.interface';


// Component
Expand All @@ -29,7 +29,7 @@ import './index.scss';

const TestMigration = () => {
const [data, setData] = useState<MigrationType>({});
const [showLogs, setShowLogs] = useState<boolean>(false);
const [isLoading, setIsLoading] = useState<boolean>(false);

const newMigrationData = useSelector((state: RootState) => state?.migration?.newMigrationData);
const selectedOrganisation = useSelector((state: RootState)=>state?.authentication?.selectedOrganisation);
Expand All @@ -47,11 +47,10 @@ const TestMigration = () => {
});
}, []);

console.log("projectId", projectId);


// Method to create test stack
const handleCreateTestStack = async () => {
setIsLoading(true);

//get org plan details
const orgDetails = await getOrgDetails(selectedOrganisation?.value);
const stacks_details_key = Object.keys(orgDetails?.data?.organization?.plan?.features).find(key => orgDetails?.data?.organization?.plan?.features[key].uid === 'stacks') || '';
Expand Down Expand Up @@ -83,22 +82,24 @@ const TestMigration = () => {
data
);

const newMigrationDataObj: INewMigration = {
...newMigrationData,
test_migration: { stack_link: res?.data?.data?.url, stack_api_key: res?.data?.data?.data?.stack?.api_key }
};
if (res?.status === 200) {
setIsLoading(false);


dispatch(updateNewMigrationData((newMigrationDataObj)));
const newMigrationDataObj: INewMigration = {
...newMigrationData,
test_migration: { stack_link: res?.data?.data?.url, stack_api_key: res?.data?.data?.data?.stack?.api_key }
};

dispatch(updateNewMigrationData((newMigrationDataObj)));
}
}

const handleTestMigration = async () => {
const testRes = await createTestMigration(
newMigrationData?.destination_stack?.selectedOrg?.value,
projectId
);

console.log("testRes", testRes);

}

return (
Expand All @@ -111,9 +112,10 @@ const TestMigration = () => {
className="mt-3"
onClick={handleCreateTestStack}
version="v2"
// size="medium"
disabled={newMigrationData?.testStacks?.some((stack: TestStacks) => stack?.isMigrated === false)}
isLoading={isLoading}
>
Create Test Stack
Create Test Stack
</Button>
{(newMigrationData?.test_migration?.stack_api_key || newMigrationData?.test_migration?.stack_link) &&
<Field
Expand Down
9 changes: 8 additions & 1 deletion ui/src/context/app/app.interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ export interface IContentMapper {
contentTypeList:ContentTypeList[]
}
export interface INewMigration {
testStacks: TestStacks[];
mapperKeys: ContentTypeMap;
legacy_cms: ILegacyCms;
destination_stack: IDestinationStack;
Expand All @@ -185,6 +186,11 @@ export interface INewMigration {
stackDetails: IDropDown;
}

export interface TestStacks {
stackUid?: string;
isMigrated?: boolean;
}

export interface IMigrationData {
allFlowSteps: IFlowStep[];
currentFlowStep: IFlowStep;
Expand Down Expand Up @@ -329,7 +335,8 @@ export const DEFAULT_NEW_MIGRATION: INewMigration = {
content_mapping: DEFAULT_CONTENT_MAPPER,
test_migration: DEFAULT_TEST_MIGRATION,
isprojectMapped: false,
stackDetails: DEFAULT_DROPDOWN
stackDetails: DEFAULT_DROPDOWN,
testStacks: []
};

export const DEFAULT_URL_TYPE: IURLType = {
Expand Down
6 changes: 1 addition & 5 deletions ui/src/pages/Migration/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ const Migration = () => {
existingGlobal: existingGlobalFields
},
stackDetails: projectData?.stackDetails,
// mapper_keys: projectData?.mapper_keys,
testStacks: projectData?.test_stacks
};

dispatch(updateNewMigrationData(projectMapper));
Expand Down Expand Up @@ -451,12 +451,8 @@ const Migration = () => {
handleOnClickContentMapper,
handleOnClickTestMigration
];



return (


<div className='migration-steps-wrapper'>
{projectData &&
<>
Expand Down