@opengeoweb/cap 9.20.1 → 9.20.2

package/index.esm.js

@@ -6,7 +6,7 @@ import { dateUtils, AlertBanner } from '@opengeoweb/shared';
 import { useSelector, useDispatch } from 'react-redux';
 import { createEntityAdapter, createSlice, createSelector } from '@reduxjs/toolkit';
 import React from 'react';
-import 'i18next';
+import i18n from 'i18next';
 import { useTranslation } from 'react-i18next';
 import { ConfigurableMapConnect } from '@opengeoweb/core';
 import { mapSelectors } from '@opengeoweb/store';
@@ -1881,14 +1881,14 @@ $$c({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG && !CORRECT_IS_RE
  * Copyright 2022 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2022 - Finnish Meteorological Institute (FMI)
  * */
-const findEventIndexInLanguage = (languages, capWarningPresets, feedAddressFromProps) => {
+const findEventIndexInLanguage = (language, languages, capWarningPresets, feedAddressFromProps) => {
   const correctFeedIndex = capWarningPresets.feeds.findIndex(({
     feedAddress
   }) => feedAddress === feedAddressFromProps);
   if (correctFeedIndex === -1) {
     return 0;
   }
-  const languageIndex = languages.findIndex(object => object.language === (capWarningPresets === null || capWarningPresets === void 0 ? void 0 : capWarningPresets.feeds[correctFeedIndex].languagePriority));
+  const languageIndex = languages.findIndex(lang => lang.language.startsWith(language));
   if (languageIndex === -1) {
     const fallbackLanguage = languages.findIndex(object => object.language.startsWith('en'));
     if (fallbackLanguage === -1) {
@@ -2014,16 +2014,21 @@ const WarningListRowCapConnect = ({
   alertId,
   capWarningPresets
 }) => {
+  var _a;
   const [languageIndex, setLanguageIndex] = React.useState(0);
   const alert = useSelector(store => getAlertById(store, alertId));
+  const alertHasLanguages = Boolean((_a = alert === null || alert === void 0 ? void 0 : alert.languages) === null || _a === void 0 ? void 0 : _a.length);
+  const {
+    language
+  } = i18n;
   React.useEffect(() => {
-    if (alert) {
-      const foundLanguageIndex = findEventIndexInLanguage(alert.languages, capWarningPresets, alert.feedAddress);
+    if (alert && alertHasLanguages) {
+      const foundLanguageIndex = findEventIndexInLanguage(language, alert.languages, capWarningPresets, alert.feedAddress);
       setLanguageIndex(foundLanguageIndex);
     }
-  }, [alert, capWarningPresets]);
+  }, [alert, language, alertHasLanguages, capWarningPresets]);
   return jsx("div", {
-    children: alert && jsx(WarningListRowCap, {
+    children: alert && alertHasLanguages && jsx(WarningListRowCap, {
       event: alert.languages[languageIndex].event,
       severity: alert.severity,
       expires: alert.expires
@@ -4378,7 +4383,7 @@ const MapViewCapConnect = ({
       }), selectedFeatureEvent && jsx(MapWarningProperties, {
         "data-testid": "mapWarnings",
         selectedFeatureProperties: selectedFeatureEvent.feature.properties.details,
-        languageIndex: findEventIndexInLanguage(selectedFeatureEvent.feature.properties.details.languages, capWarningPresets, selectedFeatureEvent.feature.properties.details.feedAddress),
+        languageIndex: findEventIndexInLanguage(i18n.language, selectedFeatureEvent.feature.properties.details.languages, capWarningPresets, selectedFeatureEvent.feature.properties.details.feedAddress),
         parentSize: parentSize
       })]
     }))
@@ -4446,9 +4451,8 @@ const ComponentsLookUp = ({
   id
 }) => {
   // TODO: implement polling when backend is ready
-  // TODO: fetch new data using feedLanguage if previous response indicates there are new warnings
-  var _a, _b;
   // NOTE: Fetching data inside this component might not work, as using React Hooks causes Invalid Hook Call -errors in tests.
+  var _a, _b;
   switch (componentType) {
     case 'CapWarningMap':
       {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/cap",
-  "version": "9.20.1",
+  "version": "9.20.2",
   "description": "GeoWeb Common Alerting Protocol (CAP) library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {

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

@@ -2,6 +2,7 @@ import React from 'react';
 import { Store } from '@reduxjs/toolkit';
 import { ThemeProviderProps } from '@opengeoweb/theme';
 import { Theme } from '@mui/material';
+import i18n from 'i18next';
 export declare const CapThemeWrapper: React.FC<ThemeProviderProps>;
 interface CapApiProviderProps {
     children: React.ReactNode;
@@ -11,9 +12,11 @@ interface CapThemeStoreProviderProps {
     children?: React.ReactNode;
     theme?: Theme;
     store: Store;
+    i18nInstance?: typeof i18n;
 }
 interface CapTranslationsWrapperProps {
     children?: React.ReactNode;
+    i18nInstance?: typeof i18n;
 }
 /**
  * A Provider component which returns the Api Provider for the Cap library

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

@@ -5,7 +5,6 @@ export interface CapPresets {
 interface Feed {
     feedAddress: string;
     feedType: string;
-    languagePriority: string;
 }
 export interface FeedLastUpdated {
     lastUpdated: number;

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

@@ -1,10 +1,10 @@
 import { CapPresets } from '../components/types';
-interface Languages {
+interface Language {
     language: string;
     event: string;
     senderName: string;
     headline: string;
     description: string;
 }
-export declare const findEventIndexInLanguage: (languages: Languages[], capWarningPresets: CapPresets, feedAddressFromProps: string) => number;
+export declare const findEventIndexInLanguage: (language: string, languages: Language[], capWarningPresets: CapPresets, feedAddressFromProps: string) => number;
 export {};

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

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

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

@@ -1 +0,0 @@
-export declare const feedLanguage: (languagePriority?: string) => string;

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

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