@opengeoweb/cap 12.2.0 → 12.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/cap",
-  "version": "12.2.0",
+  "version": "12.4.1",
   "description": "GeoWeb Common Alerting Protocol (CAP) library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,23 +8,23 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/api": "12.2.0",
-    "@opengeoweb/core": "12.2.0",
+    "@opengeoweb/api": "12.4.1",
+    "@opengeoweb/core": "12.4.1",
     "frappe-gantt": "^0.6.1",
-    "@opengeoweb/shared": "12.2.0",
-    "@opengeoweb/store": "12.2.0",
-    "react-redux": "^8.1.3",
-    "@opengeoweb/webmap": "12.2.0",
-    "@opengeoweb/webmap-react": "12.2.0",
-    "@mui/system": "^6.1.1",
+    "@opengeoweb/shared": "12.4.1",
+    "@opengeoweb/store": "12.4.1",
+    "react-redux": "^9.2.0",
+    "@opengeoweb/webmap": "12.4.1",
+    "@opengeoweb/webmap-react": "12.4.1",
+    "@mui/system": "^7.0.1",
     "react-i18next": "^15.1.1",
-    "@reduxjs/toolkit": "^1.9.7",
-    "@opengeoweb/theme": "12.2.0",
-    "i18next": "^23.11.5",
-    "axios": "^1.7.7",
-    "@opengeoweb/timeslider": "12.2.0",
-    "@mui/material": "^6.1.1",
-    "ol": "^10.4.0"
+    "@reduxjs/toolkit": "^2.6.1",
+    "@opengeoweb/theme": "12.4.1",
+    "i18next": "^25.0.1",
+    "@opengeoweb/timeslider": "12.4.1",
+    "@mui/material": "^7.0.1",
+    "ol": "^10.4.0",
+    "@tanstack/react-query": "^5.69.2"
   },
   "peerDependencies": {
     "react": "18",

package/src/lib/CapDemo.stories.d.ts

@@ -1,8 +1,9 @@
 import * as React from 'react';
+import { StoryObj } from '@storybook/react/*';
 declare const _default: {
     title: string;
     tags: string[];
 };
 export default _default;
 export declare const CapDemoFakeApi: React.FC;
-export declare const CapDemoRealApi: React.FC;
+export declare const CapDemoRealApi: StoryObj;

package/src/lib/components/ComponentsLookUp/componentsLookUp.d.ts

@@ -1,5 +1,4 @@
 import React from 'react';
-import { ApiUrls } from '@opengeoweb/api';
 import { InitialMapProps } from '@opengeoweb/core';
 import { CapFeatures } from '../types';
 export type SupportedComponentTypes = 'CapWarningList' | 'CapWarningMap';
@@ -23,12 +22,11 @@ export interface ComponentsLookUpPayload {
     componentType: SupportedComponentTypes;
     id: string;
     initialProps: InitialProps;
-    config: ApiUrls;
 }
 /**
  * The lookup table is for registering your own components with the workspace.
  * @param payload
  * @returns
  */
-export declare const ComponentsLookUp: ({ componentType, initialProps, productConfigKey, config, id, }: ComponentsLookUpPayload) => React.ReactElement;
+export declare const ComponentsLookUp: ({ componentType, initialProps, productConfigKey, id, }: ComponentsLookUpPayload) => React.ReactElement;
 export {};

package/src/lib/components/GanttChart/GanttModule.stories.d.ts

@@ -3,4 +3,5 @@ import GanttModule from './GanttModule';
 declare const meta: Meta<typeof GanttModule>;
 export default meta;
 type Story = StoryObj<typeof GanttModule>;
+export declare const GanttDemoFakeApi: Story;
 export declare const GanttDemoRealApi: Story;

package/src/lib/components/MapViewCap/MapViewCapConnect.d.ts

@@ -11,7 +11,7 @@ export interface MapViewCapConnectProps {
         top: number;
     };
     srs?: string;
-    capWarningPresets?: CapPresets;
+    capWarningPresets: CapPresets;
     layers?: InitialMapProps['mapPreset']['layers'];
     children?: React.ReactNode;
 }

package/src/lib/components/MapViewCap/MapViewCapConnectWrapper.d.ts

@@ -10,7 +10,7 @@ interface MapViewCapConnectWrapperProps {
         top: number;
     };
     srs?: string;
