@opengeoweb/layer-select 12.2.0 → 12.3.0

package/index.esm.js

@@ -2,13 +2,13 @@ import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
 import React__default from 'react';
 import { useSelector, useDispatch } from 'react-redux';
-import { CustomIconButton, FilterOption, ToolContainerDraggable, CustomAccordion, CustomToggleButton, CustomTooltip, SearchHighlight, SearchField, ToggleMenu, CustomDialog } from '@opengeoweb/shared';
+import { CustomIconButton, FilterOption, ToolContainerDraggable, CustomAccordion, CustomToggleButton, CustomTooltip, SearchHighlight, SearchField, AlertBanner, ToggleMenu, CustomDialog } from '@opengeoweb/shared';
 import { Filter, LayersAdd, Add, Cached, Edit, Visibility, Delete, Copy } from '@opengeoweb/theme';
-import { uiTypes, serviceActions, selectorMemoizationOptions, serviceSelectors, uiActions, getUserAddedServices, setUserAddedServices, layerActions, uiSelectors, layerSelectors, mapListener, serviceListener, layersListener, uiReducer, layerReducer, serviceReducer, mapReducer, useSetupDialog, mapSelectors, layerTypes } from '@opengeoweb/store';
+import { uiTypes, serviceActions, selectorMemoizationOptions, serviceSelectors, uiActions, getUserAddedServices, setUserAddedServices, layerActions, uiSelectors, layerSelectors, mapListener, serviceListener, layersListener, openlayersListener, uiReducer, layerReducer, serviceReducer, mapReducer, useSetupDialog, mapSelectors, layerTypes } from '@opengeoweb/store';
 import { createEntityAdapter, createSlice, createSelector, createListenerMiddleware, isAnyOf, combineReducers, configureStore } from '@reduxjs/toolkit';
 import { compact, countBy, partition } from 'lodash';
 import { snackbarListener, snackbarReducer, snackbarTypes, snackbarActions } from '@opengeoweb/snackbar';
-import { Switch, Grid2, List, Box, Typography, useTheme, Backdrop, CircularProgress, Button, ListItem, ListItemText, LinearProgress, InputAdornment } from '@mui/material';
+import { Switch, Grid, List, Box, Typography, useTheme, Backdrop, CircularProgress, Button, ListItem, ListItemText, LinearProgress, InputAdornment } from '@mui/material';
 import 'i18next';
 import { useTranslation } from 'react-i18next';
 import { FixedSizeList } from 'react-window';
@@ -1197,7 +1197,7 @@ var layerSelectReducersMap = {
   ui: uiReducer,
   snackbar: snackbarReducer
 };
