@opengeoweb/core 4.1.0 → 4.3.0

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

@@ -1,9 +1,15 @@
+import { ServiceLayer, ServiceScope } 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[];
-    isUserAddedService?: boolean;
+    filterIds?: string[];
+    scope?: ServiceScope;
 }
 export interface ActiveServices {
     [key: string]: ActiveServiceObject;
@@ -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;
+    scope: ServiceScope;
+    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/map/sagas.d.ts

@@ -9,7 +9,7 @@ export declare const generateTimeList: (start: Moment, end: Moment, interval: nu
     name: string;
     value: string;
 }[];
-export declare function updateMapDraw(mapId: string, draw: unknown): void;
+export declare function updateMapDraw(mapId: string, draw: any): void;
 export declare function startAnimationSaga({ payload, }: ReturnType<typeof mapActions.mapStartAnimation>): Generator;
 export declare function stopAnimationSaga({ payload, }: ReturnType<typeof mapActions.mapStopAnimation>): Generator;
 export declare function deleteLayerSaga({ payload, }: ReturnType<typeof layerActions.layerDelete>): SagaIterator;

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

@@ -119,30 +119,3 @@ export declare const getLayerStyles: ((state: {
 }> & {
     clearCache: () => void;
 };
-/**
- * Gets services and maps them into an array
- *
- * Example: services = getServices(store)
- * @param {object} store store: object - Store object
- * @returns {array} returnType: [] - array containing services
- */
-export declare const getServicesInArray: ((state: {
-    syncronizationGroupStore?: import("../../generic/synchronizationGroups/types").SynchronizationGroupState;
-    ui?: import("../../ui/types").UIStoreType;
-    webmap?: import("../types").WebMapState;
-    services?: ServiceState;
-    layers?: import("../types").LayerState;
-    layerSelect?: import("../../layerSelect/types").LayerSelectStoreType;
-}) => {
-    name: string;
-    serviceUrl: string;
-    isUserAddedService: boolean;
-}[]) & import("reselect").OutputSelectorFields<((args_0: ServiceState) => {
-    name: string;
-    serviceUrl: string;
-    isUserAddedService: boolean;
-}[]) & {
-    clearCache: () => void;
-}> & {
-    clearCache: () => void;
-};

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

@@ -1,13 +1,14 @@
-import { Style } from '@opengeoweb/webmap';
+import { Dimension, GeographicBoundingBox, Style } from '@opengeoweb/webmap';
 export interface Services {
     [key: string]: ReduxService;
 }
+export declare type ServiceScope = 'user' | 'system';
 export interface ReduxService {
     name?: string;
     serviceUrl?: string;
     active?: boolean;
     layers?: ServiceLayer[];
-    isUserAddedService?: boolean;
+    scope?: ServiceScope;
 }
 /**
  * Used in the services object of webmap to keep a list of available layers in the service
@@ -20,6 +21,8 @@ export interface ServiceLayer {
     abstract?: string;
     keywords?: string[];
     styles?: Style[];
+    dimensions?: Dimension[];
+    geographicBoundingBox?: GeographicBoundingBox;
 }
 export interface ServiceState {
     byId: Services;
@@ -29,10 +32,17 @@ export interface SetLayersForServicePayload {
     id: string;
     name: string;
     serviceUrl: string;
+    abstract?: string;
     layers: ServiceLayer[];
-    isUserAddedService: boolean;
+    scope: ServiceScope;
 }
 export interface MapStoreRemoveServicePayload {
     id: string;
     serviceUrl: string;
 }
+export interface ServiceFilterSettings {
+    enabledServiceIds: string[];
+    searchString: string;
+    checkedFilterIds: string[];
+    allFiltersActive: boolean;
+}

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

@@ -6,7 +6,7 @@ export declare const getUiStore: (store: AppStore) => UIStoreType;
  *
  * Example: getDialogDetailsByType(store, 'legend')
  * @param {object} store store object from which the ui state wll be extracted
- * @param {string} dialogType type of the dialog 'legend' | 'layerManager' | 'dimensionSelect-elevation'
+ * @param {string} dialogType type of the dialog
  * @returns {array} [string, boolean] first element gives the active map id, second element whether the dialog is open
  */
 export declare const getDialogDetailsByType: (store: AppStore, dialogType: string) => UIType;
@@ -14,7 +14,7 @@ export declare const getDialogDetailsByType: (store: AppStore, dialogType: strin
  * For a given ui component: gets wether the dialog is open or closed
  *
  * @param {object} store store object from which the ui state wll be extracted
- * @param {string} dialogType type of the dialog 'legend' | 'layerManager' | 'dimensionSelect-elevation'
+ * @param {string} dialogType type of the dialog
  * @returns {boolean} returnType: boolean
  */
 export declare const getisDialogOpen: ((state: {
@@ -33,7 +33,7 @@ export declare const getisDialogOpen: ((state: {
  *For a given ui component: gets the active map Id
  *
  * @param {object} store store object from which the ui state wll be extracted
- * @param {string} dialogType type of the dialog 'legend' | 'layerManager' | 'dimensionSelect-elevation'
+ * @param {string} dialogType type of the dialog
  * @returns {string} returnType: string - the active map id
  */
 export declare const getDialogMapId: ((state: {
@@ -52,7 +52,7 @@ export declare const getDialogMapId: ((state: {
  *For a given ui component: gets the order of visible dialog
  *
  * @param {object} store store object from which the ui state wll be extracted
- * @param {DialogType} dialogType type of the dialog 'legend' | 'layerManager' | 'dimensionSelect-elevation' | dimensionSelect-ensemble_member
+ * @param {DialogType} dialogType type of the dialog
  * @returns {number} the higher the order number the higher the zIndex
  */
 export declare const getDialogOrder: ((state: {
@@ -71,7 +71,7 @@ export declare const getDialogOrder: ((state: {
  *For a given ui component: returns if ordered on top
  *
  * @param {object} store store object from which the ui state wll be extracted
- * @param {DialogType} dialogType type of the dialog 'legend' | 'layerManager' | 'dimensionSelect-elevation' | dimensionSelect-ensemble_member
+ * @param {DialogType} dialogType type of the dialog
  * @returns {boolean}
  */
 export declare const getDialogIsOrderedOnTop: ((state: {

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

@@ -1,6 +1,17 @@
 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",
+    SyncGroups = "syncGroups",
+    TimeSeriesSelect = "timeSeriesSelect",
+    TimeSeriesManager = "timeSeriesManager",
+    KeywordFilter = "keywordFilter",
+    DimensionSelectEnsembleMember = "dimensionSelect-ensemble_member",
+    DimensionSelectElevation = "dimensionSelect-elevation",
+    LayerManager = "layerManager",
+    LayerSelect = "layerSelect"
+}
+export declare type DialogType = DialogTypes | LegendDialogType;
 export declare type Source = 'app' | 'module';
 export interface UIType {
     type: DialogType;

package/lib/store/utils.d.ts

@@ -1,6 +1,8 @@
+import { ServiceScope } from './mapStore/types';
 export declare const selectorMemoizationOptions: {
     memoizeOptions: {
         maxSize: number;
         resultEqualityCheck: (value: any, other: any) => boolean;
     };
 };
+export declare const isUserAddedService: (scope: ServiceScope) => boolean;

package/lib/utils/__mocks__/getCapabilities.d.ts

@@ -30,20 +30,8 @@ export declare const mockLayersWithChildren: {
         children: any[];
     }[];
 };
-export declare const mockLayersWithNoTitle: {
-    leaf: boolean;
-    name: string;
-    title: any;
-    path: any[];
-    children: any[];
-};
-export declare const mockLayersWithNoTitleOrName: {
-    leaf: boolean;
-    name: any;
-    title: any;
-    path: any[];
-    children: any[];
-};
+export declare const mockLayersWithNoTitle: LayerTree;
+export declare const mockLayersWithNoTitleOrName: LayerTree;
 export declare const mockLayersWithSubcategory: {
     leaf: boolean;
     name: any;

package/lib/utils/defaultTestSettings.d.ts

@@ -1,5 +1,6 @@
 import { LayerOptions, Style, WMLayer } from '@opengeoweb/webmap';
 import { Service } from '../components/WMSLoader/services';
+import { ActiveLayerObject } from '../store/layerSelect/types';
 import { Layer, LayerType, Services } from '../store/mapStore/types';
 export declare const defaultReduxLayerRadarColor: {
     service: string;
@@ -24,6 +25,8 @@ export declare const makeGeoservicesRadarLayer: () => WMLayer;
 export declare const styleListForRADNL25PCPCMLayer: Style[];
 export declare const styleListForRADNLOPERR25PCPRRL3KNMILayer: Style[];
 export declare const defaultReduxServices: Services;
+export declare const defaultReduxActiveLayers: ActiveLayerObject[];
+export declare const defaultReduxActiveLayersWithoutOptionalVariables: ActiveLayerObject[];
 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.3.0",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -13,27 +13,28 @@
   "dependencies": {},
   "peerDependencies": {
     "react": "^17.0.2",
-    "@opengeoweb/theme": "4.1.0",
-    "@mui/material": "^5.2.8",
+    "@opengeoweb/theme": "4.3.0",
+    "@mui/material": "^5.10.8",
     "moment": "^2.29.0",
     "react-redux": "^8.0.2",
     "react-intl": "^5.17.5",
     "lodash": "^4.17.20",
-    "@opengeoweb/shared": "4.1.0",
-    "react-draggable": "^4.4.3",
+    "@opengeoweb/shared": "4.3.0",
+    "react-draggable": "^4.4.5",
     "re-resizable": "^6.9.0",
-    "@opengeoweb/form-fields": "4.1.0",
+    "@opengeoweb/form-fields": "4.3.0",
     "react-hook-form": "^6.12.1",
     "moment-timezone": "^0.5.31",
-    "@mui/lab": "^5.0.0-alpha.64",
+    "@mui/x-date-pickers": "^5.0.4",
     "axios": "^0.25.0",
-    "@opengeoweb/webmap": "4.1.0",
+    "@opengeoweb/webmap": "4.3.0",
     "throttle-debounce": "^3.0.1",
     "proj4": "^2.6.2",
-    "react-sortablejs": "^6.0.0",
+    "react-sortablejs": "^6.1.4",
+    "sortablejs": "^1.15.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/TimeSlider/TimeSliderScaleSlider/TimeSliderScaleSlider.d.ts

@@ -1,12 +0,0 @@
-import * as React from 'react';
-import { Layer, Scale } from '../../../store/mapStore/types';
-interface TimeSliderScaleSliderProps {
-    layers?: Layer[];
-    timeSliderScale: Scale;
-    centerTime: number;
-    secondsPerPx: number;
-    selectedTime: number;
-    onChangeTimeSliderScale: (scale: number, newCenterTime: number, dataScalePerPx: number) => void;
-}
-declare const TimeSliderScaleSlider: React.FC<TimeSliderScaleSliderProps>;
-export default TimeSliderScaleSlider;

package/lib/components/TimeSlider/TimeSliderScaleSlider/TimeSliderScaleSlider.stories.d.ts

@@ -1,13 +0,0 @@
-import * as React from 'react';
-declare const _default: {
-    title: string;
-};
-export default _default;
-export declare const TimeSliderScaleLightDemo: {
-    (): React.ReactElement;
-    storyName: string;
-};
-export declare const TimeSliderScaleDarkDemo: {
-    (): React.ReactElement;
-    storyName: string;
-};

package/lib/components/TimeSlider/TimeSliderScaleSlider/TimeSliderScaleSliderConnect.d.ts

@@ -1,24 +0,0 @@
-import * as React from 'react';
-import { mapActions } from '../../../store';
-import { Layer, Dimension, Scale } from '../../../store/mapStore/types';
-export interface ConnectedScaleSliderProps {
-    timeSliderScale?: Scale;
-    mapId: string;
-    layers?: Layer[];
-    centerTime?: number;
-    secondsPerPx?: number;
-    dimensions?: Dimension[];
-    mapSetTimeSliderScale?: typeof mapActions.setTimeSliderScale;
-    mapSetTimeSliderDataScaleToSecondsPerPx?: typeof mapActions.setTimeSliderDataScaleToSecondsPerPx;
-    mapSetTimeSliderCenterTime?: typeof mapActions.setTimeSliderCenterTime;
-}
-/**
- * TimeSliderScaleSlider component connected to the store displaying a scale slider of the time slider
- *
- * Expects the following props:
- * @param {string} mapId mapId: string - Id of the map
- * @example
- * ``` <TimeSliderScaleSliderConnect mapId={mapId} />```
- */
-declare const TimeSliderScaleSliderConnect: import("react-redux").ConnectedComponent<React.FC<ConnectedScaleSliderProps>, Omit<ConnectedScaleSliderProps, "layers" | "timeSliderScale" | "centerTime" | "secondsPerPx" | "dimensions" | "mapSetTimeSliderScale" | "mapSetTimeSliderDataScaleToSecondsPerPx" | "mapSetTimeSliderCenterTime"> & ConnectedScaleSliderProps & import("react-redux").ConnectProps>;
-export default TimeSliderScaleSliderConnect;