@opengeoweb/core 4.1.0 → 4.2.0

package/lib/components/TimeSlider/TimeSliderButtons/TimeStepButton/TimeStepButton.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import { Dimension, MapActionOrigin } from '../../../../store/mapStore/types';
 export declare const timeStepTitle = "Time step";
 export interface TimeStepButtonProps {

package/lib/components/TimeSlider/TimeSliderButtons/TimeStepButton/TimeStepButton.stories.d.ts

@@ -1,9 +1,30 @@
-import React from 'react';
 declare const _default: {
     title: string;
 };
 export default _default;
-export declare const TimeStepButtonDemo: {
-    (): React.ReactElement;
+export declare const TimeStepButtonDemoLight: {
+    (): JSX.Element;
     storyName: string;
+    story: {
+        name: string;
+        parameters: {
+            zeplinLink: {
+                name: string;
+                link: string;
+            }[];
+        };
+    };
+};
+export declare const TimeStepButtonDemoDark: {
+    (): JSX.Element;
+    storyName: string;
+    story: {
+        name: string;
+        parameters: {
+            zeplinLink: {
+                name: string;
+                link: string;
+            }[];
+        };
+    };
 };

package/lib/components/WMSLoader/services.d.ts

@@ -3,4 +3,5 @@ export interface Service {
     url: string;
     id: string;
     isUserAddedService?: boolean;
+    abstract?: string;
 }

package/lib/hooks/index.d.ts

@@ -0,0 +1 @@
+export * from './useSetupDialog';

package/lib/hooks/useSetupDialog/index.d.ts

@@ -0,0 +1 @@
+export * from './useSetupDialog';

package/lib/hooks/useSetupDialog/useSetupDialog.d.ts

@@ -0,0 +1,9 @@
+import type { uiTypes } from '../..';
+export interface SetupDialogReturnValue {
+    setDialogOrder: () => void;
+    dialogOrder: number;
+    onCloseDialog: () => void;
+    uiSource: uiTypes.Source;
+    isDialogOpen: boolean;
+}
+export declare const useSetupDialog: (dialogType: uiTypes.DialogType) => SetupDialogReturnValue;

package/lib/hooks/useSetupDialog/useSetupDialog.spec.d.ts

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

package/lib/index.d.ts

@@ -8,6 +8,7 @@ import * as SyncGroups from './store/generic/synchronizationGroups';
 import coreModuleConfig from './store/coreModuleConfig';
 import { LayerManagerConnect, LayerManagerMapButtonConnect } from './components/LayerManager';
 import { MultiDimensionSelectMapButtonsConnect, MultiMapDimensionSelectConnect } from './components/MultiMapDimensionSelect';
+export * from './hooks';
 export * from './components/MultiMapView/MultiMapViewConnect';
 export * from './components/MultiMapView/HarmoniePresets';
 export { MapViewConnect, MapView, MapViewLayer } from './components/MapView';

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

@@ -1,13 +1,16 @@
 import { PayloadAction } from '@reduxjs/toolkit';
-import { AddKeywordsAndActiveServicesPayload, DisableActiveServicePayload, EnableActiveServicePayload, EnableOnlyOneKeywordPayload, LayerSelectServiceRemovedPayload, LayerSelectStoreType, SetSearchFilterPayload, ToggleKeywordsPayload } from './types';
+import { AddKeywordsAndActiveServicesPayload, DisableActiveServicePayload, EnableActiveServicePayload, EnableOnlyOneKeywordPayload, LayerSelectRemoveServicePayload, LayerSelectStoreType, SetAllServicesEnabledPayload, SetActiveLayerInfoPayload, SetSearchFilterPayload, ToggleKeywordsPayload } from './types';
 export declare const initialState: LayerSelectStoreType;
 export declare const reducer: import("@reduxjs/toolkit").Reducer<LayerSelectStoreType, import("@reduxjs/toolkit").AnyAction>;
 export declare const layerSelectActions: import("@reduxjs/toolkit").CaseReducerActions<{
     setSearchFilter: (draft: import("immer/dist/internal").WritableDraft<LayerSelectStoreType>, action: PayloadAction<SetSearchFilterPayload>) => void;
-    addKeywordsAndActiveServices: (draft: import("immer/dist/internal").WritableDraft<LayerSelectStoreType>, action: PayloadAction<AddKeywordsAndActiveServicesPayload>) => void;
-    layerSelectServiceRemoved: (draft: import("immer/dist/internal").WritableDraft<LayerSelectStoreType>, action: PayloadAction<LayerSelectServiceRemovedPayload>) => void;
+    setAllServicesEnabled: (draft: import("immer/dist/internal").WritableDraft<LayerSelectStoreType>, action: PayloadAction<SetAllServicesEnabledPayload>) => void;
+    addFiltersAndActiveServices: (draft: import("immer/dist/internal").WritableDraft<LayerSelectStoreType>, action: PayloadAction<AddKeywordsAndActiveServicesPayload>) => void;
+    layerSelectRemoveService: (draft: import("immer/dist/internal").WritableDraft<LayerSelectStoreType>, action: PayloadAction<LayerSelectRemoveServicePayload>) => void;
     enableActiveService: (draft: import("immer/dist/internal").WritableDraft<LayerSelectStoreType>, action: PayloadAction<EnableActiveServicePayload>) => void;
     disableActiveService: (draft: import("immer/dist/internal").WritableDraft<LayerSelectStoreType>, action: PayloadAction<DisableActiveServicePayload>) => void;
-    toggleKeywords: (draft: import("immer/dist/internal").WritableDraft<LayerSelectStoreType>, action: PayloadAction<ToggleKeywordsPayload>) => void;
-    enableOnlyOneKeyword: (draft: import("immer/dist/internal").WritableDraft<LayerSelectStoreType>, action: PayloadAction<EnableOnlyOneKeywordPayload>) => void;
+    toggleFilter: (draft: import("immer/dist/internal").WritableDraft<LayerSelectStoreType>, action: PayloadAction<ToggleKeywordsPayload>) => void;
+    enableOnlyOneFilter: (draft: import("immer/dist/internal").WritableDraft<LayerSelectStoreType>, action: PayloadAction<EnableOnlyOneKeywordPayload>) => void;
+    setActiveLayerInfo: (draft: import("immer/dist/internal").WritableDraft<LayerSelectStoreType>, action: PayloadAction<SetActiveLayerInfoPayload>) => void;
 }>;
+export declare type LayerSelectActions = ReturnType<typeof layerSelectActions.setSearchFilter> | ReturnType<typeof layerSelectActions.addFiltersAndActiveServices> | ReturnType<typeof layerSelectActions.layerSelectRemoveService> | ReturnType<typeof layerSelectActions.enableActiveService> | ReturnType<typeof layerSelectActions.disableActiveService> | ReturnType<typeof layerSelectActions.toggleFilter> | ReturnType<typeof layerSelectActions.enableOnlyOneFilter> | ReturnType<typeof layerSelectActions.setActiveLayerInfo>;

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

@@ -1,7 +1,8 @@
 import { SagaIterator } from 'redux-saga';
-import { ServiceActions, serviceActions } from '../mapStore/service/reducer';
+import { serviceActions, ServiceActions } from '../mapStore/service/reducer';
+import { LayerSelectActions } from './reducer';
 export declare function newServiceAddedSaga(capturedAction: ServiceActions): SagaIterator;
-export declare function layerSelectServiceRemovedSaga(capturedAction: ServiceActions): 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;

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

@@ -1,5 +1,5 @@
 import { AppStore } from '../../types/types';
-import { LayerSelectStoreType, ActiveServices, KeywordObject } from './types';
+import { LayerSelectStoreType, ActiveServices, ActiveServiceObject, Filter, ActiveLayerObject } from './types';
 /**
  * Returns search filter string
  *
@@ -38,6 +38,15 @@ export declare const getActiveServices: ((state: {
 }> & {
     clearCache: () => void;
 };
+/**
+ * Returns active services by id
+ *
+ * Example getActiveServices(store, 'server-id');
+ * @param {object} store store: object - store object
+ * @param {serverId} serverId serverId: string - active server id
+ * @returns {object} returnType: object of active service
+ */
+export declare const getActiveServiceById: (store: AppStore, serviceId: string) => ActiveServiceObject;
 /**
  * Returns all ids of enabled services
  *
@@ -64,7 +73,7 @@ export declare const getEnabledServiceIds: ((state: {
  * @param {object} store store: object - store object
  * @returns {array} returnType: array of keyword ids that are checked
  */
-export declare const getCheckedKeywordIds: ((state: {
+export declare const getCheckedFilterIds: ((state: {
     syncronizationGroupStore?: import("../generic/synchronizationGroups/types").SynchronizationGroupState;
     ui?: import("../ui/types").UIStoreType;
     webmap?: import("../mapStore/types").WebMapState;
@@ -83,7 +92,7 @@ export declare const getCheckedKeywordIds: ((state: {
  * @param {object} store store: object - store object
  * @returns {array} returnType: array of all keyword ids
  */
-export declare const getAllKeywordIds: ((state: {
+export declare const getAllFilterIds: ((state: {
     syncronizationGroupStore?: import("../generic/synchronizationGroups/types").SynchronizationGroupState;
     ui?: import("../ui/types").UIStoreType;
     webmap?: import("../mapStore/types").WebMapState;
@@ -95,6 +104,25 @@ export declare const getAllKeywordIds: ((state: {
 }> & {
     clearCache: () => void;
 };
+/**
+ * Returns all filters
+ *
+ * Example getAllFilters(store);
+ * @param {object} store store: object - store object
+ * @returns {array} returnType: array of all filters
+ */
+export declare const getAllFilters: ((state: {
+    syncronizationGroupStore?: import("../generic/synchronizationGroups/types").SynchronizationGroupState;
+    ui?: import("../ui/types").UIStoreType;
+    webmap?: import("../mapStore/types").WebMapState;
+    services?: import("../mapStore/types").ServiceState;
+    layers?: import("../mapStore/types").LayerState;
+    layerSelect?: LayerSelectStoreType;
+}) => Filter[]) & import("reselect").OutputSelectorFields<(args_0: LayerSelectStoreType) => Filter[] & {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};
 /**
  * Returns if all keywords are checked
  *
@@ -102,7 +130,7 @@ export declare const getAllKeywordIds: ((state: {
  * @param {object} store store: object - store object
  * @returns {array} returnType: boolean if all keywords are checked
  */
-export declare const isAllKeywordsChecked: ((state: {
+export declare const isAllFiltersChecked: ((state: {
     syncronizationGroupStore?: import("../generic/synchronizationGroups/types").SynchronizationGroupState;
     ui?: import("../ui/types").UIStoreType;
     webmap?: import("../mapStore/types").WebMapState;
@@ -119,7 +147,26 @@ export declare const isAllKeywordsChecked: ((state: {
  *
  * Example: keywordObject = getKeywordObjectById(store, 'keywordId')
  * @param {object} store object from which the keyword state will be extracted
- * @param {string} keywordId Id of the keyword
+ * @param {string} filterId Id of the keyword
  * @returns {object} object containing keyword information (id, amount, amountVisible, checked)
  */
-export declare const getKeywordObjectById: (store: AppStore, keywordId: string) => KeywordObject;
+export declare const getFilterById: (store: AppStore, filterId: string) => Filter;
+/**
+ * Returns the active layer info
+ *
+ * Example getActiveLayerInfo(store);
+ * @param {object} store store: object - store object
+ * @returns {object} returnType: ActiveLayerObject
+ */
+export declare const getActiveLayerInfo: ((state: {
+    syncronizationGroupStore?: import("../generic/synchronizationGroups/types").SynchronizationGroupState;
+    ui?: import("../ui/types").UIStoreType;
+    webmap?: import("../mapStore/types").WebMapState;
+    services?: import("../mapStore/types").ServiceState;
+    layers?: import("../mapStore/types").LayerState;
+    layerSelect?: LayerSelectStoreType;
+}) => ActiveLayerObject) & import("reselect").OutputSelectorFields<(args_0: LayerSelectStoreType) => ActiveLayerObject & {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};

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

@@ -1,8 +1,14 @@
+import { ServiceLayer } from '../mapStore/types';
+export interface ActiveLayerObject extends ServiceLayer {
+    serviceName: string;
+}
 export interface ActiveServiceObject {
+    serviceId?: string;
     serviceName?: string;
     serviceUrl?: string;
+    abstract?: string;
     enabled?: boolean;
-    keywordsPerService?: string[];
+    filterIds?: string[];
     isUserAddedService?: boolean;
 }
 export interface ActiveServices {
@@ -12,17 +18,19 @@ export interface ActiveServiceType {
     byId: ActiveServices;
     allIds: string[];
 }
-export interface KeywordObject {
-    id?: string;
+export interface Filter {
+    id: string;
+    name: string;
     amount?: number;
     amountVisible?: number;
     checked?: boolean;
+    type: 'keyword' | 'group';
 }
-export interface Keywords {
-    [key: string]: KeywordObject;
+export interface FiltersById {
+    [key: string]: Filter;
 }
-export interface KeywordType {
-    byId: Keywords;
+export interface Filters {
+    byId: FiltersById;
     allIds: string[];
 }
 export interface LayerSelectModuleState {
@@ -30,36 +38,47 @@ export interface LayerSelectModuleState {
 }
 export interface LayerSelectStoreType {
     filters: FiltersType;
+    allServicesEnabled: boolean;
+    activeLayerInfo: ActiveLayerObject;
 }
 export interface FiltersType {
     searchFilter: string;
     activeServices: ActiveServiceType;
-    keywords: KeywordType;
+    filters: Filters;
 }
 export interface SetSearchFilterPayload {
     filterText: string;
 }
+export interface SetAllServicesEnabledPayload {
+    allServicesEnabled: boolean;
+}
 export interface EnableActiveServicePayload {
     serviceId: string;
-    keywords: string[];
+    filters: string[];
 }
 export interface DisableActiveServicePayload {
     serviceId: string;
-    keywords: string[];
+    filters: string[];
 }
 export interface AddKeywordsAndActiveServicesPayload {
     serviceId: string;
     serviceName: string;
     serviceUrl: string;
+    abstract?: string;
     keywords: string[];
     isUserAddedService: boolean;
+    groups: string[];
 }
-export interface LayerSelectServiceRemovedPayload {
+export interface LayerSelectRemoveServicePayload {
     serviceId: string;
+    serviceUrl?: string;
 }
 export interface ToggleKeywordsPayload {
-    keywords: string[];
+    filterIds: string[];
 }
 export interface EnableOnlyOneKeywordPayload {
-    keyword: string;
+    filterId: string;
+}
+export interface SetActiveLayerInfoPayload {
+    layer: ActiveLayerObject;
 }

package/lib/store/mapStore/service/types.d.ts

@@ -1,4 +1,4 @@
-import { Style } from '@opengeoweb/webmap';
+import { Dimension, GeographicBoundingBox, Style } from '@opengeoweb/webmap';
 export interface Services {
     [key: string]: ReduxService;
 }
@@ -20,6 +20,8 @@ export interface ServiceLayer {
     abstract?: string;
     keywords?: string[];
     styles?: Style[];
+    dimensions?: Dimension[];
+    geographicBoundingBox?: GeographicBoundingBox;
 }
 export interface ServiceState {
     byId: Services;
@@ -29,6 +31,7 @@ export interface SetLayersForServicePayload {
     id: string;
     name: string;
     serviceUrl: string;
+    abstract?: string;
     layers: ServiceLayer[];
     isUserAddedService: boolean;
 }

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

@@ -1,6 +1,9 @@
 import { MapActionOrigin } from '../mapStore/types';
 declare type LegendDialogType = string;
-export declare type DialogType = 'layerManager' | 'layerSelect' | 'dimensionSelect-elevation' | 'dimensionSelect-ensemble_member' | 'keywordFilter' | 'timeSeriesManager' | 'timeSeriesSelect' | 'syncGroups' | LegendDialogType;
+export declare enum DialogTypes {
+    LayerInfo = "layerInfo"
+}
+export declare type DialogType = 'layerManager' | 'layerSelect' | DialogTypes.LayerInfo | 'dimensionSelect-elevation' | 'dimensionSelect-ensemble_member' | 'keywordFilter' | 'timeSeriesManager' | 'timeSeriesSelect' | 'syncGroups' | LegendDialogType;
 export declare type Source = 'app' | 'module';
 export interface UIType {
     type: DialogType;

package/lib/utils/defaultTestSettings.d.ts

@@ -24,6 +24,7 @@ export declare const makeGeoservicesRadarLayer: () => WMLayer;
 export declare const styleListForRADNL25PCPCMLayer: Style[];
 export declare const styleListForRADNLOPERR25PCPRRL3KNMILayer: Style[];
 export declare const defaultReduxServices: Services;
+export declare const ReduxServicesWithoutOptionalVariables: Services;
 export declare const multiDimensionLayer: Layer;
 export declare const flDimensionLayer: Layer;
 export declare const WmMultiDimensionLayer: WMLayer;

package/lib/utils/getCapabilities.d.ts

@@ -1,3 +1,4 @@
+import { Dimension, GeographicBoundingBox, Style } from '@opengeoweb/webmap';
 /**
  * Represents the layers as advertised in the WMS GetCapabilities document
  */
@@ -10,7 +11,9 @@ export interface LayerTree {
     keywords?: string[];
     abstract?: string;
     text?: string;
-    styles?: any[];
+    styles?: Style[];
+    dimensions?: Dimension[];
+    geographicBoundingBox?: GeographicBoundingBox;
 }
 /**
  * Converts webmapjs node structure to LayerTree

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -13,27 +13,27 @@
   "dependencies": {},
   "peerDependencies": {
     "react": "^17.0.2",
-    "@opengeoweb/theme": "4.1.0",
+    "@opengeoweb/theme": "4.2.0",
     "@mui/material": "^5.2.8",
     "moment": "^2.29.0",
     "react-redux": "^8.0.2",
     "react-intl": "^5.17.5",
     "lodash": "^4.17.20",
-    "@opengeoweb/shared": "4.1.0",
+    "@opengeoweb/shared": "4.2.0",
     "react-draggable": "^4.4.3",
     "re-resizable": "^6.9.0",
-    "@opengeoweb/form-fields": "4.1.0",
+    "@opengeoweb/form-fields": "4.2.0",
     "react-hook-form": "^6.12.1",
     "moment-timezone": "^0.5.31",
     "@mui/lab": "^5.0.0-alpha.64",
     "axios": "^0.25.0",
-    "@opengeoweb/webmap": "4.1.0",
+    "@opengeoweb/webmap": "4.2.0",
     "throttle-debounce": "^3.0.1",
     "proj4": "^2.6.2",
     "react-sortablejs": "^6.0.0",
     "react-window": "^1.8.7",
-    "immer": "^9.0.15",
     "redux-dynamic-modules": "^5.2.0",
+    "immer": "^9.0.15",
     "@reduxjs/toolkit": "^1.8.3",
     "lodash.clonedeep": "^4.5.0",
     "@turf/turf": "^5.1.6",

package/lib/components/LayerManager/LayerSelect/LayerSelectUtils.d.ts

@@ -1,4 +0,0 @@
-import { NoIdService, UserAddedServices } from '../../../utils/types';
-import { Service } from '../../WMSLoader/services';
-export declare const mergePresetsAndUserAddedServices: (presets: Service[], userAddedServices: UserAddedServices) => NoIdService[];
-export declare const isNoIdService: (param: unknown) => param is NoIdService;