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

chore: fix table widget migration merge conflict (#16711)

Browse Source
This commit is contained in:
balajisoundar 2022-09-13 12:01:40 +05:30 committed by GitHub
parent 6f45430395
commit 87774a64ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/src/constants/WidgetConstants.tsx
View File

@ -70,7 +70,7 @@ export const layoutConfigurations: LayoutConfigurations = {
FLUID: { minWidth: -1, maxWidth: -1 }, FLUID: { minWidth: -1, maxWidth: -1 },
}; };
export const LATEST_PAGE_VERSION = 60; export const LATEST_PAGE_VERSION = 61;
export const GridDefaults = { export const GridDefaults = {
DEFAULT_CELL_SIZE: 1, DEFAULT_CELL_SIZE: 1,

8
app/client/src/utils/DSLMigrations.ts
View File

@ -1086,12 +1086,12 @@ export const transformDSL = (
} }
if (currentDSL.version === 59) { if (currentDSL.version === 59) {
currentDSL = migrateTableWidgetV2Validation(currentDSL); currentDSL = migrateChartWidgetReskinningData(currentDSL);
currentDSL.version = LATEST_PAGE_VERSION; currentDSL.version = 60;
} }
if (currentDSL.version === 59) { if (currentDSL.version === 60) {
currentDSL = migrateChartWidgetReskinningData(currentDSL); currentDSL = migrateTableWidgetV2Validation(currentDSL);
currentDSL.version = LATEST_PAGE_VERSION; currentDSL.version = LATEST_PAGE_VERSION;
} }