qwc2 2025.11.12 → 2025.11.15

package/components/AttributeForm.js

@@ -655,13 +655,12 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
           }
         }
       });
-      // Remove readonly fields
+      // Remove expression fields
       Object.keys(feature.properties).forEach(function (key) {
-        var _fieldConfig$constrai;
         var fieldConfig = editConfig.fields.find(function (field) {
           return field.id === key;
         }) || {};
-        if (fieldConfig !== null && fieldConfig !== void 0 && (_fieldConfig$constrai = fieldConfig.constraints) !== null && _fieldConfig$constrai !== void 0 && _fieldConfig$constrai.readOnly) {
+        if (fieldConfig !== null && fieldConfig !== void 0 && fieldConfig.expression) {
           delete feature.properties[key];
         }
       });
@@ -676,11 +675,10 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         var relEditConfig = _this.props.editConfigs[mapName][layerName];
         entry.features.forEach(function (f) {
           Object.keys(f.properties).forEach(function (key) {
-            var _fieldConfig$constrai2;
             var fieldConfig = relEditConfig.fields.find(function (field) {
               return field.id === key;
             }) || {};
-            if (fieldConfig !== null && fieldConfig !== void 0 && (_fieldConfig$constrai2 = fieldConfig.constraints) !== null && _fieldConfig$constrai2 !== void 0 && _fieldConfig$constrai2.readOnly) {
+            if (fieldConfig !== null && fieldConfig !== void 0 && fieldConfig.expression) {
               delete f.properties[key];
             }
           });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2025.11.12",
+    "version": "2025.11.15",
     "description": "QGIS Web Client",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",

package/plugins/Editing.js

@@ -314,7 +314,6 @@ var Editing = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_this, "geomPicked", function (layer, feature, mapName) {
       var _this$props$editConte2;
-      console.log(mapName);
       var geomType = _this.props.editContext.geomType;
       var geometry = feature.geometry;
       if (geometry.type !== geomType) {

package/reducers/locale.js

@@ -13,6 +13,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  * LICENSE file in the root directory of this source tree.
  */
 
+import deepmerge from 'deepmerge';
 import { flatten } from 'flat';
 import { CHANGE_LOCALE, ADD_TRANSLATIONS } from '../actions/locale';
 var defaultState = {
@@ -27,6 +28,7 @@ export default function locale() {
     case CHANGE_LOCALE:
       {
         return {
+          messagesTree: action.messages,
           messages: flatten(action.messages),
           fallbackMessages: flatten(action.fallbackMessages),
           current: action.locale
@@ -35,6 +37,7 @@ export default function locale() {
     case ADD_TRANSLATIONS:
       {
         return _objectSpread(_objectSpread({}, state), {}, {
+          messagesTree: deepmerge(state.messages, action.translations[state.current]),
           messages: _objectSpread(_objectSpread({}, state.messages), flatten(action.translations[state.current] || {}))
         });
       }

package/utils/LayerUtils.js

@@ -1466,16 +1466,18 @@ var LayerUtils = {
     return reports;
   },
   computeVisbilityPreset: function computeVisbilityPreset(layer) {
+    var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
     var result = {};
     if (layer.sublayers) {
+      var istoplevel = !!layer.url;
       layer.sublayers.forEach(function (sublayer) {
-        return Object.assign(result, LayerUtils.computeVisbilityPreset(sublayer));
+        return Object.assign(result, LayerUtils.computeVisbilityPreset(sublayer, !istoplevel ? path + layer.name + "/" : ""));
       });
-      if (layer.visibility && !layer.url) {
-        result[layer.name] = "";
+      if (layer.visibility && !istoplevel) {
+        result[path + layer.name] = "";
       }
     } else if (layer.visibility) {
-      result[layer.name] = layer.style;
+      result[path + layer.name] = layer.style;
     }
     return result;
   },
@@ -1500,23 +1502,21 @@ var LayerUtils = {
     return null;
   },
   applyVisibilityPreset: function applyVisibilityPreset(layer, preset) {
+    var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     var newLayer = _objectSpread({}, layer);
+    var itempath = [].concat(_toConsumableArray(path.slice(1)), [newLayer.name]).join("/");
     if (newLayer.sublayers) {
-      var haveVisibileSublayer = false;
+      newLayer.visibility = itempath in preset;
       newLayer.sublayers = newLayer.sublayers.map(function (sublayer) {
-        var newSublayer = LayerUtils.applyVisibilityPreset(sublayer, preset);
-        haveVisibileSublayer || (haveVisibileSublayer = newSublayer.visibility === true);
-        return newSublayer;
+        return LayerUtils.applyVisibilityPreset(sublayer, preset, [].concat(_toConsumableArray(path), [layer.name]));
       });
-      newLayer.visibility = haveVisibileSublayer;
-      if (newLayer.name in preset) {
+    } else {
+      if (itempath in preset) {
         newLayer.visibility = true;
+        newLayer.style = preset[itempath];
+      } else {
+        newLayer.visibility = false;
       }
-    } else if (newLayer.name in preset) {
-      newLayer.visibility = true;
-      newLayer.style = preset[newLayer.name];
-    } else {
-      newLayer.visibility = false;
     }
     return newLayer;
   },

package/utils/LocaleUtils.js

@@ -11,7 +11,6 @@ import axios from 'axios';
 import deepmerge from 'deepmerge';
 import StandardApp from '../components/StandardApp';
 import ConfigUtils from './ConfigUtils';
-var themeTranslationCache = {};
 var LocaleUtils = {
   loadLocale: function loadLocale(lang, fallbackLangData) {
     return new Promise(function (resolve) {
@@ -105,20 +104,6 @@ var LocaleUtils = {
     } else {
       return number.toFixed(decimals);
     }
-  },
-  loadThemeTranslations: function loadThemeTranslations(serviceUrl) {
-    return new Promise(function (resolve) {
-      if (serviceUrl in themeTranslationCache) {
-        resolve(themeTranslationCache[serviceUrl]);
-      } else {
-        axios.get(serviceUrl + "?SERVICE=GetTranslations&LANG=" + LocaleUtils.lang()).then(function (response) {
-          themeTranslationCache[serviceUrl] = response.data;
-          resolve(response.data);
-        })["catch"](function (e) {
-          resolve({});
-        });
-      }
-    });
   }
 };
 export default LocaleUtils;

package/utils/ServiceLayerUtils.js

@@ -36,6 +36,7 @@ import CoordinatesUtils from './CoordinatesUtils';
 import LayerUtils from './LayerUtils';
 import LocaleUtils from './LocaleUtils';
 import MiscUtils from './MiscUtils';
+import StandardApp from '../components/StandardApp';
 function strcmp(a, b) {
   var al = a.toLowerCase();
   var bl = b.toLowerCase();
@@ -654,7 +655,8 @@ var ServiceLayerUtils = {
             })];
             Promise.all(metadataRequests).then(function () {
               if (layer.translations) {
-                layer = LayerUtils.applyTranslations(layer, layer.translations);
+                var commonTranslations = StandardApp.store.getState().locale.messagesTree.maptranslations || {};
+                layer = LayerUtils.applyTranslations(layer, deepmerge(commonTranslations, layer.translations));
               }
               callback(layerConfig.id, layer);
             });

package/utils/ThemeUtils.js

@@ -19,11 +19,13 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
  * LICENSE file in the root directory of this source tree.
  */
 
+import deepmerge from 'deepmerge';
 import { remove as removeDiacritics } from 'diacritics';
 import isEmpty from 'lodash.isempty';
 import url from 'url';
 import { v4 as uuidv4 } from 'uuid';
 import { LayerRole } from '../actions/layers';
+import StandardApp from '../components/StandardApp';
 import { SearchResultType } from '../utils/SearchProviders';
 import ConfigUtils from './ConfigUtils';
 import LayerUtils from './LayerUtils';
@@ -334,11 +336,12 @@ var ThemeUtils = {
     }).filter(Boolean);
   },
   applyTranslations: function applyTranslations(group) {
+    var commonTranslations = StandardApp.store.getState().locale.messagesTree.maptranslations || {};
     return _objectSpread(_objectSpread({}, group), {}, {
       subdirs: group.subdirs ? group.subdirs.map(ThemeUtils.applyTranslations) : null,
       items: group.items ? group.items.map(function (item) {
         var _item$translations$th, _item$translations;
-        return _objectSpread(_objectSpread({}, LayerUtils.applyTranslations(item, item.translations)), {}, {
+        return _objectSpread(_objectSpread({}, LayerUtils.applyTranslations(item, deepmerge(commonTranslations, item.translations))), {}, {
           title: (_item$translations$th = (_item$translations = item.translations) === null || _item$translations === void 0 || (_item$translations = _item$translations.theme) === null || _item$translations === void 0 ? void 0 : _item$translations.title) !== null && _item$translations$th !== void 0 ? _item$translations$th : item.title
         });
       }) : null