@opengeoweb/workspace 14.5.2 → 15.0.0

package/index.esm.js

@@ -3,11 +3,11 @@ import { createApiInstance, createNonAuthApiInstance, getApi, getHeaders, handle
 import { syncGroupsTypes, syncGroupsActions, layerActions, mapActions, uiActions, genericActions, layerTypes, mapEnums, selectorMemoizationOptions, genericSelectors, mapSelectors, syncGroupsSelectors, routerActions, createViewObjectForNewMap, mapListener, serviceListener, layersListener, syncGroupsListener, openlayersListener, uiReducer, loadingIndicatorReducer, syncGroupsReducer, layerReducer, serviceReducer, mapReducer, uiTypes, linkComponentTypesConstants, loadingIndicatorSelectors, uiSelectors } from '@opengeoweb/store';
 import { chunk, union, cloneDeep, pick, isEmpty, isEqual, isString } from 'lodash';
 import { getLeaves, createBalancedTreeFromLeaves, MosaicContext, getAndAssertNodeAtPathExists, MosaicWindow, Mosaic } from 'react-mosaic-component';
+import { queryOptions, useMutation, useQuery } from '@tanstack/react-query';
+import { sessionStorageProvider, getAxiosErrorMessage, isAxiosError, isAxiosAuthError, safelyInitI18nForTestsAndStories, sharedTranslations, SHARED_NAMESPACE, ConfirmationServiceProvider, CustomIconButton, useConfirmationDialog, usePrevious, AlertBanner, CustomAccordion, CustomTooltip, dateUtils, SystemScope, SearchHighlight, ToggleMenu, SearchField, Filter, LastUpdateTime, renderCounter, CustomDialog, ToolContainer, CustomToggleButton, ConfirmationButtons } from '@opengeoweb/shared';
 import { timeSeriesActions, TimeSeriesTypes, timeSeriesSelectors, timeSeriesReducer } from '@opengeoweb/time-series';
 import { publicWarningActions, publicWarningsSelectors, warningsTranslations, WARN_NAMESPACE } from '@opengeoweb/warnings';
 import { snackbarTypes, snackbarActions, snackbarListener, snackbarReducer, SnackbarWrapperConnect } from '@opengeoweb/snackbar';
-import { queryOptions, useQuery, useMutation } from '@tanstack/react-query';
-import { sessionStorageProvider, getAxiosErrorMessage, isAxiosError, isAxiosAuthError, safelyInitI18nForTestsAndStories, sharedTranslations, SHARED_NAMESPACE, ConfirmationServiceProvider, CustomIconButton, useConfirmationDialog, usePrevious, AlertBanner, CustomAccordion, CustomTooltip, dateUtils, SystemScope, SearchHighlight, ToggleMenu, SearchField, Filter, LastUpdateTime, renderCounter, CustomDialog, ToolContainer, CustomToggleButton, ConfirmationButtons } from '@opengeoweb/shared';
 import { isAxiosError as isAxiosError$1 } from 'axios';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useTranslation, I18nextProvider } from 'react-i18next';
@@ -143,7 +143,10 @@ var en = {
 	"workspace-labels-dataSource": "Data Source",
 	"workspace-labels-viewType": "View Type",
 	"workspace-presets-form-active-labels": "Active labels ({{count}})",
-	"workspace-label-active": "ACTIVE"
+	"workspace-label-active": "ACTIVE",
+	"fetch-config-error-retry": "Retry",
+	"fetch-config-error-title": "An error has occured whilst fetching the label configuration",
+	"fetch-config-no-labels-available": "There are no labels available, please contact your administrator"
 };
 var fi = {
 	"workspace-menu": "Workspace menu",
@@ -492,7 +495,10 @@ var nl = {
 	"workspace-labels-dataSource": "niet vertaald",
 	"workspace-labels-viewType": "niet vertaald",
 	"workspace-presets-form-active-labels": "niet vertaald ({{count}})",
-	"workspace-label-active": "ACTIVE"
+	"workspace-label-active": "ACTIVE",
+	"fetch-config-error-retry": "Opnieuw proberen",
+	"fetch-config-error-title": "Het ophalen van de label configuratie is mislukt",
+	"fetch-config-no-labels-available": "Er zijn geen labels beschikbaar, neem contact op met de administrator"
 };
 var workspaceTranslations = {
 	en: en,
@@ -504,11 +510,6 @@ var workspaceTranslations = {
 function _OverloadYield(e, d) {
   this.v = e, this.k = d;
 }
-function _arrayLikeToArray(r, a) {
-  (null == a || a > r.length) && (a = r.length);
-  for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
-  return n;
-}
 function asyncGeneratorStep(n, t, e, r, o, a, c) {
   try {
     var i = n[a](c),
@@ -534,23 +535,6 @@ function _asyncToGenerator(n) {
     });
   };
 }
-function _createForOfIteratorHelperLoose(r, e) {
-  var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
-  if (t) return (t = t.call(r)).next.bind(t);
-  if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e) {
-    t && (r = t);
-    var o = 0;
-    return function () {
-      return o >= r.length ? {
-        done: true
-      } : {
-        done: false,
-        value: r[o++]
-      };
-    };
-  }
-  throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
 function _objectDestructuringEmpty(t) {
   if (null == t) throw new TypeError("Cannot destructure " + t);
 }
@@ -738,13 +722,6 @@ function _regeneratorValues(e) {
   }
   throw new TypeError(typeof e + " is not iterable");
 }
-function _unsupportedIterableToArray(r, a) {
-  if (r) {
-    if ("string" == typeof r) return _arrayLikeToArray(r, a);
-    var t = {}.toString.call(r).slice(8, -1);
-    return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
-  }
-}
 function _regeneratorRuntime() {
 
   var r = _regenerator(),
@@ -857,88 +834,71 @@ var getApiRoutes$1 = function getApiRoutes(axiosInstance) {
       }
       return getWorkspacePreset;
     }(),
-    saveWorkspacePreset: function () {
-      var _saveWorkspacePreset = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(workspacePresetId, data) {
+    saveWorkspacePresetAs: function () {
+      var _saveWorkspacePresetAs = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(data) {
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              return _context3.abrupt("return", axiosInstance.put("/workspacepreset/" + workspacePresetId + "/", data));
-            case 1:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3);
-      }));
-      function saveWorkspacePreset(_x3, _x4) {
-        return _saveWorkspacePreset.apply(this, arguments);
-      }
-      return saveWorkspacePreset;
-    }(),
-    saveWorkspacePresetAs: function () {
-      var _saveWorkspacePresetAs = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(data) {
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
-            case 0:
-              return _context4.abrupt("return", axiosInstance.post("/workspacepreset/", data).then(function (response) {
+              return _context3.abrupt("return", axiosInstance.post("/workspacepreset/", data).then(function (response) {
                 var headerLocation = response == null ? void 0 : response.request.getResponseHeader('Location');
                 return getIdFromUrl(headerLocation);
               }));
             case 1:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
-        }, _callee4);
+        }, _callee3);
       }));
-      function saveWorkspacePresetAs(_x5) {
+      function saveWorkspacePresetAs(_x3) {
         return _saveWorkspacePresetAs.apply(this, arguments);
       }
       return saveWorkspacePresetAs;
     }(),
     // view presets
     getViewPresets: function () {
-      var _getViewPresets = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _getViewPresets = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              return _context5.abrupt("return", axiosInstance.get('/viewpreset', {
+              return _context4.abrupt("return", axiosInstance.get('/viewpreset', {
                 params: params
               }));
             case 1:
             case "end":
-              return _context5.stop();
+              return _context4.stop();
           }
-        }, _callee5);
+        }, _callee4);
       }));
-      function getViewPresets(_x6) {
+      function getViewPresets(_x4) {
         return _getViewPresets.apply(this, arguments);
       }
       return getViewPresets;
     }(),
     saveViewPreset: function () {
-      var _saveViewPreset = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(viewPresetId, data) {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _saveViewPreset = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(viewPresetId, data) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              return _context6.abrupt("return", axiosInstance.put("/viewpreset/" + viewPresetId + "/", data.initialProps === null ? Object.assign({}, data, {
+              return _context5.abrupt("return", axiosInstance.put("/viewpreset/" + viewPresetId + "/", data.initialProps === null ? Object.assign({}, data, {
                 initialProps: {}
               }) : data));
             case 1:
             case "end":
-              return _context6.stop();
+              return _context5.stop();
           }
-        }, _callee6);
+        }, _callee5);
       }));
-      function saveViewPreset(_x7, _x8) {
+      function saveViewPreset(_x5, _x6) {
         return _saveViewPreset.apply(this, arguments);
       }
       return saveViewPreset;
     }(),
     saveViewPresetAs: function () {
-      var _saveViewPresetAs = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(data) {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _saveViewPresetAs = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(data) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              return _context7.abrupt("return", axiosInstance.post("/viewpreset/", data.initialProps === null ? Object.assign({}, data, {
+              return _context6.abrupt("return", axiosInstance.post("/viewpreset/", data.initialProps === null ? Object.assign({}, data, {
                 initialProps: {}
               }) : data).then(function (response) {
                 var headerLocation = response == null ? void 0 : response.request.getResponseHeader('Location');
@@ -946,11 +906,11 @@ var getApiRoutes$1 = function getApiRoutes(axiosInstance) {
               }));
             case 1:
             case "end":
-              return _context7.stop();
+              return _context6.stop();
           }
-        }, _callee7);
+        }, _callee6);
       }));
-      function saveViewPresetAs(_x9) {
+      function saveViewPresetAs(_x7) {
         return _saveViewPresetAs.apply(this, arguments);
       }
       return saveViewPresetAs;
@@ -1088,6 +1048,121 @@ var toViewsArray = function toViewsArray(wsViews) {
   });
 };
 
