Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-22 16:38:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

fixes: app resource mapping for imported apps

Browse source
This commit is contained in:
arpitnath 2023-09-27 22:26:07 +05:30
parent c94177281d
commit 8a0326d41f
2 changed files with 51 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,8 @@ interface AppResourceMappings {
appVersionMapping: Record<string, string>;
appEnvironmentMapping: Record<string, string>;
appDefaultEnvironmentMapping: Record<string, string[]>;
pagesMapping: Record<string, string>;
componentsMapping: Record<string, string>;
}
type DefaultDataSourceKind = 'restapi' | 'runjs' | 'runpy' | 'tooljetdb' | 'workflows';
@ -310,6 +312,8 @@ export class AppImportExportService {
appVersionMapping: {},
appEnvironmentMapping: {},
appDefaultEnvironmentMapping: {},
pagesMapping: {},
componentsMapping: {},
};
const {
importingDataSources,
@ -349,7 +353,7 @@ export class AppImportExportService {
importingComponents,
importingEvents
);
// console.log('-----arpit extract import data:: ', { appResourceMappings });
console.log('-----arpit extract import data:: ', { appResourceMappings });
if (!isNormalizedAppDefinitionSchema) {
for (const importingAppVersion of importingAppVersions) {
const updatedDefinition = this.replaceDataQueryIdWithinDefinitions(
@ -587,6 +591,8 @@ export class AppImportExportService {
const pageCreated = await manager.save(newPage);
appResourceMappings.pagesMapping[page.id] = pageCreated.id;
isHomePage = importingAppVersion.homePageId === page.id;
if (isHomePage) {
@ -609,6 +615,7 @@ export class AppImportExportService {
const savedComponent = await manager.save(newComponent);
appResourceMappings.componentsMapping[component.id] = savedComponent.id;
const componentLayout = component.layouts;
componentLayout.forEach(async (layout) => {
@ -658,6 +665,14 @@ export class AppImportExportService {
}
}
this.updateEventActionsForNewVersionWithNewMappingIds(
manager,
appResourceMappings.appVersionMapping[importingAppVersion.id],
appResourceMappings.dataQueryMapping,
appResourceMappings.componentsMapping,
appResourceMappings.pagesMapping
);
await manager.update(
AppVersion,
{ id: appResourceMappings.appVersionMapping[importingAppVersion.id] },
@ -1352,6 +1367,38 @@ export class AppImportExportService {
replaceTooljetDbTableIds(queryOptions: any, tooljetDatabaseMapping: any) {
return { ...queryOptions, table_id: tooljetDatabaseMapping[queryOptions.table_id]?.id };
}
async updateEventActionsForNewVersionWithNewMappingIds(
manager: EntityManager,
versionId: string,
oldDataQueryToNewMapping: Record<string, unknown>,
oldComponentToNewComponentMapping: Record<string, unknown>,
oldPageToNewPageMapping: Record<string, unknown>
) {
const allEvents = await manager.find(EventHandler, {
where: { appVersionId: versionId },
});
for (const event of allEvents) {
const eventDefinition = event.event;
if (eventDefinition?.actionId === 'run-query') {
eventDefinition.queryId = oldDataQueryToNewMapping[eventDefinition.queryId];
}
if (eventDefinition?.actionId === 'control-component') {
eventDefinition.componentId = oldComponentToNewComponentMapping[eventDefinition.componentId];
}
if (eventDefinition?.actionId === 'switch-page') {
eventDefinition.pageId = oldPageToNewPageMapping[eventDefinition.pageId];
}
event.event = eventDefinition;
await manager.save(event);
}
}
}
function convertSinglePageSchemaToMultiPageSchema(appParams: any) {

6
server/src/services/apps.service.ts
View file

@ -406,9 +406,9 @@ export class AppsService {
async updateEventActionsForNewVersionWithNewMappingIds(
manager: EntityManager,
versionId: string,
oldDataQueryToNewMapping: any,
oldComponentToNewComponentMapping: any,
oldPageToNewPageMapping: any
oldDataQueryToNewMapping: Record<string, unknown>,
oldComponentToNewComponentMapping: Record<string, unknown>,
oldPageToNewPageMapping: Record<string, unknown>
) {
const allEvents = await manager.find(EventHandler, {
where: { appVersionId: versionId },