Skip to content
Merged
Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions ui/src/components/ContentMapper/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
const groupArray = nestedList.filter(item =>
item?.child?.some(e => e?.id)
)

if(groupArray[0].child && previousSelectedValue !== selectedValue?.label && groupArray[0]?.uid === rowIndex){
for(const item of groupArray[0].child){
deletedExstingField[item?.uid] = {
Expand Down Expand Up @@ -1316,7 +1317,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
}
}

const selectedOption = OptionsForRow.length;
const selectedOption = OptionsForRow?.filter((option) => !option?.isDisabled)?.length

// Handle case where there is exactly one match and it is auto-mapped
if(OptionsForRow.length === 1 &&
Expand Down Expand Up @@ -1415,7 +1416,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
isDisabled: false
};

const adjustedOptions = (OptionsForRow.length === 0 && !contentTypeSchema) ? option :
const adjustedOptions: OptionsType[] | OptionsType = (OptionsForRow.length === 0 && !contentTypeSchema) ? option :
(OptionsForRow.length > 0 && OptionsForRow.every((item)=>item.isDisabled) && OptionValue.label === Fields[data?.contentstackFieldType]?.label) ? []
: OptionsForRow.map((option: OptionsType) => ({
...option,
Expand Down
10 changes: 5 additions & 5 deletions ui/src/components/LogScreen/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -184,25 +184,25 @@ const TestMigrationLogViewer = ({ serverPath, sendDataToParent,projectId }: Logs
transition: "transform 0.1s ease"
}}>
{logs?.map((log, index) => {
const key = `${index}-${new Date().getMilliseconds()}`
// const key = `${index}-${new Date().getMilliseconds()}`
try {
const logObject = JSON.parse(log);
const level = logObject.level;
const timestamp = logObject.timestamp;
const message = logObject.message;
return (
<>
<div key={`${index?.toString()}`}>
{message === "Migration logs will appear here once the process begins."
? <div key={`${index?.toString}`} style={logStyles[level] || logStyles.info} className="log-entry text-center">
? <div style={logStyles[level] || logStyles.info} className="log-entry text-center">
<div className="log-message">{message}</div>
</div>
: <div key={key} style={logStyles[level] || logStyles.info} className="log-entry logs-bg">
: <div style={logStyles[level] || logStyles.info} className="log-entry logs-bg">
<div className="log-number">{index}</div>
<div className="log-time">{ timestamp ? new Date(timestamp)?.toTimeString()?.split(' ')[0] : new Date()?.toTimeString()?.split(' ')[0]}</div>
<div className="log-message">{message}</div>
</div>
}
</>
</div>
);
} catch (error) {
console.error('Invalid JSON string', error);
Expand Down
Loading