+/* *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2026 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2026 - Finnish Meteorological Institute (FMI)
+ * Copyright 2026 - The Norwegian Meteorological Institute (MET Norway)
+ * */
+/*
+ configureLibraryDefaults([LIB_KEY], {
+  staleTime: 5 * 60 * 1000,
+});
+*/
+var LIB_KEY = 'workspace-lib';
+var getPresetBaseUrl = function getPresetBaseUrl() {
+  var config = sessionStorageProvider.getConfig();
+  return (config == null ? void 0 : config.GW_PRESET_BACKEND_URL) || '';
+};
+
+var getViewPreset = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(viewpresetId, auth) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", fetch(getPresetBaseUrl() + "/viewpreset/" + viewpresetId, {
+            headers: getHeaders(auth)
+          }).then(handleResponse));
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function getViewPreset(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+var updateViewPreset = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(viewpresetId, data, auth) {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          return _context2.abrupt("return", fetch(getPresetBaseUrl() + "/viewpreset/" + viewpresetId, {
+            headers: getHeaders(auth),
+            method: 'PUT',
+            body: JSON.stringify(data)
+          }).then(handleResponse));
+        case 1:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function updateViewPreset(_x3, _x4, _x5) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+var deleteViewPreset = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(viewPresetId, auth) {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          return _context3.abrupt("return", fetch(getPresetBaseUrl() + "/viewpreset/" + viewPresetId, {
+            method: 'DELETE',
+            headers: getHeaders(auth)
+          }).then(handleResponse));
+        case 1:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return function deleteViewPreset(_x6, _x7) {
+    return _ref3.apply(this, arguments);
+  };
+}();
+
+var API_KEY$1 = 'viewpresets-api';
+var generateViewPresetsQueryKeys = function generateViewPresetsQueryKeys(queryKeys) {
+  return [LIB_KEY, API_KEY$1].concat(queryKeys);
+};
+var viewpresetsQueryOptions = {
+  getViewPreset: function getViewPreset$1(id, credentials) {
+    return queryOptions({
+      queryKey: generateViewPresetsQueryKeys([id]),
+      queryFn: function () {
+        var _queryFn = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                return _context.abrupt("return", getViewPreset(id, credentials));
+              case 1:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        function queryFn() {
+          return _queryFn.apply(this, arguments);
+        }
+        return queryFn;
+      }()
+    });
+  }
+};
+
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1443,7 +1518,7 @@ var viewPresetsAdapter = createEntityAdapter({
 var initialState$2 = viewPresetsAdapter.getInitialState();
 var warningsPresetChangeActions = [publicWarningActions.setWarningFilters];
 var syncGroupChangeActions = [syncGroupsActions.syncGroupRemoveTarget, syncGroupsActions.syncGroupAddTarget];
-var mapPresetChangeActions = [layerActions.setBaseLayers, layerActions.layerDelete, layerActions.addLayer, layerActions.duplicateMapLayer, layerActions.layerChangeEnabled, layerActions.layerChangeName, layerActions.layerChangeStyle, layerActions.layerChangeOpacity, layerActions.layerChangeDimension, layerActions.layerChangeAcceptanceTime, mapActions.layerMoveLayer, mapActions.setAutoLayerId, mapActions.setAutoTimestepLayerId, mapActions.setAutoUpdateLayerId, mapActions.toggleAutoUpdate, mapActions.mapStartAnimation, mapActions.mapStopAnimation, mapActions.toggleTimeSliderIsVisible, mapActions.setTimeStep, mapActions.setTimeSliderSpan, mapActions.toggleTimeSpanAuto, mapActions.setAnimationDelay, mapActions.toggleTimestepAuto, mapActions.setAnimationStartTime, mapActions.setAnimationEndTime, mapActions.changeOverlayer, uiActions.setActiveMapIdForDialog, uiActions.setToggleOpenDialog, genericActions.setBbox, mapActions.setBbox];
+var mapPresetChangeActions = [layerActions.setBaseLayers, layerActions.layerDelete, layerActions.addLayer, layerActions.duplicateMapLayer, layerActions.layerChangeEnabled, layerActions.layerChangeName, layerActions.layerChangeStyle, layerActions.layerChangeOpacity, layerActions.layerChangeDimension, layerActions.layerChangeAcceptanceTime, mapActions.layerMoveLayer, mapActions.setAutoLayerId, mapActions.setAutoTimestepLayerId, mapActions.setAutoUpdateLayerId, mapActions.toggleAutoUpdate, mapActions.mapStartAnimation, mapActions.mapStopAnimation, mapActions.toggleTimeSliderIsVisible, mapActions.setTimeStep, mapActions.setTimeSliderSpan, mapActions.toggleTimeSpanAuto, mapActions.setAnimationDelay, mapActions.toggleTimestepAuto, mapActions.setAnimationStartTime, mapActions.setAnimationEndTime, mapActions.changeOverlayer, uiActions.setActiveMapIdForDialog, uiActions.setToggleOpenDialog, genericActions.setBbox, mapActions.setBbox, mapActions.toggleClock];
 var timeSeriesPresetChangeActions = [timeSeriesActions.addParameter, timeSeriesActions.addPlot, timeSeriesActions.deleteParameter, timeSeriesActions.deletePlot, timeSeriesActions.moveParameter, timeSeriesActions.movePlot, timeSeriesActions.toggleParameter, timeSeriesActions.togglePlot, timeSeriesActions.patchParameter, timeSeriesActions.updateTitle];
 var supportedMapActionOrigins = [layerTypes.LayerActionOrigin.layerManager, layerTypes.LayerActionOrigin.wmsLoader, mapEnums.MapActionOrigin.map];
 var supportedTimeSeriesActionOrigins = [TimeSeriesTypes.TimeSeriesActionOrigin.timeSeriesManager, TimeSeriesTypes.TimeSeriesActionOrigin.timeSeriesSelect];
@@ -1857,6 +1932,23 @@ var slice$2 = createSlice({
 var viewPresetsReducer = slice$2.reducer,
   viewPresetActions = slice$2.actions;
 
+/* *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2023 - Finnish Meteorological Institute (FMI)
+ * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
+ * */
 var getCleanSearchQuery = function getCleanSearchQuery(searchQuery) {
   return searchQuery.trim().split(/\s+/).join();
 };
@@ -1918,33 +2010,15 @@ var filterAndSortPresets = function filterAndSortPresets(presets, selectedFilter
     var matchesLabelFilters = function matchesLabelFilters(preset) {
       var _preset$labels;
       var presetLabels = (_preset$labels = preset.labels) != null ? _preset$labels : {};
-      var _loop = function _loop() {
-          var _presetLabels$key;
-          var _step$value = _step.value,
-            key = _step$value.key,
-            selectedValues = _step$value.values;
-          var presetValues = (_presetLabels$key = presetLabels[key]) != null ? _presetLabels$key : [];
-          // If user filtered on this group but preset has no labels in it → exclude
-          if (!presetValues.length) {
-            return {
-              v: false
-            };
-          }
-          var hasAllSelectedValues = selectedValues.every(function (label) {
-            return presetValues.includes(label);
-          });
-          if (!hasAllSelectedValues) {
-            return {
-              v: false
-            };
-          }
-        },
-        _ret;
-      for (var _iterator = _createForOfIteratorHelperLoose(activeGroups), _step; !(_step = _iterator()).done;) {
-        _ret = _loop();
-        if (_ret) return _ret.v;
-      }
-      return true;
+      return activeGroups.some(function (_ref2) {
+        var _presetLabels$key;
+        var key = _ref2.key,
+          selectedValues = _ref2.values;
+        var presetValues = (_presetLabels$key = presetLabels[key]) != null ? _presetLabels$key : [];
+        return selectedValues.some(function (label) {
+          return presetValues.includes(label);
+        });
+      });
     };
     return scopeFiltered.filter(matchesLabelFilters);
   }();
@@ -2879,16 +2953,12 @@ var getViewPresetLabelFilters = createSelector(getViewPresetById, function (_sto
   return viewPreset == null ? void 0 : viewPreset.labelFilters;
 }, selectorMemoizationOptions);
 
-var getPresetBaseUrl = function getPresetBaseUrl() {
-  var config = sessionStorageProvider.getConfig();
-  return (config == null ? void 0 : config.GW_PRESET_BACKEND_URL) || '';
-};
-var getViewPreset = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(viewpresetId, auth) {
+var getWorkspaceLabelsConfig = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(auth) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          return _context.abrupt("return", fetch(getPresetBaseUrl() + "/viewpreset/" + viewpresetId, {
+          return _context.abrupt("return", fetch(getPresetBaseUrl() + "/workspace-labels-config", {
             headers: getHeaders(auth)
           }).then(handleResponse));
         case 1:
@@ -2897,19 +2967,17 @@ var getViewPreset = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function getViewPreset(_x, _x2) {
+  return function getWorkspaceLabelsConfig(_x) {
     return _ref.apply(this, arguments);
   };
 }();
-var updateViewPreset = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(viewpresetId, data, auth) {
+var getWorkspace = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(workspaceId, auth) {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          return _context2.abrupt("return", fetch(getPresetBaseUrl() + "/viewpreset/" + viewpresetId, {
-            headers: getHeaders(auth),
-            method: 'PUT',
-            body: JSON.stringify(data)
+          return _context2.abrupt("return", fetch(getPresetBaseUrl() + "/workspacepreset/" + workspaceId, {
+            headers: getHeaders(auth)
           }).then(handleResponse));
         case 1:
         case "end":
@@ -2917,18 +2985,18 @@ var updateViewPreset = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function updateViewPreset(_x3, _x4, _x5) {
+  return function getWorkspace(_x2, _x3) {
     return _ref2.apply(this, arguments);
   };
 }();
-var deleteViewPreset = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(viewPresetId, auth) {
+var deleteWorkspace = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(workspaceId, auth) {
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          return _context3.abrupt("return", fetch(getPresetBaseUrl() + "/viewpreset/" + viewPresetId, {
-            method: 'DELETE',
-            headers: getHeaders(auth)
+          return _context3.abrupt("return", fetch(getPresetBaseUrl() + "/workspacepreset/" + workspaceId, {
+            headers: getHeaders(auth),
+            method: 'DELETE'
           }).then(handleResponse));
         case 1:
         case "end":
@@ -2936,49 +3004,92 @@ var deleteViewPreset = /*#__PURE__*/function () {
       }
     }, _callee3);
   }));
-  return function deleteViewPreset(_x6, _x7) {
+  return function deleteWorkspace(_x4, _x5) {
     return _ref3.apply(this, arguments);
   };
 }();
+var updateWorkspace = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(workspaceId, data, auth) {
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          return _context4.abrupt("return", fetch(getPresetBaseUrl() + "/workspacepreset/" + workspaceId, {
+            headers: getHeaders(auth),
+            method: 'PUT',
+            body: JSON.stringify(data)
+          }).then(handleResponse));
+        case 1:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  }));
+  return function updateWorkspace(_x6, _x7, _x8) {
+    return _ref4.apply(this, arguments);
+  };
+}();
+var saveWorkspacePreset = /*#__PURE__*/function () {
+  var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(workspaceId, data, auth) {
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          return _context5.abrupt("return", fetch(getPresetBaseUrl() + "/workspacepreset/" + workspaceId + "/", {
+            headers: getHeaders(auth),
+            method: 'PUT',
+            body: JSON.stringify(data)
+          }).then(handleResponse));
+        case 1:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee5);
+  }));
+  return function saveWorkspacePreset(_x9, _x0, _x1) {
+    return _ref5.apply(this, arguments);
+  };
+}();
+var createWorkspace = /*#__PURE__*/function () {
+  var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(data, auth) {
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
+        case 0:
+          return _context6.abrupt("return", fetch(getPresetBaseUrl() + "/workspacepreset", {
+            headers: getHeaders(auth),
+            method: 'POST',
+            body: JSON.stringify(data)
+          }).then(handleResponse));
+        case 1:
+        case "end":
+          return _context6.stop();
+      }
+    }, _callee6);
+  }));
+  return function createWorkspace(_x10, _x11) {
+    return _ref6.apply(this, arguments);
+  };
+}();
 
-/* *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Copyright 2026 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
- * Copyright 2026 - Finnish Meteorological Institute (FMI)
- * Copyright 2026 - The Norwegian Meteorological Institute (MET Norway)
- * */
+var API_KEY = 'workspaces-api';
+// set default query options for this API
 /*
- configureLibraryDefaults([LIB_KEY], {
+ configureLibraryDefaults([LIB_KEY, API_KEY], {
   staleTime: 5 * 60 * 1000,
 });
 */
-var LIB_KEY = 'workspace-lib';
-
-var API_KEY = 'viewpresets-api';
-var generateViewPresetsQueryKeys = function generateViewPresetsQueryKeys(queryKeys) {
+var generateWorkspaceQueryKeys = function generateWorkspaceQueryKeys(queryKeys) {
   return [LIB_KEY, API_KEY].concat(queryKeys);
 };
-var viewpresetsQueryOptions = {
-  getViewPreset: function getViewPreset$1(id, credentials) {
+var workspaceQueryOptions = {
+  saveWorkspacePreset: function saveWorkspacePreset$1(id, data, credentials) {
     return queryOptions({
-      queryKey: generateViewPresetsQueryKeys([id]),
+      queryKey: generateWorkspaceQueryKeys([id]),
+      staleTime: 0,
       queryFn: function () {
         var _queryFn = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                return _context.abrupt("return", getViewPreset(id, credentials));
+                return _context.abrupt("return", saveWorkspacePreset(id, data, credentials));
               case 1:
               case "end":
                 return _context.stop();
@@ -4596,53 +4707,34 @@ var getApiRoutes = function getApiRoutes(axiosInstance) {
       }
       return getWorkspacePreset;
     }(),
-    saveWorkspacePreset: function () {
-      var _saveWorkspacePreset = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(workspacePresetId, data) {
+    saveWorkspacePresetAs: function () {
+      var _saveWorkspacePresetAs = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(data) {
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              // eslint-disable-next-line no-console
-              console.log('api: save workspace preset', workspacePresetId, data);
-              return _context3.abrupt("return", axiosInstance.put("/workspacepreset/" + workspacePresetId + "/", data));
-            case 2:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3);
-      }));
-      function saveWorkspacePreset(_x3, _x4) {
-        return _saveWorkspacePreset.apply(this, arguments);
-      }
-      return saveWorkspacePreset;
-    }(),
-    saveWorkspacePresetAs: function () {
-      var _saveWorkspacePresetAs = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(data) {
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               // eslint-disable-next-line no-console
               console.log('api: save workspace preset as', data);
-              return _context4.abrupt("return", axiosInstance.post("/workspacepreset/", data).then(function () {
+              return _context3.abrupt("return", axiosInstance.post("/workspacepreset/", data).then(function () {
                 return null;
               }));
             case 2:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
-        }, _callee4);
+        }, _callee3);
       }));
-      function saveWorkspacePresetAs(_x5) {
+      function saveWorkspacePresetAs(_x3) {
         return _saveWorkspacePresetAs.apply(this, arguments);
       }
       return saveWorkspacePresetAs;
     }(),
     // view presets
     getViewPresets: function () {
-      var _getViewPresets = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _getViewPresets = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              return _context5.abrupt("return", axiosInstance.get('/viewpreset', {
+              return _context4.abrupt("return", axiosInstance.get('/viewpreset', {
                 params: params
               }).then(function () {
                 var data = filterViewPresetList(params);
@@ -4652,51 +4744,51 @@ var getApiRoutes = function getApiRoutes(axiosInstance) {
               }));
             case 1:
             case "end":
-              return _context5.stop();
+              return _context4.stop();
           }
-        }, _callee5);
+        }, _callee4);
       }));
-      function getViewPresets(_x6) {
+      function getViewPresets(_x4) {
         return _getViewPresets.apply(this, arguments);
       }
       return getViewPresets;
     }(),
     saveViewPreset: function () {
-      var _saveViewPreset = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(presetId, data) {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _saveViewPreset = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(presetId, data) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               // eslint-disable-next-line no-console
               console.log('api: save view preset', presetId, data);
-              return _context6.abrupt("return", axiosInstance.put("/viewpreset/" + presetId + "/", data));
+              return _context5.abrupt("return", axiosInstance.put("/viewpreset/" + presetId + "/", data));
             case 2:
             case "end":
-              return _context6.stop();
+              return _context5.stop();
           }
-        }, _callee6);
+        }, _callee5);
       }));
