@opengeoweb/warnings 9.27.1 → 9.28.0

package/index.esm.js

@@ -180,7 +180,11 @@ var en = {
 	"aviation-phenomenon-occasional-towering-cumulus-cloud": "Occasional towering cumulus cloud",
 	"aviation-phenomenon-frequent-towering-cumulus-cloud": "Frequent towering cumulus cloud",
 	"aviation-phenomenon-moderate-mountain-wave": "Moderate mountain wave",
-	"aviation-phenomenon-mountains-obscured": "Mountains obscured"
+	"aviation-phenomenon-mountains-obscured": "Mountains obscured",
+	"warning-dialog-expire-succes": "Warning has been expired",
+	"warning-dialog-expire-title": "Expire warning",
+	"warning-dialog-expire-confirm": "Expire",
+	"warning-dialog-expire-description": "Are you sure you want to expire this warning?"
 };
 var nl = {
 	"drawing-tool-form-tools": "Gereedschap",
@@ -302,7 +306,11 @@ var nl = {
 	"filter-phenomenon": "Fenomenen",
 	"filter-level": "Niveaus",
 	"filter-source": "Bronnen",
-	"error-title-retry": "Probeer opnieuw"
+	"error-title-retry": "Probeer opnieuw",
+	"warning-dialog-expire-succes": "Waarschuwing laten verlopen is succesvol",
+	"warning-dialog-expire-title": "Waarschuwing laten verlopen",
+	"warning-dialog-expire-confirm": "Verlopen",
+	"warning-dialog-expire-description": "Weet je zeker dat je deze waarschuwing wilt laten verlopen?"
 };
 var fi = {
 	"drawing-tool-form-tools": "Työkalut",
@@ -424,7 +432,11 @@ var fi = {
 	"filter-phenomenon": "ei käännetty",
 	"filter-level": "ei käännetty",
 	"filter-source": "ei käännetty",
-	"error-title-retry": "Yritä uudelleen"
+	"error-title-retry": "Yritä uudelleen",
+	"warning-dialog-expire-succes": "ei käännetty",
+	"warning-dialog-expire-title": "ei käännetty",
+	"warning-dialog-expire-confirm": "ei käännetty",
+	"warning-dialog-expire-description": "ei käännetty"
 };
 var no = {
 	"drawing-tool-form-tools": "Verktøy",
@@ -546,7 +558,11 @@ var no = {
 	"filter-phenomenon": "Fenomen",
 	"filter-level": "Grad",
 	"filter-source": "Kilder",
-	"error-title-retry": "Prøv igjen"
+	"error-title-retry": "Prøv igjen",
+	"warning-dialog-expire-succes": "ikke oversatt",
+	"warning-dialog-expire-title": "ikke oversatt",
+	"warning-dialog-expire-confirm": "ikke oversatt",
+	"warning-dialog-expire-description": "ikke oversatt"
 };
 var warningsTranslations = {
 	en: en,
@@ -11045,8 +11061,8 @@ const AreaField = ({
       }, {
         children: [jsx(Typography, Object.assign({
           variant: "h4",
-          color: "text.primary",
           sx: {
+            color: 'text.primary',
             fontSize: '0.75rem',
             fontWeight: 'normal',
             lineHeight: 1.83
@@ -11056,7 +11072,9 @@ const AreaField = ({
           children: objectName
         })), jsx(Typography, Object.assign({
           variant: "body2",
-          color: "text.secondary"
+          sx: {
+            color: 'text.secondary'
+          }
         }, {
           children: lastUpdatedTime ? formatDate(lastUpdatedTime) : ''
         })), geoJSON ? jsx(ToggleMenu, {
@@ -14123,7 +14141,7 @@ const transformAirmetToWarningFormat = apiAirmet => {
       descriptionTranslation: '',
       areas: [{
         geoJSON: airmet.startGeometry,
-        objectName: ''
+        objectName: airmet.locationIndicatorATSR
       }],
       phenomenon: airmet.phenomenon,
       validFrom: airmet.validDateStart,
@@ -14145,7 +14163,7 @@ const transformSigmetToWarningFormat = apiSigmet => {
       descriptionTranslation: '',
       areas: [{
         geoJSON: sigmet.startGeometry,
-        objectName: ''
+        objectName: sigmet.locationIndicatorATSR
       }],
       phenomenon: sigmet.phenomenon,
       validFrom: sigmet.validDateStart,
@@ -14170,6 +14188,23 @@ const mapProductStatusToWarningStatus = productStatus => {
   }
 };
 
+function useOverflowCheck(text) {
+  const ref = React__default.useRef(null);
+  const [isOverflowing, setIsOverflowing] = React__default.useState(false);
+  React__default.useEffect(() => {
+    const checkOverflow = () => {
+      if (ref.current) {
+        setIsOverflowing(ref.current.scrollWidth > ref.current.clientWidth);
+      }
+    };
+    checkOverflow();
+  }, [text]);
+  return {
+    ref,
+    isOverflowing
+  };
+}
+
 const getSortedStatus = status => {
   switch (status) {
     case 'DRAFT_PUBLISHED':
@@ -14312,6 +14347,7 @@ const getMenuItems = ({
   onEditWarning: _onEditWarning = () => {},
   onDeleteWarning: _onDeleteWarning = () => {},
   onDeleteReviewWarning: _onDeleteReviewWarning = () => {},
+  onExpireWarning: _onExpireWarning = () => {},
   t
 }) => {
   const duplicate = {
@@ -14319,6 +14355,8 @@ const getMenuItems = ({
     action: () => _onEditWarning(getWarningWithoutIdStatusEditor(warning)),
     icon: jsx(Copy, {})
   };
+  // disable Expire option if warning is not active
+  const shouldDisableExpire = !dateUtils.isBetween(dateUtils.getNowUtc(), dateUtils.createDate(warning.warningDetail.validFrom), dateUtils.createDate(warning.warningDetail.validUntil), '[]');
   switch (warning.status) {
     case 'PUBLISHED':
       return [{
@@ -14327,9 +14365,9 @@ const getMenuItems = ({
         icon: jsx(Edit, {})
       }, duplicate, {
         text: t('warning-list-button-expire'),
-        action: () => null,
+        action: () => _onExpireWarning(warning),
         icon: jsx(Expire, {}),
-        isDisabled: true
+        isDisabled: shouldDisableExpire
       }, {
         text: t('warning-list-button-withdraw'),
         action: () => null,
@@ -14364,6 +14402,7 @@ const getMenuItems = ({
   }
 };
 const WarningListItem = _a => {
+  var _b, _c;
   var {
       warning,
       status,
@@ -14371,26 +14410,25 @@ const WarningListItem = _a => {
       onSelectWarning = () => {},
       onEditWarning = () => {},
       onDeleteWarning = () => {},
-      onDeleteReviewWarning = () => {}
+      onDeleteReviewWarning = () => {},
+      onExpireWarning = () => {}
     } = _a,
-    props = __rest(_a, ["warning", "status", "activeWarningId", "onSelectWarning", "onEditWarning", "onDeleteWarning", "onDeleteReviewWarning"]);
+    props = __rest(_a, ["warning", "status", "activeWarningId", "onSelectWarning", "onEditWarning", "onDeleteWarning", "onDeleteReviewWarning", "onExpireWarning"]);
   const {
     t
   } = useWarningsTranslation();
   const phenomenonDetails = allPhenomenaDict[warning.warningDetail.phenomenon];
+  const objectNameText = ((_c = (_b = warning.warningDetail.areas) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.objectName) || '-';
+  const {
+    ref: objectNameRef,
+    isOverflowing: isObjectNameOverflowing
+  } = useOverflowCheck(objectNameText);
+  const phenomenonText = (phenomenonDetails === null || phenomenonDetails === void 0 ? void 0 : phenomenonDetails.translationKey) ? t(phenomenonDetails.translationKey) : '-';
+  const {
+    ref: phenomenonRef,
+    isOverflowing: isPhenomenonOverflowing
+  } = useOverflowCheck(phenomenonText);
   const levelDetails = levelOptionsDict[warning.warningDetail.level];
-  // State and effect to track if the phenomena text is overflowing
-  const textRef = useRef(null);
-  const [isOverflowing, setIsOverflowing] = useState(false);
-  useEffect(() => {
-    // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-    const checkOverflow = () => {
-      if (textRef.current) {
-        setIsOverflowing(textRef.current.scrollWidth > textRef.current.clientWidth);
-      }
-    };
-    checkOverflow();
-  }, [phenomenonDetails]);
   return jsx(ListItem, Object.assign({
     sx: {
       marginBottom: 0.25,
@@ -14412,7 +14450,8 @@ const WarningListItem = _a => {
         t,
         onEditWarning,
         onDeleteReviewWarning,
-        onDeleteWarning
+        onDeleteWarning,
+        onExpireWarning
       }),
       buttonIcon: jsx(Options, {})
     }),
@@ -14491,7 +14530,7 @@ const WarningListItem = _a => {
             children: [jsx(Box, Object.assign({
               display: "inline-block",
               component: "div",
-              ref: textRef,
+              ref: phenomenonRef,
               sx: {
                 textOverflow: 'ellipsis',
                 overflow: 'hidden',
@@ -14499,22 +14538,19 @@ const WarningListItem = _a => {
                 whiteSpace: 'nowrap'
               }
             }, {
-              children: (() => {
-                if (isOverflowing) {
-                  return jsx(CustomTooltip, Object.assign({
-                    title: (phenomenonDetails === null || phenomenonDetails === void 0 ? void 0 : phenomenonDetails.translationKey) ? t(phenomenonDetails.translationKey) : '-',
-                    placement: "top",
-                    sx: {
-                      zIndex: 1000
-                    }
-                  }, {
-                    children: jsx("span", {
-                      children: (phenomenonDetails === null || phenomenonDetails === void 0 ? void 0 : phenomenonDetails.translationKey) ? t(phenomenonDetails.translationKey) : '-'
-                    })
-                  }));
+              children: isPhenomenonOverflowing ? jsx(CustomTooltip, Object.assign({
+                title: phenomenonText,
+                placement: "top",
+                sx: {
+                  zIndex: 1000
                 }
-                return (phenomenonDetails === null || phenomenonDetails === void 0 ? void 0 : phenomenonDetails.translationKey) ? t(phenomenonDetails.translationKey) : '-';
-              })()
+              }, {
+                children: jsx("span", {
+                  children: phenomenonText
+                })
+              })) : jsx("span", {
+                children: phenomenonText
+              })
             })), jsx(Box, Object.assign({
               sx: {
                 position: 'absolute',
@@ -14554,6 +14590,35 @@ const WarningListItem = _a => {
               return '-';
             })()
           }))
+        })), jsx(WarningListColumnContent, Object.assign({
+          title: t('areas'),
+          status: status
+        }, {
+          children: jsx(Box, Object.assign({
+            display: "inline-block",
+            component: "div",
+            ref: objectNameRef,
+            sx: {
+              textOverflow: 'ellipsis',
+              overflow: 'hidden',
+              width: 70,
+              whiteSpace: 'nowrap'
+            }
+          }, {
+            children: isObjectNameOverflowing ? jsx(CustomTooltip, Object.assign({
+              title: objectNameText,
+              placement: "top",
+              sx: {
+                zIndex: 1000
+              }
+            }, {
+              children: jsx("span", {
+                children: objectNameText
+              })
+            })) : jsx("span", {
+              children: objectNameText
+            })
+          }))
         })), jsx(WarningListColumnContent, Object.assign({
           title: t('warning-list-header-status'),
           status: status,
@@ -14683,6 +14748,7 @@ const PublicWarningList = ({
   onRefetchWarnings: _onRefetchWarnings = () => {},
   onDeleteReviewWarning: _onDeleteReviewWarning = () => {},
   onClickAllChip: _onClickAllChip = () => {},
+  onExpireWarning: _onExpireWarning = () => {},
   isAllChipSelected: _isAllChipSelected = true
 }) => {
   const {
@@ -14873,9 +14939,12 @@ const PublicWarningList = ({
         width: 140
       }), jsx(WarningListHeaderContent, {
         title: t('warning-list-header-level')
+      }), jsx(WarningListHeaderContent, {
+        title: t('areas'),
+        width: 100
       }), jsx(WarningListHeaderContent, {
         title: t('warning-list-header-status'),
-        width: 96,
+        width: 76,
         sx: {
           marginRight: '48px'
         }
@@ -14925,7 +14994,8 @@ const PublicWarningList = ({
               onEditWarning: _onEditWarning,
               onDeleteWarning: _onDeleteWarning,
               onDeleteReviewWarning: _onDeleteReviewWarning,
-              activeWarningId: _selectedPublicWarningId
+              activeWarningId: _selectedPublicWarningId,
+              onExpireWarning: _onExpireWarning
             }, key);
           }
         }))
@@ -15137,6 +15207,7 @@ const PublicWarningListConnect = () => {
   const error = useSelector(getPublicWarningsError);
   const isFormDirty = useSelector(getSelectedPublicIsFormDirty);
   const lastUpdatedTime = useSelector(getPublicWarningsLastUpdatedTime);
+  const warningsApi = getWarningsApi();
   const openPublicWarningDialog = (formAction, publicWarning) => __awaiter(void 0, void 0, void 0, function* () {
     if (isFormDirty) {
       const mayProceed = yield confirmDialog(warningFormConfirmationOptions(t)).then(() => true).catch(() => false);
@@ -15170,12 +15241,23 @@ const PublicWarningListConnect = () => {
       openPublicWarningDialog('', publicWarning);
     }
   });
+  const expireWarning = warning => __awaiter(void 0, void 0, void 0, function* () {
+    const expiredWarning = Object.assign(Object.assign({}, warning), {
+      status: PublicWarningStatus.EXPIRED
+    });
+    setConfirmDialogOptions({
+      confirmLabel: t('warning-dialog-expire-confirm'),
+      title: t('warning-dialog-expire-title'),
+      description: t('warning-dialog-expire-description'),
+      request: () => warningsApi.updateWarning(expiredWarning.id, expiredWarning),
+      callback: () => onRemoveSuccess(expiredWarning.id, t('warning-dialog-expire-succes'))
+    });
+  });
   const openSnackbar = message => {
     dispatch(snackbarActions.openSnackbar({
       message
     }));
   };
-  const warningsApi = getWarningsApi();
   const deleteWarning = (warningId, warningEditor) => {
     const isLocked = warningEditor && warningEditor !== (auth === null || auth === void 0 ? void 0 : auth.username) || false;
     setConfirmDialogOptions({
@@ -15248,6 +15330,7 @@ const PublicWarningListConnect = () => {
       onEditWarning: editWarning,
       onDeleteWarning: deleteWarning,
       onDeleteReviewWarning: deleteReviewWarning,
+      onExpireWarning: expireWarning,
       selectedPublicWarningId: selectedPublicWarningId,
       lastUpdatedTime: lastUpdatedTime,
       onRefetchWarnings: fetchWarnings,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/warnings",
-  "version": "9.27.1",
+  "version": "9.28.0",
   "description": "GeoWeb warinings library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -28,7 +28,7 @@
     "@opengeoweb/authentication": "*",
     "react-i18next": "^14.1.2",
     "i18next": "^23.11.5",
-    "@mui/material": "^5.16.0",
+    "@mui/material": "^6.1.1",
     "immer": "^10.0.3"
   },
   "peerDependencies": {

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

@@ -7,6 +7,7 @@ interface WarningStatusProps {
     onEditWarning?: (warning: PublicWarning) => void;
     onDeleteWarning?: (warningId: string, warningEditor?: string) => void;
     onDeleteReviewWarning?: (warning: PublicWarning) => void;
+    onExpireWarning?: (warning: PublicWarning) => void;
 }
 export declare const PublicWarningList: React.FC<{
     isLoading?: boolean;

package/src/lib/components/PublicWarningList/WarningListItem.d.ts

@@ -1,4 +1,4 @@
-import { GridProps, ListItemProps } from '@mui/material';
+import { Grid2Props, ListItemProps } from '@mui/material';
 import React from 'react';
 import { PublicWarning, PublicWarningStatus } from '../../store/publicWarningForm/types';
 export interface WarningStatusProps extends ListItemProps {
@@ -7,11 +7,12 @@ export interface WarningStatusProps extends ListItemProps {
     onEditWarning?: (warning: PublicWarning) => void;
     onDeleteWarning?: (warningId: string, warningEditor?: string) => void;
     onDeleteReviewWarning?: (warning: PublicWarning) => void;
+    onExpireWarning?: (warning: PublicWarning) => void;
 }
 export declare const getWarningWithoutIdStatusEditor: (warning: PublicWarning) => PublicWarning;
 export declare const getWarningWithLinkedToId: (warning: PublicWarning) => PublicWarning;
 export declare const getWarningWithProposalId: (warning: PublicWarning) => PublicWarning;
-export declare const WarningListColumnContent: React.FC<GridProps & {
+export declare const WarningListColumnContent: React.FC<Grid2Props & {
     title?: string;
     status: PublicWarningStatus;
     children?: React.ReactNode;

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

@@ -0,0 +1,7 @@
+import { RefObject } from 'react';
+interface OverflowCheckResult {
+    ref: RefObject<HTMLDivElement>;
+    isOverflowing: boolean;
+}
+export default function useOverflowCheck(text: string): OverflowCheckResult;
+export {};

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

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