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

Fix: duplicated datasource in export of app (#9393)

Browse source 
* Fix: duplicated datasource in export of app

* fix:code sanity

---------

Co-authored-by: Kritagya <kriks.iitk@.com>
This commit is contained in:
kriks7iitk 2024-04-16 20:05:03 +05:30 committed by GitHub
parent 9302132b53
commit 38eb851c93
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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