-      function saveViewPreset(_x7, _x8) {
+      function saveViewPreset(_x5, _x6) {
         return _saveViewPreset.apply(this, arguments);
       }
       return saveViewPreset;
     }(),
     saveViewPresetAs: function () {
-      var _saveViewPresetAs = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(data) {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _saveViewPresetAs = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(data) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               // eslint-disable-next-line no-console
               console.log('api: save view preset as', data);
-              return _context7.abrupt("return", axiosInstance.post("/viewpreset/", data).then(function () {
+              return _context6.abrupt("return", axiosInstance.post("/viewpreset/", data).then(function () {
                 return null;
               }));
             case 2:
             case "end":
-              return _context7.stop();
+              return _context6.stop();
           }
-        }, _callee7);
+        }, _callee6);
       }));
-      function saveViewPresetAs(_x9) {
+      function saveViewPresetAs(_x7) {
         return _saveViewPresetAs.apply(this, arguments);
       }
       return saveViewPresetAs;
@@ -4945,7 +5037,7 @@ workspaceListListener.startListening({
   actionCreator: workspaceListActions.submitFormWorkspaceActionDialogOptions,
   effect: function () {
     var _effect3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref3, listenerApi) {
-      var payload, workspaceApi, workspaceState, presetId, presetAction, data, emptyMapPresetTitle, emptyWorkspacePresetTitle, scope, _yield$workspaceApi$g2, originalData, workspaceDataNewTitle, _originalData$views, _data$views2, _yield$workspaceApi$g3, _originalData, mergedViews, payloadToSave, isSaveWorkspaceAction, isSaveAsWorkspaceAction, hasWorkspaceAlreadyBeenSaved, workspaceId, workspaceData, viewsWithInitialProps, newWorkspace, message, category;
+      var payload, workspaceApi, workspaceState, presetId, presetAction, data, emptyMapPresetTitle, emptyWorkspacePresetTitle, scope, _listenerApi$getState, _yield$workspaceApi$g2, originalData, workspaceDataNewTitle, credentials, _originalData$views, _listenerApi$getState2, _data$views2, _yield$workspaceApi$g3, _originalData, mergedViews, payloadToSave, _credentials, isSaveWorkspaceAction, isSaveAsWorkspaceAction, hasWorkspaceAlreadyBeenSaved, workspaceId, workspaceData, viewsWithInitialProps, newWorkspace, hasChanges, _listenerApi$getState3, _credentials2, message, category;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -4961,7 +5053,7 @@ workspaceListListener.startListening({
             if (presetAction === WorkspacePresetAction.DELETE || presetAction === WorkspacePresetAction.DELETE_SYSTEM_PRESET) ;
             // edit
             if (!(presetAction === WorkspacePresetAction.EDIT)) {
-              _context3.next = 18;
+              _context3.next = 19;
               break;
             }
             _context3.next = 12;
@@ -4977,9 +5069,10 @@ workspaceListListener.startListening({
               updated: data.updated,
               updatedBy: data.updatedBy
             });
-            _context3.next = 17;
-            return workspaceApi.saveWorkspacePreset(presetId, workspaceDataNewTitle);
-          case 17:
+            credentials = (_listenerApi$getState = listenerApi.getState().common) == null || (_listenerApi$getState = _listenerApi$getState.auth) == null ? void 0 : _listenerApi$getState.credentials;
+            _context3.next = 18;
+            return getQueryClient().fetchQuery(workspaceQueryOptions.saveWorkspacePreset(presetId, workspaceDataNewTitle, credentials));
+          case 18:
             listenerApi.dispatch(workspaceListActions.onSuccessWorkspacePresetAction({
               workspaceId: presetId,
               action: presetAction,
@@ -4991,14 +5084,14 @@ workspaceListListener.startListening({
               updatedBy: data.updatedBy,
               scope: scope
             }));
-          case 18:
+          case 19:
             if (!(presetAction === WorkspacePresetAction.EDIT_TITLE)) {
-              _context3.next = 28;
+              _context3.next = 30;
               break;
             }
-            _context3.next = 21;
+            _context3.next = 22;
             return workspaceApi.getWorkspacePreset(presetId);
-          case 21:
+          case 22:
             _yield$workspaceApi$g3 = _context3.sent;
             _originalData = _yield$workspaceApi$g3.data;
             // 2) Merge the single (or few) edited view titles from `data.views`
@@ -5014,9 +5107,10 @@ workspaceListListener.startListening({
             payloadToSave = Object.assign({}, _originalData, {
               views: mergedViews
             });
-            _context3.next = 27;
-            return workspaceApi.saveWorkspacePreset(presetId, payloadToSave);
-          case 27:
+            _credentials = (_listenerApi$getState2 = listenerApi.getState().common) == null || (_listenerApi$getState2 = _listenerApi$getState2.auth) == null ? void 0 : _listenerApi$getState2.credentials;
+            _context3.next = 29;
+            return getQueryClient().fetchQuery(workspaceQueryOptions.saveWorkspacePreset(presetId, payloadToSave, _credentials));
+          case 29:
             // 4) Notify success so reducer updates local state
             listenerApi.dispatch(workspaceListActions.onSuccessWorkspacePresetAction({
               workspaceId: presetId,
@@ -5029,12 +5123,12 @@ workspaceListListener.startListening({
               // Reducer uses mosaicNodeId+title from `views` to patch state.
               views: (_data$views2 = data.views) != null ? _data$views2 : []
             }));
-          case 28:
+          case 30:
             // save (as) user/system presets
             isSaveWorkspaceAction = presetAction === WorkspacePresetAction.SAVE_SYSTEM_PRESET || presetAction === WorkspacePresetAction.SAVE;
             isSaveAsWorkspaceAction = presetAction === WorkspacePresetAction.SAVE_SYSTEM_PRESET_AS || presetAction === WorkspacePresetAction.SAVE_AS;
             if (!(isSaveWorkspaceAction || isSaveAsWorkspaceAction)) {
-              _context3.next = 47;
+              _context3.next = 52;
               break;
             }
             hasWorkspaceAlreadyBeenSaved = getWorkspaceDialogIsSaved(workspaceState);
@@ -5058,27 +5152,33 @@ workspaceListListener.startListening({
               views: viewsWithInitialProps
             });
             if (!(!hasWorkspaceAlreadyBeenSaved && isSaveAsWorkspaceAction)) {
-              _context3.next = 41;
+              _context3.next = 43;
               break;
             }
-            _context3.next = 39;
+            _context3.next = 41;
             return workspaceApi.saveWorkspacePresetAs(newWorkspace);
-          case 39:
+          case 41:
             workspaceId = _context3.sent;
             newWorkspace = Object.assign({}, newWorkspace, {
               id: workspaceId
             });
-          case 41:
+          case 43:
             listenerApi.dispatch(workspaceListActions.onSuccessWorkspaceSaveDialog({
               presetId: workspaceId
             }));
             if (isSaveAsWorkspaceAction) {
-              _context3.next = 45;
+              _context3.next = 50;
               break;
             }
-            _context3.next = 45;
-            return workspaceApi.saveWorkspacePreset(workspaceId, newWorkspace);
-          case 45:
+            hasChanges = hasWorkspaceChanges(listenerApi.getState());
+            if (!hasChanges) {
+              _context3.next = 50;
+              break;
+            }
+            _credentials2 = (_listenerApi$getState3 = listenerApi.getState().common) == null || (_listenerApi$getState3 = _listenerApi$getState3.auth) == null ? void 0 : _listenerApi$getState3.credentials;
+            _context3.next = 50;
+            return getQueryClient().fetchQuery(workspaceQueryOptions.saveWorkspacePreset(workspaceId, newWorkspace, _credentials2));
+          case 50:
             listenerApi.dispatch(workspaceListActions.onSuccessWorkspacePresetAction({
               action: presetAction,
               workspaceId: workspaceId,
@@ -5091,7 +5191,7 @@ workspaceListListener.startListening({
             listenerApi.dispatch(routerActions.navigateToUrl({
               url: getWorkspaceRouteUrl(workspaceId)
             }));
-          case 47:
+          case 52:
             // Reset
             if (presetAction === WorkspacePresetAction.RESET) {
               // In case we're resetting the `New workspace` preset
@@ -5116,10 +5216,10 @@ workspaceListListener.startListening({
                 scope: scope
               }));
             }
-            _context3.next = 55;
+            _context3.next = 60;
             break;
-          case 50:
-            _context3.prev = 50;
+          case 55:
+            _context3.prev = 55;
             _context3.t0 = _context3["catch"](4);
             message = isAxiosError(_context3.t0) ? getAxiosErrorMessage(_context3.t0) : _context3.t0.message;
             category = isAxiosAuthError(_context3.t0) ? WorkspaceListErrorCategory.AUTH : WorkspaceListErrorCategory.GENERIC;
@@ -5130,11 +5230,11 @@ workspaceListListener.startListening({
                 message: message
               }
             }));
-          case 55:
+          case 60:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[4, 50]]);
+      }, _callee3, null, [[4, 55]]);
     }));
     function effect(_x5, _x6) {
       return _effect3.apply(this, arguments);
@@ -5215,7 +5315,6 @@ workspaceListener.startListening({
             payload = _ref3.payload;
             // Cancel any in-progress instances of this listener
             listenerApi.cancelActiveListeners();
-            // see https://gitlab.com/opengeoweb/geoweb-assets/-/issues/4413
             _context4.next = 4;
             return listenerApi.condition(function (_action, currentState) {
               var _currentState$workspa;
@@ -5420,10 +5519,17 @@ workspaceListener.startListening({
             listenerApi.dispatch(workspaceActions.changePreset({
               workspacePreset: fullLoadingWorkspace
             }));
+            // wait for teardown of previous workspace to finish
+            _context9.next = 19;
+            return listenerApi.condition(function (_action, currentState) {
+              var _currentState$workspa2;
+              return ((_currentState$workspa2 = currentState.workspace) == null ? void 0 : _currentState$workspa2.id) === fullLoadingWorkspace.id;
+            }, 500);
+          case 19:
             // fetch all individual view presets in batches and collect all actions
             workspaceIdsInBatches = getListInChunks(workspaceData.views);
             actionsToDispatch = [];
-            _context9.next = 21;
+            _context9.next = 23;
             return Promise.all(workspaceIdsInBatches.map(/*#__PURE__*/function () {
               var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(batchCall) {
                 return _regeneratorRuntime().wrap(function _callee8$(_context8) {
@@ -5441,9 +5547,7 @@ workspaceListener.startListening({
                                 }
                                 return _context7.abrupt("return");
                               case 2:
-                                return _context7.abrupt("return", fetchWorkspaceViewPreset(function (thunkAction) {
-                                  actionsToDispatch.push(thunkAction);
-                                }, view.viewPresetId, view.mosaicNodeId, common == null ? void 0 : common.auth.credentials));
+                                return _context7.abrupt("return", fetchWorkspaceViewPreset(listenerApi.dispatch, view.viewPresetId, view.mosaicNodeId, common == null ? void 0 : common.auth.credentials));
                               case 3:
                               case "end":
                                 return _context7.stop();
@@ -5464,13 +5568,13 @@ workspaceListener.startListening({
                 return _ref7.apply(this, arguments);
               };
             }()));
-          case 21:
+          case 23:
             // Trigger all actions at once
             actionsToDispatch.map(listenerApi.dispatch);
-            _context9.next = 28;
+            _context9.next = 30;
             break;
-          case 24:
-            _context9.prev = 24;
+          case 26:
+            _context9.prev = 26;
             _context9.t0 = _context9["catch"](4);
             errorType = _context9.t0.message === ERROR_NOT_FOUND ? WorkspaceErrorType.NOT_FOUND : WorkspaceErrorType.GENERIC;
             listenerApi.dispatch(workspaceActions.errorWorkspace({
@@ -5480,11 +5584,11 @@ workspaceListener.startListening({
                 type: errorType
               }
             }));
-          case 28:
+          case 30:
           case "end":
             return _context9.stop();
         }
-      }, _callee9, null, [[4, 24]]);
+      }, _callee9, null, [[4, 26]]);
     }));
     function effect(_x12, _x13) {
       return _effect5.apply(this, arguments);
@@ -5496,7 +5600,7 @@ workspaceListener.startListening({
   actionCreator: workspaceActions.saveWorkspacePreset,
   effect: function () {
     var _effect6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee0(_ref9, listenerApi) {
-      var payload, workspace, _workspace$scope, workspaceApi;
+      var payload, workspace, _listenerApi$getState3, _workspace$scope, credentials;
       return _regeneratorRuntime().wrap(function _callee0$(_context0) {
         while (1) switch (_context0.prev = _context0.next) {
           case 0:
@@ -5505,9 +5609,9 @@ workspaceListener.startListening({
             listenerApi.cancelActiveListeners();
             workspace = payload.workspace;
             _context0.prev = 3;
-            workspaceApi = getWorkspaceApi();
+            credentials = (_listenerApi$getState3 = listenerApi.getState().common) == null || (_listenerApi$getState3 = _listenerApi$getState3.auth) == null ? void 0 : _listenerApi$getState3.credentials;
             _context0.next = 7;
-            return workspaceApi.saveWorkspacePreset(workspace.id, workspace);
+            return getQueryClient().fetchQuery(workspaceQueryOptions.saveWorkspacePreset(workspace.id, workspace, credentials));
           case 7:
             listenerApi.dispatch(workspaceActions.loadedWorkspace(undefined));
             listenerApi.dispatch(workspaceListActions.onSuccessWorkspacePresetAction({
@@ -6730,280 +6834,46 @@ var ViewLoading = function ViewLoading(_ref) {
     })]
   });
 };
-var ViewError = function ViewError(_ref2) {
-  var viewPresetId = _ref2.viewPresetId,
-    mosaicNodeId = _ref2.mosaicNodeId;
-  var dispatch = useDispatch();
-  var _useWorkspaceTranslat2 = useWorkspaceTranslation(),
-    t = _useWorkspaceTranslat2.t;
-  var fetchWorkspaceViewPreset = React.useCallback(function () {
-    dispatch(workspaceActions.fetchWorkspaceViewPreset({
-      viewPresetId: viewPresetId,
-      mosaicNodeId: mosaicNodeId
-    }));
-  }, [dispatch, viewPresetId, mosaicNodeId]);
-  return jsx(AlertBanner, {
-    actionButtonProps: {
-      title: t('workspace-retry'),
-      onClick: fetchWorkspaceViewPreset
-    },
-    shouldClose: true,
-    title: t('workspace-viewpresets-fail-fetch', {
-      VIEWPRESET_ID: viewPresetId
-    })
-  });
-};
-var defaultComponentsLookUp = function defaultComponentsLookUp(_ref3) {
-  var componentType = _ref3.componentType,
-    viewPresetId = _ref3.viewPresetId,
-    mosaicNodeId = _ref3.mosaicNodeId;
-  switch (componentType) {
-    case 'ViewLoading':
-      return jsx(ViewLoading, {
-        viewPresetId: viewPresetId
-      });
-    case 'ViewError':
-      return jsx(ViewError, {
-        mosaicNodeId: mosaicNodeId,
-        viewPresetId: viewPresetId
-      });
-    default:
-      return null;
-  }
-};
-
-var config = sessionStorageProvider.getConfig();
-var presetBaseUrl = (config == null ? void 0 : config.GW_PRESET_BACKEND_URL) || '';
-var labelsConfigUrl = '/assets/workspaceLabelsConfig.json';
-var getWorkspaceLabelsConfig = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          return _context.abrupt("return", fetch(labelsConfigUrl).then(handleResponse));
-        case 1:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return function getWorkspaceLabelsConfig() {
-    return _ref.apply(this, arguments);
-  };
-}();
-var getWorkspace = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(workspaceId, auth) {
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          return _context2.abrupt("return", fetch(presetBaseUrl + "/workspacepreset/" + workspaceId, {
-            headers: getHeaders(auth)
-          }).then(handleResponse));
-        case 1:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2);
-  }));
-  return function getWorkspace(_x, _x2) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-var deleteWorkspace = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(workspaceId, auth) {
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
-        case 0:
-          return _context3.abrupt("return", fetch(presetBaseUrl + "/workspacepreset/" + workspaceId, {
-            headers: getHeaders(auth),
-            method: 'DELETE'
-          }).then(handleResponse));
-        case 1:
-        case "end":
-          return _context3.stop();
-      }
-    }, _callee3);
-  }));
-  return function deleteWorkspace(_x3, _x4) {
-    return _ref3.apply(this, arguments);
-  };
-}();
-var updateWorkspace = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(workspaceId, data, auth) {
-    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
-        case 0:
-          return _context4.abrupt("return", fetch(presetBaseUrl + "/workspacepreset/" + workspaceId, {
-            headers: getHeaders(auth),
-            method: 'PUT',
-            body: JSON.stringify(data)
-          }).then(handleResponse));
-        case 1:
-        case "end":
-          return _context4.stop();
-      }
-    }, _callee4);
-  }));
-  return function updateWorkspace(_x5, _x6, _x7) {
-    return _ref4.apply(this, arguments);
-  };
-}();
-var createWorkspace = /*#__PURE__*/function () {
-  var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(data, auth) {
-    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
-        case 0:
-          return _context5.abrupt("return", fetch(presetBaseUrl + "/workspacepreset", {
-            headers: getHeaders(auth),
-            method: 'POST',
-            body: JSON.stringify(data)
-          }).then(handleResponse));
-        case 1:
-        case "end":
-          return _context5.stop();
-      }
-    }, _callee5);
-  }));
-  return function createWorkspace(_x8, _x9) {
-    return _ref5.apply(this, arguments);
-  };
-}();
-
-var useWorkspaceLabelsConfig = function useWorkspaceLabelsConfig() {
-  return useQuery({
-    queryKey: ['workspace-labels-config'],
-    queryFn: getWorkspaceLabelsConfig
-  });
-};
-var onWorkspaceApiError = function onWorkspaceApiError(dispatch, error, t) {
-  dispatch(workspaceListActions.onErrorWorkspacePresetAction({
-    error: {
-      message: error.message + " " + t('workspace-error-generic'),
-      type: WorkspaceListErrorType.VERBATIM_ERROR,
-      category: error.message === 'Authentication context not found' ? WorkspaceListErrorCategory.AUTH : WorkspaceListErrorCategory.GENERIC
-    }
-  }));
-};
-var useDeleteWorkspacePreset = function useDeleteWorkspacePreset() {
-  var _useAuthenticationCon = useAuthenticationContext(),
-    auth = _useAuthenticationCon.auth;
-  var _useSelector = useSelector(getWorkspaceActionFormValues),
-    title = _useSelector.title;
-  var _useWorkspaceTranslat = useWorkspaceTranslation(),
-    t = _useWorkspaceTranslat.t;
-  var dispatch = useDispatch();
-  return useMutation({
-    mutationFn: function () {
-      var _mutationFn = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-        var id;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              id = _ref.id;
-              if (auth) {
-                _context.next = 3;
-                break;
-              }
-              throw new Error('Authentication context not found');
-            case 3:
-              return _context.abrupt("return", deleteWorkspace(id, auth));
-            case 4:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      function mutationFn(_x) {
-        return _mutationFn.apply(this, arguments);
-      }
-      return mutationFn;
-    }(),
-    onSuccess: function onSuccess(data, variables) {
-      dispatch(workspaceListActions.onSuccessWorkspacePresetAction({
-        workspaceId: variables.id,
-        action: WorkspacePresetAction.DELETE,
-        emptyWorkspacePresetTitle: t('workspace-new'),
-        title: title
-      }));
-    },
-    onError: function onError(error) {
-      onWorkspaceApiError(dispatch, error, t);
-    }
-  });
-};
-var useCreateWorkspacePreset = function useCreateWorkspacePreset() {
-  var _useAuthenticationCon2 = useAuthenticationContext(),
-    auth = _useAuthenticationCon2.auth;
+var ViewError = function ViewError(_ref2) {
+  var viewPresetId = _ref2.viewPresetId,
+    mosaicNodeId = _ref2.mosaicNodeId;
+  var dispatch = useDispatch();
   var _useWorkspaceTranslat2 = useWorkspaceTranslation(),
     t = _useWorkspaceTranslat2.t;
-  var dispatch = useDispatch();
-  return useMutation({
-    mutationFn: function () {
-      var _mutationFn2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
-        var data;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              data = _ref2.data;
-              if (auth) {
-                _context2.next = 3;
-                break;
-              }
-              throw new Error('Authentication context not found');
-            case 3:
-              return _context2.abrupt("return", createWorkspace(data, auth));
-            case 4:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2);
-      }));
-      function mutationFn(_x2) {
-        return _mutationFn2.apply(this, arguments);
-      }
-      return mutationFn;
-    }(),
-    onSuccess: function onSuccess(data, variables) {
-      var location = data == null ? void 0 : data.get('location');
-      var newId = getIdFromUrl(location);
-      var scope = variables.data.scope || 'user';
-      dispatch(workspaceListActions.onSuccessWorkspacePresetAction({
-        workspaceId: newId,
-        action: variables.action || WorkspacePresetAction.SAVE_AS,
-        title: variables.data.title,
-        scope: scope
-      }));
+  var fetchWorkspaceViewPreset = React.useCallback(function () {
+    dispatch(workspaceActions.fetchWorkspaceViewPreset({
+      viewPresetId: viewPresetId,
+      mosaicNodeId: mosaicNodeId
+    }));
+  }, [dispatch, viewPresetId, mosaicNodeId]);
+  return jsx(AlertBanner, {
+    actionButtonProps: {
+      title: t('workspace-retry'),
+      onClick: fetchWorkspaceViewPreset
     },
-    onError: function onError(error) {
-      onWorkspaceApiError(dispatch, error, t);
-    }
+    shouldClose: true,
+    title: t('workspace-viewpresets-fail-fetch', {
+      VIEWPRESET_ID: viewPresetId
+    })
   });
 };
