From 8388838703001332176e7d90b4a4f5ba866cbde3 Mon Sep 17 00:00:00 2001 From: Vijaykant Yadav Date: Thu, 3 Jul 2025 12:41:36 +0530 Subject: [PATCH 1/7] fix: disable pages on modules --- .../src/AppBuilder/AppCanvas/AppCanvas.jsx | 2 +- .../RightSideBar/RightSidebarToggle.jsx | 24 +++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx b/frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx index 12d33283c8..1566e87287 100644 --- a/frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx +++ b/frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx @@ -182,7 +182,7 @@ export const AppCanvas = ({ appId, isViewer = false, switchDarkMode, darkMode }) )} style={canvasContainerStyles} > - {showOnDesktop && ( + {showOnDesktop && appType !== 'module' && ( { @@ -13,6 +14,7 @@ const RightSidebarToggle = ({ darkMode = false }) => { (state) => [state.isRightSidebarOpen, state.setRightSidebarOpen], shallow ); + const { appType } = useModuleContext(); const setActiveRightSideBarTab = useStore((state) => state.setActiveRightSideBarTab); const activeRightSideBarTab = useStore((state) => state.activeRightSideBarTab); const isRightSidebarPinned = useStore((state) => state.isRightSidebarPinned); @@ -50,16 +52,18 @@ const RightSidebarToggle = ({ darkMode = false }) => { className={`left-sidebar-item left-sidebar-layout left-sidebar-inspector`} tip="Component properties" /> - { - handleToggle(RIGHT_SIDE_BAR_TAB.PAGES); - }} - darkMode={darkMode} - icon="file01" - className={`left-sidebar-item left-sidebar-layout left-sidebar-inspector`} - tip="Page settings" - /> + {appType !== 'module' && ( + { + handleToggle(RIGHT_SIDE_BAR_TAB.PAGES); + }} + darkMode={darkMode} + icon="file01" + className={`left-sidebar-item left-sidebar-layout left-sidebar-inspector`} + tip="Page settings" + /> + )} ); }; From 108aa42eea4f27385b72d9ea91a33983713973bf Mon Sep 17 00:00:00 2001 From: Kavin Venkatachalam Date: Thu, 3 Jul 2025 16:38:40 +0530 Subject: [PATCH 2/7] fix: show modules inside the editor --- frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx b/frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx index 1566e87287..1c7d2d6d69 100644 --- a/frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx +++ b/frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx @@ -202,6 +202,7 @@ export const AppCanvas = ({ appId, isViewer = false, switchDarkMode, darkMode }) scrollbarWidth: 'none', overflow: 'auto', width: currentMode === 'view' ? `calc(100% - ${isViewerSidebarPinned ? '0px' : '0px'})` : '100%', + height: 'inherit', }} className={`app-${appId} _tooljet-page-${getPageId()}`} > @@ -213,7 +214,7 @@ export const AppCanvas = ({ appId, isViewer = false, switchDarkMode, darkMode }) {environmentLoadingState !== 'loading' && (
Date: Wed, 2 Jul 2025 14:18:59 +0530 Subject: [PATCH 3/7] fix: add fallback for useModuleId hook in query panel Handle case where ModuleContext is not available by wrapping useModuleId in try-catch with 'canvas' fallback --- frontend/package.json | 2 +- .../src/AppBuilder/CodeEditor/useQueryPanelKeyHooks.js | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 57785151d3..3034d57e39 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -267,4 +267,4 @@ "jsx" ] } -} +} \ No newline at end of file diff --git a/frontend/src/AppBuilder/CodeEditor/useQueryPanelKeyHooks.js b/frontend/src/AppBuilder/CodeEditor/useQueryPanelKeyHooks.js index 1a41a7f19b..b5f549a354 100644 --- a/frontend/src/AppBuilder/CodeEditor/useQueryPanelKeyHooks.js +++ b/frontend/src/AppBuilder/CodeEditor/useQueryPanelKeyHooks.js @@ -7,7 +7,14 @@ export const useQueryPanelKeyHooks = (onChange, value, type) => { const queryPanelHeight = useStore((state) => state.queryPanel.queryPanelHeight); const runQueryOnShortcut = useStore((state) => state.queryPanel.runQueryOnShortcut); const previewQueryOnShortcut = useStore((state) => state.queryPanel.previewQueryOnShortcut); - const moduleId = useModuleId(); + + // Handle case where ModuleContext is not available + let moduleId; + try { + moduleId = useModuleId(); + } catch (error) { + moduleId = 'canvas'; // Default fallback + } const location = useLocation(); const { pathname } = location; From d9b6efefadb24010586d6f50d23f8190e2ee6e43 Mon Sep 17 00:00:00 2001 From: Kavin Venkatachalam Date: Thu, 3 Jul 2025 16:39:19 +0530 Subject: [PATCH 4/7] Updated submodules ref --- frontend/ee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/ee b/frontend/ee index 0ae5dac299..a2aaf14252 160000 --- a/frontend/ee +++ b/frontend/ee @@ -1 +1 @@ -Subproject commit 0ae5dac299e4a72e219243255722fbea2f530808 +Subproject commit a2aaf14252bfe033d52c37675bfc75aa03bf9389 From edf657b659f5a9b2433473493b2ae139e2ada188 Mon Sep 17 00:00:00 2001 From: Kavin Venkatachalam Date: Thu, 3 Jul 2025 17:47:41 +0530 Subject: [PATCH 5/7] Revert "fix: add fallback for useModuleId hook in query panel" This reverts commit 27ba7dec307a4c365971109cbe445a2cbba0ad69. --- frontend/package.json | 2 +- .../src/AppBuilder/CodeEditor/useQueryPanelKeyHooks.js | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 3034d57e39..57785151d3 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -267,4 +267,4 @@ "jsx" ] } -} \ No newline at end of file +} diff --git a/frontend/src/AppBuilder/CodeEditor/useQueryPanelKeyHooks.js b/frontend/src/AppBuilder/CodeEditor/useQueryPanelKeyHooks.js index b5f549a354..1a41a7f19b 100644 --- a/frontend/src/AppBuilder/CodeEditor/useQueryPanelKeyHooks.js +++ b/frontend/src/AppBuilder/CodeEditor/useQueryPanelKeyHooks.js @@ -7,14 +7,7 @@ export const useQueryPanelKeyHooks = (onChange, value, type) => { const queryPanelHeight = useStore((state) => state.queryPanel.queryPanelHeight); const runQueryOnShortcut = useStore((state) => state.queryPanel.runQueryOnShortcut); const previewQueryOnShortcut = useStore((state) => state.queryPanel.previewQueryOnShortcut); - - // Handle case where ModuleContext is not available - let moduleId; - try { - moduleId = useModuleId(); - } catch (error) { - moduleId = 'canvas'; // Default fallback - } + const moduleId = useModuleId(); const location = useLocation(); const { pathname } = location; From ace4fe754cb7ca562bd48ee2a439adeb389d7f72 Mon Sep 17 00:00:00 2001 From: Kavin Venkatachalam Date: Thu, 3 Jul 2025 17:49:20 +0530 Subject: [PATCH 6/7] fix: Added a fallback for module context --- frontend/src/AppBuilder/_contexts/ModuleContext.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/AppBuilder/_contexts/ModuleContext.jsx b/frontend/src/AppBuilder/_contexts/ModuleContext.jsx index d0f2b96c31..b216743ed2 100644 --- a/frontend/src/AppBuilder/_contexts/ModuleContext.jsx +++ b/frontend/src/AppBuilder/_contexts/ModuleContext.jsx @@ -13,7 +13,7 @@ export const ModuleProvider = ({ moduleId, isModuleMode, appType, isModuleEditor export const useModuleContext = () => { const context = useContext(ModuleContext); if (!context) { - throw new Error('useModuleContext must be used within a ModuleProvider'); + return { moduleId: 'canvas', isModuleMode: false, isModuleEditor: false }; } return context; }; @@ -21,7 +21,7 @@ export const useModuleContext = () => { export const useModuleId = () => { const context = useContext(ModuleContext); if (!context) { - throw new Error('useModuleId must be used within a ModuleProvider'); + return 'canvas'; } return context.moduleId; From 841d66078342bb08bf7eda4a31928af1db3b1bac Mon Sep 17 00:00:00 2001 From: Kavin Venkatachalam Date: Thu, 3 Jul 2025 19:15:20 +0530 Subject: [PATCH 7/7] fix: modules are hidden if the query manager is expanded --- frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx b/frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx index 1c7d2d6d69..b48143f383 100644 --- a/frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx +++ b/frontend/src/AppBuilder/AppCanvas/AppCanvas.jsx @@ -202,7 +202,7 @@ export const AppCanvas = ({ appId, isViewer = false, switchDarkMode, darkMode }) scrollbarWidth: 'none', overflow: 'auto', width: currentMode === 'view' ? `calc(100% - ${isViewerSidebarPinned ? '0px' : '0px'})` : '100%', - height: 'inherit', + ...(appType === 'module' && isModuleMode && { height: 'inherit' }), }} className={`app-${appId} _tooljet-page-${getPageId()}`} >