-    productConfigKey?: string;
+    productConfigKey: string;
     layers?: InitialMapProps['mapPreset']['layers'];
 }
 export declare const MapViewCapConnectWrapper: React.FC<MapViewCapConnectWrapperProps>;

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

@@ -3,13 +3,13 @@ import { Store } from '@reduxjs/toolkit';
 import { ThemeProviderProps } from '@opengeoweb/theme';
 import { Theme } from '@mui/material';
 import i18n from 'i18next';
+import { QueryClient } from '@tanstack/react-query';
 export declare const CapThemeWrapper: React.FC<ThemeProviderProps>;
-interface CapApiProviderProps {
+interface CapQueryClientProviderProps {
     children: React.ReactNode;
-    createApi?: () => void;
+    customClient?: QueryClient;
 }
-interface CapThemeStoreProviderProps {
-    children?: React.ReactNode;
+interface CapThemeStoreProviderProps extends CapQueryClientProviderProps {
     theme?: Theme;
     store: Store;
     i18nInstance?: typeof i18n;
@@ -19,11 +19,11 @@ interface CapTranslationsWrapperProps {
     i18nInstance?: typeof i18n;
 }
 /**
- * A Provider component which returns the Api Provider for the Cap library
+ * A Provider component which returns the QueryClientProvider for the Cap library
  * @param children
  * @returns
  */
-export declare const CapApiProvider: React.FC<CapApiProviderProps>;
+export declare const CapQueryClientProvider: React.FC<CapQueryClientProviderProps>;
 export interface CapStoreProviderProps extends ThemeProviderProps {
     store: Store;
 }

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

@@ -1,8 +1,10 @@
 import React from 'react';
 import { CapPresets } from '../types';
+import { CapAlert } from '../../store/types';
 interface WarningListCapProps {
-    capWarningPresets?: CapPresets;
-    alertIds: string[];
+    capWarningPresets: CapPresets;
+    alerts: CapAlert[];
+    isPending?: boolean;
 }
 export declare const WarningListCap: React.FC<WarningListCapProps>;
 export {};

package/src/lib/components/WarningListCap/WarningListRowCap/WarningListRowCapConnect.d.ts

@@ -1,7 +1,8 @@
 import React from 'react';
+import { CapAlert } from '../../../store/types';
 import { CapPresets } from '../../types';
 interface WarningListRowCapConnectProps {
-    alertId: string;
+    alert: CapAlert;
     capWarningPresets: CapPresets;
 }
 export declare const WarningListRowCapConnect: React.FC<WarningListRowCapConnectProps>;

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

@@ -6,9 +6,6 @@ interface Feed {
     feedAddress: string;
     feedType: string;
 }
-export interface FeedLastUpdated {
-    lastUpdated: number;
-}
 export interface CapWarnings {
     alert: CapAlert;
     features: CapFeatures;

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

@@ -1,5 +1 @@
-export { capActions, capReducer } from './reducer';
-export * as capSelectors from './selectors';
-export * from './mockStore';
-export type { CapModule } from './types';
 export * from './store';

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

@@ -1,11 +1,2 @@
-import { ToolkitStore } from '@reduxjs/toolkit/dist/configureStore';
-import { CapModule } from './types';
-export declare const capReducersMap: {
-    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>;
-    syncGroups: import("redux").Reducer<import("dist/libs/store/src/store/generic/syncGroups/types").SynchronizationGroupState, import("redux").AnyAction>;
-    cap: import("redux").Reducer<import("./types").CapStore>;
-};
-export declare const capMiddlewares: import("@reduxjs/toolkit").ListenerMiddleware<import("@opengeoweb/store").CoreAppStore, import("@reduxjs/toolkit").ThunkDispatch<import("@opengeoweb/store").CoreAppStore, unknown, import("redux").AnyAction>, unknown>[];
-export declare const createMockStore: (mockState?: CapModule) => ToolkitStore;
+import { Store } from '@reduxjs/toolkit';
+export declare const createMockStore: (mockState?: any) => Store;

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

@@ -1,5 +1,3 @@
-import { EntityState } from '@reduxjs/toolkit';
-import { CoreAppStore } from '@opengeoweb/store';
 import { Language } from '../components/types';
 export interface CapAlert {
     feedAddress: string;
@@ -10,33 +8,8 @@ export interface CapAlert {
     expires: string;
     languages: Language[];
 }
-export type CapAlertState = EntityState<CapAlert>;
 export interface CapFeed {
     id: string;
     lastUpdated: number;
     alertIds: string[];
 }
-export type CapFeedState = EntityState<CapFeed>;
-export interface CapStore {
-    feeds: CapFeedState;
-    alerts: CapAlertState;
-}
-export interface CapModule {
-    cap?: CapStore;
-}
-export interface AddAllFeedAlertsPayload {
-    feedId: string;
-    alertUrls: string[];
-}
-export interface AddManyAlertsToFeedPayload {
-    feedId: string;
-    alertIds: string[];
-}
-export interface FeedLastUpdatedPayload {
-    id: string;
-    changes: {
-        lastUpdated: number;
-    };
-}
-export interface AppStore extends CoreAppStore, CapModule {
-}

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

@@ -1,2 +1,2 @@
 import { CustomFeature } from '../components/types';
-export declare const addFeedAdressToCustomGeoJSonFeature: (feedAddress: string, features: CustomFeature[]) => CustomFeature[];
+export declare const addFeedAddressToCustomGeoJSonFeature: (feedAddress: string, features: CustomFeature[]) => CustomFeature[];

package/src/lib/utils/cap-api/api.d.ts

@@ -0,0 +1,12 @@
+import { CapAlert, CapPresets, CustomFeature } from '../../components/types';
+export interface FeedAddressLink {
+    feedAddress: string;
+    link: string;
+}
+export interface CapAlertAndFeatures {
+    alert: CapAlert;
+    features: CustomFeature[];
+}
+export declare const getConfig: (productConfigKey: string) => Promise<CapPresets>;
+export declare const getFeedLinks: (feedAddress: string) => Promise<FeedAddressLink[]>;
+export declare const getSingleAlert: (alertUrl: FeedAddressLink) => Promise<CapAlertAndFeatures>;

package/src/lib/utils/cap-api/fakeApi.d.ts

@@ -0,0 +1,2 @@
+export declare const generateAlertId: () => string;
+export declare const capApiEndpoints: import("msw").HttpHandler[];

package/src/lib/utils/cap-api/hooks.d.ts

@@ -0,0 +1,10 @@
+import { UseQueryResult } from '@tanstack/react-query';
+import { CapPresets } from '../../components/types';
+import { CapAlertAndFeatures } from './api';
+interface CombinePendingResult<T> {
+    results: T;
+    pending: boolean;
+}
+export declare const useGetConfig: (productConfigKey: string) => UseQueryResult<CapPresets>;
+export declare const useAllFeedAlerts: (capPresets: CapPresets) => CombinePendingResult<CapAlertAndFeatures[]>;
+export {};

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

@@ -1,3 +1,3 @@
 import { FeatureEvent } from '@opengeoweb/webmap-react';
 import { CustomFeature } from '../components/types';
-export declare const highlightGeoJson: (currentFeatures: Record<string, CustomFeature[]>, featureResults: FeatureEvent) => Record<string, CustomFeature[]>;
+export declare const highlightGeoJson: (currentFeatures: Record<string, CustomFeature[]>, featureResults?: FeatureEvent) => Record<string, CustomFeature[]>;

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

@@ -3,3 +3,4 @@ import { UseTranslationResponse } from 'react-i18next';
 export declare const CAP_NAMESPACE = "cap";
 export declare const initCapI18n: () => typeof i18n;
 export declare const useCapTranslation: () => UseTranslationResponse<typeof CAP_NAMESPACE, typeof i18n>;
+export { i18n };

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

@@ -1,19 +1,2 @@
 import { CapAlert } from '../components/types';
 export declare const mockAlert: CapAlert;
-export declare const mockAlert2: CapAlert;
-export declare const mockAlert3: {
-    identifier: string;
-    feedAddress: string;
-    severity: string;
-    certainty: string;
-    onset: string;
-    expires: string;
-    languages: {
-        areaDesc: string;
-        language: string;
-        event: string;
-        senderName: string;
-        headline: string;
-        description: string;
-    }[];
-};

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

@@ -1,6 +1,3 @@
-import { CapPresets, CapWarnings, FeedLastUpdated } from '../components/types';
+import { CapPresets, CapWarnings } from '../components/types';
 export declare const mockCapWarningPresets: CapPresets;
 export declare const mockCapWarnings: CapWarnings;
-export declare const mockCapWarnings2: CapWarnings;
-export declare const mockCapWarnings3: CapWarnings;
-export declare const mockLastUpdated: FeedLastUpdated;

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

@@ -1,4 +1,2 @@
 import { CapFeatures } from '../components/types';
 export declare const mockGeoJson: CapFeatures;
-export declare const mockGeoJson2: CapFeatures;
-export declare const mockGeoJson3: CapFeatures;

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

@@ -1,21 +0,0 @@
-import { CapStore } from './types';
-export declare const mockCapStateWithAlerts: CapStore;
-export declare const mockCapStateWithFeeds: {
-    alerts: {
-        ids: never[];
-        entities: {};
-    };
-    feeds: {
-        ids: string[];
-        entities: {
-            'https://alerts.fmi.fi/cap/feed/rss_en-GB.rss': {
-                id: string;
-                lastUpdated: number;
-            };
-            'https://api.met.no/weatherapi/metalerts/1.1': {
-                id: string;
-                lastUpdated: number;
-            };
-        };
-    };
-};

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

@@ -1,12 +0,0 @@
-import { Draft, PayloadAction } from '@reduxjs/toolkit';
-import { CapFeed, CapFeedState, CapAlert, CapAlertState, AddManyAlertsToFeedPayload, FeedLastUpdatedPayload, CapStore } from './types';
-export declare const feedAdapter: import("@reduxjs/toolkit").EntityAdapter<CapFeed>;
-export declare const feedInitialState: CapFeedState;
-export declare const alertAdapter: import("@reduxjs/toolkit").EntityAdapter<CapAlert>;
-export declare const alertInitialState: CapAlertState;
-export declare const initialState: CapStore;
-export declare const capReducer: import("redux").Reducer<CapStore>, capActions: import("@reduxjs/toolkit").CaseReducerActions<{
-    addManyAlerts: (draft: Draft<CapStore>, action: PayloadAction<CapAlert[]>) => void;
-    addManyAlertsToFeed: (draft: Draft<CapStore>, action: PayloadAction<AddManyAlertsToFeedPayload>) => void;
-    setFeedLastUpdatedTimes: (draft: Draft<CapStore>, action: PayloadAction<FeedLastUpdatedPayload[]>) => void;
-}, "capReducer">;

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

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

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

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

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

@@ -1,15 +0,0 @@
-import { CoreAppStore } from '@opengeoweb/store';
-import { CapAlert, CapModule, CapStore, CapFeed } from './types';
-export declare const getCapStore: (store: CapModule) => CapStore;
-export declare const getCapFeedById: (state: CapModule, id: import("@reduxjs/toolkit").EntityId) => CapFeed | undefined, getCapFeeds: (state: CapModule) => CapFeed[];
-export declare const getAlertById: (state: CapModule, id: import("@reduxjs/toolkit").EntityId) => CapAlert | undefined, getAlerts: (state: CapModule) => CapAlert[], getAlertIds: (state: CapModule) => import("@reduxjs/toolkit").EntityId[];
-export declare const getAlertsInEffect: ((state: CapModule & CoreAppStore, selectedTime: string) => CapAlert[]) & import("reselect").OutputSelectorFields<(args_0: CapAlert[], args_1: string) => CapAlert[], {
-    clearCache: () => void;
-}> & {
-    clearCache: () => void;
-};
-export declare const getLastUpdatedTimes: ((state: CapModule) => number[]) & import("reselect").OutputSelectorFields<(args_0: CapFeed[]) => number[], {
-    clearCache: () => void;
-}> & {
-    clearCache: () => void;
-};

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

@@ -1,20 +0,0 @@
-import { CreateApiProps } from '@opengeoweb/api';
-import { CapFeatures, CapPresets, CapWarnings, FeedLastUpdated } from '../components/types';
-export interface CapApi {
-    getCapConfiguration?: (productConfigKey: string) => Promise<{
-        data: CapPresets;
-    }>;
-    getAllAlerts?: (thirdPartyApiUrl: string) => Promise<{
-        data: CapFeatures;
-    }>;
-    getFeedLinks?: (thirdPartyApiUrl: string) => Promise<{
-        data: string[];
-    }>;
-    getSingleAlert?: (alertUrl: string) => Promise<{
-        data: CapWarnings;
-    }>;
-    getLastUpdated?: (thirdPartyApiUrl: string) => Promise<{
-        data: FeedLastUpdated;
-    }>;
-}
-export declare const createApi: (props: CreateApiProps) => CapApi;

package/src/lib/utils/api.spec.d.ts

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

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

@@ -1,2 +0,0 @@
-import { CapApi } from './api';
-export declare const createApi: () => CapApi;

package/src/lib/utils/fakeApi.spec.d.ts

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