@opengeoweb/core 4.6.0 → 4.6.1

package/lib/components/ConfigurableMap/ConfigurableMapConnect.d.ts

@@ -30,6 +30,7 @@ export interface ConfigurableMapConnectProps {
     multiLegend?: boolean;
     shouldShowLayerManager?: boolean;
     showClock?: boolean;
+    displayGetFeatureInfoButtonInMap?: boolean;
     children?: React.ReactNode;
 }
 export declare const ConfigurableMapConnect: React.FC<ConfigurableMapConnectProps>;

package/lib/components/FeatureInfo/GetFeatureInfoButtonConnect.d.ts

@@ -0,0 +1,8 @@
+import * as React from 'react';
+import { Source } from '../../store/ui/types';
+interface GetFeatureInfoButtonProps {
+    mapId: string;
+    source?: Source;
+}
+declare const GetFeatureInfoButtonConnect: React.FC<GetFeatureInfoButtonProps>;
+export default GetFeatureInfoButtonConnect;

package/lib/components/FeatureInfo/GetFeatureInfoButtonConnect.spec.d.ts

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

package/lib/components/FeatureInfo/GetFeatureInfoConnect.d.ts

@@ -0,0 +1,8 @@
+import * as React from 'react';
+export declare const IS_GETFEATUREINFO_OPEN_BY_DEFAULT = false;
+interface GetFeatureInfoConnectProps {
+    showMapId?: boolean;
+    mapId: string;
+}
+declare const GetFeatureInfoConnect: React.FC<GetFeatureInfoConnectProps>;
+export default GetFeatureInfoConnect;

package/lib/components/FeatureInfo/GetFeatureInfoConnect.spec.d.ts

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

package/lib/components/FeatureInfo/GetFeatureInfoDialog.d.ts

@@ -0,0 +1,16 @@
+import React from 'react';
+import { Layer, MapLocation } from '../../store/mapStore/types';
+import { Source } from '../../store/ui/types';
+interface GetFeatureInfoDialogProps {
+    layers: Layer[];
+    isOpen: boolean;
+    onClose: () => void;
+    onMouseDown?: () => void;
+    mapId: string;
+    showMapId?: boolean;
+    order?: number;
+    source?: Source;
+    mapPinLocation?: MapLocation;
+}
+declare const GetFeatureInfoDialog: React.FC<GetFeatureInfoDialogProps>;
+export default GetFeatureInfoDialog;

package/lib/components/FeatureInfo/GetFeatureInfoDialog.spec.d.ts

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

package/lib/components/FeatureInfo/index.d.ts

@@ -0,0 +1,3 @@
+import GetFeatureInfoConnect from './GetFeatureInfoConnect';
+export { default as GetFeatureInfoButtonConnect } from './GetFeatureInfoButtonConnect';
+export { GetFeatureInfoConnect };

package/lib/components/FeatureInfo/utils.d.ts

@@ -0,0 +1,17 @@
+import { Layer } from '../../store/mapStore/types';
+export interface GFIResult {
+    data: string;
+    isLoading: boolean;
+}
+export interface GFILayer {
+    layerId: string;
+    url: string;
+    title: string;
+}
+/**
+ * Make a list of GFI Layers to display.
+ * @param layers
+ * @param mapId
+ * @returns
+ */
+export declare const getLayersToUpdate: (layers: Layer[], mapId: string) => GFILayer[];

package/lib/components/FeatureInfo/utils.spec.d.ts

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

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

@@ -1,5 +1,5 @@
 import { CSSProperties } from 'react';
