Skip to content

Feature/test migration #364

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
merged 2 commits into from
Dec 6, 2024
Merged

Feature/test migration #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ce20f4
[CMG-418] - Content mapper | after test migration not able to update …
sayalijoshi27 Dec 6, 2024
a3bb66c
Merge branch 'dev' of https://github.com/contentstack/migration-v2-no…
sayalijoshi27 Dec 6, 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
4 changes: 2 additions & 2 deletions ui/src/components/Card/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ const CardList = ({ project }: ProjectType) => {

return (
<div style={{ margin: '0 19px 20px 0' }}>
<div onClick={() => onClickProject(project?.id || '')}>
<div onClick={() => onClickProject(project?.id ?? '')}>
<div className="ProjectCard">
<div className='ProjectCardWrapper'>
<Tooltip content={project?.name} position="top" type="primary" variantType="basic">
<Tooltip content={project?.name} position="right" type="primary" variantType="basic">
<div className="ProjectCard__heading">
{project?.name && <h4 className="ProjectCard__title flex-v-center">{project?.name}</h4>}
</div>
Expand Down
12 changes: 6 additions & 6 deletions ui/src/components/ContentMapper/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
data?.otherCmsField === 'url' ||
data?.otherCmsField === 'reference'||
data?.contentstackFieldType === "global_field" ||
newMigrationData?.project_current_step?.toString() !== stepId
newMigrationData?.project_current_step > 4
}
/>
</div>
Expand All @@ -955,7 +955,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
onClick={() =>
handleAdvancedSetting(fieldLabel, data?.advanced || {}, data?.uid, data)
}
disabled={newMigrationData?.project_current_step?.toString() !== stepId}
disabled={newMigrationData?.project_current_step > 4}
/>
</Tooltip>
)}
Expand Down Expand Up @@ -1412,7 +1412,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
maxWidth="290px"
isClearable={selectedOptions?.includes(existingField?.[data?.uid]?.label ?? '')}
options={adjustedOptions}
isDisabled={OptionValue?.isDisabled || newMigrationData?.project_current_step?.toString() !== stepId}
isDisabled={OptionValue?.isDisabled || newMigrationData?.project_current_step > 4}
/>
</div>
{!OptionValue?.isDisabled && (
Expand All @@ -1427,7 +1427,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
>
<Button
buttonType="light"
disabled={(contentTypeSchema && existingField[data?.uid] || newMigrationData?.project_current_step?.toString() !== stepId) ? true : false}
disabled={(contentTypeSchema && existingField[data?.uid] || newMigrationData?.project_current_step > 4) ? true : false}
>
<Icon
version={'v2'}
Expand Down Expand Up @@ -2051,7 +2051,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
placeholder={otherContentType?.label}
isSearchable
version="v2"
isDisabled={newMigrationData?.project_current_step?.toString() !== stepId}
isDisabled={newMigrationData?.project_current_step > 4}
/>
</div>
)}
Expand All @@ -2071,7 +2071,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
className="saveButton"
onClick={handleSaveContentType}
version="v2"
disabled={newMigrationData?.project_current_step?.toString() !== stepId}
disabled={newMigrationData?.project_current_step > 4}
>
Save
</Button>
Expand Down
12 changes: 11 additions & 1 deletion ui/src/components/MigrationFlowHeader/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ type MigrationFlowHeaderProps = {
finalExecutionStarted?: boolean;
};

/**
* Renders a MigrationFlowHeader component to show the project name and CTA to proceed to next step
* @param projectData - The projectData object containing project details.
* @param handleOnClick - Callback function to proceed to next step.
* @param isLoading - isLoading flag to load redux data
* @param finalExecutionStarted - The finalExecutionStarted boolean to check if migration execution is started to disable Start Migration button.
*/
const MigrationFlowHeader = ({projectData, handleOnClick, isLoading, finalExecutionStarted }: MigrationFlowHeaderProps) => {
const [projectName, setProjectName] = useState('');
const [currentStep, setCurrentStep] = useState<number>(0);
Expand All @@ -37,6 +44,9 @@ const MigrationFlowHeader = ({projectData, handleOnClick, isLoading, finalExecut
}, [selectedOrganisation?.value, params?.projectId]);

/******** Function to get project ********/
/**
* Fetch the project details project name and current step.
*/
const fetchProject = async () => {
setProjectName(projectData?.name);
setCurrentStep(projectData?.current_step);
Expand All @@ -59,7 +69,7 @@ const MigrationFlowHeader = ({projectData, handleOnClick, isLoading, finalExecut
<div className='d-flex align-items-center justify-content-between migration-flow-header'>
<div className='d-flex align-items-center'>
{ projectName &&
<Tooltip content={projectName} position='top' version={'v2'}>
<Tooltip content={projectName} position='right' version={'v2'}>
<h1 className='project-name-ellipsis'>{projectName}</h1>
</Tooltip>}
</div>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/pages/Projects/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
width: 100% !important;
}
.PageLayout__head {
border-top: 0 none;
height: auto;
border-bottom: 1px solid $color-brand-secondary-lightest;
border-top: 1px solid $color-brand-secondary-lightest;
left: 56px;
padding:20px 10px 20px 13px;
position: fixed;
width: calc(100% - 56px) !important;
z-index: 1;
}
}
}
Expand Down