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

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

Browse source 
Release platform v14.8 (v2.35.3)
This commit is contained in:
Midhun G S 2024-04-17 12:12:10 +05:30 committed by GitHub
commit ac6f191789
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.version
View file

@ -1 +1 @@
2.35.2
2.35.3

2
frontend/.version
View file

@ -1 +1 @@
2.35.2
2.35.3

2
server/.version
View file

@ -1 +1 @@
2.35.2
2.35.3

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