-
-/* *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Copyright 2025 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
- * Copyright 2025 - Finnish Meteorological Institute (FMI)
- * Copyright 2025 - The Norwegian Meteorological Institute (MET Norway)
- * */
-var LABELS_CONFIG_DEFAULT = {
-  purpose: ['Aviation', 'Monitor', 'Public', 'Maritime', 'Warning', 'Media', 'Nowcasting (0–12h)'],
-  parameters: ['Pressure', 'Temperature', 'Wind', 'Humidity', 'Water vapour', 'Visibility', 'Geopotential', 'Snow', 'Cloud', 'Waves', 'Index', 'Precipitation'],
-  phenomena: ['Turbulence', 'MTW', 'CAT', 'Icing', 'Freezing rain', 'FlashFlood', 'Wind gust', 'Rain', 'Snow', 'Road ice', 'Lightning strike', 'Drifting snow', 'Wave height + water level', 'Forest fire', 'Polar Low', 'Heat wave', 'Gale warning'],
-  viewType: [].concat(ALL_COMPONENT_TYPES),
-  dataType: ['observation', 'forecast', 'archive'],
-  dataSource: ['Meps', 'Arome Arctic', 'Ecmwf', 'Ensemble', 'AIFS', 'BRIS', 'radar', 'satellite', 'synop']
+var defaultComponentsLookUp = function defaultComponentsLookUp(_ref3) {
+  var componentType = _ref3.componentType,
+    viewPresetId = _ref3.viewPresetId,
+    mosaicNodeId = _ref3.mosaicNodeId;
+  switch (componentType) {
+    case 'ViewLoading':
+      return jsx(ViewLoading, {
+        viewPresetId: viewPresetId
+      });
+    case 'ViewError':
+      return jsx(ViewError, {
+        mosaicNodeId: mosaicNodeId,
+        viewPresetId: viewPresetId
+      });
+    default:
+      return null;
+  }
 };
 
 var VIEW_TYPE_KEY = 'viewType';
@@ -7037,13 +6907,12 @@ var PresetLabelsPanel = function PresetLabelsPanel(_ref) {
     control: control,
     name: 'views'
   });