-import { ActiveServices } from '../../../store/layerSelect/types';
+import { ActiveServiceObjectEntities } from '../../../store/layerSelect/types';
 export declare const layerSelectColumnsLarge: {
     column1: {
         width: number;
@@ -74,4 +74,4 @@ export declare const layerSelectColumnsSmall: {
 };
 export declare const widthToColumns: (width: number) => Record<string, CSSProperties>;
 export declare const widthToRowHeight: (width: number) => number;
-export declare const sortByService: (serviceObj: ActiveServices) => ActiveServices;
+export declare const sortByService: (serviceObj: ActiveServiceObjectEntities) => ActiveServiceObjectEntities;

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

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { ActiveServiceObject } from '../../../../store/layerSelect/types';
+import { ActiveServiceObjectEntities } from '../../../../store/layerSelect/types';
 interface ServiceListProps {
-    activeServices: Record<string, ActiveServiceObject>;
+    activeServices: ActiveServiceObjectEntities;
     setHeight: (height: number) => void;
 }
 declare const ServiceList: React.FC<ServiceListProps>;

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

@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { ActiveServices } from '../../../../store/layerSelect/types';
+import { ActiveServiceObjectEntities } from '../../../../store/layerSelect/types';
 import { PopupVariant } from '../ServicePopup/ServicePopup';
 import { ReduxLayer } from '../../../../store/mapStore/types';
 interface ServiceOptionsDialogProps {
-    services: ActiveServices;
+    services: ActiveServiceObjectEntities;
     layerSelectRemoveService?: (serviceId: string, serviceUrl: string, serviceName: string) => void;
     layerSelectReloadService?: (serviceUrl: string) => void;
     selectedLayers: ReduxLayer[];

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { SetLayersForServicePayload } from '../../../../store/mapStore/types';
-import { ActiveServices } from '../../../../store/layerSelect/types';
+import { ActiveServiceObjectEntities } from '../../../../store/layerSelect/types';
 export declare type PopupVariant = 'edit' | 'add' | 'save' | 'show';
 export interface ServicePopupProps {
     servicePopupVariant: PopupVariant;
@@ -12,7 +12,7 @@ export interface ServicePopupProps {
     serviceUrl?: string;
     serviceName?: string;
     serviceAbstracts?: string;
-    services?: ActiveServices;
+    services?: ActiveServiceObjectEntities;
     serviceSetLayers: (payload: SetLayersForServicePayload) => void;
     showSnackbar?: (message: string) => void;
 }

package/lib/components/LayerManager/LayerSelect/ServicePopup/utils.d.ts

@@ -1,4 +1,4 @@
-import { ActiveServices } from '../../../../store/layerSelect/types';
+import { ActiveServiceObjectEntities } from '../../../../store/layerSelect/types';
 import { SetLayersForServicePayload } from '../../../../store/mapStore/types';
 export declare type ValidationResult = string | boolean;
 export declare const VALIDATIONS_NAME_EXISTING = "This name already exists. Choose another name.";
@@ -6,6 +6,6 @@ export declare const VALIDATIONS_SERVICE_EXISTING = "URL already exists.";
 export declare const VALIDATIONS_SERVICE_VALID_URL = "Not a valid URL.";
 export declare const VALIDATIONS_REQUEST_FAILED = "Download failed. Check the URL.";
 export declare const VALIDATIONS_FIELD_REQUIRED = "This field is required";
-export declare const validateServiceName: (value: string, services: ActiveServices, ownServiceName?: string) => ValidationResult;
-export declare const validateServiceUrl: (value: string, services: ActiveServices) => ValidationResult;
+export declare const validateServiceName: (value: string, services: ActiveServiceObjectEntities, ownServiceName?: string) => ValidationResult;
+export declare const validateServiceUrl: (value: string, services: ActiveServiceObjectEntities) => ValidationResult;
 export declare const loadWMSService: (serviceUrl: string, forceReload?: boolean) => Promise<SetLayersForServicePayload>;

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

@@ -1,5 +1,7 @@
 import { PayloadAction } from '@reduxjs/toolkit';
-import { AddKeywordsAndActiveServicesPayload, DisableActiveServicePayload, EnableActiveServicePayload, EnableOnlyOneKeywordPayload, LayerSelectRemoveServicePayload, LayerSelectStoreType, SetAllServicesEnabledPayload, SetActiveLayerInfoPayload, SetSearchFilterPayload, ToggleKeywordsPayload } from './types';
+import { AddKeywordsAndActiveServicesPayload, DisableActiveServicePayload, EnableActiveServicePayload, EnableOnlyOneKeywordPayload, LayerSelectRemoveServicePayload, LayerSelectStoreType, SetAllServicesEnabledPayload, SetActiveLayerInfoPayload, SetSearchFilterPayload, ToggleKeywordsPayload, Filter, ActiveServiceObject } from './types';
+export declare const layerSelectFilterAdapter: import("@reduxjs/toolkit").EntityAdapter<Filter>;
+export declare const layerSelectActiveServicesAdapter: import("@reduxjs/toolkit").EntityAdapter<ActiveServiceObject>;
 export declare const initialState: LayerSelectStoreType;
 export declare const reducer: import("redux").Reducer<LayerSelectStoreType, import("redux").AnyAction>;
 export declare const layerSelectActions: import("@reduxjs/toolkit").CaseReducerActions<{

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

@@ -1,5 +1,5 @@
 import { AppStore } from '../../types/types';
-import { LayerSelectStoreType, ActiveServices, ActiveServiceObject, Filter, ActiveLayerObject } from './types';
+import { LayerSelectStoreType, ActiveServiceObject, ActiveLayerObject, ActiveServiceObjectEntities } from './types';
 /**
  * Returns search filter string
  *
@@ -24,20 +24,9 @@ export declare const getSearchFilter: ((state: {
  *
  * Example getActiveServices(store);
  * @param {object} store store: object - store object
- * @returns {object} returnType: object of active services
+ * @returns {ActiveServiceObjectEntities} returnType: ActiveServiceObjectEntitiesobject of active services
  */
-export declare const getActiveServices: ((state: {
-    syncronizationGroupStore?: import("../generic/synchronizationGroups/types").SynchronizationGroupState | undefined;
-    ui?: import("../ui/types").UIStoreType | undefined;
-    webmap?: import("../mapStore/types").WebMapState | undefined;
-    services?: import("../mapStore/types").ServiceState | undefined;
-    layers?: import("../mapStore/types").LayerState | undefined;
-    layerSelect?: LayerSelectStoreType | undefined;
-}) => ActiveServices) & import("reselect").OutputSelectorFields<((args_0: LayerSelectStoreType) => ActiveServices) & {
-    clearCache: () => void;
-}> & {
-    clearCache: () => void;
-};
+export declare const getActiveServices: (store: AppStore) => ActiveServiceObjectEntities;
 /**
  * Returns active services by id
  *
@@ -92,18 +81,7 @@ export declare const getCheckedFilterIds: ((state: {
  * @param {object} store store: object - store object
  * @returns {array} returnType: array of all keyword ids
  */
-export declare const getAllFilterIds: ((state: {
-    syncronizationGroupStore?: import("../generic/synchronizationGroups/types").SynchronizationGroupState | undefined;
-    ui?: import("../ui/types").UIStoreType | undefined;
-    webmap?: import("../mapStore/types").WebMapState | undefined;
-    services?: import("../mapStore/types").ServiceState | undefined;
-    layers?: import("../mapStore/types").LayerState | undefined;
-    layerSelect?: LayerSelectStoreType | undefined;
-}) => string[]) & import("reselect").OutputSelectorFields<((args_0: LayerSelectStoreType) => string[]) & {
-    clearCache: () => void;
-}> & {
-    clearCache: () => void;
-};
+export declare const getAllFilterIds: (store: AppStore) => string[];
 /**
  * Returns all filters
  *
@@ -111,18 +89,7 @@ export declare const getAllFilterIds: ((state: {
  * @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 | undefined;
-    ui?: import("../ui/types").UIStoreType | undefined;
-    webmap?: import("../mapStore/types").WebMapState | undefined;
-    services?: import("../mapStore/types").ServiceState | undefined;
-    layers?: import("../mapStore/types").LayerState | undefined;
-    layerSelect?: LayerSelectStoreType | undefined;
-}) => Filter[]) & import("reselect").OutputSelectorFields<(args_0: LayerSelectStoreType) => Filter[] & {
-    clearCache: () => void;
-}> & {
-    clearCache: () => void;
-};
+export declare const getAllFilters: (state: AppStore) => import("./types").Filter[];
 /**
  * Returns if all keywords are checked
  *
@@ -150,7 +117,7 @@ export declare const isAllFiltersChecked: ((state: {
  * @param {string} filterId Id of the keyword
  * @returns {object} object containing keyword information (id, amount, amountVisible, checked)
  */
-export declare const getFilterById: (store: AppStore, filterId: string) => Filter;
+export declare const getFilterById: (state: AppStore, id: import("@reduxjs/toolkit").EntityId) => import("./types").Filter | undefined;
 /**
  * Returns the active layer info
  *

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

@@ -1,3 +1,4 @@
+import { EntityState } from '@reduxjs/toolkit';
 import { ServiceLayer, ServiceScope } from '../mapStore/types';
 export interface ActiveLayerObject extends ServiceLayer {
     serviceName: string;
@@ -10,13 +11,7 @@ export interface ActiveServiceObject {
     enabled?: boolean;
     filterIds?: string[];
     scope?: ServiceScope;
-}
-export interface ActiveServices {
-    [key: string]: ActiveServiceObject;
-}
-export interface ActiveServiceType {
-    byId: ActiveServices;
-    allIds: string[];
+    isLoading?: boolean;
 }
 export declare enum FilterType {
     Keyword = "keywords",
@@ -30,25 +25,21 @@ export interface Filter {
     checked?: boolean;
     type: FilterType;
 }
-export interface FiltersById {
-    [key: string]: Filter;
-}
-export interface Filters {
-    byId: FiltersById;
-    allIds: string[];
-}
-export interface LayerSelectModuleState {
-    layerSelect?: LayerSelectStoreType;
+export declare type ActiveServiceObjectEntities = Record<string, ActiveServiceObject>;
+export declare type Filters = EntityState<Filter>;
+export declare type ActiveServiceType = EntityState<ActiveServiceObject>;
+export interface FiltersType {
+    searchFilter: string;
+    activeServices: ActiveServiceType;
+    filters: Filters;
 }
 export interface LayerSelectStoreType {
     filters: FiltersType;
     allServicesEnabled: boolean;
     activeLayerInfo: ActiveLayerObject;
 }
-export interface FiltersType {
-    searchFilter: string;
-    activeServices: ActiveServiceType;
-    filters: Filters;
+export interface LayerSelectModuleState {
+    layerSelect?: LayerSelectStoreType;
 }
 export interface SetSearchFilterPayload {
     filterText: string;
@@ -72,6 +63,7 @@ export interface AddKeywordsAndActiveServicesPayload {
     keywords: string[];
     scope: ServiceScope;
     groups: string[];
+    isLoading?: boolean;
 }
 export interface LayerSelectRemoveServicePayload {
     serviceId: string;

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

@@ -0,0 +1,5 @@
+import { EntityAdapter } from '@reduxjs/toolkit';
+import { WritableDraft } from 'immer/dist/types/types-external';
+import { Filter, FilterType, LayerSelectStoreType } from './types';
+export declare const getFilterId: (filterType: FilterType, filterName: string) => string;
+export declare const produceFilters: (filterNames: string[], filterType: FilterType, draft: WritableDraft<LayerSelectStoreType>, layerSelectFilterAdapter: EntityAdapter<Filter>) => void;

package/lib/store/layerSelect/utils.spec.d.ts

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

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

@@ -1,5 +1,6 @@
 import { MapActionOrigin } from '../mapStore/types';
 declare type LegendDialogType = string;
+declare type GetFeatureInfoDialogType = string;
 export declare enum DialogTypes {
     LayerInfo = "layerInfo",
     SyncGroups = "syncGroups",
@@ -11,7 +12,7 @@ export declare enum DialogTypes {
     LayerManager = "layerManager",
     LayerSelect = "layerSelect"
 }
-export declare type DialogType = DialogTypes | LegendDialogType;
+export declare type DialogType = DialogTypes | LegendDialogType | GetFeatureInfoDialogType;
 export declare type Source = 'app' | 'module';
 export interface UIType {
     type: DialogType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "4.6.0",
+  "version": "4.6.1",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -13,24 +13,25 @@
   "dependencies": {},
   "peerDependencies": {
     "react": "^17.0.2",
-    "@opengeoweb/theme": "4.6.0",
+    "@opengeoweb/theme": "4.6.1",
     "@mui/material": "^5.10.8",
     "moment": "^2.29.0",
     "react-redux": "^8.0.4",
-    "react-intl": "^5.17.5",
-    "@opengeoweb/shared": "4.6.0",
+    "@opengeoweb/webmap": "4.6.1",
+    "throttle-debounce": "^3.0.1",
+    "proj4": "^2.6.2",
+    "axios": "^0.25.0",
+    "@opengeoweb/api": "4.6.1",
+    "@opengeoweb/shared": "4.6.1",
     "react-draggable": "^4.4.5",
     "re-resizable": "^6.9.0",
     "@redux-eggs/core": "^2.2.0",
-    "@opengeoweb/form-fields": "4.6.0",
+    "@opengeoweb/form-fields": "4.6.1",
     "react-hook-form": "^6.12.1",
     "moment-timezone": "^0.5.31",
     "@mui/x-date-pickers": "^5.0.4",
     "lodash": "^4.17.20",
-    "axios": "^0.25.0",
-    "@opengeoweb/webmap": "4.6.0",
-    "throttle-debounce": "^3.0.1",
-    "proj4": "^2.6.2",
+    "react-intl": "^5.17.5",
     "react-sortablejs": "^6.1.4",
     "sortablejs": "^1.15.0",
     "react-window": "^1.8.7",