Skip to content

Commit b5823fa

Browse files
committed
Merge branch 'dev' of https://github.com/contentstack/migration-v2-node-server into feature/aem-final
2 parents 027cb64 + 49880db commit b5823fa

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

ui/src/components/ContentMapper/contentMapper.interface.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export interface FieldMapType {
7171
}
7272

7373
export interface Advanced {
74-
validationRegex: string;
74+
validationRegex?: string;
7575
mandatory?: boolean;
7676
multiple?: boolean;
7777
unique?: boolean;
@@ -89,6 +89,7 @@ export interface Advanced {
8989
referenedItems?: string[];
9090
title?: string;
9191
url?: string;
92+
initial?: Omit<Advanced, 'initial'>;
9293
}
9394

9495
export interface ItemStatus {

ui/src/components/ContentMapper/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2032,7 +2032,9 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
20322032
contentstackFieldType: row?.backupFieldType,
20332033
contentstackField: row?.otherCmsField,
20342034
contentstackFieldUid: row?.backupFieldUid,
2035-
2035+
advanced: {
2036+
...row?.advanced?.initial,
2037+
},
20362038
};
20372039
});
20382040
setTableData(updatedRows);
@@ -2112,8 +2114,6 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
21122114
setContentTypes(resetContentTypes);
21132115
setCount(filteredCT?.length);
21142116

2115-
await fetchFields(selectedContentType?.id ?? '', searchText || '');
2116-
21172117
Notification({
21182118
notificationContent: { text: data?.message },
21192119
notificationProps: {

0 commit comments

Comments
 (0)