-  var availableLabels = labelsConfig != null ? labelsConfig : LABELS_CONFIG_DEFAULT;
   var labels = React.useMemo(function () {
-    return normalizeLabels(watchedLabels, availableLabels);
-  }, [watchedLabels, availableLabels]);
+    return normalizeLabels(watchedLabels, labelsConfig);
+  }, [watchedLabels, labelsConfig]);
   var groupKeys = React.useMemo(function () {
-    return Array.from(new Set([VIEW_TYPE_KEY].concat(Object.keys(availableLabels != null ? availableLabels : {}), watchedLabels ? Object.keys(watchedLabels) : [])));
-  }, [availableLabels, watchedLabels]);
+    return Array.from(new Set([VIEW_TYPE_KEY].concat(Object.keys(labelsConfig != null ? labelsConfig : {}), watchedLabels ? Object.keys(watchedLabels) : [])));
+  }, [labelsConfig, watchedLabels]);
   var orderedGroupKeys = React.useMemo(function () {
     var withoutViewType = groupKeys.filter(function (key) {
       return key !== VIEW_TYPE_KEY;
@@ -7105,9 +6974,9 @@ var PresetLabelsPanel = function PresetLabelsPanel(_ref) {
     return (_labels$VIEW_TYPE_KEY = labels[VIEW_TYPE_KEY]) != null ? _labels$VIEW_TYPE_KEY : [];
   }, [labels]);
   var viewTypeConfigItems = React.useMemo(function () {
-    var _availableLabels$VIEW;
-    return ((_availableLabels$VIEW = availableLabels == null ? void 0 : availableLabels[VIEW_TYPE_KEY]) != null ? _availableLabels$VIEW : []).slice();
-  }, [availableLabels]);
+    var _labelsConfig$VIEW_TY;
+    return ((_labelsConfig$VIEW_TY = labelsConfig == null ? void 0 : labelsConfig[VIEW_TYPE_KEY]) != null ? _labelsConfig$VIEW_TY : []).slice();
+  }, [labelsConfig]);
   var viewTypeItems = React.useMemo(function () {
     if (isMenuFilterMode) {
       if (viewTypeConfigItems.length > 0) {
@@ -7194,9 +7063,9 @@ var PresetLabelsPanel = function PresetLabelsPanel(_ref) {
   };
   var groups = React.useMemo(function () {
     return orderedGroupKeys.map(function (key) {
-      var _availableLabels$key;
+      var _labelsConfig$key;
       var isViewType = key === VIEW_TYPE_KEY;
-      var items = isViewType ? viewTypeItems : (_availableLabels$key = availableLabels[key]) != null ? _availableLabels$key : [];
+      var items = isViewType ? viewTypeItems : (_labelsConfig$key = labelsConfig[key]) != null ? _labelsConfig$key : [];
       var locked = !isMenuFilterMode && isViewType;
       return {
         key: key,
@@ -7205,7 +7074,7 @@ var PresetLabelsPanel = function PresetLabelsPanel(_ref) {
         locked: locked
       };
     });
-  }, [orderedGroupKeys, availableLabels, viewTypeItems, isMenuFilterMode, titleForGroup]);
+  }, [orderedGroupKeys, labelsConfig, viewTypeItems, isMenuFilterMode, titleForGroup]);
   var _React$useState = React.useState(false),
     expandAll = _React$useState[0],
     setExpandAll = _React$useState[1];
@@ -7397,11 +7266,183 @@ var PresetLabelsPanel = function PresetLabelsPanel(_ref) {
   });
 };
 
+var useWorkspaceLabelsConfig = function useWorkspaceLabelsConfig() {
+  var _useAuthenticationCon = useAuthenticationContext(),
+    auth = _useAuthenticationCon.auth;
+  return useQuery({
+    queryKey: ['workspace-labels-config'],
+    queryFn: function () {
+      var _queryFn = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              return _context.abrupt("return", getWorkspaceLabelsConfig(auth));
+            case 1:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function queryFn() {
+        return _queryFn.apply(this, arguments);
+      }
+      return queryFn;
+    }()
+  });
+};
+var onWorkspaceApiError = function onWorkspaceApiError(dispatch, error, t) {
+  dispatch(workspaceListActions.onErrorWorkspacePresetAction({
+    error: {
+      message: error.message + " " + t('workspace-error-generic'),
+      type: WorkspaceListErrorType.VERBATIM_ERROR,
+      category: error.message === 'Authentication context not found' ? WorkspaceListErrorCategory.AUTH : WorkspaceListErrorCategory.GENERIC
+    }
+  }));
+};
+var useDeleteWorkspacePreset = function useDeleteWorkspacePreset() {
+  var _useAuthenticationCon2 = useAuthenticationContext(),
+    auth = _useAuthenticationCon2.auth;
+  var _useSelector = useSelector(getWorkspaceActionFormValues),
+    title = _useSelector.title;
+  var _useWorkspaceTranslat = useWorkspaceTranslation(),
+    t = _useWorkspaceTranslat.t;
+  var dispatch = useDispatch();
+  return useMutation({
+    mutationFn: function () {
+      var _mutationFn = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
+        var id;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              id = _ref.id;
+              if (auth) {
+                _context2.next = 3;
+                break;
+              }
+              throw new Error('Authentication context not found');
+            case 3:
+              return _context2.abrupt("return", deleteWorkspace(id, auth));
+            case 4:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }));
+      function mutationFn(_x) {
+        return _mutationFn.apply(this, arguments);
+      }
+      return mutationFn;
+    }(),
+    onSuccess: function onSuccess(data, variables) {
+      dispatch(workspaceListActions.onSuccessWorkspacePresetAction({
+        workspaceId: variables.id,
+        action: WorkspacePresetAction.DELETE,
+        emptyWorkspacePresetTitle: t('workspace-new'),
+        title: title
+      }));
+    },
+    onError: function onError(error) {
+      onWorkspaceApiError(dispatch, error, t);
+    }
+  });
+};
+var useCreateWorkspacePreset = function useCreateWorkspacePreset() {
+  var _useAuthenticationCon3 = useAuthenticationContext(),
+    auth = _useAuthenticationCon3.auth;
+  var _useWorkspaceTranslat2 = useWorkspaceTranslation(),
+    t = _useWorkspaceTranslat2.t;
+  var dispatch = useDispatch();
+  return useMutation({
+    mutationFn: function () {
+      var _mutationFn2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref2) {
+        var data;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              data = _ref2.data;
+              if (auth) {
+                _context3.next = 3;
+                break;
+              }
+              throw new Error('Authentication context not found');
+            case 3:
+              return _context3.abrupt("return", createWorkspace(data, auth));
+            case 4:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3);
+      }));
+      function mutationFn(_x2) {
+        return _mutationFn2.apply(this, arguments);
+      }
+      return mutationFn;
+    }(),
+    onSuccess: function onSuccess(data, variables) {
+      var location = data == null ? void 0 : data.get('location');
+      var newId = getIdFromUrl(location);
+      var scope = variables.data.scope || 'user';
+      dispatch(workspaceListActions.onSuccessWorkspacePresetAction({
+        workspaceId: newId,
+        action: variables.action || WorkspacePresetAction.SAVE_AS,
+        title: variables.data.title,
+        scope: scope
+      }));
+    },
+    onError: function onError(error) {
+      onWorkspaceApiError(dispatch, error, t);
+    }
+  });
+};
+
+var PresetLabelsPanelWrapper = function PresetLabelsPanelWrapper(_ref) {
+  var viewComponentType = _ref.viewComponentType,
+    onLabelsChange = _ref.onLabelsChange,
+    menuLabels = _ref.menuLabels,
+    _ref$isMenuFilterMode = _ref.isMenuFilterMode,
+    isMenuFilterMode = _ref$isMenuFilterMode === void 0 ? false : _ref$isMenuFilterMode;
+  var _useWorkspaceTranslat = useWorkspaceTranslation(),
+    t = _useWorkspaceTranslat.t;
+  var _useWorkspaceLabelsCo = useWorkspaceLabelsConfig(),
+    labelsConfig = _useWorkspaceLabelsCo.data,
+    isLoading = _useWorkspaceLabelsCo.isFetching,
+    labelsError = _useWorkspaceLabelsCo.error,
+    refetchLabelsConfig = _useWorkspaceLabelsCo.refetch;
+  if (isLoading) {
+    return jsx(LinearProgress, {
+      color: "secondary",
+      "data-testid": "labelspanel-loading-bar",
+      sx: {
+        marginBottom: '-4px'
+      }
+    });
+  }
+  if (labelsError || labelsConfig === undefined) {
+    return jsx(AlertBanner, {
+      actionButtonProps: {
+        title: t('fetch-config-error-retry'),
+        onClick: function onClick() {
+          void refetchLabelsConfig();
+        }
+      },
+      info: labelsError ? labelsError.message : t('fetch-config-no-labels-available'),
+      severity: "error",
+      title: t('fetch-config-error-title')
+    });
+  }
+  return jsx(PresetLabelsPanel, {
+    isMenuFilterMode: isMenuFilterMode,
+    labelsConfig: labelsConfig,
+    menuLabels: menuLabels,
+    onLabelsChange: onLabelsChange,
+    viewComponentType: viewComponentType
+  });
+};
+
 var WorkspaceMenuLabelsPanel = function WorkspaceMenuLabelsPanel(_ref) {
   var value = _ref.value,
     onChange = _ref.onChange,
-    menuLabels = _ref.menuLabels,
-    labelsConfig = _ref.labelsConfig;
+    menuLabels = _ref.menuLabels;
   var methods = useForm({
     defaultValues: {
       labels: value != null ? value : {},
@@ -7409,10 +7450,9 @@ var WorkspaceMenuLabelsPanel = function WorkspaceMenuLabelsPanel(_ref) {
     }
   });
   return jsx(FormProvider, Object.assign({}, methods, {
-    children: jsx(PresetLabelsPanel, {
+    children: jsx(PresetLabelsPanelWrapper, {
       "data-testid": "workspace-menu-labels-panel",
       isMenuFilterMode: true,
-      labelsConfig: labelsConfig,
       menuLabels: menuLabels,
       onLabelsChange: onChange
     })
@@ -7783,7 +7823,7 @@ var WorkspacePresetInfo = function WorkspacePresetInfo(_ref) {
   });
 };
 
-var WORKSPACE_SELECT_LIST_ROW_HEIGHT = 46;
+var WORKSPACE_SELECT_LIST_ROW_HEIGHT = 41;
 var getPresetIcon = function getPresetIcon(preset, currentUsername) {
   if (preset.scope === 'system') {
     return jsx(WorkspacePresetsSystemIcon, {
@@ -7903,12 +7943,13 @@ var WorkspaceSelectListRow = function WorkspaceSelectListRow(_ref) {
     disablePadding: true,
     sx: {
       mb: 0.5,
+      ml: 0.5,
       borderRadius: 1.5,
       backgroundColor: 'geowebColors.cards.cardContainer',
-      boxShadow: '0px 1px 3px rgba(15, 23, 42, 0.12)',
+      boxShadow: '0px 4px 4px rgba(15, 23, 42, 0.2), 2px 2px 6px rgba(15, 23, 42, 0.12)',
       transition: 'box-shadow 0.15s ease-out, transform 0.15s ease-out',
       ' .MuiListItemText-primary': {
-        fontSize: '12px',
+        fontSize: '16px',
         fontWeight: 500,
         textOverflow: 'ellipsis',
         overflow: 'hidden',
@@ -7938,7 +7979,9 @@ var WorkspaceSelectListRow = function WorkspaceSelectListRow(_ref) {
       role: "listitem",
       selected: isSelected,
       sx: {
-        padding: 1,
+        pl: 2,
+        pr: 1,
+        py: 1,
         height: WORKSPACE_SELECT_LIST_ROW_HEIGHT + "px"
       },
       children: [jsx(ListItemIcon, {
@@ -8032,7 +8075,7 @@ var MIN_HEIGHT_SCROLLABLE_LIST = 88; // Slightly less than 2 rows
 var LIST_PADDING_TOP = 8;
 var DEFAULT_RESULTS_HEIGHT = 22;
 // row height = height + margin
-var rowHeight = WORKSPACE_SELECT_LIST_ROW_HEIGHT + 4;
+var rowHeight = WORKSPACE_SELECT_LIST_ROW_HEIGHT + 12;
 var WorkspaceSelectList = function WorkspaceSelectList(_ref) {
   var workspacePresets = _ref.workspacePresets,
     currentSelectedId = _ref.currentSelectedId,
@@ -8063,7 +8106,8 @@ var WorkspaceSelectList = function WorkspaceSelectList(_ref) {
     children: [jsxs(Box, {
       sx: {
         marginBottom: '4px',
-        fontSize: '12px'
+        fontSize: '12px',
+        ml: 0.5
       },
       children: [workspacePresets.length, " ", t('workspace-results')]
     }), jsx(AutoSizer, {
@@ -8086,7 +8130,9 @@ var WorkspaceSelectList = function WorkspaceSelectList(_ref) {
                 style = _ref3.style;
               var preset = items[index];
               return jsx("div", {
-                style: style,
+                style: Object.assign({}, style, {
+                  paddingRight: '8px'
+                }),
                 children: jsx(WorkspaceSelectListRow, {
                   infoOpenPresetId: infoOpenPresetId,
                   isAdmin: isAdmin,
@@ -8119,8 +8165,6 @@ var ViewPresetMenuListConnect = function ViewPresetMenuListConnect(_ref) {
     t = _useWorkspaceTranslat.t;
   var dispatch = useDispatch();
   var store = useStore();
-  var _useWorkspaceLabelsCo = useWorkspaceLabelsConfig(),
-    labelsConfig = _useWorkspaceLabelsCo.data;
   var _useAuthenticationCon = useAuthenticationContext(),
     currentRole = _useAuthenticationCon.currentRole,
     isLoggedIn = _useAuthenticationCon.isLoggedIn,
@@ -8148,6 +8192,12 @@ var ViewPresetMenuListConnect = function ViewPresetMenuListConnect(_ref) {
       return Array.isArray(group) && group.length > 0;
     });
   }, [viewPresetLabelFilters]);
+  var activeLabelFilterCount = React.useMemo(function () {
+    if (!viewPresetLabelFilters) {
+      return 0;
+    }
+    return Object.values(viewPresetLabelFilters).flat().length;
+  }, [viewPresetLabelFilters]);
   var filteredPresets = React.useMemo(function () {
     return filterAndSortPresets(viewPresets, viewPresetListFilters, username, isAdmin, viewPresetLabelFilters != null ? viewPresetLabelFilters : undefined);
   }, [viewPresets, viewPresetListFilters, username, isAdmin, viewPresetLabelFilters]);
@@ -8422,16 +8472,9 @@ var ViewPresetMenuListConnect = function ViewPresetMenuListConnect(_ref) {
         title: t('workspace-retry'),
         onClick: fetchViewPresets
       }
-    })), !error && jsx(Box, {
-      sx: {
-        padding: 1,
-        pt: 1,
-        flexShrink: 0
-      },
-      children: jsx(SearchField, {
-        searchFilter: viewPresetListSearchQuery,
-        setSearchFilter: onSearchFilter
-      })
+    })), !error && jsx(SearchField, {
+      searchFilter: viewPresetListSearchQuery,
+      setSearchFilter: onSearchFilter
     }), jsxs(Box, {
       sx: {
         display: 'grid',
@@ -8452,7 +8495,6 @@ var ViewPresetMenuListConnect = function ViewPresetMenuListConnect(_ref) {
         },
         children: jsx(FormProvider, Object.assign({}, labelsFormMethods, {
           children: jsx(WorkspaceMenuLabelsPanel, {
-            labelsConfig: labelsConfig,
             menuLabels: viewPresetLabelFilters,
             onChange: onLabelsFilterChange
           })
@@ -8482,6 +8524,7 @@ var ViewPresetMenuListConnect = function ViewPresetMenuListConnect(_ref) {
               width: '100%'
             },
             children: jsx(Filter, {
+              activeLabelFilterCount: activeLabelFilterCount,
               filters: viewPresetListFilters,
               isAllSelected: isAllSelectedForFilters,
               isLabelFilterOpen: isLabelFilterOpen,
@@ -8638,8 +8681,6 @@ var WorkspaceSelectListConnect = function WorkspaceSelectListConnect(_ref) {
   var dispatch = useDispatch();
   var _useWorkspaceTranslat = useWorkspaceTranslation(),
     t = _useWorkspaceTranslat.t;
-  var _useWorkspaceLabelsCo = useWorkspaceLabelsConfig(),
-    labelsConfig = _useWorkspaceLabelsCo.data;
   var _useAuthenticationCon = useAuthenticationContext(),
     currentRole = _useAuthenticationCon.currentRole,
     isLoggedIn = _useAuthenticationCon.isLoggedIn,
@@ -8662,6 +8703,12 @@ var WorkspaceSelectListConnect = function WorkspaceSelectListConnect(_ref) {
       return Array.isArray(group) && group.length > 0;
     });
   }, [labelFilters]);
+  var activeLabelFilterCount = React.useMemo(function () {
+    if (!labelFilters) {
+      return 0;
+    }
+    return Object.values(labelFilters).flat().length;
+  }, [labelFilters]);
   var filteredPresets = React.useMemo(function () {
     return filterAndSortPresets(workspacePresets, selectedFilters, username, isAdmin, labelFilters != null ? labelFilters : undefined);
   }, [workspacePresets, selectedFilters, username, isAdmin, labelFilters]);
@@ -8982,15 +9029,9 @@ var WorkspaceSelectListConnect = function WorkspaceSelectListConnect(_ref) {
           }
         }
       }))
-    }), !error && jsx(Box, {
-      sx: {
-        padding: 1,
-        pt: 1
-      },
-      children: jsx(SearchField, {
-        searchFilter: workspaceSearchQuery,
-        setSearchFilter: searchFilter
-      })
+    }), !error && jsx(SearchField, {
+      searchFilter: workspaceSearchQuery,
+      setSearchFilter: searchFilter
     }), jsxs(Box, {
       sx: {
         display: 'grid',
@@ -9008,7 +9049,6 @@ var WorkspaceSelectListConnect = function WorkspaceSelectListConnect(_ref) {
         },
         children: jsx(FormProvider, Object.assign({}, labelsFormMethods, {
           children: jsx(WorkspaceMenuLabelsPanel, {
-            labelsConfig: labelsConfig,
             menuLabels: labelFilters,
             onChange: onLabelsFilterChange
           })
@@ -9024,7 +9064,8 @@ var WorkspaceSelectListConnect = function WorkspaceSelectListConnect(_ref) {
         },
         children: [!error && jsxs(Box, {
           sx: {
-            marginBottom: 1
+            marginBottom: 1,
+            mx: 0.5
           },
           children: [jsx(Box, {
             sx: {
@@ -9032,6 +9073,7 @@ var WorkspaceSelectListConnect = function WorkspaceSelectListConnect(_ref) {
               width: '100%'
             },
             children: jsx(Filter, {
+              activeLabelFilterCount: activeLabelFilterCount,
               filters: workspaceListFilters,
               isAllSelected: isAllSelected,
               isLabelFilterOpen: isLabelFilterOpen,
@@ -9049,6 +9091,9 @@ var WorkspaceSelectListConnect = function WorkspaceSelectListConnect(_ref) {
             },
             children: jsx(LastUpdateTime, {
               hideLabel: true,
+              iconButtonSx: {
+                marginLeft: 0
+              },
               onPressRefresh: function onPressRefresh() {
                 return fetchWorkspaceList();
               }
@@ -9098,7 +9143,7 @@ var WorkspaceMenu = function WorkspaceMenu(_ref) {
       return !prev;
     });
   }, []);
-  var dialogWidth = isLabelFilterOpen ? 700 : 380;
+  var dialogWidth = isLabelFilterOpen ? 700 : 483;
   return jsx(CustomDialog, {
     "data-testid": "workspace-menu",
     hasLayout: false,
@@ -10359,8 +10404,7 @@ var WorkspacePresetsForm = function WorkspacePresetsForm(_ref) {
     confirmLabel = _ref.confirmLabel,
     cancelLabel = _ref.cancelLabel,
     onClose = _ref.onClose,
-    dialogTitle = _ref.dialogTitle,
-    labelsConfig = _ref.labelsConfig;
+    dialogTitle = _ref.dialogTitle;
   var _useWorkspaceTranslat = useWorkspaceTranslation(),
     t = _useWorkspaceTranslat.t;
   var _useFormContext = useFormContext(),
@@ -10490,9 +10534,7 @@ var WorkspacePresetsForm = function WorkspacePresetsForm(_ref) {
               bgcolor: 'geowebColors.background.surface',
               maxWidth: '80%'
             },
-            children: jsx(PresetLabelsPanel, {
-              labelsConfig: labelsConfig
-            })
+            children: jsx(PresetLabelsPanelWrapper, {})
           }), jsxs(Box, {
             sx: {
               pl: {
@@ -10639,8 +10681,7 @@ var WorkspacePresetsFormDialog = function WorkspacePresetsFormDialog(_ref) {
     isLoading = _ref$isLoading === void 0 ? false : _ref$isLoading,
     error = _ref.error,
     _ref$isWorkspaceSaved = _ref.isWorkspaceSaved,
-    isWorkspaceSaved = _ref$isWorkspaceSaved === void 0 ? false : _ref$isWorkspaceSaved,
-    labelsConfig = _ref.labelsConfig;
+    isWorkspaceSaved = _ref$isWorkspaceSaved === void 0 ? false : _ref$isWorkspaceSaved;
   var _useFormContext = useFormContext(),
     handleFormSubmit = _useFormContext.handleSubmit,
     reset = _useFormContext.reset;
@@ -10817,7 +10858,6 @@ var WorkspacePresetsFormDialog = function WorkspacePresetsFormDialog(_ref) {
       formValues: formValues,
       hasSavedWorkspace: isWorkspaceSaved,
       isLoading: isLoading,
-      labelsConfig: labelsConfig,
       onClose: onClose,
       onSubmit: onSubmit,
       showInlineActions: withLabelsPanel
@@ -10849,8 +10889,6 @@ var WorkspaceTabConnect = function WorkspaceTabConnect(_ref) {
     deleteWorkspace = _useDeleteWorkspacePr.mutate;
   var _useCreateWorkspacePr = useCreateWorkspacePreset(),
     createWorkspace = _useCreateWorkspacePr.mutate;
-  var _useWorkspaceLabelsCo = useWorkspaceLabelsConfig(),
-    labelsConfig = _useWorkspaceLabelsCo.data;
   var title = useSelector(function (store) {
     return getSelectedWorkspaceTitle(store);
   });
@@ -10991,7 +11029,6 @@ var WorkspaceTabConnect = function WorkspaceTabConnect(_ref) {
       isLoading: isFetching,
       isOpen: Boolean(dialogDetails),
       isWorkspaceSaved: hasSavedWorkspace,
-      labelsConfig: labelsConfig,
       onClose: closeWorkspaceActionDialog,
       onFormSubmit: onSubmitForm,
       presetId: presetId || undefined
@@ -11045,8 +11082,7 @@ var ViewPresetsForm = function ViewPresetsForm(_ref) {
     confirmLabel = _ref.confirmLabel,
     cancelLabel = _ref.cancelLabel,
     onClose = _ref.onClose,
-    dialogTitle = _ref.dialogTitle,
-    labelsConfig = _ref.labelsConfig;
+    dialogTitle = _ref.dialogTitle;
   var fieldName = 'title';
   var _useWorkspaceTranslat = useWorkspaceTranslation(),
     t = _useWorkspaceTranslat.t;
@@ -11114,8 +11150,7 @@ var ViewPresetsForm = function ViewPresetsForm(_ref) {
               bgcolor: 'geowebColors.background.surface',
               maxWidth: '80%'
             },
-            children: jsx(PresetLabelsPanel, {
-              labelsConfig: labelsConfig,
+            children: jsx(PresetLabelsPanelWrapper, {
               viewComponentType: viewComponentType
             })
           }), jsxs(Box, {
@@ -11255,7 +11290,6 @@ var ViewPresetsFormDialog = function ViewPresetsFormDialog(_ref) {
     viewPresetId = _ref.viewPresetId,
     viewComponentType = _ref.viewComponentType,
     formValues = _ref.formValues,
-    labelsConfig = _ref.labelsConfig,
     onSuccess = _ref.onSuccess,
     onClose = _ref.onClose,
     title = _ref.title,
@@ -11469,7 +11503,6 @@ var ViewPresetsFormDialog = function ViewPresetsFormDialog(_ref) {
       error: error,
       formValues: formValues,
       isLoading: isLoading,
-      labelsConfig: labelsConfig,
       onClose: onClose,
       onSubmit: onSubmit,
       showInlineActions: withLabelsPanel,
@@ -11520,8 +11553,7 @@ var useDeleteViewPreset = function useDeleteViewPreset() {
 var ViewPresetsFormDialogConnect = function ViewPresetsFormDialogConnect(_ref) {
   var _dialogOptions$formVa;
   var _ref$scope = _ref.scope,
-    scope = _ref$scope === void 0 ? 'user' : _ref$scope,
-    labelsConfig = _ref.labelsConfig;
+    scope = _ref$scope === void 0 ? 'user' : _ref$scope;
   var dispatch = useDispatch();
   var dialogOptions = useSelector(function (store) {
     return getDialogOptions(store);
@@ -11563,7 +11595,6 @@ var ViewPresetsFormDialogConnect = function ViewPresetsFormDialogConnect(_ref) {
     action: (dialogOptions == null ? void 0 : dialogOptions.action) || PresetAction.SAVE,
     formValues: dialogOptions == null ? void 0 : dialogOptions.formValues,
     isOpen: isOpen,
-    labelsConfig: labelsConfig,
     onClose: onClose,
     onDelete: deleteViewPreset,
     onReset: onReset,
@@ -11586,8 +11617,6 @@ var WorkspaceDetail = function WorkspaceDetail(_ref) {
     t = _useWorkspaceTranslat.t;
   var _useAuthenticationCon = useAuthenticationContext(),
     currentRole = _useAuthenticationCon.currentRole;
-  var _useWorkspaceLabelsCo = useWorkspaceLabelsConfig(),
-    labelsConfig = _useWorkspaceLabelsCo.data;
   var isAdmin = (currentRole == null ? void 0 : currentRole.name) === GEOWEB_ROLE_PRESETS_ADMIN.name;
   var error = useSelector(function (store) {
     return getWorkspaceError(store);
@@ -11688,7 +11717,6 @@ var WorkspaceDetail = function WorkspaceDetail(_ref) {
         })
       })]
     }), jsx(ViewPresetsFormDialogConnect, {
-      labelsConfig: labelsConfig,
       scope: isAdmin ? 'system' : 'user'
     })]
   });