Skip to content

content mapper bugs #207

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
Jul 19, 2024
Merged

content mapper bugs #207

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
4365db3
refactor:mapping for exsting content type case
AishDani Jul 19, 2024
02b1c34
Merge branch 'dev' of github.com:contentstack/migration-v2-node-serve…
AishDani Jul 19, 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
12 changes: 10 additions & 2 deletions ui/src/components/ContentMapper/contentMapper.interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,12 @@ export interface FieldMetadata {
multiline?: boolean;
allow_rich_text?: boolean;
markdown?: boolean;
allow_json_rte?: boolean;
}
export interface ContentTypesSchema {
uid?: string;
display_name?: string;
data_type?: 'text' | 'number' | 'isodate' | 'json' | 'file' | 'reference' | 'group';
data_type?: 'text' | 'number' | 'isodate' | 'json' | 'file' | 'reference' | 'group' | 'boolean' | 'link';
field_metadata?: FieldMetadata;
enum?: any;
}
Expand All @@ -108,9 +109,16 @@ export interface ContentTypeList {
uid: string;
}

interface value {
uid?:string;
data_type?: string;
display_name?: string;
options?: object;
'No matches found'?:string;
}
export interface optionsType {
label?: string;
value?: object;
value?: value;
isDisabled?: boolean;
}

Expand Down
153 changes: 118 additions & 35 deletions ui/src/components/ContentMapper/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ const dummy_obj:any = {
'json':{
label:'JSON Rich Text Editor',
options : {
'JSON Rich Text Editor':'json'}
'JSON Rich Text Editor':'json'
}
},
'html':{
label : 'HTML Rich text Editor',
Expand All @@ -99,34 +100,50 @@ const dummy_obj:any = {
},
'file': {
label:'File',
options: {'File':'file'}
options: {
'File':'file'
}
},
'number': {
label:'Number',
options: {'Number':'number'}
options: {
'Number':'number'
}
},
'isodate': { label :'Date',
options: {'Date':'isodate'}
options: {
'Date':'isodate'
}
},
'boolean': {
label: 'Boolean',
options: {'Boolean':'boolean'}
options: {
'Boolean':'boolean'
}
},
'link': {
label:'Link',
options: {'Link':'link'}
options: {
'Link':'link'
}
},
'reference':{
label: 'Reference',
options: {'Reference':'reference'}
options: {
'Reference':'reference'
}
},
'dropdown': {
label:'Dropdown',
options: {'Dropdown':'dropdown'}
options: {
'Dropdown':'dropdown'
}
},
'radio': {
label :'Select',
options: {'Select':'select'}
options: {
'Select':'select'
}
},
'CheckBox': {
label:'Select',
Expand Down Expand Up @@ -304,7 +321,7 @@ const ContentMapper = ({projectData}:ContentMapperComponentProps) => {
};
}
});
setexsitingField(updatedExstingField);
//setexsitingField(updatedExstingField);
}
}, [tableData, isContentTypeSaved]);

Expand Down Expand Up @@ -709,27 +726,37 @@ const ContentMapper = ({projectData}:ContentMapperComponentProps) => {
};