-var layerSelectMiddlewares = [mapListener.middleware, serviceListener.middleware, layersListener.middleware, layerSelectListener.middleware, snackbarListener.middleware];
+var layerSelectMiddlewares = [mapListener.middleware, serviceListener.middleware, layersListener.middleware, layerSelectListener.middleware, snackbarListener.middleware, openlayersListener.middleware];
 var layerSelectRootReducer = combineReducers(layerSelectReducersMap);
 var createMockStore = function createMockStore(mockState) {
   return configureStore({
@@ -1335,7 +1335,7 @@ var KeywordFilterResults = function KeywordFilterResults(_ref) {
     onMouseDown: onMouseDown,
     order: order,
     source: source,
-    children: [jsxs(Grid2, {
+    children: [jsxs(Grid, {
       container: true,
       size: {
         xs: 12
@@ -1348,7 +1348,7 @@ var KeywordFilterResults = function KeywordFilterResults(_ref) {
         top: 0,
         zIndex: 100
       },
-      children: [jsx(Grid2, {
+      children: [jsx(Grid, {
         container: true,
         size: {
           xs: 6
@@ -1359,7 +1359,7 @@ var KeywordFilterResults = function KeywordFilterResults(_ref) {
           padding: '15px 15px 0 24px'
         },
         children: t('select-all')
-      }), jsx(Grid2, {
+      }), jsx(Grid, {
         container: true,
         size: {
           xs: 6
@@ -1619,7 +1619,7 @@ var LayerListRow = function LayerListRow(_ref) {
   var rowHeight = widthToRowHeight(layerSelectWidth);
   var columns = widthToColumns(layerSelectWidth);
   var dimensions = getDimensionsList(layer.dimensions);
-  return jsxs(Grid2, {
+  return jsxs(Grid, {
     "data-testid": "layerListLayerRow",
     container: true,
     justifyContent: "center",
@@ -1632,10 +1632,10 @@ var LayerListRow = function LayerListRow(_ref) {
       border: 'solid 1px',
       borderColor: 'geowebColors.cards.cardContainerBorder'
     },
-    children: [jsxs(Grid2, {
+    children: [jsxs(Grid, {
       container: true,
       sx: columns.column8,
-      children: [jsx(Grid2, {
+      children: [jsx(Grid, {
         size: {
           xs: 12
         },
@@ -1653,7 +1653,7 @@ var LayerListRow = function LayerListRow(_ref) {
             search: searchFilter
           })
         })
-      }), jsxs(Grid2, {
+      }), jsxs(Grid, {
         container: true,
         direction: "column",
         sx: columns.column1,
@@ -1673,9 +1673,9 @@ var LayerListRow = function LayerListRow(_ref) {
           isActive: hasActiveLayer,
           onClick: onToggleActiveLayer
         })]
-      }), jsxs(Grid2, {
+      }), jsxs(Grid, {
         sx: columns.column2,
-        children: [jsx(Grid2, {
+        children: [jsx(Grid, {
           sx: columns.column3,
           children: layer["abstract"] && jsx(Typography, {
             "data-testid": "layerAbstract",
@@ -1685,15 +1685,15 @@ var LayerListRow = function LayerListRow(_ref) {
               search: searchFilter
             })
           })
-        }), jsxs(Grid2, {
+        }), jsxs(Grid, {
           container: true,
           sx: columns.column4,
-          children: [jsx(Grid2, {
+          children: [jsx(Grid, {
             sx: columns.column5,
             children: jsx(LayerListDimensions, {
               dimensions: dimensions
             })
-          }), jsxs(Grid2, {
+          }), jsxs(Grid, {
             sx: columns.column6,
             children: [layer.path.length > 0 && jsxs(Typography, {
               sx: layerInfoStyle,
@@ -1713,7 +1713,7 @@ var LayerListRow = function LayerListRow(_ref) {
           })]
         })]
       })]
-    }), jsx(Grid2, {
+    }), jsx(Grid, {
       container: true,
       sx: columns.column9,
       justifyContent: "flex-end",
@@ -2127,11 +2127,14 @@ var styles = {
   header: {
     position: 'sticky',
     top: 0,
-    fontSize: 'default',
     padding: '12px',
     backgroundColor: 'geowebColors.background.surface',
     zIndex: 100
   },
+  text: {
+    fontSize: 'default',
+    opacity: 0.67
+  },
   loading: {
     position: 'absolute',
     zIndex: 101
@@ -2164,7 +2167,8 @@ var ServiceOptionsDialog = function ServiceOptionsDialog(_ref) {
     selectedLayers = _ref.selectedLayers,
     setServicePopupInfo = _ref.setServicePopupInfo,
     _ref$isLoading = _ref.isLoading,
-    isLoading = _ref$isLoading === void 0 ? false : _ref$isLoading;
+    isLoading = _ref$isLoading === void 0 ? false : _ref$isLoading,
+    error = _ref.error;
   var _useLayerSelectTransl = useLayerSelectTranslation(),
     t = _useLayerSelectTransl.t;
   var openAddService = function openAddService() {
@@ -2188,9 +2192,15 @@ var ServiceOptionsDialog = function ServiceOptionsDialog(_ref) {
     },
     tabIndex: -1,
     ref: dialogRef,
-    children: [jsx(Box, {
+    children: [jsxs(Box, {
       sx: styles.header,
-      children: t('services')
+      children: [jsx(Box, {
+        sx: styles.text,
+        children: t('services')
+      }), error && jsx(AlertBanner, {
+        title: error,
+        shouldClose: true
+      })]
     }), jsx(Backdrop, {
       sx: Object.assign({}, styles.loading, {
         backgroundSize: 'cover'
@@ -2270,7 +2280,7 @@ var Rows = function Rows(_ref2) {
               marginLeft: 1
             }
           },
-          children: jsxs(Grid2, {
+          children: jsxs(Grid, {
             container: true,
             justifyContent: "left",
             sx: {
@@ -2475,22 +2485,17 @@ var getServiceSuccesUpdateMessage = function getServiceSuccesUpdateMessage(servi
     }
   };
 };
-var getServiceFailedUpdateMessage = function getServiceFailedUpdateMessage(error) {
-  var message = error.message;
-  return {
-    type: snackbarTypes.SnackbarMessageType.TRANSLATABLE_MESSAGE,
-    key: 'unable-to-update-service',
-    params: {
-      message: message
-    }
-  };
-};
 var ServiceOptionsDialogConnect = function ServiceOptionsDialogConnect(_ref) {
   var mapId = _ref.mapId;
   var _React$useState = React.useState(false),
     isLoading = _React$useState[0],
     setIsLoading = _React$useState[1];
+  var _React$useState2 = React.useState(undefined),
+    error = _React$useState2[0],
+    setError = _React$useState2[1];
   var dispatch = useDispatch();
+  var _useLayerSelectTransl = useLayerSelectTranslation(),
+    t = _useLayerSelectTransl.t;
   var serviceSetLayers = React.useCallback(function (payload) {
     dispatch(serviceActions.serviceSetLayers(Object.assign({}, payload, {
       isUpdating: true
@@ -2532,10 +2537,11 @@ var ServiceOptionsDialogConnect = function ServiceOptionsDialogConnect(_ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             setIsLoading(true);
-            _context.prev = 1;
-            _context.next = 4;
+            setError(undefined);
+            _context.prev = 2;
+            _context.next = 5;
             return loadWMSService(serviceUrl, true);
-          case 4:
+          case 5:
             layersForService = _context.sent;
             service = getService(services, serviceUrl);
             serviceSetLayers({
@@ -2550,35 +2556,36 @@ var ServiceOptionsDialogConnect = function ServiceOptionsDialogConnect(_ref) {
             clearImageCacheForAllMaps();
             serviceTitle = service && service.serviceName || layersForService.name;
             showSnackbar(getServiceSuccesUpdateMessage(serviceTitle));
-            _context.next = 15;
+            _context.next = 16;
             break;
-          case 12:
-            _context.prev = 12;
-            _context.t0 = _context["catch"](1);
-            // TODO: Maarten Plieger 2022-11-02: Snackbars should not be used to inform the user that something went wrong.
-            // https://gitlab.com/opengeoweb/opengeoweb/-/issues/2819
-            showSnackbar(getServiceFailedUpdateMessage(_context.t0));
-          case 15:
-            _context.prev = 15;
+          case 13:
+            _context.prev = 13;
+            _context.t0 = _context["catch"](2);
+            setError(t('unable-to-update-service', {
+              message: _context.t0.message
+            }));
+          case 16:
+            _context.prev = 16;
             setIsLoading(false);
-            return _context.finish(15);
-          case 18:
+            return _context.finish(16);
+          case 19:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 12, 15, 18]]);
+      }, _callee, null, [[2, 13, 16, 19]]);
     }));
     return function (_x) {
       return _ref2.apply(this, arguments);
     };
-  }(), [serviceSetLayers, services, showSnackbar]);
+  }(), [serviceSetLayers, services, showSnackbar, t]);
   return jsx(ServiceOptionsDialog, {
     selectedLayers: selectedLayers,
     services: services,
     layerSelectRemoveService: layerSelectRemoveService,
     layerSelectReloadService: layerSelectReloadService,
     setServicePopupInfo: setServicePopupInfo,
-    isLoading: isLoading
+    isLoading: isLoading,
+    error: error
   });
 };
 
@@ -2684,7 +2691,8 @@ var LayerSelect = function LayerSelect(_ref) {
       },
       children: jsx(KeywordFilterButtonConnect, {
         mapId: mapId,
-        isMultiMap: isMultiMap
+        isMultiMap: isMultiMap,
+        source: source
       })
     }), jsx(Box, {
       sx: {
@@ -3182,4 +3190,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, createMockStore, getServiceFailedUpdateMessage, getServiceSuccesUpdateMessage, getSuccesMessage, isUserAddedService, layerSelectActions, initialState as layerSelectInitialState, layerSelectListener, layerSelectMiddlewares, layerSelectReducer, layerSelectReducersMap, 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, createMockStore, getServiceSuccesUpdateMessage, getSuccesMessage, isUserAddedService, layerSelectActions, initialState as layerSelectInitialState, layerSelectListener, layerSelectMiddlewares, layerSelectReducer, layerSelectReducersMap, selectors as layerSelectSelectors, layerSelectTranslations, types as layerSelectTypes, useAppSelector };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/layer-select",
-  "version": "12.2.0",
+  "version": "12.3.0",
   "description": "GeoWeb layer select library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,20 +8,20 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/shared": "12.2.0",
-    "@opengeoweb/store": "12.2.0",
-    "react-redux": "^8.1.3",
-    "@opengeoweb/theme": "12.2.0",
-    "@opengeoweb/webmap-react": "12.2.0",
-    "@opengeoweb/webmap": "12.2.0",
+    "@opengeoweb/shared": "12.3.0",
+    "@opengeoweb/store": "12.3.0",
+    "react-redux": "^9.2.0",
+    "@opengeoweb/theme": "12.3.0",
+    "@opengeoweb/webmap-react": "12.3.0",
+    "@opengeoweb/webmap": "12.3.0",
     "react-window": "^1.8.10",
-    "@opengeoweb/snackbar": "12.2.0",
-    "@opengeoweb/form-fields": "12.2.0",
+    "@opengeoweb/snackbar": "12.3.0",
+    "@opengeoweb/form-fields": "12.3.0",
     "react-hook-form": "^7.50.1",
-    "@reduxjs/toolkit": "^1.9.7",
+    "@reduxjs/toolkit": "^2.6.1",
     "lodash": "^4.17.21",
     "i18next": "^23.11.5",
-    "@mui/material": "^6.1.1",
+    "@mui/material": "^7.0.1",
     "react-i18next": "^15.1.1"
   },
   "peerDependencies": {

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

@@ -8,6 +8,7 @@ interface ServiceOptionsDialogProps {
     selectedLayers: layerTypes.ReduxLayer[];
     setServicePopupInfo?: (popupInfo: ServicePopupInfo) => void;
     isLoading?: boolean;
+    error?: string;
 }
 export interface ServicePopupInfo {
     isOpen: boolean;

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

@@ -34,3 +34,12 @@ export declare const ServiceOptionsDialogDark: {
         }[];
     };
 };
+export declare const ServiceOptionsDialogWithError: {
+    tags: string[];
+    args: {
+        services: layerSelectTypes.ActiveServiceObjectEntities;
+        selectedLayers: layerTypes.Layer[];
+        isLoading: boolean;
+        error: string;
+    };
+};

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

@@ -4,6 +4,5 @@ interface ServiceOptionsDialogConnectProps {
     mapId?: string;
 }
 export declare const getServiceSuccesUpdateMessage: (serviceName: string) => snackbarTypes.TranslatableMessage;
-export declare const getServiceFailedUpdateMessage: (error: Error) => snackbarTypes.TranslatableMessage;
 export declare const ServiceOptionsDialogConnect: React.FC<ServiceOptionsDialogConnectProps>;
 export {};

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

@@ -1,2 +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>;
+export declare const layerSelectListener: import("@reduxjs/toolkit").ListenerMiddlewareInstance<RootState, import("redux-thunk").ThunkDispatch<RootState, unknown, import("redux").UnknownAction>, unknown>;

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

@@ -1,8 +1,8 @@
 import { PayloadAction, Draft } from '@reduxjs/toolkit';
 import { uiTypes } from '@opengeoweb/store';
 import { LayerSelectRemoveServicePayload, LayerSelectStoreType, SetSearchFilterPayload, ToggleKeywordsPayload, Filter, ActiveServiceObject, ToggleServicePopupPayload, ServicePopupObject } from './types';
-export declare const layerSelectFilterAdapter: import("@reduxjs/toolkit").EntityAdapter<Filter>;
-export declare const layerSelectActiveServicesAdapter: import("@reduxjs/toolkit").EntityAdapter<ActiveServiceObject>;
+export declare const layerSelectFilterAdapter: import("@reduxjs/toolkit").EntityAdapter<Filter, string>;
+export declare const layerSelectActiveServicesAdapter: import("@reduxjs/toolkit").EntityAdapter<ActiveServiceObject, string>;
 export declare const initialServicePopupState: ServicePopupObject;
 export declare const initialState: LayerSelectStoreType;
 export declare const layerSelectReducer: import("redux").Reducer<LayerSelectStoreType>, layerSelectActions: import("@reduxjs/toolkit").CaseReducerActions<{

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

@@ -8,10 +8,26 @@ export declare const useAppSelector: TypedUseSelectorHook<RootState>;
  * @param {object} store store: object - store object
  * @returns {array} returnType: string
  */
-export declare const getSearchFilter: ((state: LayerSelectModuleState) => string) & import("reselect").OutputSelectorFields<(args_0: LayerSelectStoreType) => string, {
-    clearCache: () => void;
-}> & {
+export declare const getSearchFilter: ((state: LayerSelectModuleState) => string) & {
     clearCache: () => void;
+    resultsCount: () => number;
+    resetResultsCount: () => void;
+} & {
+    resultFunc: (resultFuncArgs_0: LayerSelectStoreType) => string;
+    memoizedResultFunc: ((resultFuncArgs_0: LayerSelectStoreType) => string) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    };
+    lastResult: () => string;
+    dependencies: [(store: LayerSelectModuleState) => LayerSelectStoreType];
+    recomputations: () => number;
+    resetRecomputations: () => void;
+    dependencyRecomputations: () => number;
+    resetDependencyRecomputations: () => void;
+} & {
+    argsMemoize: typeof import("reselect").weakMapMemoize;
+    memoize: typeof import("reselect").weakMapMemoize;
 };
 /**
  * Returns active services array
@@ -21,7 +37,19 @@ export declare const getSearchFilter: ((state: LayerSelectModuleState) => string
  * @returns {ActiveServiceObjectEntities} returnType: ActiveServiceObjectEntitiesobject of active services
  */
 export declare const getActiveServices: (store: LayerSelectModuleState) => ActiveServiceObjectEntities;
-export declare const getActiveServicesDictionary: (state: LayerSelectModuleState) => import("@reduxjs/toolkit").Dictionary<import("./types").ActiveServiceObject>, getActiveServiceById: (state: LayerSelectModuleState, id: import("@reduxjs/toolkit").EntityId) => import("./types").ActiveServiceObject | undefined, getAllActiveServices: (state: LayerSelectModuleState) => import("./types").ActiveServiceObject[];
+export declare const getActiveServicesDictionary: (state: LayerSelectModuleState) => Record<string, import("./types").ActiveServiceObject>, getActiveServiceById: (state: LayerSelectModuleState, id: string) => {
+    serviceId?: string | undefined;
+    serviceName?: string | undefined;
+    serviceUrl?: string | undefined;
+    abstract?: string | undefined;
+    enabled?: boolean | undefined;
+    filterIds?: string[] | undefined;
+    scope?: import("dist/libs/shared/src").SystemScope | undefined;
+    isLoading?: boolean | undefined;
+    keywords?: string[] | undefined;
+    groups?: string[] | undefined;
+    isInSearch?: boolean | undefined;
+}, getAllActiveServices: (state: LayerSelectModuleState) => import("./types").ActiveServiceObject[];
 /**
  * Returns all ids of enabled services
  *
@@ -29,10 +57,26 @@ export declare const getActiveServicesDictionary: (state: LayerSelectModuleState
  * @param {object} store store: object - store object
  * @returns {array} returnType: array of service ids that are enabled
  */
-export declare const getEnabledServiceIds: ((state: LayerSelectModuleState) => string[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").ActiveServiceObject[]) => string[], {
-    clearCache: () => void;
-}> & {
+export declare const getEnabledServiceIds: ((state: LayerSelectModuleState) => string[]) & {
     clearCache: () => void;
+    resultsCount: () => number;
+    resetResultsCount: () => void;
+} & {
+    resultFunc: (resultFuncArgs_0: import("./types").ActiveServiceObject[]) => string[];
+    memoizedResultFunc: ((resultFuncArgs_0: import("./types").ActiveServiceObject[]) => string[]) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    };
+    lastResult: () => string[];
+    dependencies: [(state: LayerSelectModuleState) => import("./types").ActiveServiceObject[]];
+    recomputations: () => number;
+    resetRecomputations: () => void;
+    dependencyRecomputations: () => number;
+    resetDependencyRecomputations: () => void;
+} & {
+    argsMemoize: typeof import("reselect").weakMapMemoize;
+    memoize: typeof import("reselect").weakMapMemoize;
 };
 /**
  * Returns ids of all keywords
@@ -42,7 +86,13 @@ export declare const getEnabledServiceIds: ((state: LayerSelectModuleState) => s
  * @returns {array} returnType: array of all keyword ids
  */
 export declare const getAllFilterIds: (store: LayerSelectModuleState) => string[];
-export declare const getAllFilters: (state: LayerSelectModuleState) => Filter[], getAllFilterIdsEntity: (state: LayerSelectModuleState) => import("@reduxjs/toolkit").EntityId[], getFilterById: (state: LayerSelectModuleState, id: import("@reduxjs/toolkit").EntityId) => Filter | undefined;
+export declare const getAllFilters: (state: LayerSelectModuleState) => Filter[], getAllFilterIdsEntity: (state: LayerSelectModuleState) => string[], getFilterById: (state: LayerSelectModuleState, id: string) => {
+    id: string;
+    name: string;
+    checked?: boolean | undefined;
+    amountVisible?: number | undefined;
+    type: import("./types").FilterType;
+};
 /**
  * Returns all ids of checked keywords
  *
@@ -50,19 +100,51 @@ export declare const getAllFilters: (state: LayerSelectModuleState) => Filter[],
  * @param {object} store store: object - store object
  * @returns {array} returnType: array of keyword ids that are checked
  */
-export declare const getCheckedFilterIds: ((state: LayerSelectModuleState) => string[]) & import("reselect").OutputSelectorFields<(args_0: Filter[]) => string[], {
-    clearCache: () => void;
-}> & {
+export declare const getCheckedFilterIds: ((state: LayerSelectModuleState) => string[]) & {
     clearCache: () => void;
+    resultsCount: () => number;
+    resetResultsCount: () => void;
+} & {
+    resultFunc: (resultFuncArgs_0: Filter[]) => string[];
+    memoizedResultFunc: ((resultFuncArgs_0: Filter[]) => string[]) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    };
+    lastResult: () => string[];
+    dependencies: [(state: LayerSelectModuleState) => Filter[]];
+    recomputations: () => number;
+    resetRecomputations: () => void;
+    dependencyRecomputations: () => number;
+    resetDependencyRecomputations: () => void;
+} & {
+    argsMemoize: typeof import("reselect").weakMapMemoize;
+    memoize: typeof import("reselect").weakMapMemoize;
 };
 export interface FiltersGrouped {
     groups: Filter[];
     keywords: Filter[];
 }
-export declare const getFilters: ((state: LayerSelectModuleState) => FiltersGrouped) & import("reselect").OutputSelectorFields<(args_0: import("./types").ActiveServiceObject[], args_1: Filter[]) => FiltersGrouped, {
-    clearCache: () => void;
-}> & {
+export declare const getFilters: ((state: LayerSelectModuleState) => FiltersGrouped) & {
     clearCache: () => void;
+    resultsCount: () => number;
+    resetResultsCount: () => void;
+} & {
+    resultFunc: (resultFuncArgs_0: import("./types").ActiveServiceObject[], resultFuncArgs_1: Filter[]) => FiltersGrouped;
+    memoizedResultFunc: ((resultFuncArgs_0: import("./types").ActiveServiceObject[], resultFuncArgs_1: Filter[]) => FiltersGrouped) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    };
+    lastResult: () => FiltersGrouped;
+    dependencies: [(state: LayerSelectModuleState) => import("./types").ActiveServiceObject[], (state: LayerSelectModuleState) => Filter[]];
+    recomputations: () => number;
+    resetRecomputations: () => void;
+    dependencyRecomputations: () => number;
+    resetDependencyRecomputations: () => void;
+} & {
+    argsMemoize: typeof import("reselect").weakMapMemoize;
+    memoize: typeof import("reselect").weakMapMemoize;
 };
 /**
  * Returns if all keywords are checked
@@ -71,10 +153,26 @@ export declare const getFilters: ((state: LayerSelectModuleState) => FiltersGrou
  * @param {object} store store: object - store object
  * @returns {array} returnType: boolean if all keywords are checked
  */
-export declare const isAllFiltersChecked: ((state: LayerSelectModuleState) => boolean) & import("reselect").OutputSelectorFields<(args_0: LayerSelectStoreType) => boolean, {
-    clearCache: () => void;
-}> & {
+export declare const isAllFiltersChecked: ((state: LayerSelectModuleState) => boolean) & {
     clearCache: () => void;
+    resultsCount: () => number;
+    resetResultsCount: () => void;
+} & {
+    resultFunc: (resultFuncArgs_0: LayerSelectStoreType) => boolean;
+    memoizedResultFunc: ((resultFuncArgs_0: LayerSelectStoreType) => boolean) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    };
+    lastResult: () => boolean;
+    dependencies: [(store: LayerSelectModuleState) => LayerSelectStoreType];
+    recomputations: () => number;
+    resetRecomputations: () => void;
+    dependencyRecomputations: () => number;
+    resetDependencyRecomputations: () => void;
+} & {
+    argsMemoize: typeof import("reselect").weakMapMemoize;
+    memoize: typeof import("reselect").weakMapMemoize;
 };
 /**
  * Returns a filtered active layer object based on the given filter settings
@@ -82,10 +180,126 @@ export declare const isAllFiltersChecked: ((state: LayerSelectModuleState) => bo
  * @param {object} store store: object - object from which the service state will be extracted
  * @returns {array} returnType: LayerWithServiceName - an array of all filtered activelayers
  */
-export declare const getFilteredLayers: ((state: LayerSelectModuleState & import("@opengeoweb/store").CoreAppStore) => LayerWithServiceName[]) & import("reselect").OutputSelectorFields<(args_0: string[], args_1: import("dist/libs/store/src/store/map/types").Services, args_2: string[], args_3: boolean, args_4: string) => LayerWithServiceName[], {
-    clearCache: () => void;
-}> & {
+export declare const getFilteredLayers: ((state: LayerSelectModuleState & import("@opengeoweb/store").CoreAppStore) => LayerWithServiceName[]) & {
     clearCache: () => void;
+    resultsCount: () => number;
+    resetResultsCount: () => void;
+} & {
+    resultFunc: (resultFuncArgs_0: string[], resultFuncArgs_1: import("dist/libs/store/src/store/map/types").Services, resultFuncArgs_2: string[], resultFuncArgs_3: boolean, resultFuncArgs_4: string) => LayerWithServiceName[];
+    memoizedResultFunc: ((resultFuncArgs_0: string[], resultFuncArgs_1: import("dist/libs/store/src/store/map/types").Services, resultFuncArgs_2: string[], resultFuncArgs_3: boolean, resultFuncArgs_4: string) => LayerWithServiceName[]) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    };
+    lastResult: () => LayerWithServiceName[];
+    dependencies: [((state: LayerSelectModuleState) => string[]) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    } & {
+        resultFunc: (resultFuncArgs_0: import("./types").ActiveServiceObject[]) => string[];
+        memoizedResultFunc: ((resultFuncArgs_0: import("./types").ActiveServiceObject[]) => string[]) & {
+            clearCache: () => void;
+            resultsCount: () => number;
+            resetResultsCount: () => void;
+        };
+        lastResult: () => string[];
+        dependencies: [(state: LayerSelectModuleState) => import("./types").ActiveServiceObject[]];
+        recomputations: () => number;
+        resetRecomputations: () => void;
+        dependencyRecomputations: () => number;
+        resetDependencyRecomputations: () => void;
+    } & {
+        argsMemoize: typeof import("reselect").weakMapMemoize;
+        memoize: typeof import("reselect").weakMapMemoize;
+    }, ((state: import("@opengeoweb/store").CoreAppStore) => import("dist/libs/store/src/store/map/types").Services) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    } & {
+        resultFunc: (resultFuncArgs_0: import("dist/libs/store/src/store/map/types").ServiceState | undefined) => import("dist/libs/store/src/store/map/types").Services;
+        memoizedResultFunc: ((resultFuncArgs_0: import("dist/libs/store/src/store/map/types").ServiceState | undefined) => import("dist/libs/store/src/store/map/types").Services) & {
+            clearCache: () => void;
+            resultsCount: () => number;
+            resetResultsCount: () => void;
+        };
+        lastResult: () => import("dist/libs/store/src/store/map/types").Services;
+        dependencies: [(store: import("@opengeoweb/store").CoreAppStore) => import("dist/libs/store/src/store/map/types").ServiceState | undefined];
+        recomputations: () => number;
+        resetRecomputations: () => void;
+        dependencyRecomputations: () => number;
+        resetDependencyRecomputations: () => void;
+    } & {
+        memoize: typeof import("reselect").weakMapMemoize;
+        argsMemoize: typeof import("reselect").weakMapMemoize;
+    }, ((state: LayerSelectModuleState) => string[]) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    } & {
+        resultFunc: (resultFuncArgs_0: Filter[]) => string[];
+        memoizedResultFunc: ((resultFuncArgs_0: Filter[]) => string[]) & {
+            clearCache: () => void;
+            resultsCount: () => number;
+            resetResultsCount: () => void;
+        };
+        lastResult: () => string[];
+        dependencies: [(state: LayerSelectModuleState) => Filter[]];
+        recomputations: () => number;
+        resetRecomputations: () => void;
+        dependencyRecomputations: () => number;
+        resetDependencyRecomputations: () => void;
+    } & {
+        argsMemoize: typeof import("reselect").weakMapMemoize;
+        memoize: typeof import("reselect").weakMapMemoize;
+    }, ((state: LayerSelectModuleState) => boolean) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    } & {
+        resultFunc: (resultFuncArgs_0: LayerSelectStoreType) => boolean;
+        memoizedResultFunc: ((resultFuncArgs_0: LayerSelectStoreType) => boolean) & {
+            clearCache: () => void;
+            resultsCount: () => number;
+            resetResultsCount: () => void;
+        };
+        lastResult: () => boolean;
+        dependencies: [(store: LayerSelectModuleState) => LayerSelectStoreType];
+        recomputations: () => number;
+        resetRecomputations: () => void;
+        dependencyRecomputations: () => number;
+        resetDependencyRecomputations: () => void;
+    } & {
+        argsMemoize: typeof import("reselect").weakMapMemoize;
+        memoize: typeof import("reselect").weakMapMemoize;
+    }, ((state: LayerSelectModuleState) => string) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    } & {
+        resultFunc: (resultFuncArgs_0: LayerSelectStoreType) => string;
+        memoizedResultFunc: ((resultFuncArgs_0: LayerSelectStoreType) => string) & {
+            clearCache: () => void;
+            resultsCount: () => number;
+            resetResultsCount: () => void;
+        };
+        lastResult: () => string;
+        dependencies: [(store: LayerSelectModuleState) => LayerSelectStoreType];
+        recomputations: () => number;
+        resetRecomputations: () => void;
+        dependencyRecomputations: () => number;
+        resetDependencyRecomputations: () => void;
+    } & {
+        argsMemoize: typeof import("reselect").weakMapMemoize;
+        memoize: typeof import("reselect").weakMapMemoize;
+    }];
+    recomputations: () => number;
+    resetRecomputations: () => void;
+    dependencyRecomputations: () => number;
+    resetDependencyRecomputations: () => void;
+} & {
+    argsMemoize: typeof import("reselect").weakMapMemoize;
+    memoize: typeof import("reselect").weakMapMemoize;
 };
 /**
  * Returns service popup details
@@ -116,22 +330,206 @@ export declare const getFilteredActiveServices: ((state: LayerSelectModuleState
         keywords?: string[] | undefined;
         groups?: string[] | undefined;
     };
-}) & import("reselect").OutputSelectorFields<(args_0: LayerWithServiceName[], args_1: ActiveServiceObjectEntities, args_2: string) => {
-    [k: string]: {
-        isInSearch: boolean;
-        serviceId?: string | undefined;
-        serviceName?: string | undefined;
-        serviceUrl?: string | undefined;
-        abstract?: string | undefined;
-        enabled?: boolean | undefined;
-        filterIds?: string[] | undefined;
-        scope?: import("dist/libs/shared/src").SystemScope | undefined;
-        isLoading?: boolean | undefined;
-        keywords?: string[] | undefined;
-        groups?: string[] | undefined;
-    };
-}, {
-    clearCache: () => void;
-}> & {
+}) & {
     clearCache: () => void;
+    resultsCount: () => number;
+    resetResultsCount: () => void;
+} & {
+    resultFunc: (resultFuncArgs_0: LayerWithServiceName[], resultFuncArgs_1: ActiveServiceObjectEntities, resultFuncArgs_2: string) => {
+        [k: string]: {
+            isInSearch: boolean;
+            serviceId?: string | undefined;
+            serviceName?: string | undefined;
+            serviceUrl?: string | undefined;
+            abstract?: string | undefined;
+            enabled?: boolean | undefined;
+            filterIds?: string[] | undefined;
+            scope?: import("dist/libs/shared/src").SystemScope | undefined;
+            isLoading?: boolean | undefined;
+            keywords?: string[] | undefined;
+            groups?: string[] | undefined;
+        };
+    };
+    memoizedResultFunc: ((resultFuncArgs_0: LayerWithServiceName[], resultFuncArgs_1: ActiveServiceObjectEntities, resultFuncArgs_2: string) => {
+        [k: string]: {
+            isInSearch: boolean;
+            serviceId?: string | undefined;
+            serviceName?: string | undefined;
+            serviceUrl?: string | undefined;
+            abstract?: string | undefined;
+            enabled?: boolean | undefined;
+            filterIds?: string[] | undefined;
+            scope?: import("dist/libs/shared/src").SystemScope | undefined;
+            isLoading?: boolean | undefined;
+            keywords?: string[] | undefined;
+            groups?: string[] | undefined;
+        };
+    }) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    };
+    lastResult: () => {
+        [k: string]: {
+            isInSearch: boolean;
+            serviceId?: string | undefined;
+            serviceName?: string | undefined;
+            serviceUrl?: string | undefined;
+            abstract?: string | undefined;
+            enabled?: boolean | undefined;
+            filterIds?: string[] | undefined;
+            scope?: import("dist/libs/shared/src").SystemScope | undefined;
+            isLoading?: boolean | undefined;
+            keywords?: string[] | undefined;
+            groups?: string[] | undefined;
+        };
+    };
+    dependencies: [((state: LayerSelectModuleState & import("@opengeoweb/store").CoreAppStore) => LayerWithServiceName[]) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    } & {
+        resultFunc: (resultFuncArgs_0: string[], resultFuncArgs_1: import("dist/libs/store/src/store/map/types").Services, resultFuncArgs_2: string[], resultFuncArgs_3: boolean, resultFuncArgs_4: string) => LayerWithServiceName[];
+        memoizedResultFunc: ((resultFuncArgs_0: string[], resultFuncArgs_1: import("dist/libs/store/src/store/map/types").Services, resultFuncArgs_2: string[], resultFuncArgs_3: boolean, resultFuncArgs_4: string) => LayerWithServiceName[]) & {
+            clearCache: () => void;
+            resultsCount: () => number;
+            resetResultsCount: () => void;
+        };
+        lastResult: () => LayerWithServiceName[];
+        dependencies: [((state: LayerSelectModuleState) => string[]) & {
+            clearCache: () => void;
+            resultsCount: () => number;
+            resetResultsCount: () => void;
+        } & {
+            resultFunc: (resultFuncArgs_0: import("./types").ActiveServiceObject[]) => string[];
+            memoizedResultFunc: ((resultFuncArgs_0: import("./types").ActiveServiceObject[]) => string[]) & {
+                clearCache: () => void;
+                resultsCount: () => number;
+                resetResultsCount: () => void;
+            };
+            lastResult: () => string[];
+            dependencies: [(state: LayerSelectModuleState) => import("./types").ActiveServiceObject[]];
+            recomputations: () => number;
+            resetRecomputations: () => void;
+            dependencyRecomputations: () => number;
+            resetDependencyRecomputations: () => void;
+        } & {
+            argsMemoize: typeof import("reselect").weakMapMemoize;
+            memoize: typeof import("reselect").weakMapMemoize;
+        }, ((state: import("@opengeoweb/store").CoreAppStore) => import("dist/libs/store/src/store/map/types").Services) & {
+            clearCache: () => void;
+            resultsCount: () => number;
+            resetResultsCount: () => void;
+        } & {
+            resultFunc: (resultFuncArgs_0: import("dist/libs/store/src/store/map/types").ServiceState | undefined) => import("dist/libs/store/src/store/map/types").Services;
+            memoizedResultFunc: ((resultFuncArgs_0: import("dist/libs/store/src/store/map/types").ServiceState | undefined) => import("dist/libs/store/src/store/map/types").Services) & {
+                clearCache: () => void;
+                resultsCount: () => number;
+                resetResultsCount: () => void;
+            };
+            lastResult: () => import("dist/libs/store/src/store/map/types").Services;
+            dependencies: [(store: import("@opengeoweb/store").CoreAppStore) => import("dist/libs/store/src/store/map/types").ServiceState | undefined];
+            recomputations: () => number;
+            resetRecomputations: () => void;
+            dependencyRecomputations: () => number;
+            resetDependencyRecomputations: () => void;
+        } & {
+            memoize: typeof import("reselect").weakMapMemoize;
+            argsMemoize: typeof import("reselect").weakMapMemoize;
+        }, ((state: LayerSelectModuleState) => string[]) & {
+            clearCache: () => void;
+            resultsCount: () => number;
+            resetResultsCount: () => void;
+        } & {
+            resultFunc: (resultFuncArgs_0: Filter[]) => string[];
+            memoizedResultFunc: ((resultFuncArgs_0: Filter[]) => string[]) & {
+                clearCache: () => void;
+                resultsCount: () => number;
+                resetResultsCount: () => void;
+            };
+            lastResult: () => string[];
+            dependencies: [(state: LayerSelectModuleState) => Filter[]];
+            recomputations: () => number;
+            resetRecomputations: () => void;
+            dependencyRecomputations: () => number;
+            resetDependencyRecomputations: () => void;
+        } & {
+            argsMemoize: typeof import("reselect").weakMapMemoize;
+            memoize: typeof import("reselect").weakMapMemoize;
+        }, ((state: LayerSelectModuleState) => boolean) & {
+            clearCache: () => void;
+            resultsCount: () => number;
+            resetResultsCount: () => void;
+        } & {
+            resultFunc: (resultFuncArgs_0: LayerSelectStoreType) => boolean;
+            memoizedResultFunc: ((resultFuncArgs_0: LayerSelectStoreType) => boolean) & {
+                clearCache: () => void;
+                resultsCount: () => number;
+                resetResultsCount: () => void;
+            };
+            lastResult: () => boolean;
+            dependencies: [(store: LayerSelectModuleState) => LayerSelectStoreType];
+            recomputations: () => number;
+            resetRecomputations: () => void;
+            dependencyRecomputations: () => number;
+            resetDependencyRecomputations: () => void;
+        } & {
+            argsMemoize: typeof import("reselect").weakMapMemoize;
+            memoize: typeof import("reselect").weakMapMemoize;
+        }, ((state: LayerSelectModuleState) => string) & {
+            clearCache: () => void;
+            resultsCount: () => number;
+            resetResultsCount: () => void;
+        } & {
+            resultFunc: (resultFuncArgs_0: LayerSelectStoreType) => string;
+            memoizedResultFunc: ((resultFuncArgs_0: LayerSelectStoreType) => string) & {
+                clearCache: () => void;
+                resultsCount: () => number;
+                resetResultsCount: () => void;
+            };
+            lastResult: () => string;
+            dependencies: [(store: LayerSelectModuleState) => LayerSelectStoreType];
+            recomputations: () => number;
+            resetRecomputations: () => void;
+            dependencyRecomputations: () => number;
+            resetDependencyRecomputations: () => void;
+        } & {
+            argsMemoize: typeof import("reselect").weakMapMemoize;
+            memoize: typeof import("reselect").weakMapMemoize;
+        }];
+        recomputations: () => number;
+        resetRecomputations: () => void;
+        dependencyRecomputations: () => number;
+        resetDependencyRecomputations: () => void;
+    } & {
+        argsMemoize: typeof import("reselect").weakMapMemoize;
+        memoize: typeof import("reselect").weakMapMemoize;
+    }, (store: LayerSelectModuleState) => ActiveServiceObjectEntities, ((state: LayerSelectModuleState) => string) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    } & {
+        resultFunc: (resultFuncArgs_0: LayerSelectStoreType) => string;
+        memoizedResultFunc: ((resultFuncArgs_0: LayerSelectStoreType) => string) & {
+            clearCache: () => void;
+            resultsCount: () => number;
+            resetResultsCount: () => void;
+        };
+        lastResult: () => string;
+        dependencies: [(store: LayerSelectModuleState) => LayerSelectStoreType];
+        recomputations: () => number;
+        resetRecomputations: () => void;
+        dependencyRecomputations: () => number;
+        resetDependencyRecomputations: () => void;
+    } & {
+        argsMemoize: typeof import("reselect").weakMapMemoize;
+        memoize: typeof import("reselect").weakMapMemoize;
+    }];
+    recomputations: () => number;
+    resetRecomputations: () => void;
+    dependencyRecomputations: () => number;
+    resetDependencyRecomputations: () => void;
+} & {
+    argsMemoize: typeof import("reselect").weakMapMemoize;
+    memoize: typeof import("reselect").weakMapMemoize;
 };

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

@@ -1,13 +1,13 @@
 import { WebMapStateModuleState, UIModuleState } from '@opengeoweb/store';
-import { ToolkitStore } from '@reduxjs/toolkit/dist/configureStore';
+import { Store } from '@reduxjs/toolkit';
 import { LayerSelectModuleState } from './types';
 export declare const layerSelectReducersMap: {
-    webmap: import("redux").Reducer<import("dist/libs/store/src/store/map/types").WebMapState, import("redux").AnyAction>;
-    services: import("redux").Reducer<import("dist/libs/store/src/store/map/types").ServiceState, import("redux").AnyAction>;
-    layers: import("redux").Reducer<import("dist/libs/store/src/store/map/types").LayerState, import("redux").AnyAction>;
+    webmap: import("redux").Reducer<import("dist/libs/store/src/store/map/types").WebMapState, import("redux").UnknownAction, import("dist/libs/store/src/store/map/types").WebMapState>;
+    services: import("redux").Reducer<import("dist/libs/store/src/store/map/types").ServiceState, import("redux").UnknownAction, import("dist/libs/store/src/store/map/types").ServiceState>;
+    layers: import("redux").Reducer<import("dist/libs/store/src/store/map/types").LayerState, import("redux").UnknownAction, import("dist/libs/store/src/store/map/types").LayerState>;
     layerSelect: import("redux").Reducer<import("./types").LayerSelectStoreType>;
-    ui: import("redux").Reducer<import("dist/libs/store/src/store/ui/types").UIStoreType, import("redux").AnyAction>;
-    snackbar: import("redux").Reducer<import("dist/libs/snackbar/src/lib/store/types").SnackbarState, import("redux").AnyAction>;
+    ui: import("redux").Reducer<import("dist/libs/store/src/store/ui/types").UIStoreType, import("redux").UnknownAction, import("dist/libs/store/src/store/ui/types").UIStoreType>;
+    snackbar: import("redux").Reducer<import("dist/libs/snackbar/src/lib/store/types").SnackbarState, import("redux").UnknownAction, import("dist/libs/snackbar/src/lib/store/types").SnackbarState>;
 };
-export declare const layerSelectMiddlewares: (import("@reduxjs/toolkit").ListenerMiddleware<import("./types").RootState, import("@reduxjs/toolkit").ThunkDispatch<import("./types").RootState, unknown, import("redux").AnyAction>, unknown> | import("@reduxjs/toolkit").ListenerMiddleware<import("@opengeoweb/snackbar").SnackbarModuleStore, import("@reduxjs/toolkit").ThunkDispatch<import("@opengeoweb/snackbar").SnackbarModuleStore, unknown, import("redux").AnyAction>, unknown>)[];
-export declare const createMockStore: (mockState?: WebMapStateModuleState | LayerSelectModuleState | UIModuleState) => ToolkitStore;
+export declare const layerSelectMiddlewares: (import("@reduxjs/toolkit").ListenerMiddleware<import("./types").RootState, import("redux-thunk").ThunkDispatch<import("./types").RootState, unknown, import("redux").UnknownAction>, unknown> | import("@reduxjs/toolkit").ListenerMiddleware<import("@opengeoweb/snackbar").SnackbarModuleStore, import("redux-thunk").ThunkDispatch<import("@opengeoweb/snackbar").SnackbarModuleStore, unknown, import("redux").UnknownAction>, unknown>)[];
+export declare const createMockStore: (mockState?: WebMapStateModuleState | LayerSelectModuleState | UIModuleState) => Store;

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

@@ -27,8 +27,8 @@ export interface Filter {
     type: FilterType;
 }
 export type ActiveServiceObjectEntities = Record<string, ActiveServiceObject>;
-export type Filters = EntityState<Filter>;
-export type ActiveServiceType = EntityState<ActiveServiceObject>;
+export type Filters = EntityState<Filter, string>;
+export type ActiveServiceType = EntityState<ActiveServiceObject, string>;
 export interface FiltersType {
     searchFilter: string;
     activeServices: ActiveServiceType;

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

@@ -4,6 +4,6 @@ import { LayerProps } from '@opengeoweb/webmap';
 import { Draft, EntityAdapter } from '@reduxjs/toolkit';
 import { Filter, FilterType, LayerSelectStoreType } from './types';
 export declare const getFilterId: (filterType: FilterType, filterName: string) => string;
-export declare const produceFilters: (filterNames: string[], filterType: FilterType, draft: Draft<LayerSelectStoreType>, layerSelectFilterAdapter: EntityAdapter<Filter>) => void;
+export declare const produceFilters: (filterNames: string[], filterType: FilterType, draft: Draft<LayerSelectStoreType>, layerSelectFilterAdapter: EntityAdapter<Filter, string>) => void;
 export declare const filterLayersFromService: (serviceId: string, services: serviceTypes.Services, filterIds: string[], allFiltersActive: boolean, searchString: string) => LayerProps[];
 export declare const isUserAddedService: (scope: SystemScope) => boolean;