Skip to content

refactor:fetch bugs and disable content type from cs if mapped #373

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 1 commit into from
Dec 7, 2024
Merged

refactor:fetch bugs and disable content type from cs if mapped #373

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
93 changes: 66 additions & 27 deletions ui/src/components/ContentMapper/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,6 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R

// useEffect for rendering mapped fields with existing stack
useEffect(() => {
console.log(otherContentType);

if (newMigrationData?.content_mapping?.content_type_mapping?.[selectedContentType?.contentstackUid || ''] === otherContentType?.id) {
tableData?.forEach((row) => {
Expand Down Expand Up @@ -464,7 +463,43 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
matchedKeys.add(key);
setExistingField((prevOptions: ExistingFieldType) => ({
...prevOptions,
[key]: { label: schemaItem?.display_name, value: schemaItem },
[key]: { label: `${item?.display_name} > ${schemaItem?.display_name}`, value: schemaItem },
}));
}
});
}
}
});

if(newMigrationData?.content_mapping?.content_type_mapping?.[otherCmsTitle] !== otherContentType?.label){
setSelectedOptions([]);
}

}

},[contentTypeSchema]);
useEffect(() => {
if (existingField) {
const matchedKeys = new Set<string>();

contentTypeSchema?.forEach((item) => {
for (const [key, value] of Object.entries(existingField)) {
if (value?.value?.uid === item?.uid) {
matchedKeys.add(key);

setExistingField((prevOptions: ExistingFieldType) => ({
...prevOptions,
[key]: { label: item?.display_name, value: item },
}));
}
if (item?.data_type === "group" && Array.isArray(item?.schema)) {
item.schema.forEach((schemaItem) => {
if (value?.value?.uid === schemaItem?.uid) {

matchedKeys.add(key);
setExistingField((prevOptions: ExistingFieldType) => ({
...prevOptions,
[key]: { label: `${item?.display_name} > ${schemaItem?.display_name}`, value: schemaItem },
}));
}
});
Expand Down Expand Up @@ -493,7 +528,8 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
});

}
},[contentTypeSchema]);

},[otherContentType]);

// To dispatch the changed dropdown state
// useEffect(() => {
Expand Down Expand Up @@ -1029,6 +1065,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
...row,
contentstackField: selectedValue?.label,
contentstackFieldUid: selectedValue?.uid,
contentstackFieldType: selectedValue?.value?.field_metadata?.allow_rich_text ? 'html' : row?.contentstackFieldType,
advanced: {
validationRegex: selectedValue?.value?.format,
mandatory: selectedValue?.value?.mandatory,
Expand Down Expand Up @@ -1127,6 +1164,8 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
return value?.data_type === 'reference';
case 'boolean':
return value?.data_type === 'boolean';
case 'link':
return value?.data_type === 'link';
default:
return false;
}
Expand Down Expand Up @@ -1457,21 +1496,9 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
) {
setContentTypeMapped((prevState: ContentTypeMap) => ({
...prevState,
[otherCmsTitle]: otherContentType?.label
[selectedContentType?.contentstackUid]: otherContentType?.id ?? ''
}));

const newMigrationDataObj: INewMigration = {
...newMigrationData,
content_mapping: {
...newMigrationData?.content_mapping,
content_type_mapping: {

...newMigrationData?.content_mapping?.content_type_mapping ?? {},
[selectedContentType?.contentstackUid]: otherContentType?.id || ''
}
}
};
dispatch(updateNewMigrationData(newMigrationDataObj));
}

if (orgId && contentTypeUid && selectedContentType) {
Expand Down Expand Up @@ -1506,13 +1533,21 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
type: 'success'
});
setIsDropDownChanged(false);

const newMigrationDataObj: INewMigration = {
...newMigrationData,
content_mapping: { ...newMigrationData?.content_mapping, isDropDownChanged: false }
content_mapping: {
...newMigrationData?.content_mapping,
content_type_mapping: {

...newMigrationData?.content_mapping?.content_type_mapping,
[selectedContentType?.contentstackUid]: otherContentType?.id ?? ''
} ,
isDropDownChanged: false
}
};

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



const savedCT = filteredContentTypes?.map(ct =>
ct?.id === data?.data?.updatedContentType?.id ? { ...ct, status: data?.data?.updatedContentType?.status } : ct
Expand Down Expand Up @@ -1597,7 +1632,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
setContentTypeMapped((prevState: ContentTypeMap) => {
const newState = { ...prevState };

delete newState[otherCmsTitle];
delete newState[selectedContentType?.contentstackUid ?? ''];
newstate = newState;

return newstate;
Expand Down Expand Up @@ -1804,12 +1839,16 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
});
}

const options = contentModels?.map((item) => ({
label: item?.title,
value: item?.title,
id: item?.uid,
isDisabled: false
}));
const options = contentModels?.map((item) => {
return {
label: item?.title,
value: item?.title,
id: item?.uid,
isDisabled: (contentTypeMapped && Object.values(contentTypeMapped).includes(item?.uid))
};
});



const adjustedOption = options?.map((option) => ({
...option,
Expand Down