@opengeoweb/layer-select 9.13.0 → 9.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/layer-select",
-  "version": "9.13.0",
+  "version": "9.14.0",
   "description": "GeoWeb layer select library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { layerTypes, serviceTypes } from '@opengeoweb/store';
-import { layerSelectTypes } from '../../store';
+import { LayerWithServiceName } from '../../store/types';
 interface AddLayerParams {
     serviceUrl: string;
     layerName: string;
@@ -10,15 +10,19 @@ export interface DeleteLayerParams {
 }
 export interface LayerListProps {
     services: serviceTypes.Services;
-    filteredLayers: layerSelectTypes.ActiveLayerObject[];
+    filteredLayers: LayerWithServiceName[];
     layerSelectHeight: number;
     serviceListHeight: number;
     layerSelectWidth: number;
     addLayer: ({ serviceUrl, layerName }: AddLayerParams) => void;
     deleteLayer: ({ layerId }: DeleteLayerParams) => void;
     mapLayers: layerTypes.ReduxLayer[];
-    mapId: string;
     searchFilter: string;
+    isLayerInfoVisibleInStore: boolean;
+    onToggleActiveLayer: ({ serviceUrl, layerName, isActiveLayer, }: AddLayerParams & {
+        isActiveLayer: boolean;
+    }) => void;
+    currentLayerInfo?: AddLayerParams;
 }
 export declare const LayerList: React.FC<LayerListProps>;
 export {};

package/src/lib/components/LayerList/LayerList.spec.d.ts

@@ -1,3 +1,3 @@
-import { layerSelectTypes } from '../../store';
-export declare const defaultReduxActiveLayers: layerSelectTypes.ActiveLayerObject[];
-export declare const defaultReduxActiveLayersWithoutOptionalVariables: layerSelectTypes.ActiveLayerObject[];
+import { LayerWithServiceName } from '../../store/types';
+export declare const defaultReduxActiveLayers: LayerWithServiceName[];
+export declare const defaultReduxActiveLayersWithoutOptionalVariables: LayerWithServiceName[];

package/src/lib/components/LayerList/LayerListDimensions.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ListItem } from '../LayerInfo/LayerInfoList';
+import { ListItem } from '@opengeoweb/webmap-react';
 interface LayerListDimensionsProps {
     dimensions: ListItem[];
 }

package/src/lib/components/LayerList/LayerListRow.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { layerTypes, serviceTypes } from '@opengeoweb/store';
+import { LayerProps } from '@opengeoweb/webmap';
 interface AddLayerParams {
     serviceUrl: string;
     layerName: string;
@@ -9,15 +10,16 @@ interface DeleteLayerParams {
     layerIndex: number;
 }
 interface LayerListRowProps {
-    layer: serviceTypes.ServiceLayer;
+    layer: LayerProps;
     layerIndex: number;
     service: serviceTypes.ReduxService;
     addLayer: ({ serviceUrl, layerName }: AddLayerParams) => void;
     deleteLayer: ({ layerId, layerIndex }: DeleteLayerParams) => void;
     mapLayers: layerTypes.ReduxLayer[];
-    mapId: string;
     layerSelectWidth: number;
     searchFilter: string;
+    hasActiveLayer: boolean;
+    onToggleActiveLayer: () => void;
 }
 export declare const LayerListRow: React.FC<LayerListRowProps>;
 export {};

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

@@ -1,6 +1,5 @@
 export * from './KeywordFilterButton';
 export * from './KeywordFilterResults';
-export * from './LayerInfo';
 export * from './LayerList';
 export * from './LayerSelect';
 export * from './SearchField';

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

@@ -1,6 +1,6 @@
 import { PayloadAction, Draft } from '@reduxjs/toolkit';
 import { uiTypes } from '@opengeoweb/store';
-import { EnableOnlyOneKeywordPayload, LayerSelectRemoveServicePayload, LayerSelectStoreType, SetActiveLayerInfoPayload, SetSearchFilterPayload, ToggleKeywordsPayload, Filter, ActiveServiceObject, ToggleServicePopupPayload, ServicePopupObject } from './types';
+import { EnableOnlyOneKeywordPayload, 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 initialServicePopupState: ServicePopupObject;
@@ -23,6 +23,5 @@ export declare const layerSelectActions: import("@reduxjs/toolkit").CaseReducerA
     }>) => void;
     toggleFilter: (draft: Draft<LayerSelectStoreType>, action: PayloadAction<ToggleKeywordsPayload>) => void;
     enableOnlyOneFilter: (draft: Draft<LayerSelectStoreType>, action: PayloadAction<EnableOnlyOneKeywordPayload>) => void;
