From 9302132b53a325ecdd526b4008286772a14af1b2 Mon Sep 17 00:00:00 2001
From: gsmithun4 <gsmithun4@gmail.com>
Date: Tue, 16 Apr 2024 20:01:51 +0530
Subject: [PATCH 1/3] bump version

---
 .version          | 2 +-
 frontend/.version | 2 +-
 server/.version   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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

From 38eb851c935acf19eef54ef8bf6ae029491a4e7d Mon Sep 17 00:00:00 2001
From: kriks7iitk <34170719+kriks7iitk@users.noreply.github.com>
Date: Tue, 16 Apr 2024 20:05:03 +0530
Subject: [PATCH 2/3] Fix: duplicated datasource in export of app (#9393)

* Fix: duplicated datasource in export of app

* fix:code sanity

---------

Co-authored-by: Kritagya <kriks.iitk@.com>
---
 server/src/services/app_import_export.service.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

From a7c2b16804e889c8f91af8e4b64c84c5254c4faf Mon Sep 17 00:00:00 2001
From: Akshay <akshaysasidharan93@gmail.com>
Date: Wed, 17 Apr 2024 11:49:56 +0530
Subject: [PATCH 3/3] encode uri for elasticsearch username & password string
 (#9386)

---
 plugins/packages/elasticsearch/lib/index.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/packages/elasticsearch/lib/index.ts b/plugins/packages/elasticsearch/lib/index.ts
index 6b76491573..68efc8f962 100644
--- a/plugins/packages/elasticsearch/lib/index.ts
+++ b/plugins/packages/elasticsearch/lib/index.ts
@@ -57,11 +57,11 @@ export default class ElasticsearchService implements QueryService {
     return sslEnabled ? 'https' : 'http';
   }
 
-  async getConnection(sourceOptions: SourceOptions): Promise<any> {
+  async getConnection(sourceOptions: SourceOptions): Promise<Client> {
     const host = sourceOptions.host;
     const port = sourceOptions.port;
-    const username = sourceOptions.username;
-    const password = sourceOptions.password;
+    const username = encodeURIComponent(sourceOptions.username);
+    const password = encodeURIComponent(sourceOptions.password);
     const sslEnabled = sourceOptions.ssl_enabled;
     const protocol = this.determineProtocol(sourceOptions);
     const sslCertificate = sourceOptions.ssl_certificate;