From 5cfc81a9d3f74e590473ade47f9a6e6d071a612b Mon Sep 17 00:00:00 2001
From: Danieldare <dodanieloluwadare@gmail.com>
Date: Thu, 27 Jan 2022 10:03:46 +0100
Subject: [PATCH] fix: add query parameters to options

---
 .../src/pages/Editor/APIEditor/ApiRightPane.tsx       | 11 +++++++++++
 .../Editor/DataSourceEditor/RestAPIDatasourceForm.tsx |  1 +
 .../transformers/RestAPIDatasourceFormTransformer.ts  |  3 +++
 3 files changed, 15 insertions(+)

diff --git a/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx b/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx
index d898c37cbf..4b53cab12d 100644
--- a/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx
+++ b/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx
@@ -146,6 +146,11 @@ const NoEntityFoundWrapper = styled.div`
 export const getDatasourceInfo = (datasource: any): string => {
   const info = [];
   const headers = get(datasource, "datasourceConfiguration.headers", []);
+  const queryParamters = get(
+    datasource,
+    "datasourceConfiguration.queryParameters",
+    [],
+  );
   const authType = get(
     datasource,
     "datasourceConfiguration.authentication.authenticationType",
@@ -153,6 +158,12 @@ export const getDatasourceInfo = (datasource: any): string => {
   ).toUpperCase();
   if (headers.length)
     info.push(`${headers.length} HEADER${headers.length > 1 ? "S" : ""}`);
+  if (queryParamters.length)
+    info.push(
+      `${queryParamters.length} QUERY PARAMETER${
+        queryParamters.length > 1 ? "S" : ""
+      }`,
+    );
   if (authType.length) info.push(authType);
   return info.join(" | ");
 };
diff --git a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
index 089d1d0360..7d50784606 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
@@ -252,6 +252,7 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
       pageId: this.props.pageId,
       appId: this.props.applicationId,
     });
+
     this.props.updateDatasource(normalizedValues, onSuccess);
   };
 
diff --git a/app/client/src/transformers/RestAPIDatasourceFormTransformer.ts b/app/client/src/transformers/RestAPIDatasourceFormTransformer.ts
index 44435190be..3d808dec65 100644
--- a/app/client/src/transformers/RestAPIDatasourceFormTransformer.ts
+++ b/app/client/src/transformers/RestAPIDatasourceFormTransformer.ts
@@ -36,6 +36,9 @@ export const datasourceToFormValues = (
     isValid: datasource.isValid,
     url: datasource.datasourceConfiguration.url,
     headers: cleanupProperties(datasource.datasourceConfiguration.headers),
+    queryParameters: cleanupProperties(
+      datasource.datasourceConfiguration.queryParameters,
+    ),
     isSendSessionEnabled: isSendSessionEnabled,
     sessionSignatureKey: sessionSignatureKey,
     authType: authType,