npm - qwc2 - Versions diffs - 2026.2.12 → 2026.2.13 - Mend

qwc2 2026.2.12 → 2026.2.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/package.json +1 -1
package/plugins/MapFilter.js +71 -75

package/package.json CHANGED Viewed

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

package/plugins/MapFilter.js CHANGED Viewed

@@ -77,7 +77,7 @@ var MapFilter = /*#__PURE__*/function (_React$Component) {
       filterInvalid: false
     });
     _defineProperty(_this, "collectPredefinedFilters", function (layers) {
-      return layers.reduce(function (res, layer) {
+      var filters = layers.reduce(function (res, layer) {
         return _objectSpread(_objectSpread({}, res), (layer.predefinedFilters || []).reduce(function (res2, config) {
           return _objectSpread(_objectSpread({}, res2), {}, _defineProperty({}, config.id, _objectSpread(_objectSpread({}, config), {}, {
             filter: Object.fromEntries(Object.entries(config.filter).map(function (_ref) {
@@ -89,40 +89,55 @@ var MapFilter = /*#__PURE__*/function (_React$Component) {
           })));
         }, {}));
       }, {});
+      if (_this.props.allowFilterByTime) {
+        var timeFilter = {};
+        layers.forEach(function (layer) {
+          return _this.buildTimeFilter(layer, timeFilter, layer.wms_name);
+        });
+        if (!isEmpty(timeFilter)) {
+          filters.__timefilter = {
+            id: "__timefilter",
+            active: false,
+            filter: timeFilter,
+            title: LocaleUtils.tr("mapfilter.timefilter"),
+            fields: [{
+              id: "tstart",
+              defaultValue: "",
+              inputConfig: {
+                type: "datetime"
+              },
+              title: LocaleUtils.tr("mapfilter.timefrom")
+            }, {
+              id: "tend",
+              defaultValue: "",
+              inputConfig: {
+                type: "datetime"
+              },
+              title: LocaleUtils.tr("mapfilter.timeto")
+            }],
+            defaultValues: {
+              tstart: '1800-01-01',
+              tend: '9999-12-31'
+            }
+          };
+        }
+      }
+      return filters;
     });
     _defineProperty(_this, "initializeFilters", function (predefinedFilters, prevFilters) {
       clearTimeout(_this.applyFilterTimeout);
       _this.applyFilterTimeout = null;
-      var filters = Object.values(predefinedFilters).reduce(function (res, filterConfig) {
+      return Object.values(predefinedFilters).reduce(function (res, filterConfig) {
         var _prevFilters$filterCo;
         return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, filterConfig.id, (_prevFilters$filterCo = prevFilters === null || prevFilters === void 0 ? void 0 : prevFilters[filterConfig.id]) !== null && _prevFilters$filterCo !== void 0 ? _prevFilters$filterCo : {
           active: false,
           filter: filterConfig.filter,
           values: filterConfig.fields.reduce(function (values, valueConfig) {
             return _objectSpread(_objectSpread({}, values), {}, _defineProperty({}, valueConfig.id, valueConfig.defaultValue));
-          }, {})
+          }, {}),
+          defaultValues: filterConfig.defaultValues
         }));
       }, {});
-      var timeFilter = {};
-      _this.props.layers.forEach(function (layer) {
-        return _this.buildTimeFilter(layer, timeFilter, layer.wms_name);
-      });
-      if (!isEmpty(timeFilter) && _this.props.allowFilterByTime) {
-        var _prevFilters$__timefi, _prevFilters$__timefi2, _prevFilters$__timefi3, _prevFilters$__timefi4;
-        filters.__timefilter = {
-          active: (_prevFilters$__timefi = (_prevFilters$__timefi2 = prevFilters.__timefilter) === null || _prevFilters$__timefi2 === void 0 ? void 0 : _prevFilters$__timefi2.active) !== null && _prevFilters$__timefi !== void 0 ? _prevFilters$__timefi : false,
-          filter: timeFilter,
-          values: (_prevFilters$__timefi3 = (_prevFilters$__timefi4 = prevFilters.__timefilter) === null || _prevFilters$__timefi4 === void 0 ? void 0 : _prevFilters$__timefi4.values) !== null && _prevFilters$__timefi3 !== void 0 ? _prevFilters$__timefi3 : {
-            tstart: "",
-            tend: ""
-          },
-          defaultValues: {
-            tstart: '1800-01-01',
-            tend: '9999-12-31'
-          }
-        };
-      }
-      return filters;
     });
     _defineProperty(_this, "applyFilter", function () {
       var _this$state$filters$_;
@@ -279,7 +294,7 @@ var MapFilter = /*#__PURE__*/function (_React$Component) {
       if (_this.state.filterEditor) {
         return _this.renderFilterEditor();
       } else {
-        return [_this.renderInvalidWarning()].concat(_toConsumableArray(_this.renderPredefinedFilters()), [_this.props.allowFilterByTime ? _this.renderTimeFilter() : null, _this.props.allowFilterByGeom ? _this.renderGeomFilter() : null], _toConsumableArray(_this.renderCustomFilters()));
+        return [_this.renderInvalidWarning()].concat(_toConsumableArray(_this.renderPredefinedFilters()), [_this.props.allowFilterByGeom ? _this.renderGeomFilter() : null], _toConsumableArray(_this.renderCustomFilters()));
       }
     });
     _defineProperty(_this, "renderInvalidWarning", function () {
@@ -389,61 +404,42 @@ var MapFilter = /*#__PURE__*/function (_React$Component) {
           var _field$title;
           return /*#__PURE__*/React.createElement("tr", {
             key: field.id
-          }, /*#__PURE__*/React.createElement("td", null, (_field$title = field.title) !== null && _field$title !== void 0 ? _field$title : LocaleUtils.tr(field.titlemsgid), ": "), /*#__PURE__*/React.createElement("td", null, field.inputConfig.type === 'select' ? /*#__PURE__*/React.createElement("select", {
-            onChange: function onChange(ev) {
-              return _this.updateFieldValue(config.id, field.id, ev.target.value);
-            },
-            value: _this.state.filters[config.id].values[field.id]
-          }, !field.defaultValue ? /*#__PURE__*/React.createElement("option", {
-            value: ""
-          }, LocaleUtils.tr("common.select")) : null, field.inputConfig.options.map(function (entry) {
-            var _entry$value, _entry$value2, _entry$label;
-            return /*#__PURE__*/React.createElement("option", {
-              key: (_entry$value = entry.value) !== null && _entry$value !== void 0 ? _entry$value : entry,
-              value: (_entry$value2 = entry.value) !== null && _entry$value2 !== void 0 ? _entry$value2 : entry
-            }, (_entry$label = entry.label) !== null && _entry$label !== void 0 ? _entry$label : entry.labelmsgid ? LocaleUtils.tr(entry.labelmsgid) : entry);
-          })) : /*#__PURE__*/React.createElement("input", _extends({
-            onChange: function onChange(ev) {
-              return _this.updateFieldValue(config.id, field.id, ev.target.value);
-            },
-            type: "text",
-            value: _this.state.filters[config.id].values[field.id] || ""
-          }, field.inputConfig))));
+          }, /*#__PURE__*/React.createElement("td", null, (_field$title = field.title) !== null && _field$title !== void 0 ? _field$title : LocaleUtils.tr(field.titlemsgid), ": "), /*#__PURE__*/React.createElement("td", null, _this.renderFilterField(config.id, field)));
         })))));
       });
     });