-    setActiveLayerInfo: (draft: Draft<LayerSelectStoreType>, action: PayloadAction<SetActiveLayerInfoPayload>) => void;
 }, uiTypes.DialogTypes.LayerSelect>;
-export type LayerSelectActions = ReturnType<typeof layerSelectActions.setSearchFilter> | ReturnType<typeof layerSelectActions.layerSelectRemoveService> | ReturnType<typeof layerSelectActions.enableActiveService> | ReturnType<typeof layerSelectActions.disableActiveService> | ReturnType<typeof layerSelectActions.toggleFilter> | ReturnType<typeof layerSelectActions.enableOnlyOneFilter> | ReturnType<typeof layerSelectActions.setActiveLayerInfo>;
+export type LayerSelectActions = ReturnType<typeof layerSelectActions.setSearchFilter> | ReturnType<typeof layerSelectActions.layerSelectRemoveService> | ReturnType<typeof layerSelectActions.enableActiveService> | ReturnType<typeof layerSelectActions.disableActiveService> | ReturnType<typeof layerSelectActions.toggleFilter> | ReturnType<typeof layerSelectActions.enableOnlyOneFilter>;

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

@@ -1,5 +1,5 @@
 import { TypedUseSelectorHook } from 'react-redux';
-import { LayerSelectStoreType, ActiveLayerObject, ActiveServiceObjectEntities, ServicePopupObject, LayerSelectModuleState, RootState, Filter } from './types';
+import { LayerSelectStoreType, ActiveServiceObjectEntities, ServicePopupObject, LayerSelectModuleState, RootState, Filter, LayerWithServiceName } from './types';
 export declare const useAppSelector: TypedUseSelectorHook<RootState>;
 /**
  * Returns search filter string
@@ -76,25 +76,13 @@ export declare const isAllFiltersChecked: ((state: LayerSelectModuleState) => bo
 }> & {
     clearCache: () => void;
 };
-/**
- * Returns the active layer info
- *
- * Example getActiveLayerInfo(store);
- * @param {object} store store: object - store object
- * @returns {object} returnType: ActiveLayerObject
- */
-export declare const getActiveLayerInfo: ((state: LayerSelectModuleState) => ActiveLayerObject) & import("reselect").OutputSelectorFields<(args_0: LayerSelectStoreType) => ActiveLayerObject, {
-    clearCache: () => void;
-}> & {
-    clearCache: () => void;
-};
 /**
  * Returns a filtered active layer object based on the given filter settings
  * Example: layerSelectSelectors.getFilteredLayers(store, filteredSettings);
  * @param {object} store store: object - object from which the service state will be extracted
- * @returns {array} returnType: ActiveLayerObject - an array of all filtered activelayers
+ * @returns {array} returnType: LayerWithServiceName - an array of all filtered activelayers
  */
