Fix widgets layout issues and catalogUrl updates

geosolutions-it · Nov 13, 2024 · 63daecd · 63daecd
1 parent 95bad6b
commit 63daecd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/web/client/components/widgets/enhancers/dependenciesToFilter.js b/web/client/components/widgets/enhancers/dependenciesToFilter.js
@@ -34,7 +34,8 @@ const shouldMapOrKeys = ({ mapSync, geomProp, dependencies = {}, layer, quickFil
         || options !== nextProps.options
         || quickFilters !== nextProps.quickFilters
         || getCqlFilter(layer, dependencies) !== getCqlFilter(nextProps.layer, nextProps.dependencies)
-        || getLayerFilter(layer) !== getLayerFilter(nextProps.layer);
+        || getLayerFilter(layer) !== getLayerFilter(nextProps.layer)
+        || layer.catalogUrl !== nextProps.layer.catalogUrl;
 };
 
 const createFilterProps = ({ mapSync, geomProp = "the_geom", dependencies = {}, filter: filterObj, layer, quickFilters, options } = {}) => {

diff --git a/web/client/plugins/Widgets.jsx b/web/client/plugins/Widgets.jsx
@@ -144,7 +144,7 @@ compose(
             } : {};
             const widthOptions = width ? {width: viewWidth - 1} : {};
             const baseHeight = isSingleWidgetLayout
-                ? rowHeight || rowHeightRecalculated
+                ? rowHeightRecalculated || rowHeight
                 : Math.floor((height - 100) / (rowHeightRecalculated + 10)) * (rowHeightRecalculated + 10);
             return ({
                 rowHeight: isSingleWidgetLayout ? rowHeightRecalculated : rowHeight || rowHeightRecalculated,