From dc3da1b02d1768fb1a9ef980accb4c0b53842722 Mon Sep 17 00:00:00 2001
From: Danieldare <dodanieloluwadare@gmail.com>
Date: Thu, 30 Dec 2021 12:06:48 +0100
Subject: [PATCH 1/2] fix: remove unnecessary space from the active datasource
 page for consistent page scroll

---
 .../pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx b/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx
index 17a0aada7f..c355811e11 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx
@@ -69,8 +69,7 @@ const MainTabsContainer = styled.div`
 const SectionGrid = styled.div`
   margin-top: 16px;
   display: grid;
-  grid-template-columns: 1fr 180px;
-  grid-template-rows: auto minmax(0, 1fr);
+  grid-template-columns: 1fr;
   gap: 10px 16px;
   flex: 1;
   min-height: 0;

From d845394a3ccc07c8d27a6883eb0d6c6e8a83d26b Mon Sep 17 00:00:00 2001
From: Danieldare <dodanieloluwadare@gmail.com>
Date: Fri, 31 Dec 2021 10:59:45 +0100
Subject: [PATCH 2/2] fix: add condition and styles to check for active tab

---
 .../IntegrationEditor/IntegrationsHomeScreen.tsx      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx b/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx
index c355811e11..f4a09eb6f0 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx
@@ -66,10 +66,11 @@ const MainTabsContainer = styled.div`
   height: 100%;
 `;
 
-const SectionGrid = styled.div`
+const SectionGrid = styled.div<{ isActiveTab?: boolean }>`
   margin-top: 16px;
   display: grid;
-  grid-template-columns: 1fr;
+  grid-template-columns: 1fr ${({ isActiveTab }) => isActiveTab && "180px"};
+  grid-template-rows: auto minmax(0, 1fr);
   gap: 10px 16px;
   flex: 1;
   min-height: 0;
@@ -486,7 +487,11 @@ class IntegrationsHomeScreen extends React.Component<
           <HeaderFlex>
             <p className="sectionHeadings">Datasources</p>
           </HeaderFlex>
-          <SectionGrid>
+          <SectionGrid
+            isActiveTab={
+              this.state.activePrimaryMenuId !== PRIMARY_MENU_IDS.ACTIVE
+            }
+          >
             <MainTabsContainer>
               {showTabs && (
                 <TabComponent