From c2e448e039e6e48413b513cd6270707b5dd885cb Mon Sep 17 00:00:00 2001
From: Kavin Venkatachalam <kavin.saratha@gmail.com>
Date: Tue, 6 May 2025 13:56:36 +0700
Subject: [PATCH] Hide the global settings

---
 frontend/ee                                   |  2 +-
 .../LeftSidebar/GlobalSettings/index.jsx      | 19 +--------------
 .../AppBuilder/LeftSidebar/LeftSidebar.jsx    | 24 +++++++++----------
 3 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/frontend/ee b/frontend/ee
index 1594d113de..5d358dc6e0 160000
--- a/frontend/ee
+++ b/frontend/ee
@@ -1 +1 @@
-Subproject commit 1594d113de132885db9e9b1263299692a74abcbc
+Subproject commit 5d358dc6e0d3780383ed6b392a2e048b55e15c3b
diff --git a/frontend/src/AppBuilder/LeftSidebar/GlobalSettings/index.jsx b/frontend/src/AppBuilder/LeftSidebar/GlobalSettings/index.jsx
index 3495239f41..d85917c797 100644
--- a/frontend/src/AppBuilder/LeftSidebar/GlobalSettings/index.jsx
+++ b/frontend/src/AppBuilder/LeftSidebar/GlobalSettings/index.jsx
@@ -11,26 +11,9 @@ import { ThemeSelect } from '@/modules/Appbuilder/components';
 import MaintenanceMode from './MaintenanceMode';
 import HideHeaderToggle from './HideHeaderToggle';
 
-const GlobalSettings = ({ darkMode, isModuleEditor }) => {
+const GlobalSettings = ({ darkMode }) => {
   const shouldFreeze = useStore((state) => state.getShouldFreeze());
 
-  if (isModuleEditor) {
-    return (
-      <div>
-        <div bsPrefix="global-settings-popover" className="global-settings-panel">
-          <HeaderSection>
-            <HeaderSection.PanelHeader title="Global settings" />
-          </HeaderSection>
-          <div style={{ padding: '12px 16px' }} className={cx({ disabled: shouldFreeze })}>
-            <div className="tj-text-xsm color-slate12 ">
-              <AppExport darkMode={darkMode} />
-            </div>
-          </div>
-        </div>
-      </div>
-    );
-  }
-
   return (
     <>
       <div>
diff --git a/frontend/src/AppBuilder/LeftSidebar/LeftSidebar.jsx b/frontend/src/AppBuilder/LeftSidebar/LeftSidebar.jsx
index 0f49eb8ef9..74c25264f1 100644
--- a/frontend/src/AppBuilder/LeftSidebar/LeftSidebar.jsx
+++ b/frontend/src/AppBuilder/LeftSidebar/LeftSidebar.jsx
@@ -192,18 +192,6 @@ export const BaseLeftSidebar = ({
           tip="Debugger"
           ref={setSideBarBtnRefs('debugger')}
         />
-        <SidebarItem
-          icon="settings"
-          selectedSidebarItem={selectedSidebarItem}
-          darkMode={darkMode}
-          // eslint-disable-next-line no-unused-vars
-          onClick={(e) => handleSelectedSidebarItem('settings')}
-          className={`left-sidebar-item  left-sidebar-layout`}
-          badge={true}
-          tip="Settings"
-          ref={setSideBarBtnRefs('settings')}
-          isModuleEditor={isModuleEditor}
-        />
       </>
     );
   };
@@ -233,6 +221,18 @@ export const BaseLeftSidebar = ({
           ref={setSideBarBtnRefs('page')}
         />
         {renderCommonItems()}
+        <SidebarItem
+          icon="settings"
+          selectedSidebarItem={selectedSidebarItem}
+          darkMode={darkMode}
+          // eslint-disable-next-line no-unused-vars
+          onClick={(e) => handleSelectedSidebarItem('settings')}
+          className={`left-sidebar-item  left-sidebar-layout`}
+          badge={true}
+          tip="Settings"
+          ref={setSideBarBtnRefs('settings')}
+          isModuleEditor={isModuleEditor}
+        />
       </>
     );
   };