@opengeoweb/layer-select 9.36.0 → 10.0.0

package/README.md

@@ -5,3 +5,7 @@ This library was generated with [Nx](https://nx.dev).
 ## Running unit tests
 
 Run `nx test layer-select` to execute the unit tests via [Jest](https://jestjs.io).
+
+### TypeScript Documentation
+
+- [TypeScript Docs](https://opengeoweb.gitlab.io/opengeoweb/typescript-docs/layer-select/)

package/index.esm.js

@@ -12,7 +12,7 @@ import 'i18next';
 import { useTranslation } from 'react-i18next';
 import { FixedSizeList } from 'react-window';
 import { getDimensionsList, LayerInfoButton } from '@opengeoweb/webmap-react';
-import { webmapUtils, LayerType, WMGetServiceFromStore, getCapabilities, clearImageCacheForAllMaps } from '@opengeoweb/webmap';
+import { webmapUtils, LayerType, getWMSServiceId, queryWMSServiceInfo, queryWMSLayers, invalidateWMSGetCapabilities, clearImageCacheForAllMaps } from '@opengeoweb/webmap';
 import { snackbarTypes, snackbarActions } from '@opengeoweb/snackbar';
 import { ReactHookFormProvider, defaultFormOptions, ReactHookFormTextField } from '@opengeoweb/form-fields';
 import { useFormContext } from 'react-hook-form';
@@ -1150,7 +1150,25 @@ layerSelectListener.startListening({
   }()
 });
 
+/* *
+ * 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 2022 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2022 - Finnish Meteorological Institute (FMI)
+ * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
+ * */
 var layerSelectConfig = {
+  // TODO: remove id in https://gitlab.com/opengeoweb/opengeoweb/-/issues/5561
   id: 'layerSelect-module',
   reducersMap: {
     layerSelect: reducer
@@ -2126,7 +2144,9 @@ var ServiceOptionsDialog = function ServiceOptionsDialog(_ref) {
       sx: styles.header,
       children: t('services')
     }), jsx(Backdrop, {
-      sx: styles.loading,
+      sx: Object.assign({}, styles.loading, {
+        backgroundSize: 'cover'
+      }),
       open: isLoading,
       children: jsx(CircularProgress, {})
     }), jsx(Rows, {
@@ -2353,20 +2373,30 @@ var loadWMSService = /*#__PURE__*/function () {
           if (forceReload === void 0) {
             forceReload = false;
           }
-          _context.next = 3;
-          return getCapabilities.getLayersFlattenedFromService(serviceUrl, forceReload);
-        case 3:
+          if (!forceReload) {
+            _context.next = 4;
+            break;
+          }
+          _context.next = 4;
+          return invalidateWMSGetCapabilities(serviceUrl);
+        case 4:
+          _context.next = 6;
+          return queryWMSLayers(serviceUrl);
+        case 6:
           layers = _context.sent;
-          service = WMGetServiceFromStore(serviceUrl);
+          _context.next = 9;
+          return queryWMSServiceInfo(serviceUrl);
+        case 9:
+          service = _context.sent;
           return _context.abrupt("return", {
-            id: service.id,
+            id: service.id || getWMSServiceId(serviceUrl),
             name: service.title,
             serviceUrl: serviceUrl,
             "abstract": service["abstract"],
             layers: layers,
             scope: 'user'
           });
-        case 6:
+        case 11:
         case "end":
           return _context.stop();
       }
@@ -3134,4 +3164,4 @@ var LayerSelectConnect = function LayerSelectConnect(_ref) {
   });
 };
 
-export { AllChipConnect, KeywordFilterButtonConnect, KeywordFilterResults, KeywordFilterResultsConnect, KeywordFilterResultsListItemConnect, KeywordFilterSelectAllSwitchConnect, LAYER_SELECT_NAMESPACE, LayerAddRemoveButton, LayerList, LayerListConnect, LayerListDimensions, LayerListRow, LayerSelectButtonConnect, LayerSelectConnect, SearchFieldConnect, ServiceChip, ServiceChipConnect, ServiceList, ServiceListConnect, ServiceOptionsButton, ServiceOptionsDialog, ServiceOptionsDialogConnect, ServicePopup, ServicePopupConnect, ServicePopupDialogConnect, getServiceFailedUpdateMessage, getServiceSuccesUpdateMessage, getSuccesMessage, isUserAddedService, layerSelectActions, layerSelectConfig, initialState as layerSelectInitialState, reducer as layerSelectReducer, selectors as layerSelectSelectors, layerSelectTranslations, types as layerSelectTypes, useAppSelector };
+export { AllChipConnect, KeywordFilterButtonConnect, KeywordFilterResults, KeywordFilterResultsConnect, KeywordFilterResultsListItemConnect, KeywordFilterSelectAllSwitchConnect, LAYER_SELECT_NAMESPACE, LayerAddRemoveButton, LayerList, LayerListConnect, LayerListDimensions, LayerListRow, LayerSelectButtonConnect, LayerSelectConnect, SearchFieldConnect, ServiceChip, ServiceChipConnect, ServiceList, ServiceListConnect, ServiceOptionsButton, ServiceOptionsDialog, ServiceOptionsDialogConnect, ServicePopup, ServicePopupConnect, ServicePopupDialogConnect, getServiceFailedUpdateMessage, getServiceSuccesUpdateMessage, getSuccesMessage, isUserAddedService, layerSelectActions, layerSelectConfig, initialState as layerSelectInitialState, layerSelectListener, reducer as layerSelectReducer, selectors as layerSelectSelectors, layerSelectTranslations, types as layerSelectTypes, useAppSelector };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/layer-select",
-  "version": "9.36.0",
+  "version": "10.0.0",
   "description": "GeoWeb layer select library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -19,7 +19,6 @@
     "@opengeoweb/form-fields": "*",
     "react-hook-form": "^7.50.1",
     "@reduxjs/toolkit": "^1.9.7",
-    "@redux-eggs/core": "^2.2.0",
     "lodash": "^4.17.21",
     "i18next": "^23.11.5",
     "@mui/material": "^6.1.1",

package/src/lib/store/config.d.ts

@@ -1,4 +1,7 @@
-import { Egg } from '@redux-eggs/core';
-import { Store } from '@reduxjs/toolkit';
-import { LayerSelectModuleState } from './types';
-export declare const layerSelectConfig: Egg<Store<LayerSelectModuleState>>;
+export declare const layerSelectConfig: {
+    id: string;
+    reducersMap: {
+        layerSelect: import("redux").Reducer<import("./types").LayerSelectStoreType>;
+    };
+    middlewares: import("@reduxjs/toolkit").ListenerMiddleware<import("./types").RootState, import("redux-thunk").ThunkDispatch<import("./types").RootState, unknown, import("redux").AnyAction>, unknown>[];
+};

package/src/lib/store/index.d.ts

@@ -4,3 +4,4 @@ export { useAppSelector } from './selectors';
 export * as layerSelectTypes from './types';
 export * from './config';
 export { isUserAddedService } from './utils';
+export { layerSelectListener } from './listeners';