diff --git a/.version b/.version index c0ac27fe01..c819688d6b 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.35.2 +2.35.3 diff --git a/frontend/.version b/frontend/.version index c0ac27fe01..c819688d6b 100644 --- a/frontend/.version +++ b/frontend/.version @@ -1 +1 @@ -2.35.2 +2.35.3 diff --git a/server/.version b/server/.version index c0ac27fe01..c819688d6b 100644 --- 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 index d0966082cb..3d792d4bac 100644 --- 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