From b0bad2189f0681e0697f74a5833afaf7c7a38332 Mon Sep 17 00:00:00 2001 From: mahmoudadel54 Date: Mon, 20 Nov 2023 08:57:24 +0200 Subject: [PATCH] #9683: Resolve review comments Description: - Reolve unused loading property from DashoardEditor file - Add tooltip for save dashboard - Remove custom style in BorderLayout and leave it with generic style --- web/client/components/layout/BorderLayout.jsx | 1 - web/client/plugins/DashboardEditor.jsx | 4 +--- web/client/plugins/DashboardSave.jsx | 2 ++ 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/web/client/components/layout/BorderLayout.jsx b/web/client/components/layout/BorderLayout.jsx index c8c7abd180..91ab672dce 100644 --- a/web/client/components/layout/BorderLayout.jsx +++ b/web/client/components/layout/BorderLayout.jsx @@ -26,7 +26,6 @@ export default ({id, children, header, footer, columns, height, style = {}, clas width: "100%", height: "100%", overflow: "hidden", - paddingRight: "auto", ...style }}> {header} diff --git a/web/client/plugins/DashboardEditor.jsx b/web/client/plugins/DashboardEditor.jsx index 768aa6afbe..cfd3391b90 100644 --- a/web/client/plugins/DashboardEditor.jsx +++ b/web/client/plugins/DashboardEditor.jsx @@ -48,7 +48,6 @@ class DashboardEditorComponent extends React.Component { static propTypes = { id: PropTypes.string, editing: PropTypes.bool, - loading: PropTypes.bool, limitDockHeight: PropTypes.bool, fluid: PropTypes.bool, zIndex: PropTypes.number, @@ -68,7 +67,6 @@ class DashboardEditorComponent extends React.Component { id: "dashboard-editor", editing: false, dockSize: 500, - loading: true, limitDockHeight: true, zIndex: 10000, fluid: false, @@ -100,7 +98,7 @@ const Plugin = connect( isDashboardEditing, isDashboardLoading, isDashboardAvailable, - (editing, loading, isDashboardOpened) => ({ editing, loading, isDashboardOpened }) + (editing, isDashboardOpened) => ({ editing, isDashboardOpened }) ), { setEditing, onMount: () => setEditorAvailable(true), diff --git a/web/client/plugins/DashboardSave.jsx b/web/client/plugins/DashboardSave.jsx index b758ee2ed4..4afffdfe94 100644 --- a/web/client/plugins/DashboardSave.jsx +++ b/web/client/plugins/DashboardSave.jsx @@ -69,6 +69,7 @@ export const DashboardSave = createPlugin('DashboardSave', { text: , icon: , action: triggerSave.bind(null, true), + tooltip: "saveDialog.saveTooltip", // display the BurgerMenu button only if the map can be edited selector: createSelector( isLoggedIn, @@ -84,6 +85,7 @@ export const DashboardSave = createPlugin('DashboardSave', { text: , icon: , action: triggerSave.bind(null, true), + tooltip: "saveDialog.saveTooltip", // display the BurgerMenu button only if the map can be edited selector: createSelector( isLoggedIn,