Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix for tabs widget getting the same name (#2538)

Browse Source 
Co-authored-by: Piyush <piyush@codeitout.com>
This commit is contained in:
Hetu Nandu 2021-01-13 15:40:28 +05:30 committed by GitHub
parent 91b8922f1c
commit d3e517ecb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/src/sagas/WidgetOperationSagas.tsx
View File

@ -287,6 +287,8 @@ export function* addChildrenSaga(
defaultConfig.widgetName,
widgetNames,
);
// update the list of widget names for the next iteration
widgetNames.push(newWidgetName);
widgets[child.widgetId] = {
...child,
widgetName: newWidgetName,

25
app/client/src/utils/WidgetPropsUtils.tsx
View File

@ -258,6 +258,26 @@ const dynamicPathListMigration = (
return currentDSL;
};
const canvasNameConflictMigration = (
currentDSL: ContainerWidgetProps<WidgetProps>,
props = { counter: 1 },
): ContainerWidgetProps<WidgetProps> => {
if (
currentDSL.type === WidgetTypes.CANVAS_WIDGET &&
currentDSL.widgetName.startsWith("Canvas")
) {
currentDSL.widgetName = `Canvas${props.counter}`;
// Canvases inside tabs have `name` property as well
if (currentDSL.name) {
currentDSL.name = currentDSL.widgetName;
}
props.counter++;
}
currentDSL.children?.forEach((c) => canvasNameConflictMigration(c, props));
return currentDSL;
};
// A rudimentary transform function which updates the DSL based on its version.
// A more modular approach needs to be designed.
const transformDSL = (currentDSL: ContainerWidgetProps<WidgetProps>) => {
@ -310,6 +330,11 @@ const transformDSL = (currentDSL: ContainerWidgetProps<WidgetProps>) => {
currentDSL.version = 7;
}
if (currentDSL.version === 7) {
currentDSL = canvasNameConflictMigration(currentDSL);
currentDSL.version = 8;
}
return currentDSL;
};