Skip to content
Merged
Changes from all commits
Commits
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
11 changes: 4 additions & 7 deletions ui/src/components/ContentMapper/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -910,8 +910,6 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re

return OptionsForRow;
};



const SelectAccessorOfColumn = (data: FieldMapType) => {
// Fetch options for the current row from dummy_obj based on backupFieldType( empty stack options)
Expand Down Expand Up @@ -1042,17 +1040,17 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
};

const adjustedOptions = (OptionsForRow.length === 0 && !contentTypeSchema) ? option :
(OptionsForRow.length > 0 && OptionsForRow.every((item)=>item.isDisabled) && OptionValue.label === dummy_obj[data?.ContentstackFieldType]?.label) ? []
(OptionsForRow.length > 0 && OptionsForRow.every((item)=>item.isDisabled) && OptionValue.label === dummy_obj[data?.ContentstackFieldType]?.label) ? []
: OptionsForRow.map((option: optionsType) => ({
...option,
isDisabled: selectedOptions.includes(option?.label ?? '')
}));

return (
<div className="table-row">
<div className="select">
<Select
value={OptionsForRow.length === 0 || exstingField[data?.uid] === undefined ? OptionValue : exstingField[data?.uid]}
value={(OptionsForRow.length === 0 || exstingField?.[data?.uid]?.label === undefined) ? OptionValue : exstingField[data?.uid]}
onChange={(selectedOption: FieldTypes) => {
if (OptionsForRow.length === 0) {
handleValueChange(selectedOption, data?.uid)
Expand All @@ -1063,7 +1061,7 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
placeholder="Select Field"
version={'v2'}
maxWidth="290px"
isClearable={false}
isClearable={selectedOptions?.includes(exstingField?.[data?.uid]?.label ?? '')}
options={adjustedOptions}
isDisabled={OptionValue?.isDisabled}
/>
Expand All @@ -1081,7 +1079,6 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
</div>
);
};


const handleSaveContentType = async () => {
const orgId = selectedOrganisation?.uid;
Expand Down