Fix #9622 adjusted rowHeight when not configured (#9700)

geosolutions-it · Nov 14, 2023 · 66e97e7 · 66e97e7
1 parent fc3b396
commit 66e97e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/web/client/configs/localConfig.json b/web/client/configs/localConfig.json
@@ -557,10 +557,7 @@
                 }
             },
             "OmniBar", "Login", "Save", "SaveAs", "Expander", "Undo", "Redo", "FullScreen", "GlobeViewSwitcher", "SearchServicesConfig", "SearchByBookmark", "WidgetsBuilder", {
-              "name": "Widgets",
-              "cfg": {
-                "enableZoomInTblWidget": true
-                }
+              "name": "Widgets"
             },
             "WidgetsTray",
             {
@@ -749,10 +746,7 @@
         "dashboard": [
           "BurgerMenu",
           {
-            "name": "Dashboard",
-            "cfg": {
-              "enableZoomInTblWidget": true
-              }
+            "name": "Dashboard"
           },
           "Notifications",
           "Login",

diff --git a/web/client/plugins/Widgets.jsx b/web/client/plugins/Widgets.jsx
@@ -144,10 +144,10 @@ compose(
             } : {};
             const widthOptions = width ? {width: viewWidth - 1} : {};
             const baseHeight = isSingleWidgetLayout
-                ? rowHeight
+                ? rowHeight || rowHeightRecalculated
                 : Math.floor((height - 100) / (rowHeightRecalculated + 10)) * (rowHeightRecalculated + 10);
             return ({
-                rowHeight: isSingleWidgetLayout ? rowHeightRecalculated : rowHeight,
+                rowHeight: isSingleWidgetLayout ? rowHeightRecalculated : rowHeight || rowHeightRecalculated,
                 className: "on-map",
                 breakpoints: isSingleWidgetLayout ? { xxs: 0 } : { md: 0 },
                 cols: cols || { md: 6, xxs: 1 },