@opengeoweb/layer-select 9.22.0 → 9.23.1

package/index.esm.js

@@ -4,12 +4,9 @@ import React__default from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { CustomIconButton, ToolContainerDraggable, CustomAccordion, CustomToggleButton, CustomTooltip, SearchHighlight, SearchField, ToggleMenu } from '@opengeoweb/shared';
 import { Filter, LayersAdd, Add, Cached, Edit, Visibility, Delete, Close, Copy } from '@opengeoweb/theme';
-import { uiTypes, serviceActions, selectorMemoizationOptions, serviceSelectors, uiActions, uiSelectors, layerSelectors, layerActions, getUserAddedServices, setUserAddedServices, useSetupDialog, mapSelectors, layerTypes } from '@opengeoweb/store';
-import { createEntityAdapter, createSlice, createSelector } from '@reduxjs/toolkit';
+import { uiTypes, serviceActions, selectorMemoizationOptions, serviceSelectors, uiActions, getUserAddedServices, setUserAddedServices, layerActions, uiSelectors, layerSelectors, useSetupDialog, mapSelectors, layerTypes } from '@opengeoweb/store';
+import { createEntityAdapter, createSlice, createSelector, createListenerMiddleware, isAnyOf } from '@reduxjs/toolkit';
 import { compact, countBy, partition } from 'lodash';
-import { createStore } from '@redux-eggs/redux-toolkit';
-import { getSagaExtension } from '@redux-eggs/saga-extension';
-import { takeEvery, select, put, all } from 'redux-saga/effects';
 import { ListItem, ListItemIcon, Checkbox, Typography, ListItemSecondaryAction, Switch, Grid, List, Box, Backdrop, CircularProgress, Button, ListItemText, Dialog, DialogTitle, LinearProgress, DialogContent, InputAdornment, DialogActions } from '@mui/material';
 import i18n from 'i18next';
 import { useTranslation } from 'react-i18next';