-    _defineProperty(_this, "renderTimeFilter", function () {
-      var timeFilter = _this.state.filters.__timefilter;
-      if (!timeFilter) {
-        return null;
+    _defineProperty(_this, "renderFilterField", function (configid, field) {
+      if (field.inputConfig.type === 'select') {
+        return /*#__PURE__*/React.createElement("select", {
+          onChange: function onChange(ev) {
+            return _this.updateFieldValue(configid, field.id, ev.target.value);
+          },
+          value: _this.state.filters[configid].values[field.id]
+        }, !field.defaultValue ? /*#__PURE__*/React.createElement("option", {
+          value: ""
+        }, LocaleUtils.tr("common.select")) : null, field.inputConfig.options.map(function (entry) {
+          var _entry$value, _entry$value2, _entry$label;
+          return /*#__PURE__*/React.createElement("option", {
+            key: (_entry$value = entry.value) !== null && _entry$value !== void 0 ? _entry$value : entry,
+            value: (_entry$value2 = entry.value) !== null && _entry$value2 !== void 0 ? _entry$value2 : entry
+          }, (_entry$label = entry.label) !== null && _entry$label !== void 0 ? _entry$label : entry.labelmsgid ? LocaleUtils.tr(entry.labelmsgid) : entry);
+        }));
+      } else if (field.inputConfig.type === "datetime") {
+        return /*#__PURE__*/React.createElement(DateTimeInput, {
+          onChange: function onChange(value) {
+            return _this.updateFieldValue(configid, field.id, value);
+          },
+          value: _this.state.filters[configid].values[field.id] || ""
+        });
+      } else {
+        return /*#__PURE__*/React.createElement("input", _extends({
+          onChange: function onChange(ev) {
+            return _this.updateFieldValue(configid, field.id, ev.target.value);
+          },
+          type: "text",
+          value: _this.state.filters[configid].values[field.id] || ""
+        }, field.inputConfig));
       }
-      return /*#__PURE__*/React.createElement("div", {
-        className: "map-filter-entry",
-        key: "__timefilter"
-      }, /*#__PURE__*/React.createElement("div", {
-        className: "map-filter-entry-titlebar"
-      }, /*#__PURE__*/React.createElement("span", {
-        className: "map-filter-entry-title"
-      }, LocaleUtils.tr("mapfilter.timefilter")), /*#__PURE__*/React.createElement(ToggleSwitch, {
-        active: timeFilter.active,
-        onChange: function onChange(active) {
-          return _this.toggleFilter("__timefilter", active);
-        }
-      })), /*#__PURE__*/React.createElement("div", {
-        className: "map-filter-entry-body"
-      }, /*#__PURE__*/React.createElement("table", {
-        className: "map-filter-entry-fields"
-      }, /*#__PURE__*/React.createElement("tbody", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("mapfilter.timefrom"), ": "), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(DateTimeInput, {
-        onChange: function onChange(value) {
-          return _this.updateFieldValue("__timefilter", "tstart", value);
-        },
-        value: timeFilter.values.tstart
-      }))), /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("mapfilter.timeto"), ": "), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(DateTimeInput, {
-        onChange: function onChange(value) {
-          return _this.updateFieldValue("__timefilter", "tend", value);
-        },
-        value: timeFilter.values.tend
-      })))))));
     });
     _defineProperty(_this, "renderCustomFilters", function () {
       if (!_this.props.allowCustomFilters) {