Add support for layerTreeHiddenSublayers theme item config

qgis · Mar 5, 2024 · bdff74c · bdff74c
1 parent a505537
commit bdff74c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2024.03.04-master",
+    "version": "2024.03.05-master",
     "description": "QGIS Web Client 2 core",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",

diff --git a/plugins/LayerTree.jsx b/plugins/LayerTree.jsx
@@ -259,6 +259,9 @@ class LayerTree extends React.Component {
         if (this.state.filtervisiblelayers && !sublayer.visibility) {
             return null;
         }
+        if (Array.isArray(layer.layerTreeHiddenSublayers) && layer.layerTreeHiddenSublayers.includes(sublayer.name)) {
+            return null;
+        }
         const allowRemove = ConfigUtils.getConfigProp("allowRemovingThemeLayers", this.props.theme) === true || layer.role !== LayerRole.THEME;
         const allowReordering = ConfigUtils.getConfigProp("allowReorderingLayers", this.props.theme) === true;
         let checkboxstate = sublayer.visibility === true ? 'checked' : 'unchecked';

diff --git a/scripts/themesConfig.js b/scripts/themesConfig.js
@@ -528,6 +528,9 @@ function getTheme(config, configItem, result, resultItem, proxy) {
             if (configItem.themeInfoLinks) {
                 resultItem.themeInfoLinks = configItem.themeInfoLinks;
             }
+            if (configItem.layerTreeHiddenSublayers) {
+                resultItem.layerTreeHiddenSublayers = configItem.layerTreeHiddenSublayers;
+            }
 
             resultItem.skipEmptyFeatureAttributes = configItem.skipEmptyFeatureAttributes;
             resultItem.config = configItem.config;

diff --git a/scripts/themesConfig.py b/scripts/themesConfig.py
@@ -477,6 +477,8 @@ def getTheme(config, configItem, result, resultItem):
             resultItem["minSearchScaleDenom"] = configItem["minSearchScale"]
         if "themeInfoLinks" in configItem:
             resultItem["themeInfoLinks"] = configItem["themeInfoLinks"]
+        if "layerTreeHiddenSublayers" in configItem:
+            resultItem["layerTreeHiddenSublayers"] = configItem["layerTreeHiddenSublayers"]
         resultItem["searchProviders"] = configItem["searchProviders"] if "searchProviders" in configItem else []
         if "additionalMouseCrs" in configItem:
             resultItem["additionalMouseCrs"] = configItem["additionalMouseCrs"]

diff --git a/utils/ThemeUtils.js b/utils/ThemeUtils.js
@@ -131,6 +131,7 @@ const ThemeUtils = {
             printUrl: ThemeUtils.inheritBaseUrlParams(theme.printUrl, theme.url, baseParams),
             featureInfoUrl: ThemeUtils.inheritBaseUrlParams(theme.featureInfoUrl, theme.url, baseParams),
             infoFormats: theme.infoFormats,
+            layerTreeHiddenSublayers: theme.layerTreeHiddenSublayers,
             externalLayerMap: {
                 ...theme.externalLayerMap,
                 ...(theme.externalLayers || []).reduce((res, cur) => {