-export declare const getFilteredLayers: ((state: LayerSelectModuleState & import("@opengeoweb/store").CoreAppStore) => ActiveLayerObject[]) & import("reselect").OutputSelectorFields<(args_0: string[], args_1: import("dist/libs/store/src/store/mapStore/types").Services, args_2: string[], args_3: boolean, args_4: string) => ActiveLayerObject[], {
+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/mapStore/types").Services, args_2: string[], args_3: boolean, args_4: string) => LayerWithServiceName[], {
     clearCache: () => void;
 }> & {
     clearCache: () => void;

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

@@ -3,6 +3,9 @@ import { EntityState } from '@reduxjs/toolkit';
 export type RootState = CoreAppStore & LayerSelectModuleState;
 export type NoIdService = Omit<LayerSelectService, 'id'>;
 export type UserAddedServices = Record<string, NoIdService>;
+export interface LayerWithServiceName extends serviceTypes.ServiceLayer {
+    serviceName: string;
+}
 export interface LayerSelectService {
     name: string;
     url: string;
@@ -10,9 +13,6 @@ export interface LayerSelectService {
     scope?: serviceTypes.ServiceScope;
     abstract?: string;
 }
-export interface ActiveLayerObject extends serviceTypes.ServiceLayer {
-    serviceName: string;
-}
 export interface ActiveServiceObject {
     serviceId?: string;
     serviceName?: string;
@@ -51,7 +51,6 @@ export interface ServicePopupObject {
 export interface LayerSelectStoreType {
     filters: FiltersType;
     allServicesEnabled: boolean;
-    activeLayerInfo: ActiveLayerObject;
     servicePopup: ServicePopupObject;
 }
 export interface LayerSelectModuleState {
@@ -79,6 +78,3 @@ export interface ToggleKeywordsPayload {
 export interface EnableOnlyOneKeywordPayload {
     filterId: string;
 }
-export interface SetActiveLayerInfoPayload {
-    layer: ActiveLayerObject;
-}

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

@@ -1,7 +1,8 @@
 import { EntityAdapter, Draft } from '@reduxjs/toolkit';
 import { serviceTypes } from '@opengeoweb/store';
+import { LayerProps } from '@opengeoweb/webmap';
 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 filterLayersFromService: (serviceId: string, services: serviceTypes.Services, filterIds: string[], allFiltersActive: boolean, searchString: string) => serviceTypes.ServiceLayer[];
+export declare const filterLayersFromService: (serviceId: string, services: serviceTypes.Services, filterIds: string[], allFiltersActive: boolean, searchString: string) => LayerProps[];
 export declare const isUserAddedService: (scope: serviceTypes.ServiceScope) => boolean;

package/src/lib/components/LayerInfo/LayerInfoButton.d.ts

@@ -1,10 +0,0 @@
-import React from 'react';
-import { CustomIconProps } from '@opengeoweb/shared';
-interface LayerInfoButtonProps extends CustomIconProps {
-    disabled?: boolean;
-    isOpenInStore?: boolean;
-    isActive?: boolean;
-    onClick?: () => void;
-}
-export declare const LayerInfoButton: React.FC<LayerInfoButtonProps>;
-export {};

package/src/lib/components/LayerInfo/LayerInfoButton.spec.d.ts

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

package/src/lib/components/LayerInfo/LayerInfoButtonConnect.d.ts

@@ -1,11 +0,0 @@
-import React from 'react';
-import { uiTypes, serviceTypes } from '@opengeoweb/store';
-interface LayerInfoButtonProps {
-    isLayerMissing?: boolean;
-    layer: serviceTypes.ServiceLayer;
-    mapId: string;
-    serviceName: string;
-    source?: uiTypes.Source;
-}
-export declare const LayerInfoButtonConnect: React.FC<LayerInfoButtonProps>;
-export {};

package/src/lib/components/LayerInfo/LayerInfoButtonConnect.spec.d.ts

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

package/src/lib/components/LayerInfo/LayerInfoDialog.d.ts

@@ -1,13 +0,0 @@
-import React from 'react';
-import { uiTypes } from '@opengeoweb/store';
-import { layerSelectTypes } from '../../store';
-export interface LayerInfoDialogProps {
-    layer: layerSelectTypes.ActiveLayerObject;
-    onClose: () => void;
-    isOpen: boolean;
-    onMouseDown?: () => void;
-    order?: number;
-    source?: uiTypes.Source;
-    dialogHeight?: number;
-}
-export declare const LayerInfoDialog: React.FC<LayerInfoDialogProps>;

package/src/lib/components/LayerInfo/LayerInfoDialog.spec.d.ts

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

package/src/lib/components/LayerInfo/LayerInfoDialog.stories.d.ts

@@ -1,25 +0,0 @@
-import * as React from 'react';
-declare const _default: {
-    title: string;
-};
-export default _default;
-export declare const LayerInfoDialogLight: {
-    (): React.ReactElement;
-    storyName: string;
-    parameters: {
-        zeplinLink: {
-            name: string;
-            link: string;
-        }[];
-    };
-};
-export declare const LayerInfoDialogDark: {
-    (): React.ReactElement;
-    storyName: string;
-    parameters: {
-        zeplinLink: {
-            name: string;
-            link: string;
-        }[];
-    };
-};

package/src/lib/components/LayerInfo/LayerInfoDialogConnect.d.ts

@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const LayerInfoDialogConnect: React.FC;

package/src/lib/components/LayerInfo/LayerInfoLegend.d.ts

@@ -1,9 +0,0 @@
-import React from 'react';
-import { mapTypes } from '@opengeoweb/store';
-export interface LayerInfoLegendProps {
-    title: string;
-    name: string;
-    dimensions: mapTypes.Dimension[];
-    legendURL: string;
-}
-export declare const LayerInfoLegend: React.FC<LayerInfoLegendProps>;

package/src/lib/components/LayerInfo/LayerInfoLegend.spec.d.ts

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

package/src/lib/components/LayerInfo/LayerInfoList.d.ts

@@ -1,11 +0,0 @@
-import React from 'react';
-export interface ListItem {
-    label: string;
-    value: string;
-    icon: React.ReactElement;
-}
-export interface LayerInfoListProps {
-    label: string;
-    list: ListItem[];
-}
-export declare const LayerInfoList: React.FC<LayerInfoListProps>;

package/src/lib/components/LayerInfo/LayerInfoText.d.ts

@@ -1,15 +0,0 @@
-import React from 'react';
-export interface LayerInfoTextProps {
-    label: string;
-    value: string;
-}
-export declare const textStyle: {
-    lineHeight: string;
-    letterSpacing: string;
-};
-export declare const textStyleWithMargin: {
-    marginBottom: number;
-    lineHeight: string;
-    letterSpacing: string;
-};
-export declare const LayerInfoText: React.FC<LayerInfoTextProps>;

package/src/lib/components/LayerInfo/LayerInfoUtils.d.ts

@@ -1,10 +0,0 @@
-import React from 'react';
-import { mapTypes } from '@opengeoweb/store';
-import { ListItem } from './LayerInfoList';
-import { layerSelectTypes } from '../../store';
-export declare const getLayerStyles: (layer: layerSelectTypes.ActiveLayerObject) => string;
-export declare const getDimensionValue: (name: string, dimensions: mapTypes.Dimension[]) => string;
-export declare const getLayerBbox: (layer: layerSelectTypes.ActiveLayerObject) => string;
-export declare const getDimensionIcon: (name: string, dimensions: mapTypes.Dimension[]) => React.ReactElement;
-export declare const getDimensionLabel: (name: string) => string;
-export declare const getDimensionsList: (dimensions: mapTypes.Dimension[]) => ListItem[];

package/src/lib/components/LayerInfo/LayerInfoUtils.spec.d.ts

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

package/src/lib/components/LayerInfo/index.d.ts

@@ -1,8 +0,0 @@
-export * from './LayerInfoButton';
-export * from './LayerInfoButtonConnect';
-export * from './LayerInfoDialog';
-export * from './LayerInfoDialogConnect';
-export * from './LayerInfoLegend';
-export * from './LayerInfoList';
-export * from './LayerInfoText';
-export * from './LayerInfoUtils';