const SelectAccessorOfColumn = (data: FieldMapType) => {
// object for storing select options according to mapped field
const OptionsForEachRow = dummy_obj?.[data?.backupFieldType]?.options;

// Mapping of field types
const fieldsOfContentstack: Mapping = {
'Single Line Textbox': 'text',
'Single-Line Text': 'text',
'text': 'text',
'Multi Line Textbox': 'multiline',
'Multi-Line Text': 'multiline',
'multiline': 'multiline',
'HTML Rich text Editor': 'allow_rich_text',
'JSON Rich Text Editor': 'json',
'Rich Text':'json',
'Group': 'Group',
'URL': 'url',
'file': 'file',
'Image':'file',
'number': 'number',
'Integer':'number',
'Date': 'isodate',
'boolean': 'boolean',
'Checkbox':'boolean',
'link': 'link',
'reference': 'reference',
'dropdown': 'enum',
'Droplist':'enum',
'radio': 'enum',
'CheckBox': 'enum'
//'CheckBox': 'enum'
};

//array of options if exsting content type has selected
const OptionsForRow: optionsType[] = [];

if (OtherContentType?.label && contentTypesList) {
Expand All @@ -739,17 +766,32 @@ const ContentMapper = ({projectData}:ContentMapperComponentProps) => {
setContentTypeSchema(ContentType?.schema)
}

// If content type schema is available and valid
if (contentTypeSchema && validateArray(contentTypeSchema)) {
const fieldTypeToMatch = fieldsOfContentstack[data?.otherCmsType as keyof Mapping];

contentTypeSchema.forEach((value) => {
switch (fieldTypeToMatch) {

//check if UID of source cms field is matching with contentstack content type fields
for (const value of contentTypeSchema) {
if (data?.uid === value?.uid) {
OptionsForRow.push({ label: value?.display_name, value: value, isDisabled: false });
break;
}
}
// If UID does not match then check for field type
if(OptionsForRow.length === 0){
for (const value of contentTypeSchema) {
const fieldTypes = new Set(['number', 'isodate', 'file', 'reference', 'boolean', 'group', 'link']);

switch (fieldTypeToMatch) {
case 'text':
if (
value?.uid === 'title' &&
value?.uid !== 'title' &&
value?.uid !=='url' &&
!fieldTypes.has(value?.data_type || '') &&
!value?.field_metadata?.multiline &&
!value?.enum &&
!value?.field_metadata?.allow_rich_text &&
!value?.field_metadata?.allow_json_rte &&
!value?.field_metadata?.markdown
) {
OptionsForRow.push({ label: value?.display_name, value: value, isDisabled: false });
Expand Down Expand Up @@ -813,34 +855,73 @@ const ContentMapper = ({projectData}:ContentMapperComponentProps) => {
isDisabled: false
});
break;

}
});

}}
}


// Variable to store length of options
const selectedOption = OptionsForRow?.length;

const OptionValue: FieldTypes =
OptionsForRow?.length === 0
? {
label: data?.ContentstackFieldType,
value: data?.ContentstackFieldType,
isDisabled: data?.ContentstackFieldType === 'group' ||
data?.ContentstackFieldType === 'text' ||
data?.ContentstackFieldType === 'url'
//variable to store the options if exsting contentstack content type is not selected
let option:any;
if (Array.isArray(OptionsForEachRow)) {
option = OptionsForEachRow.map((option) => ({
label: option,
value: option,
}));
} else if (typeof OptionsForEachRow === 'object') {
option = Object.entries(OptionsForEachRow).map(([label, value]) => ({
label,
value,
}));
}else{
option = [{ label: OptionsForEachRow, value: OptionsForEachRow }]
}

const OptionValue: any =
OptionsForRow?.length === 1 &&
//disable url, title and group fields
(OptionsForRow?.[0]?.value?.uid === 'url' || OptionsForRow?.[0]?.value?.uid === 'title' ||OptionsForRow?.[0]?.value?.uid === 'group')
? {
label: OptionsForRow?.[0]?.value?.display_name,
value: OptionsForRow?.[0]?.value,
isDisabled: true
}
: OptionsForRow?.length === 0
? {
label: dummy_obj[data?.ContentstackFieldType]?.label,
value: dummy_obj[data?.ContentstackFieldType]?.label,
isDisabled: data?.ContentstackFieldType === 'text' ||
data?.ContentstackFieldType === 'group' ||
data?.ContentstackFieldType === 'url'
}
: { label: `${selectedOption} matches`, value: `${selectedOption} matches` };

const adjustedOptions = OptionsForRow.map((option: optionsType) => ({
: {
label: `${selectedOption} matches`,
value: `${selectedOption} matches`,
isDisabled: false
};

// Adjust the options based on whether existing contentstack content type is selected
const adjustedOptions = OptionsForRow.length === 0 ? option
: OptionsForRow.map((option: optionsType) => ({
...option,
isDisabled: selectedOptions?.includes(option?.label ?? '')
}));

}));
return (
<div className="table-row">
<div className="select">
<Select
value={exstingField[data?.uid] || OptionValue}
onChange={(selectedOption: FieldTypes) => handleFieldChange(selectedOption, data?.uid)}
value={OptionsForRow.length === 0 || exstingField[data?.uid] === undefined ? OptionValue : exstingField[data?.uid]}
onChange={(selectedOption: FieldTypes) => {
if(OptionsForRow.length === 0){
handleValueChange(selectedOption, data?.uid)}
else{
handleFieldChange(selectedOption, data?.uid)

}}}
placeholder="Select Field"
version={'v2'}
maxWidth="290px"
Expand Down Expand Up @@ -947,17 +1028,19 @@ const ContentMapper = ({projectData}:ContentMapperComponentProps) => {
};

const handleResetContentType = async () => {
const orgId = newMigrationData?.destination_stack?.selectedOrg?.uid;
const orgId = projectData?.org_id;
const projectID = projectId;
setisDropDownCHanged(false);

const updatedRows = tableData.map((row) => {
return { ...row, ContentstackFieldType: row.backupFieldType };
});
setTableData(updatedRows);
const dataCs = {
contentTypeData: {
status:selectedContentType?.status,
id: selectedContentType?.id,
projectId:projectId,
otherCmsTitle: otherCmsTitle,
otherCmsUid: selectedContentType?.otherCmsUid,
isUpdated: true,
Expand Down