Merge pull request #9402 from ToolJet/release/platformv14.8

Release platform v14.8 (v2.35.3)
ToolJet · Apr 17, 2024 · ac6f191 · ac6f191
2 parents a7c2b16 + 38eb851
commit ac6f191
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-2.35.2
+2.35.3
diff --git a/frontend/.version b/frontend/.version
@@ -1 +1 @@
-2.35.2
+2.35.3
diff --git a/server/.version b/server/.version
@@ -1 +1 @@
-2.35.2
+2.35.3
diff --git a/server/src/services/app_import_export.service.ts b/server/src/services/app_import_export.service.ts
@@ -95,13 +95,14 @@ export class AppImportExportService {
  }
  const appVersions = await queryAppVersions.orderBy('app_versions.created_at', 'ASC').getMany();
 
- let dataSources =
+ const legacyLocalDataSources =
  appVersions?.length &&
  (await manager
  .createQueryBuilder(DataSource, 'data_sources')
  .where('data_sources.appVersionId IN(:...versionId)', {
  versionId: appVersions.map((v) => v.id),
  })
+ .andWhere('data_sources.scope != :scope', { scope: DataSourceScopes.GLOBAL })
  .orderBy('data_sources.created_at', 'ASC')
  .getMany());
 
@@ -127,7 +128,7 @@ export class AppImportExportService {
 
  const globalDataSources = [...new Map(globalQueries.map((gq) => [gq.dataSource.id, gq.dataSource])).values()];
 
- dataSources = [...dataSources, ...globalDataSources];
+ const dataSources = [...legacyLocalDataSources, ...globalDataSources];
 
  if (dataSources?.length) {
  dataQueries = await manager