@@ -60,41 +57,41 @@ var en = {
 };
 var fi = {
 	"layer-select": "Layer Select",
-	"select-all": "Ei käännetty",
-	"groups-and-keywords-dialog-title": "Ei käännetty",
-	only: "Ei käännetty",
-	add: "Ei käännetty",
-	remove: "Ei käännetty",
-	"layer-list-results": "Ei käännetty",
-	groups: "Ei käännetty",
-	keywords: "Ei käännetty",
-	"layer-select-button-tooltip": "Ei käännetty",
-	all: "Ei käännetty",
-	services: "Ei käännetty",
-	"add-a-new-service": "Ei käännetty",
-	"update-service-title": "Ei käännetty",
-	"edit-service-title": "Ei käännetty",
-	"save-service-title": "Ei käännetty",
-	"show-service-title": "Ei käännetty",
-	"service-has-active-layers-error": "Ei käännetty",
-	"delete-service": "Ei käännetty",
-	"copy-url-message": "Ei käännetty",
-	"get-success-message": "Ei käännetty",
-	"service-popup-helper-text": "Ei käännetty",
-	close: "Ei käännetty",
-	cancel: "Ei käännetty",
-	save: "Ei käännetty",
-	"validations-name-existing": "Ei käännetty",
-	"validations-service-existing": "Ei käännetty",
-	"validations-service-valid-url": "Ei käännetty",
-	"validations-request-failed": "Ei käännetty",
-	"validations-field-required": "Ei käännetty",
-	"service-url-label": "Ei käännetty",
-	"service-name-label": "Ei käännetty",
-	"service-abstracts-label": "Ei käännetty",
-	"service-successfully-updated": "Ei käännetty",
-	"unable-to-update-service": "Ei käännetty",
-	"service-has-been-deleted": "Ei käännetty"
+	"select-all": "Valitse kaikki",
+	"groups-and-keywords-dialog-title": "Ryhmät ja Avainsanat",
+	only: "Pelkästään",
+	add: "lisää",
+	remove: "poista",
+	"layer-list-results": "tulosta",
+	groups: "Ryhmät",
+	keywords: "Avainsanat",
+	"layer-select-button-tooltip": "Avaa Layer Select",
+	all: "Kaikki",
+	services: "Palvelut",
+	"add-a-new-service": "Lisää uusi pavelu",
+	"update-service-title": "Päivitä karttatasot WMS palvelusta",
+	"edit-service-title": "Muokkaa palvelua",
+	"save-service-title": "Tallenna palvelu",
+	"show-service-title": "Näytä palvelu",
+	"service-has-active-layers-error": "Palvelu sisältää aktiivisia karttatasoja. Palvelua ei voi poistaa",
+	"delete-service": "Poista palvelu",
+	"copy-url-message": "Palvelun osoite kopioitu leikepöydälle",
+	"get-success-message": "Palvelu \"{{serviceName}}\" tallennettu onnistuneesti",
+	"service-popup-helper-text": "Lyhyt kuvaus siitä mitä palvelu tekee",
+	close: "sulje",
+	cancel: "peruuta",
+	save: "tallenna",
+	"validations-name-existing": "Nimi on jo käytössä. Valitse toinen nimi.",
+	"validations-service-existing": "Osoite on jo käytössä.",
+	"validations-service-valid-url": "Epäkelpo URL-osoite",
+	"validations-request-failed": "Lataus epäonnistui. Tarkista URL-osoite",
+	"validations-field-required": "Kenttä tulee täyttää",
+	"service-url-label": "Tämä palvelu viittaa tähän URL-osoitteeseen",
+	"service-name-label": "Palvelun nimi",
+	"service-abstracts-label": "Tiivistelmä",
+	"service-successfully-updated": "Palvelu \"{{serviceName}}\"  päivitetty onnistuunnesti",
+	"unable-to-update-service": "Palvelun päivitys epäonnistui. Syy: \"{{message}}\"",
+	"service-has-been-deleted": "Palvelu \"{{serviceName}}\" poistettu"
 };
 var no = {
 	"layer-select": "Lagvalg",
@@ -2798,117 +2795,137 @@ var types = /*#__PURE__*/Object.freeze({
   __proto__: null
 });
 
-function* layerSelectCloseInfoDialogSaga({
-  type,
-  payload
-}) {
-  switch (type) {
-    case uiActions.setToggleOpenDialog.type:
-      {
-        const togglePayload = payload;
-        if (!togglePayload.setOpen && togglePayload.type === uiTypes.DialogTypes.LayerSelect) {
-          yield put(layerActions.hideLayerInfo());
-        }
-        break;
-      }
-    case uiActions.setActiveMapIdForDialog.type:
-      {
-        const activeMapIdPayload = payload;
-        if (!activeMapIdPayload.setOpen) {
-          const isLayerInfoDialogOpen = yield select(uiSelectors.getisDialogOpen, uiTypes.DialogTypes.LayerInfo);
-          if (isLayerInfoDialogOpen) {
-            yield put(layerActions.hideLayerInfo());
-          }
-        }
-        break;
-      }
-    default:
-      {
-        const isLayerInfoDialogOpen = yield select(uiSelectors.getisDialogOpen, uiTypes.DialogTypes.LayerInfo);
-        if (isLayerInfoDialogOpen) {
-          const filteredLayers = yield select(getFilteredLayers);
-          const dialogInfo = yield select(layerSelectors.getActiveLayerInfo);
-          const layerWithData = yield select(serviceSelectors.getLayerFromService, dialogInfo.serviceUrl, dialogInfo.layerName);
-          if (!filteredLayers.map(layer => layer.title).includes(layerWithData.title)) {
-            yield put(layerActions.hideLayerInfo());
-          }
-        }
-      }
-  }
-}
-function* layerSelectRemoveServiceSaga(capturedAction) {
-  const removedService = capturedAction.payload;
-  const {
-    serviceId,
-    serviceUrl
-  } = removedService;
-  const results = yield select(getActiveServices);
-  const services = results;
-  const servicesEnabled = Object.values(services).find(service => service === null || service === void 0 ? void 0 : service.enabled);
-  if (servicesEnabled === undefined) {
-    yield all(Object.entries(services).map(([serviceId]) => {
-      return put(layerSelectActions.enableActiveService({
-        serviceId
-      }));
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+/* global Reflect, Promise, SuppressedError, Symbol */
+
+
+function __rest(s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+}
+
+function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+
+const layerSelectListener = createListenerMiddleware();
+layerSelectListener.startListening({
+  actionCreator: serviceActions.mapStoreRemoveService,
+  effect: action => __awaiter(void 0, void 0, void 0, function* () {
+    const {
+      serviceUrl
+    } = action.payload;
+    const localStorageServices = getUserAddedServices();
+    delete localStorageServices[serviceUrl];
+    setUserAddedServices(localStorageServices);
+  })
+});
+layerSelectListener.startListening({
+  actionCreator: layerSelectActions.layerSelectRemoveService,
+  effect: (action, listenerApi) => __awaiter(void 0, void 0, void 0, function* () {
+    const removedService = action.payload;
+    const {
+      serviceId,
+      serviceUrl
+    } = removedService;
+    const services = getActiveServices(listenerApi.getState());
+    const servicesEnabled = Object.values(services).find(service => service === null || service === void 0 ? void 0 : service.enabled);
+    if (servicesEnabled === undefined) {
+      Object.entries(services).map(([entryServiceId]) => {
+        return listenerApi.dispatch(layerSelectActions.enableActiveService({
+          serviceId: entryServiceId
+        }));
+      });
+    }
+    listenerApi.dispatch(serviceActions.mapStoreRemoveService({
+      id: serviceId,
+      serviceUrl: serviceUrl
     }));
-  }
-  yield put(serviceActions.mapStoreRemoveService({
-    id: serviceId,
-    serviceUrl: serviceUrl
-  }));
-}
-function addServiceToLocalStorageSaga({
-  payload
-}) {
-  const {
-    scope,
-    name,
-    serviceUrl,
-    abstract
-  } = payload;
-  if (!isUserAddedService(scope)) {
-    return;
-  }
-  const localStorageServices = getUserAddedServices();
-  setUserAddedServices(Object.assign(Object.assign({}, localStorageServices), {
-    [serviceUrl]: {
+  })
+});
+layerSelectListener.startListening({
+  actionCreator: serviceActions.serviceSetLayers,
+  effect: action => __awaiter(void 0, void 0, void 0, function* () {
+    const {
+      scope,
       name,
-      url: serviceUrl,
+      serviceUrl,
       abstract
+    } = action.payload;
+    if (isUserAddedService(scope)) {
+      const localStorageServices = getUserAddedServices();
+      setUserAddedServices(Object.assign(Object.assign({}, localStorageServices), {
+        [serviceUrl]: {
+          name,
+          url: serviceUrl,
+          abstract
+        }
+      }));
     }
-  }));
-}
-function removeServiceFromLocalStorageSaga({
-  payload
-}) {
-  const {
-    serviceUrl
-  } = payload;
-  const localStorageServices = getUserAddedServices();
-  if (!localStorageServices[serviceUrl]) {
-    return;
-  }
-  const updatedServices = Object.assign({}, localStorageServices);
-  delete updatedServices[serviceUrl];
-  setUserAddedServices(updatedServices);
-}
-function* rootSaga() {
-  yield takeEvery(layerSelectActions.layerSelectRemoveService.type, layerSelectRemoveServiceSaga);
-  yield takeEvery(serviceActions.serviceSetLayers.type, addServiceToLocalStorageSaga);
-  yield takeEvery(serviceActions.mapStoreRemoveService.type, removeServiceFromLocalStorageSaga);
-  yield takeEvery([uiActions.setToggleOpenDialog.type, uiActions.setActiveMapIdForDialog.type, layerSelectActions.disableActiveService.type, layerSelectActions.toggleFilter.type, layerSelectActions.setSearchFilter.type], layerSelectCloseInfoDialogSaga);
-}
-
-// TODO: This fixes typecheck errors but maybe there is a better way to do that
-createStore({
-  extensions: [getSagaExtension()]
+  })
 });
+layerSelectListener.startListening({
+  matcher: isAnyOf(uiActions.setToggleOpenDialog, uiActions.setActiveMapIdForDialog),
+  effect: (action, listenerApi) => __awaiter(void 0, void 0, void 0, function* () {
+    const {
+      payload
+    } = action;
+    if (!payload.setOpen && payload.type === uiTypes.DialogTypes.LayerSelect) {
+      listenerApi.dispatch(layerActions.hideLayerInfo());
+    }
+  })
+});
+layerSelectListener.startListening({
+  matcher: isAnyOf(layerSelectActions.disableActiveService, layerSelectActions.onlyThisServiceEnabled, layerSelectActions.toggleFilter, layerSelectActions.setSearchFilter),
+  effect: (action, listenerApi) => __awaiter(void 0, void 0, void 0, function* () {
+    if (uiSelectors.getisDialogOpen(listenerApi.getState(), uiTypes.DialogTypes.LayerInfo)) {
+      const filteredLayers = getFilteredLayers(listenerApi.getState());
+      const dialogInfo = layerSelectors.getActiveLayerInfo(listenerApi.getState());
+      const layerWithData = dialogInfo && serviceSelectors.getLayerFromService(listenerApi.getState(), dialogInfo.serviceUrl, dialogInfo.layerName);
+      if (!filteredLayers.map(layer => layer.title).includes((layerWithData === null || layerWithData === void 0 ? void 0 : layerWithData.title) || '')) {
+        listenerApi.dispatch(layerActions.hideLayerInfo());
+      }
+    }
+  })
+});
+
 const layerSelectConfig = {
   id: 'layerSelect-module',
   reducersMap: {
     layerSelect: reducer
   },
-  sagas: [rootSaga]
+  middlewares: [layerSelectListener.middleware]
 };
 
 const KeywordFilterButtonConnect = ({
@@ -3911,50 +3928,6 @@ const ServiceListConnect = ({
   });
 };
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
-
-
-function __rest(s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-}
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
-typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-};
-
 const styles = {
   servicesContainer: {
     width: '360px',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/layer-select",
-  "version": "9.22.0",
+  "version": "9.23.1",
   "description": "GeoWeb layer select library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -21,10 +21,7 @@
     "react-hook-form": "^7.50.1",
     "@reduxjs/toolkit": "^1.9.7",
     "@redux-eggs/core": "^2.2.0",
-    "@redux-eggs/redux-toolkit": "^2.2.0",
-    "@redux-eggs/saga-extension": "^2.2.0",
     "lodash": "^4.17.21",
-    "redux-saga": "^1.2.3",
     "i18next": "^23.11.5",
     "react-i18next": "^14.1.2"
   },

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

@@ -0,0 +1,2 @@
+import { RootState } from './types';
+export declare const layerSelectListener: import("@reduxjs/toolkit").ListenerMiddlewareInstance<RootState, import("@reduxjs/toolkit").ThunkDispatch<RootState, unknown, import("redux").AnyAction>, unknown>;

package/src/lib/store/listeners.spec.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -1,8 +0,0 @@
-import { SagaIterator } from 'redux-saga';
-import { serviceActions, uiActions } from '@opengeoweb/store';
-import { layerSelectActions, LayerSelectActions } from './reducer';
-export declare function layerSelectCloseInfoDialogSaga({ type, payload, }: ReturnType<typeof uiActions.setToggleOpenDialog | typeof uiActions.setActiveMapIdForDialog | typeof layerSelectActions.disableActiveService | typeof layerSelectActions.toggleFilter | typeof layerSelectActions.setSearchFilter>): SagaIterator;
-export declare function layerSelectRemoveServiceSaga(capturedAction: LayerSelectActions): SagaIterator;
-export declare function addServiceToLocalStorageSaga({ payload, }: ReturnType<typeof serviceActions.serviceSetLayers>): void;
-export declare function removeServiceFromLocalStorageSaga({ payload, }: ReturnType<typeof serviceActions.mapStoreRemoveService>): void;
-export declare function rootSaga(): SagaIterator;