@opengeoweb/layer-select 9.35.1-spike-oltanstack.0 → 9.37.0

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, getWMSServiceId, queryWMSServiceInfo, queryWMSLayers, invalidateWMSGetCapabilities, clearImageCacheForAllMaps } from '@opengeoweb/webmap';
+import { webmapUtils, LayerType, WMGetServiceFromStore, getCapabilities, 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,30 +2373,20 @@ var loadWMSService = /*#__PURE__*/function () {
           if (forceReload === void 0) {
             forceReload = false;
           }
-          if (!forceReload) {
-            _context.next = 4;
-            break;
-          }
-          _context.next = 4;
-          return invalidateWMSGetCapabilities(serviceUrl);
-        case 4:
-          _context.next = 6;
-          return queryWMSLayers(serviceUrl);
-        case 6:
+          _context.next = 3;
+          return getCapabilities.getLayersFlattenedFromService(serviceUrl, forceReload);
+        case 3:
           layers = _context.sent;
-          _context.next = 9;
-          return queryWMSServiceInfo(serviceUrl);
-        case 9:
-          service = _context.sent;
+          service = WMGetServiceFromStore(serviceUrl);
           return _context.abrupt("return", {
-            id: service.id || getWMSServiceId(serviceUrl),
+            id: service.id,
             name: service.title,
             serviceUrl: serviceUrl,
             "abstract": service["abstract"],
             layers: layers,
             scope: 'user'
           });
-        case 11:
+        case 6:
         case "end":
           return _context.stop();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/layer-select",
-  "version": "9.35.1-spike-oltanstack.0",
+  "version": "9.37.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/components/KeywordFilterResults/KeywordFilterResults.stories.d.ts

@@ -1,25 +1,8 @@
-import * as React from 'react';
-declare const _default: {
-    title: string;
-};
-export default _default;
-export declare const KeywordFilterResultsLight: {
-    (): React.ReactElement;
-    tags: string[];
-    parameters: {
-        zeplinLink: {
-            name: string;
-            link: string;
-        }[];
-    };
-};
-export declare const KeywordFilterResultsDark: {
-    (): React.ReactElement;
-    tags: string[];
-    parameters: {
-        zeplinLink: {
-            name: string;
-            link: string;
-        }[];
-    };
-};
+import type { Meta, StoryObj } from '@storybook/react';
+import { KeywordFilterResults } from './KeywordFilterResults';
+declare const meta: Meta<typeof KeywordFilterResults>;
+export default meta;
+type Story = StoryObj<typeof KeywordFilterResults>;
+export declare const Component: Story;
+export declare const KeywordFilterResultsLight: Story;
+export declare const KeywordFilterResultsDark: Story;

package/src/lib/components/LayerSelect/LayerSelect.stories.d.ts

@@ -1,33 +1,10 @@
-import * as React from 'react';
-declare const _default: {
-    title: string;
-};
-export default _default;
-export declare const LayerSelectDemoLightTheme: {
-    (): React.ReactElement;
-    tags: string[];
-    parameters: {
-        zeplinLink: {
-            name: string;
-            link: string;
-        }[];
-    };
-};
-export declare const LayerSelectDemoDarkTheme: {
-    (): React.ReactElement;
-    tags: string[];
-    parameters: {
-        zeplinLink: {
-            name: string;
-            link: string;
-        }[];
-    };
-};
-export declare const LayerSelectDemoSmallLightTheme: {
-    (): React.ReactElement;
-    tags: string[];
-};
-export declare const LayerSelectDemoSmallDarkTheme: {
-    (): React.ReactElement;
-    tags: string[];
-};
+import type { Meta, StoryObj } from '@storybook/react';
+import { LayerSelect } from './LayerSelect';
+declare const meta: Meta<typeof LayerSelect>;
+export default meta;
+type Story = StoryObj<typeof LayerSelect>;
+export declare const Component: Story;
+export declare const LayerSelectDemoLightTheme: Story;
+export declare const LayerSelectDemoDarkTheme: Story;
+export declare const LayerSelectDemoSmallLightTheme: Story;
+export declare const LayerSelectDemoSmallDarkTheme: Story;

package/src/lib/components/Providers/Providers.d.ts

@@ -11,9 +11,11 @@ interface LayerSelectTranslationWrapperProps {
     children?: React.ReactNode;
     i18nInstance?: typeof i18n;
 }
-export declare const ThemeProvider: React.FC<BaseProviderProps>;
 export declare const LayerSelecti18nProvider: React.FC<LayerSelectTranslationWrapperProps>;
 export declare const DemoWrapper: React.FC<BaseProviderProps>;
+export declare const LayerSelectStoreProvider: React.FC<ThemeProviderProps & {
+    store: Store;
+}>;
 export declare const TestThemeStoreProvider: React.FC<ThemeProviderProps & {
     store: Store;
 }>;

package/src/lib/components/ServiceOptionsButton/ServiceOptionsButton.stories.d.ts

@@ -1,7 +1,8 @@
-import * as React from 'react';
-declare const _default: {
-    title: string;
-};
-export default _default;
-export declare const ServiceOptionsButtonLight: () => React.ReactElement;
-export declare const ServiceOptionsButtonDark: () => React.ReactElement;
+import type { Meta, StoryObj } from '@storybook/react';
+import { ServiceOptionsButton } from './ServiceOptionsButton';
+declare const meta: Meta<typeof ServiceOptionsButton>;
+export default meta;
+type Story = StoryObj<typeof ServiceOptionsButton>;
+export declare const Component: Story;
+export declare const ServiceOptionsButtonLight: Story;
+export declare const ServiceOptionsButtonDark: Story;

package/src/lib/components/ServiceOptionsDialog/ServiceOptionsDialog.stories.d.ts

@@ -1,11 +1,18 @@
-import * as React from 'react';
-declare const _default: {
-    title: string;
-};
-export default _default;
+import { layerTypes } from '@opengeoweb/store';
+import type { Meta, StoryObj } from '@storybook/react';
+import { ServiceOptionsDialog } from './ServiceOptionsDialog';
+import { layerSelectTypes } from '../../store';
+declare const meta: Meta<typeof ServiceOptionsDialog>;
+export default meta;
+type Story = StoryObj<typeof ServiceOptionsDialog>;
+export declare const Component: Story;
 export declare const ServiceOptionsDialogLight: {
-    (): React.ReactElement;
     tags: string[];
+    args: {
+        services: layerSelectTypes.ActiveServiceObjectEntities;
+        selectedLayers: layerTypes.Layer[];
+        isLoading: boolean;
+    };
     parameters: {
         zeplinLink: {
             name: string;
@@ -14,8 +21,12 @@ export declare const ServiceOptionsDialogLight: {
     };
 };
 export declare const ServiceOptionsDialogDark: {
-    (): React.ReactElement;
     tags: string[];
+    args: {
+        services: layerSelectTypes.ActiveServiceObjectEntities;
+        selectedLayers: layerTypes.Layer[];
+        isLoading: boolean;
+    };
     parameters: {
         zeplinLink: {
             name: string;

package/src/lib/components/ServicePopup/ServicePopup.stories.d.ts

@@ -1,6 +1,10 @@
 import * as React from 'react';
-declare const _default: import("@storybook/csf").ComponentAnnotations<import("@storybook/react").ReactRenderer, import("./ServicePopup").ServicePopupProps>;
-export default _default;
+import type { Meta, StoryObj } from '@storybook/react';
+import { ServicePopup } from './ServicePopup';
+declare const meta: Meta<typeof ServicePopup>;
+export default meta;
+type Story = StoryObj<typeof ServicePopup>;
+export declare const Component: Story;
 export declare const ServicePopupAddLight: {
     (): React.ReactElement;
     tags: string[];
@@ -41,4 +45,3 @@ export declare const ServicePopupShowDark: {
         }[];
     };
 };
-export declare const ServicePopupWithInvalidUrl: () => React.ReactElement;

package/src/lib/components/ServicePopup/ServicePopupConnect.stories.d.ts

@@ -3,4 +3,7 @@ declare const _default: {
     title: string;
 };
 export default _default;
-export declare const ServicePopupAddWithExistingServiceError: React.FC;
+export declare const ServicePopupAddWithExistingServiceError: {
+    (): React.ReactElement;
+    tags: string[];
+};

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>[];
+};