Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 09:28:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes: v1 apps with dq queries resuts in app crash

Browse source
This commit is contained in:
arpitnath 2023-10-28 03:23:42 +05:30
parent b7eff41826
commit 28d21814fe
1 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
server/src/services/app_import_export.service.ts
View file

@ -789,6 +789,8 @@ export class AppImportExportService {
(dq) => dq.id === appResourceMappings.dataQueryMapping[importedDataQuery.id]
);
if (!mappedNewDataQuery) continue;
const importingQueryEvents = importingEvents.filter(
(event) => event.target === Target.dataQuery && event.sourceId === importedDataQuery.id
);
@ -808,25 +810,27 @@ export class AppImportExportService {
});
} else {
this.replaceDataQueryOptionsWithNewDataQueryIds(
mappedNewDataQuery.options,
mappedNewDataQuery?.options,
appResourceMappings.dataQueryMapping
);
const queryEvents = mappedNewDataQuery.options?.events || [];
const queryEvents = mappedNewDataQuery?.options?.events || [];
delete mappedNewDataQuery?.options?.events;
queryEvents.forEach(async (event, index) => {
const newEvent = {
name: event.eventId,
sourceId: mappedNewDataQuery.id,
target: Target.dataQuery,
event: event,
index: queryEvents.index || index,
appVersionId: mappedNewDataQuery.appVersionId,
};
if (queryEvents.length > 0) {
queryEvents.forEach(async (event, index) => {
const newEvent = {
name: event.eventId,
sourceId: mappedNewDataQuery.id,
target: Target.dataQuery,
event: event,
index: queryEvents.index || index,
appVersionId: mappedNewDataQuery.appVersionId,
};
await manager.save(EventHandler, newEvent);
});
await manager.save(EventHandler, newEvent);
});
}
}
await manager.save(mappedNewDataQuery);
@ -1167,7 +1171,20 @@ export class AppImportExportService {
} else {
version.showViewerNavigation = appVersion.definition.showViewerNavigation || true;
version.homePageId = appVersion.definition?.homePageId;
version.globalSettings = appVersion.definition?.globalSettings;
if (!appVersion.definition?.globalSettings) {
version.globalSettings = {
hideHeader: false,
appInMaintenance: false,
canvasMaxWidth: 100,
canvasMaxWidthType: '%',
canvasMaxHeight: 2400,
canvasBackgroundColor: '#edeff5',
backgroundFxQuery: '',
};
} else {
version.globalSettings = appVersion.definition?.globalSettings;
}
}
await manager.save(version);