@opengeoweb/warnings 20.2.0-nightly-20261029 → 21.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.esm.js +178 -47
- package/dist/src/lib/components/FilterList/filter-utils.d.ts +1 -0
- package/dist/src/lib/components/PublicWarningsForm/LevelField/LevelField.d.ts +1 -0
- package/dist/src/lib/components/PublicWarningsForm/LevelField/MinorLevelChip.d.ts +6 -0
- package/dist/src/lib/components/PublicWarningsForm/LevelField/index.d.ts +1 -0
- package/dist/src/lib/components/PublicWarningsForm/PublicWarningsForm.d.ts +4 -1
- package/dist/src/lib/components/WarningsTimeline/warningBlockColors.d.ts +1 -1
- package/dist/src/lib/utils/warningUtils.d.ts +1 -0
- package/package.json +12 -12
package/dist/index.esm.js
CHANGED
|
@@ -13,7 +13,7 @@ import { SA_NAMESPACE, isInstanceOfCancelSigmet, getDefaultValidFromValue, isIns
|
|
|
13
13
|
import { LayerType, generateMapId, webmapUtils } from '@opengeoweb/webmap';
|
|
14
14
|
import React, { useRef, useState, useEffect, useCallback, useMemo } from 'react';
|
|
15
15
|
import { useAuthenticationContext as useAuthenticationContext$1 } from '@opengeoweb/authentication';
|
|
16
|
-
import { MenuItem, Grid, styled, Box, Typography, useTheme, Accordion, AccordionSummary, ListItem, ListItemButton, Stack, AccordionDetails, LinearProgress, Tabs, Tab, Button, Menu, ListSubheader, FormHelperText, Paper, Card, CardContent, FormControl, CircularProgress, Chip, ListItemText, ListItemIcon, Popover, RadioGroup, FormControlLabel, Radio,
|
|
16
|
+
import { MenuItem, Grid, styled, Box, Typography, useTheme, Accordion, AccordionSummary, ListItem, ListItemButton, Stack, AccordionDetails, LinearProgress, Tabs, Tab, Button, Menu, ListSubheader, FormHelperText, Paper, Card, CardContent, Tooltip, FormControl, CircularProgress, Chip, ListItemText, ListItemIcon, Popover, RadioGroup, FormControlLabel, Radio, IconButton, Checkbox, DialogTitle, DialogContent, Switch, Collapse } from '@mui/material';
|
|
17
17
|
import { List, useListRef } from 'react-window';
|
|
18
18
|
import { AirmetPhenomena, SigmetPhenomena, getHeaders, handleResponse, throwResponseError, useAuthQuery, useAuthenticationContext, optimisticUpdate, ProductStatus, LevelUnits } from '@opengeoweb/api';
|
|
19
19
|
import { snackbarListener, snackbarReducer, snackbarActions, snackbarTypes } from '@opengeoweb/snackbar';
|
|
@@ -143,6 +143,7 @@ var en = {
|
|
|
143
143
|
"warning-level-moderate": "Moderate",
|
|
144
144
|
"warning-level-severe": "Severe",
|
|
145
145
|
"warning-level-extreme": "Extreme",
|
|
146
|
+
"warning-level-minor": "Minor",
|
|
146
147
|
"warning-level-letter-moderate": "M",
|
|
147
148
|
"warning-level-letter-severe": "S",
|
|
148
149
|
"warning-level-letter-extreme": "E",
|
|
@@ -566,6 +567,7 @@ var nl = {
|
|
|
566
567
|
"warning-level-moderate": "Gematigd",
|
|
567
568
|
"warning-level-severe": "Ernstig",
|
|
568
569
|
"warning-level-extreme": "Extreem",
|
|
570
|
+
"warning-level-minor": "Gering",
|
|
569
571
|
"warning-level-letter-moderate": "G",
|
|
570
572
|
"warning-level-letter-severe": "E",
|
|
571
573
|
"warning-level-letter-extreme": "X",
|
|
@@ -946,6 +948,7 @@ var fi = {
|
|
|
946
948
|
"warning-level-moderate": "Kohtalainen",
|
|
947
949
|
"warning-level-severe": "Vakava",
|
|
948
950
|
"warning-level-extreme": "Äärimmäinen",
|
|
951
|
+
"warning-level-minor": "Vähäinen",
|
|
949
952
|
"warning-level-letter-moderate": "K",
|
|
950
953
|
"warning-level-letter-severe": "V",
|
|
951
954
|
"warning-level-letter-extreme": "Ä",
|
|
@@ -1278,6 +1281,7 @@ var no = {
|
|
|
1278
1281
|
"warning-level-moderate": "Moderat",
|
|
1279
1282
|
"warning-level-severe": "Stor",
|
|
1280
1283
|
"warning-level-extreme": "Ekstrem",
|
|
1284
|
+
"warning-level-minor": "Liten",
|
|
1281
1285
|
"warning-level-letter-moderate": "M",
|
|
1282
1286
|
"warning-level-letter-severe": "S",
|
|
1283
1287
|
"warning-level-letter-extreme": "E",
|
|
@@ -2295,6 +2299,7 @@ var AreaDrawingManagerMapButtonConnect = function AreaDrawingManagerMapButtonCon
|
|
|
2295
2299
|
var PublicWarningStatus;
|
|
2296
2300
|
(function (PublicWarningStatus) {
|
|
2297
2301
|
PublicWarningStatus["DRAFT"] = "DRAFT";
|
|
2302
|
+
// Warning events retain this status; public update drafts use DRAFT + UPDATE.
|
|
2298
2303
|
PublicWarningStatus["DRAFT_PUBLISHED"] = "DRAFT_PUBLISHED";
|
|
2299
2304
|
PublicWarningStatus["PUBLISHED"] = "PUBLISHED";
|
|
2300
2305
|
PublicWarningStatus["UPDATED"] = "UPDATED";
|
|
@@ -2565,6 +2570,7 @@ var Domain;
|
|
|
2565
2570
|
})(Domain || (Domain = {}));
|
|
2566
2571
|
var Level;
|
|
2567
2572
|
(function (Level) {
|
|
2573
|
+
Level["minor"] = "minor";
|
|
2568
2574
|
Level["extreme"] = "extreme";
|
|
2569
2575
|
Level["moderate"] = "moderate";
|
|
2570
2576
|
Level["severe"] = "severe";
|
|
@@ -2604,9 +2610,9 @@ var defaultDomainFilter = {
|
|
|
2604
2610
|
var domainLevels = {
|
|
2605
2611
|
aviation: [Level.airmet, Level.sigmet],
|
|
2606
2612
|
maritime: [Level.extreme, Level.moderate, Level.severe],
|
|
2607
|
-
"public": [Level.extreme, Level.moderate, Level.severe]
|
|
2613
|
+
"public": [Level.extreme, Level.moderate, Level.severe, Level.minor]
|
|
2608
2614
|
};
|
|
2609
|
-
var defaultLevelFilter = (_defaultLevelFilter = {}, _defaultLevelFilter[emptyFilterId] = true, _defaultLevelFilter.extreme = true, _defaultLevelFilter.moderate = true, _defaultLevelFilter.severe = true, _defaultLevelFilter.AIR = true, _defaultLevelFilter.SIG = true, _defaultLevelFilter);
|
|
2615
|
+
var defaultLevelFilter = (_defaultLevelFilter = {}, _defaultLevelFilter[emptyFilterId] = true, _defaultLevelFilter.extreme = true, _defaultLevelFilter.moderate = true, _defaultLevelFilter.severe = true, _defaultLevelFilter.minor = true, _defaultLevelFilter.AIR = true, _defaultLevelFilter.SIG = true, _defaultLevelFilter);
|
|
2610
2616
|
var defaultEmptyFilter = (_defaultEmptyFilter = {}, _defaultEmptyFilter[emptyFilterId] = true, _defaultEmptyFilter);
|
|
2611
2617
|
var defaultAreaFilter = (_defaultAreaFilter = {}, _defaultAreaFilter[emptyFilterId] = true, _defaultAreaFilter);
|
|
2612
2618
|
var makeFilterFromList = function makeFilterFromList(options, value) {
|
|
@@ -3498,16 +3504,18 @@ var getSortedStatus = function getSortedStatus(status) {
|
|
|
3498
3504
|
}
|
|
3499
3505
|
}
|
|
3500
3506
|
};
|
|
3507
|
+
var isExpireMessage = function isExpireMessage(warning) {
|
|
3508
|
+
return (warning == null ? void 0 : warning.type) === 'public' && warning.gw_type === PublicWarningGwType.EXPIRE;
|
|
3509
|
+
};
|
|
3501
3510
|
// The new message the backend creates when a public warning is expired or
|
|
3502
3511
|
// withdrawn (gw_type EXPIRE or WITHDRAW). It is only ever published, so it
|
|
3503
3512
|
// cannot be updated, expired or withdrawn itself.
|
|
3504
3513
|
var isExpireOrWithdrawMessage = function isExpireOrWithdrawMessage(warning) {
|
|
3505
3514
|
return warning.type === 'public' && (warning.gw_type === PublicWarningGwType.EXPIRE || warning.gw_type === PublicWarningGwType.WITHDRAW);
|
|
3506
3515
|
};
|
|
3507
|
-
//
|
|
3508
|
-
// DRAFT_PUBLISHED, so the type is checked as well.
|
|
3516
|
+
// Public update drafts use DRAFT + UPDATE; warning events retain DRAFT_PUBLISHED.
|
|
3509
3517
|
var isPublicUpdateDraft = function isPublicUpdateDraft(warning) {
|
|
3510
|
-
return (warning == null ? void 0 : warning.type) === 'public' && warning.status === PublicWarningStatus.
|
|
3518
|
+
return (warning == null ? void 0 : warning.type) === 'public' && warning.status === PublicWarningStatus.DRAFT && warning.gw_type === PublicWarningGwType.UPDATE;
|
|
3511
3519
|
};
|
|
3512
3520
|
var getWarningWithoutIdStatusEditor = function getWarningWithoutIdStatusEditor(warning) {
|
|
3513
3521
|
var _warningDetail$areas;
|
|
@@ -3521,6 +3529,12 @@ var getWarningWithoutIdStatusEditor = function getWarningWithoutIdStatusEditor(w
|
|
|
3521
3529
|
warningDetail.proposal_id;
|
|
3522
3530
|
warningDetail.warning_handle_uuid;
|
|
3523
3531
|
var cleanWarningDetail = _objectWithoutPropertiesLoose(warningDetail, _excluded2$3);
|
|
3532
|
+
// A duplicate starts a new warning, without the source revision metadata.
|
|
3533
|
+
if (fullWarning.type === 'public') {
|
|
3534
|
+
delete fullWarning.gw_type;
|
|
3535
|
+
delete fullWarning.previous_id;
|
|
3536
|
+
delete fullWarning.next_id;
|
|
3537
|
+
}
|
|
3524
3538
|
var areas = (_warningDetail$areas = warningDetail.areas) == null ? void 0 : _warningDetail$areas.map(function (_ref) {
|
|
3525
3539
|
_ref.published_warning_uuid;
|
|
3526
3540
|
var area = _objectWithoutPropertiesLoose(_ref, _excluded3);
|
|
@@ -3541,7 +3555,9 @@ var getWarningWithLinkedToId = function getWarningWithLinkedToId(warning) {
|
|
|
3541
3555
|
warningDetail: Object.assign({}, cleanWarningDetail, {
|
|
3542
3556
|
linked_to_id: id
|
|
3543
3557
|
}),
|
|
3544
|
-
status: PublicWarningStatus.
|
|
3558
|
+
status: PublicWarningStatus.DRAFT
|
|
3559
|
+
}, warning.type === 'public' && {
|
|
3560
|
+
gw_type: PublicWarningGwType.UPDATE
|
|
3545
3561
|
});
|
|
3546
3562
|
};
|
|
3547
3563
|
var getWarningWithProposalId = function getWarningWithProposalId(warning) {
|
|
@@ -11081,6 +11097,11 @@ var DescriptionField = function DescriptionField(_ref) {
|
|
|
11081
11097
|
});
|
|
11082
11098
|
};
|
|
11083
11099
|
|
|
11100
|
+
var MinorLevelColors = {
|
|
11101
|
+
color: '#72BB23',
|
|
11102
|
+
borderColor: '#000000',
|
|
11103
|
+
textColor: '#051039'
|
|
11104
|
+
};
|
|
11084
11105
|
var WarningLevel;
|
|
11085
11106
|
(function (WarningLevel) {
|
|
11086
11107
|
WarningLevel["moderate"] = "moderate";
|
|
@@ -11198,6 +11219,35 @@ var LevelField = function LevelField(_ref) {
|
|
|
11198
11219
|
});
|
|
11199
11220
|
};
|
|
11200
11221
|
|
|
11222
|
+
var MinorLevelChip = function MinorLevelChip(_ref) {
|
|
11223
|
+
var children = _ref.children,
|
|
11224
|
+
_ref$sx = _ref.sx,
|
|
11225
|
+
sx = _ref$sx === void 0 ? [] : _ref$sx;
|
|
11226
|
+
var _useWarningsTranslati = useWarningsTranslation(),
|
|
11227
|
+
t = _useWarningsTranslati.t;
|
|
11228
|
+
var label = t('warning-level-minor');
|
|
11229
|
+
return jsx(Tooltip, {
|
|
11230
|
+
title: label,
|
|
11231
|
+
children: jsx(Box, {
|
|
11232
|
+
"aria-label": label,
|
|
11233
|
+
component: "span",
|
|
11234
|
+
role: "img",
|
|
11235
|
+
sx: [{
|
|
11236
|
+
display: 'block',
|
|
11237
|
+
width: 40,
|
|
11238
|
+
height: '1.2em',
|
|
11239
|
+
textTransform: 'none',
|
|
11240
|
+
backgroundColor: MinorLevelColors.color,
|
|
11241
|
+
color: MinorLevelColors.textColor,
|
|
11242
|
+
border: 1,
|
|
11243
|
+
borderColor: MinorLevelColors.borderColor
|
|
11244
|
+
}].concat(Array.isArray(sx) ? sx : [sx]),
|
|
11245
|
+
tabIndex: 0,
|
|
11246
|
+
children: children
|
|
11247
|
+
})
|
|
11248
|
+
});
|
|
11249
|
+
};
|
|
11250
|
+
|
|
11201
11251
|
var probablityOptions$1 = [100, 90, 80, 70, 60, 50, 40, 30, 20, 10];
|
|
11202
11252
|
var defaultProbability = 30;
|
|
11203
11253
|
var ProbabilityField = function ProbabilityField(_ref) {
|
|
@@ -13420,10 +13470,15 @@ var prepareFormValues = function prepareFormValues(data) {
|
|
|
13420
13470
|
};
|
|
13421
13471
|
function warningLevelFeatureColors(level, geoJSON,
|
|
13422
13472
|
// Allow undefined
|
|
13423
|
-
isAviationWarning
|
|
13473
|
+
isAviationWarning,
|
|
13474
|
+
// Determines if it's an aviation warning
|
|
13475
|
+
isExpiryMessage) {
|
|
13424
13476
|
if (isAviationWarning === void 0) {
|
|
13425
13477
|
isAviationWarning = false;
|
|
13426
13478
|
}
|
|
13479
|
+
if (isExpiryMessage === void 0) {
|
|
13480
|
+
isExpiryMessage = false;
|
|
13481
|
+
}
|
|
13427
13482
|
if (!(geoJSON != null && geoJSON.features)) {
|
|
13428
13483
|
// Return an empty FeatureCollection if geoJSON is invalid
|
|
13429
13484
|
return {
|
|
@@ -13443,6 +13498,8 @@ isAviationWarning) {
|
|
|
13443
13498
|
// Orange for start, purple for end
|
|
13444
13499
|
borderColor: isStartGeometry ? FEATURE_DRAW_FILL_COLOR : FEATURE_DRAW_SECONDARY_FILL_COLOR
|
|
13445
13500
|
};
|
|
13501
|
+
} else if (isExpiryMessage) {
|
|
13502
|
+
colors = MinorLevelColors;
|
|
13446
13503
|
} else if (level && level in LevelColors) {
|
|
13447
13504
|
// Public warning: use LevelColors if level is defined
|
|
13448
13505
|
colors = LevelColors[level];
|
|
@@ -13542,7 +13599,11 @@ var Form = function Form(_ref6) {
|
|
|
13542
13599
|
isDrawPolygonActive = _ref6$isDrawPolygonAc === void 0 ? false : _ref6$isDrawPolygonAc,
|
|
13543
13600
|
_ref6$isDrawingModeAc = _ref6.isDrawingModeActive,
|
|
13544
13601
|
isDrawingModeActive = _ref6$isDrawingModeAc === void 0 ? false : _ref6$isDrawingModeAc,
|
|
13545
|
-
publicWarningStatus = _ref6.publicWarningStatus
|
|
13602
|
+
publicWarningStatus = _ref6.publicWarningStatus,
|
|
13603
|
+
_ref6$isExpiryMessage = _ref6.isExpiryMessage,
|
|
13604
|
+
isExpiryMessage = _ref6$isExpiryMessage === void 0 ? false : _ref6$isExpiryMessage,
|
|
13605
|
+
_ref6$isPublicUpdateD = _ref6.isPublicUpdateDraft,
|
|
13606
|
+
isPublicUpdateDraft = _ref6$isPublicUpdateD === void 0 ? false : _ref6$isPublicUpdateD;
|
|
13546
13607
|
var _React$useState = React.useState(false),
|
|
13547
13608
|
isPublishing = _React$useState[0],
|
|
13548
13609
|
setIsPublishing = _React$useState[1];
|
|
@@ -13974,7 +14035,7 @@ var Form = function Form(_ref6) {
|
|
|
13974
14035
|
var level = watch('level');
|
|
13975
14036
|
var hasPublicWarningPolygon = Boolean(warningGeoJSONFeature == null ? void 0 : warningGeoJSONFeature.features.length);
|
|
13976
14037
|
var isDrawPolygonDisabled = areFieldsDisabled || isReadOnly || linkedMapIds.length === 0;
|
|
13977
|
-
var shouldDisablePolygonDeleteForWarningStatus = publicWarningStatus !== undefined && publicWarningStatus !== PublicWarningStatus.DRAFT && hasPublicWarningPolygon;
|
|
14038
|
+
var shouldDisablePolygonDeleteForWarningStatus = publicWarningStatus !== undefined && (publicWarningStatus !== PublicWarningStatus.DRAFT || isPublicUpdateDraft) && hasPublicWarningPolygon;
|
|
13978
14039
|
var isDeletePolygonDisabled = isDrawPolygonDisabled || !hasPublicWarningPolygon || shouldDisablePolygonDeleteForWarningStatus;
|
|
13979
14040
|
var drawToolsDisabledTooltip = linkedMapIds.length === 0 ? t('warning-draw-tools-disabled') : undefined;
|
|
13980
14041
|
var deletePolygonDisabledTooltip;
|
|
@@ -13988,10 +14049,10 @@ var Form = function Form(_ref6) {
|
|
|
13988
14049
|
return;
|
|
13989
14050
|
}
|
|
13990
14051
|
// sync drawing on map with selected warning including selected level color
|
|
13991
|
-
var geoJSONFeature = warningLevelFeatureColors(level, initialPublicWarningArea);
|
|
14052
|
+
var geoJSONFeature = warningLevelFeatureColors(level, initialPublicWarningArea, false, isExpiryMessage);
|
|
13992
14053
|
setWarningGeoJSONFeature(geoJSONFeature);
|
|
13993
14054
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
13994
|
-
}, [initialPublicWarningArea, level]);
|
|
14055
|
+
}, [initialPublicWarningArea, level, isExpiryMessage]);
|
|
13995
14056
|
React.useEffect(function () {
|
|
13996
14057
|
if (selectedAviationProduct) {
|
|
13997
14058
|
return;
|
|
@@ -14206,7 +14267,17 @@ var Form = function Form(_ref6) {
|
|
|
14206
14267
|
xs: 12,
|
|
14207
14268
|
sm: 6
|
|
14208
14269
|
},
|
|
14209
|
-
children:
|
|
14270
|
+
children: isExpiryMessage ? jsxs(Box, {
|
|
14271
|
+
children: [jsx(Typography, {
|
|
14272
|
+
component: "div",
|
|
14273
|
+
variant: "caption",
|
|
14274
|
+
children: t('warning-level')
|
|
14275
|
+
}), jsx(MinorLevelChip, {
|
|
14276
|
+
sx: {
|
|
14277
|
+
width: '100%'
|
|
14278
|
+
}
|
|
14279
|
+
})]
|
|
14280
|
+
}) : jsx(LevelField, {
|
|
14210
14281
|
isDisabled: areFieldsDisabled || isPublicWarningInDrawingMode,
|
|
14211
14282
|
isReadOnly: isReadOnly
|
|
14212
14283
|
})
|
|
@@ -14656,6 +14727,7 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
|
|
|
14656
14727
|
id: newFormValues.linked_to_id
|
|
14657
14728
|
}),
|
|
14658
14729
|
status: PublicWarningStatus.PUBLISHED,
|
|
14730
|
+
gw_type: newFormValues.linked_to_id ? PublicWarningGwType.UPDATE : PublicWarningGwType.ORIGINAL,
|
|
14659
14731
|
type: 'public'
|
|
14660
14732
|
}
|
|
14661
14733
|
}));
|
|
@@ -14724,16 +14796,15 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
|
|
|
14724
14796
|
}();
|
|
14725
14797
|
var saveForm = /*#__PURE__*/function () {
|
|
14726
14798
|
var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(newFormValues) {
|
|
14727
|
-
var status;
|
|
14728
14799
|
return _regenerator().w(function (_context3) {
|
|
14729
14800
|
while (1) switch (_context3.n) {
|
|
14730
14801
|
case 0:
|
|
14731
|
-
status = newFormValues.linked_to_id ? PublicWarningStatus.DRAFT_PUBLISHED : PublicWarningStatus.DRAFT;
|
|
14732
14802
|
return _context3.a(2, saveWarning({
|
|
14733
14803
|
id: newFormValues.id,
|
|
14734
14804
|
data: {
|
|
14735
14805
|
warningDetail: newFormValues,
|
|
14736
|
-
status:
|
|
14806
|
+
status: PublicWarningStatus.DRAFT,
|
|
14807
|
+
gw_type: newFormValues.linked_to_id ? PublicWarningGwType.UPDATE : PublicWarningGwType.ORIGINAL,
|
|
14737
14808
|
editor: auth == null ? void 0 : auth.username,
|
|
14738
14809
|
type: 'public'
|
|
14739
14810
|
},
|
|
@@ -14833,6 +14904,8 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
|
|
|
14833
14904
|
formState: formState,
|
|
14834
14905
|
isDrawPolygonActive: isDrawPolygonActive,
|
|
14835
14906
|
isDrawingModeActive: isDrawingModeActive,
|
|
14907
|
+
isExpiryMessage: !!(warning != null && warning.id) && warning.type === 'public' && warning.gw_type === PublicWarningGwType.EXPIRE,
|
|
14908
|
+
isPublicUpdateDraft: isPublicUpdateDraft(warning),
|
|
14836
14909
|
isReadOnly: isReadOnly,
|
|
14837
14910
|
linkedMapIds: selectedMapIds,
|
|
14838
14911
|
mode: formMode,
|
|
@@ -15098,7 +15171,7 @@ var AreaDrawingLoaderConnect = function AreaDrawingLoaderConnect(_ref) {
|
|
|
15098
15171
|
}
|
|
15099
15172
|
return ((_selectedWarning$warn4 = selectedWarning == null || (_selectedWarning$warn5 = selectedWarning.warningDetail) == null ? void 0 : _selectedWarning$warn5.areas) != null ? _selectedWarning$warn4 : []).reduce(function (layersById, area, index) {
|
|
15100
15173
|
var _selectedWarning$warn6, _ref3, _Object$assign;
|
|
15101
|
-
var styledGeoJSON = warningLevelFeatureColors(selectedWarning == null || (_selectedWarning$warn6 = selectedWarning.warningDetail) == null ? void 0 : _selectedWarning$warn6.level, area.geoJSON, isAviationWarning);
|
|
15174
|
+
var styledGeoJSON = warningLevelFeatureColors(selectedWarning == null || (_selectedWarning$warn6 = selectedWarning.warningDetail) == null ? void 0 : _selectedWarning$warn6.level, area.geoJSON, isAviationWarning, isExpireMessage(selectedWarning));
|
|
15102
15175
|
if (!styledGeoJSON.features.length) {
|
|
15103
15176
|
return layersById;
|
|
15104
15177
|
}
|
|
@@ -15235,7 +15308,7 @@ var AreaDrawingLoaderConnect = function AreaDrawingLoaderConnect(_ref) {
|
|
|
15235
15308
|
type: areaDrawingLoaderType,
|
|
15236
15309
|
error: uiError
|
|
15237
15310
|
} : undefined;
|
|
15238
|
-
var shouldDisableRemoveWarning = warningStatus !== undefined && warningStatus !== PublicWarningStatus.DRAFT && areas.length > 0;
|
|
15311
|
+
var shouldDisableRemoveWarning = warningStatus !== undefined && (warningStatus !== PublicWarningStatus.DRAFT || isPublicUpdateDraft(selectedWarning)) && areas.length > 0;
|
|
15239
15312
|
return jsx(AreaDrawingLoader, {
|
|
15240
15313
|
bounds: bounds,
|
|
15241
15314
|
drawingListItems: items,
|
|
@@ -15916,7 +15989,7 @@ var getWarningSectionStatus = function getWarningSectionStatus(warning) {
|
|
|
15916
15989
|
};
|
|
15917
15990
|
var STATUS_SORT_ORDER = (_STATUS_SORT_ORDER = {}, _STATUS_SORT_ORDER[PublicWarningStatus.TODO] = 0, _STATUS_SORT_ORDER[PublicWarningStatus.DRAFT] = 1, _STATUS_SORT_ORDER[PublicWarningStatus.DRAFT_PUBLISHED] = 1, _STATUS_SORT_ORDER[PublicWarningStatus.PUBLISHED] = 2, _STATUS_SORT_ORDER[PublicWarningStatus.EXPIRED] = 3, _STATUS_SORT_ORDER[PublicWarningStatus.WITHDRAWN] = 3, _STATUS_SORT_ORDER[PublicWarningStatus.UPDATED] = 3, _STATUS_SORT_ORDER[PublicWarningStatus.IGNORED] = 3, _STATUS_SORT_ORDER);
|
|
15918
15991
|
var compareWarningsByStatus = function compareWarningsByStatus(warningA, warningB) {
|
|
15919
|
-
return STATUS_SORT_ORDER[
|
|
15992
|
+
return STATUS_SORT_ORDER[getWarningSectionStatus(warningA)] - STATUS_SORT_ORDER[getWarningSectionStatus(warningB)];
|
|
15920
15993
|
};
|
|
15921
15994
|
var SIZE_THRESHOLDS = {
|
|
15922
15995
|
xxs: 24,
|
|
@@ -16639,6 +16712,27 @@ var draftStripes = function draftStripes(stripeColor, bgColor) {
|
|
|
16639
16712
|
return "repeating-linear-gradient(\n -45deg,\n transparent,\n transparent 8px,\n " + stripeColor + " 8px,\n " + stripeColor + " 9px\n ), " + bgColor;
|
|
16640
16713
|
};
|
|
16641
16714
|
var TimelineColors = {
|
|
16715
|
+
minor: {
|
|
16716
|
+
published: {
|
|
16717
|
+
background: MinorLevelColors.color,
|
|
16718
|
+
border: MinorLevelColors.borderColor,
|
|
16719
|
+
iconColor: MinorLevelColors.textColor,
|
|
16720
|
+
letterColor: MinorLevelColors.textColor
|
|
16721
|
+
},
|
|
16722
|
+
draft: {
|
|
16723
|
+
background: '#FCFFEB',
|
|
16724
|
+
stripeColor: 'rgba(255, 255, 255, 0.5)',
|
|
16725
|
+
border: MinorLevelColors.borderColor,
|
|
16726
|
+
iconColor: MinorLevelColors.color,
|
|
16727
|
+
letterColor: MinorLevelColors.color
|
|
16728
|
+
},
|
|
16729
|
+
expired: {
|
|
16730
|
+
background: '#EFEFEF',
|
|
16731
|
+
border: MinorLevelColors.borderColor,
|
|
16732
|
+
iconColor: MinorLevelColors.color,
|
|
16733
|
+
letterColor: MinorLevelColors.color
|
|
16734
|
+
}
|
|
16735
|
+
},
|
|
16642
16736
|
// Public warnings - Extreme (Red)
|
|
16643
16737
|
extreme: {
|
|
16644
16738
|
published: {
|
|
@@ -16751,10 +16845,13 @@ var TimelineColors = {
|
|
|
16751
16845
|
}
|
|
16752
16846
|
}
|
|
16753
16847
|
};
|
|
16754
|
-
var getThemeForLevel = function getThemeForLevel(level, isAviation) {
|
|
16848
|
+
var getThemeForLevel = function getThemeForLevel(level, isAviation, isExpiryMessage) {
|
|
16755
16849
|
if (isAviation) {
|
|
16756
16850
|
return TimelineColors.aviation;
|
|
16757
16851
|
}
|
|
16852
|
+
if (isExpiryMessage) {
|
|
16853
|
+
return TimelineColors.minor;
|
|
16854
|
+
}
|
|
16758
16855
|
switch (level) {
|
|
16759
16856
|
case WarningLevel.extreme:
|
|
16760
16857
|
return TimelineColors.extreme;
|
|
@@ -16766,8 +16863,11 @@ var getThemeForLevel = function getThemeForLevel(level, isAviation) {
|
|
|
16766
16863
|
return TimelineColors["default"];
|
|
16767
16864
|
}
|
|
16768
16865
|
};
|
|
16769
|
-
var getBlockStyle = function getBlockStyle(level, status, isAviation) {
|
|
16770
|
-
|
|
16866
|
+
var getBlockStyle = function getBlockStyle(level, status, isAviation, isExpiryMessage) {
|
|
16867
|
+
if (isExpiryMessage === void 0) {
|
|
16868
|
+
isExpiryMessage = false;
|
|
16869
|
+
}
|
|
16870
|
+
var theme = getThemeForLevel(level, isAviation, isExpiryMessage);
|
|
16771
16871
|
if (status === PublicWarningStatus.DRAFT || status === PublicWarningStatus.DRAFT_PUBLISHED) {
|
|
16772
16872
|
var _theme$draft = theme.draft,
|
|
16773
16873
|
stripeColor = _theme$draft.stripeColor,
|
|
@@ -21914,23 +22014,23 @@ var WarningListItemMenu = function WarningListItemMenu(_ref) {
|
|
|
21914
22014
|
|
|
21915
22015
|
var _excluded$1 = ["warning", "activeWarningId", "activeEventId", "highlightedItem", "onHoverWarning", "onSelectWarning", "onEditWarning", "onDeleteWarning", "onDeleteReviewWarning", "onExpireWarning", "onWithdrawWarning", "onActionAviationWarning", "onActionMaritimeWarning", "shouldDisableAviationAmendOption", "isHidden", "onToggleVisibility", "selectedForBatchDelete", "toggleWarningForBatchDelete"];
|
|
21916
22016
|
var _messageTypes;
|
|
21917
|
-
var renderLevelText = function renderLevelText(levelString) {
|
|
22017
|
+
var renderLevelText = function renderLevelText(levelString, prefixLength) {
|
|
22018
|
+
if (prefixLength === void 0) {
|
|
22019
|
+
prefixLength = 1;
|
|
22020
|
+
}
|
|
21918
22021
|
if (!levelString) {
|
|
21919
22022
|
return null;
|
|
21920
22023
|
}
|
|
21921
|
-
var
|
|
21922
|
-
var
|
|
22024
|
+
var prefix = levelString[0].toUpperCase() + levelString.slice(1, prefixLength);
|
|
22025
|
+
var suffix = levelString.slice(prefixLength);
|
|
21923
22026
|
return jsxs(Box, {
|
|
21924
22027
|
children: [jsx(Box, {
|
|
21925
22028
|
component: "span",
|
|
21926
|
-
|
|
21927
|
-
textTransform: 'uppercase'
|
|
21928
|
-
},
|
|
21929
|
-
children: firstLetter
|
|
22029
|
+
children: prefix
|
|
21930
22030
|
}), jsx(Box, {
|
|
21931
22031
|
className: "level-suffix",
|
|
21932
22032
|
component: "span",
|
|
21933
|
-
children:
|
|
22033
|
+
children: suffix
|
|
21934
22034
|
})]
|
|
21935
22035
|
});
|
|
21936
22036
|
};
|
|
@@ -21957,7 +22057,7 @@ var messageTypes = (_messageTypes = {}, _messageTypes[PublicWarningGwType.ORIGIN
|
|
|
21957
22057
|
endedTitle: 'Withdrawn'
|
|
21958
22058
|
}, _messageTypes);
|
|
21959
22059
|
var renderStatusIcon = function renderStatusIcon(warning, status) {
|
|
21960
|
-
var _warning$
|
|
22060
|
+
var _warning$gw_type2;
|
|
21961
22061
|
var getStatusTag = function getStatusTag(content, color, icon) {
|
|
21962
22062
|
if (icon === void 0) {
|
|
21963
22063
|
icon = null;
|
|
@@ -22003,7 +22103,8 @@ var renderStatusIcon = function renderStatusIcon(warning, status) {
|
|
|
22003
22103
|
case PublicWarningStatus.DRAFT:
|
|
22004
22104
|
{
|
|
22005
22105
|
if (warning.type === 'public') {
|
|
22006
|
-
|
|
22106
|
+
var _warning$gw_type;
|
|
22107
|
+
return getMessageTypeTag((_warning$gw_type = warning.gw_type) != null ? _warning$gw_type : PublicWarningGwType.ORIGINAL, 'blue');
|
|
22007
22108
|
}
|
|
22008
22109
|
return jsx(Box, {
|
|
22009
22110
|
sx: {
|
|
@@ -22031,7 +22132,7 @@ var renderStatusIcon = function renderStatusIcon(warning, status) {
|
|
|
22031
22132
|
if (warning.gw_type === PublicWarningGwType.EXPIRE && warning.warningDetail.validUntil) {
|
|
22032
22133
|
return getStatusTagWithTitle(messageTypes[PublicWarningGwType.EXPIRE].label, 'green', "Ends the warning at " + getUtcDateLabel(warning.warningDetail.validUntil));
|
|
22033
22134
|
}
|
|
22034
|
-
return getMessageTypeTag((_warning$
|
|
22135
|
+
return getMessageTypeTag((_warning$gw_type2 = warning.gw_type) != null ? _warning$gw_type2 : PublicWarningGwType.ORIGINAL, 'green');
|
|
22035
22136
|
case PublicWarningStatus.UPDATED:
|
|
22036
22137
|
return getMessageTypeTag(PublicWarningGwType.UPDATE, 'grey', true);
|
|
22037
22138
|
case PublicWarningStatus.WITHDRAWN:
|
|
@@ -22058,7 +22159,7 @@ var renderStatusIcon = function renderStatusIcon(warning, status) {
|
|
|
22058
22159
|
}
|
|
22059
22160
|
};
|
|
22060
22161
|
var WarningListItem = function WarningListItem(_ref) {
|
|
22061
|
-
var _warning$warningDetai, _sx, _sx2, _Object$assign;
|
|
22162
|
+
var _warning$warningDetai, _sx, _sx2, _sx3, _Object$assign;
|
|
22062
22163
|
var warning = _ref.warning,
|
|
22063
22164
|
activeWarningId = _ref.activeWarningId,
|
|
22064
22165
|
activeEventId = _ref.activeEventId,
|
|
@@ -22107,6 +22208,7 @@ var WarningListItem = function WarningListItem(_ref) {
|
|
|
22107
22208
|
isIncidentoverflowing = _useOverflowCheck3.isOverflowing;
|
|
22108
22209
|
var incidentName = warning.productStatus !== 'DRAFT' && warning.warningDetail.incident !== undefined ? warning.warningDetail.incident : '-';
|
|
22109
22210
|
var levelDetails = levelOptionsDict[warning.warningDetail.level];
|
|
22211
|
+
var isExpiryMessage = isExpireMessage(warning);
|
|
22110
22212
|
var status = warning.status || mapProductStatusToWarningStatus(warning.productStatus);
|
|
22111
22213
|
var levelTranslation = levelDetails == null ? void 0 : levelDetails.translationKey;
|
|
22112
22214
|
var defaultLevelText = React.useMemo(function () {
|
|
@@ -22349,7 +22451,23 @@ var WarningListItem = function WarningListItem(_ref) {
|
|
|
22349
22451
|
width: 56
|
|
22350
22452
|
}, _sx2),
|
|
22351
22453
|
title: t('warning-list-header-level'),
|
|
22352
|
-
children: jsx(
|
|
22454
|
+
children: isExpiryMessage ? jsx(MinorLevelChip, {
|
|
22455
|
+
sx: (_sx3 = {
|
|
22456
|
+
width: 'auto',
|
|
22457
|
+
marginRight: 2,
|
|
22458
|
+
display: 'flex',
|
|
22459
|
+
alignItems: 'center',
|
|
22460
|
+
justifyContent: 'center',
|
|
22461
|
+
fontWeight: 'bold'
|
|
22462
|
+
}, _sx3["@container publicWarningList (min-width: " + breakpoints.desktop + "px)"] = {
|
|
22463
|
+
marginRight: 0,
|
|
22464
|
+
height: '32px',
|
|
22465
|
+
'.level-suffix': {
|
|
22466
|
+
display: 'none'
|
|
22467
|
+
}
|
|
22468
|
+
}, _sx3),
|
|
22469
|
+
children: renderLevelText(t('warning-level-minor'), 2)
|
|
22470
|
+
}) : jsx(Box, {
|
|
22353
22471
|
component: "span",
|
|
22354
22472
|
sx: Object.assign({}, getLevelStyle(levelDetails), (_Object$assign = {
|
|
22355
22473
|
fontWeight: 'bold',
|
|
@@ -22476,7 +22594,9 @@ var WarningListItemSeperator = function WarningListItemSeperator(_ref) {
|
|
|
22476
22594
|
}));
|
|
22477
22595
|
};
|
|
22478
22596
|
|
|
22479
|
-
var warningColors = Object.assign({}, LevelColors
|
|
22597
|
+
var warningColors = Object.assign({}, LevelColors, {
|
|
22598
|
+
minor: MinorLevelColors
|
|
22599
|
+
});
|
|
22480
22600
|
|
|
22481
22601
|
var ExpandableFilterChip = function ExpandableFilterChip(_ref) {
|
|
22482
22602
|
var id = _ref.id,
|
|
@@ -22644,7 +22764,7 @@ var ExpandableFilterChip = function ExpandableFilterChip(_ref) {
|
|
|
22644
22764
|
})
|
|
22645
22765
|
}),
|
|
22646
22766
|
labelStyle: Object.assign({}, getLevelStyle(warningColor), {
|
|
22647
|
-
width:
|
|
22767
|
+
width: warningColor ? 'fit-content' : '100%',
|
|
22648
22768
|
fontSize: '16px'
|
|
22649
22769
|
}),
|
|
22650
22770
|
onClick: function onClick(checked, only) {
|
|
@@ -23637,7 +23757,7 @@ var useWarningListFeatureSync = function useWarningListFeatureSync(_ref) {
|
|
|
23637
23757
|
var _warning$warningDetai6, _area$areaId;
|
|
23638
23758
|
var level = warning == null || (_warning$warningDetai6 = warning.warningDetail) == null ? void 0 : _warning$warningDetai6.level;
|
|
23639
23759
|
var isAviationWarning = level === 'SIG' || level === 'AIR';
|
|
23640
|
-
var styledGeoJSON = level ? warningLevelFeatureColors(isAviationWarning ? undefined : level, area.geoJSON, isAviationWarning) : area.geoJSON;
|
|
23760
|
+
var styledGeoJSON = level || isExpireMessage(warning) ? warningLevelFeatureColors(isAviationWarning ? undefined : level, area.geoJSON, isAviationWarning, isExpireMessage(warning)) : area.geoJSON;
|
|
23641
23761
|
return {
|
|
23642
23762
|
id: originalId + ((_area$areaId = area.areaId) != null ? _area$areaId : ''),
|
|
23643
23763
|
originalId: originalId,
|
|
@@ -23825,7 +23945,7 @@ var createWarningFilterPredicate = function createWarningFilterPredicate(warning
|
|
|
23825
23945
|
if (!savedDomainFilter[levelDomain]) {
|
|
23826
23946
|
return false;
|
|
23827
23947
|
}
|
|
23828
|
-
var level = getValue(Level, warning.warningDetail.level);
|
|
23948
|
+
var level = isExpireMessage(warning) ? Level.minor : getValue(Level, warning.warningDetail.level);
|
|
23829
23949
|
if (!pickedLevelFilter[level]) {
|
|
23830
23950
|
return false;
|
|
23831
23951
|
}
|
|
@@ -23856,18 +23976,22 @@ var createWarningFilterPredicate = function createWarningFilterPredicate(warning
|
|
|
23856
23976
|
};
|
|
23857
23977
|
};
|
|
23858
23978
|
var useWarningFilters = function useWarningFilters(warnings, onUpdateFilters, savedFilterState, presetFilterState) {
|
|
23979
|
+
var _persistedLevelFilter;
|
|
23859
23980
|
var _savedFilterState$dom = savedFilterState.domain,
|
|
23860
23981
|
savedDomainFilter = _savedFilterState$dom === void 0 ? initialFilters.domain : _savedFilterState$dom,
|
|
23861
23982
|
_savedFilterState$phe = savedFilterState.phenomenon,
|
|
23862
23983
|
savedPhenomenonFilter = _savedFilterState$phe === void 0 ? initialFilters.phenomenon : _savedFilterState$phe,
|
|
23863
23984
|
_savedFilterState$lev = savedFilterState.level,
|
|
23864
|
-
|
|
23985
|
+
persistedLevelFilter = _savedFilterState$lev === void 0 ? initialFilters.level : _savedFilterState$lev,
|
|
23865
23986
|
_savedFilterState$are = savedFilterState.area,
|
|
23866
23987
|
savedAreaFilter = _savedFilterState$are === void 0 ? initialFilters.area : _savedFilterState$are,
|
|
23867
23988
|
_savedFilterState$sou = savedFilterState.source,
|
|
23868
23989
|
savedSourceFilter = _savedFilterState$sou === void 0 ? initialFilters.source : _savedFilterState$sou,
|
|
23869
23990
|
_savedFilterState$tim = savedFilterState.time,
|
|
23870
23991
|
savedTimeFilter = _savedFilterState$tim === void 0 ? initialFilters.time : _savedFilterState$tim;
|
|
23992
|
+
var savedLevelFilter = Object.assign({}, persistedLevelFilter, {
|
|
23993
|
+
minor: (_persistedLevelFilter = persistedLevelFilter.minor) != null ? _persistedLevelFilter : initialFilters.level.minor
|
|
23994
|
+
});
|
|
23871
23995
|
/** Levels for selected domain(s) */
|
|
23872
23996
|
var relevantLevels = useMemo(function () {
|
|
23873
23997
|
return getLevelsForDomainFilter(savedDomainFilter);
|
|
@@ -24565,6 +24689,8 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
|
|
|
24565
24689
|
case 0:
|
|
24566
24690
|
expiredWarning = Object.assign({}, warning, {
|
|
24567
24691
|
status: PublicWarningStatus.EXPIRED
|
|
24692
|
+
}, warning.type === 'public' && {
|
|
24693
|
+
gw_type: PublicWarningGwType.EXPIRE
|
|
24568
24694
|
});
|
|
24569
24695
|
_context6.n = 1;
|
|
24570
24696
|
return getUpdateDraftNotice(warning);
|
|
@@ -24625,6 +24751,8 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
|
|
|
24625
24751
|
case 0:
|
|
24626
24752
|
withdrawnWarning = Object.assign({}, warning, {
|
|
24627
24753
|
status: PublicWarningStatus.WITHDRAWN
|
|
24754
|
+
}, warning.type === 'public' && {
|
|
24755
|
+
gw_type: PublicWarningGwType.WITHDRAW
|
|
24628
24756
|
});
|
|
24629
24757
|
_context8.n = 1;
|
|
24630
24758
|
return getUpdateDraftNotice(warning);
|
|
@@ -25559,7 +25687,7 @@ var getTooltipContent = function getTooltipContent(warning, t) {
|
|
|
25559
25687
|
var probability = type === 'warningsEvent' ? (_probablityOptions$fi = probablityOptions.find(function (probability) {
|
|
25560
25688
|
return probability.value === warningDetail.probability;
|
|
25561
25689
|
})) == null ? void 0 : _probablityOptions$fi.name : warningDetail.probability;
|
|
25562
|
-
var line1 = isAviation ? [type.toUpperCase(), phenomenonLabel].filter(Boolean).join(' · ') : [phenomenonLabel, warningDetail.level, warningDetail.probability ? probability + "%" : null].filter(Boolean).join(' · ');
|
|
25690
|
+
var line1 = isAviation ? [type.toUpperCase(), phenomenonLabel].filter(Boolean).join(' · ') : [phenomenonLabel, isExpireMessage(warning) ? t('warning-level-minor') : warningDetail.level, warningDetail.probability ? probability + "%" : null].filter(Boolean).join(' · ');
|
|
25563
25691
|
var period = warningDetail.validFrom && warningDetail.validUntil ? formatPeriod(warningDetail.validFrom, warningDetail.validUntil) : null;
|
|
25564
25692
|
var meta = [author, status].filter(Boolean).join(' · ');
|
|
25565
25693
|
return jsxs(Box, {
|
|
@@ -25612,10 +25740,11 @@ var WarningBlock = /*#__PURE__*/React.memo(function (_ref) {
|
|
|
25612
25740
|
type = warning.type;
|
|
25613
25741
|
var author = getWarningAuthor(warning);
|
|
25614
25742
|
var isAviation = type === 'sigmet' || type === 'airmet';
|
|
25615
|
-
var
|
|
25743
|
+
var isExpiryMessage = isExpireMessage(warning);
|
|
25744
|
+
var level = isExpiryMessage ? null : warningDetail.level || null;
|
|
25616
25745
|
var letter = level ? t("warning-level-letter-" + level) : '';
|
|
25617
25746
|
var effectiveStatus = getEffectiveStatus(warning);
|
|
25618
|
-
var _getBlockStyle = getBlockStyle(level, effectiveStatus, isAviation),
|
|
25747
|
+
var _getBlockStyle = getBlockStyle(level, effectiveStatus, isAviation, isExpiryMessage),
|
|
25619
25748
|
background = _getBlockStyle.background,
|
|
25620
25749
|
border = _getBlockStyle.border,
|
|
25621
25750
|
iconColor = _getBlockStyle.iconColor,
|
|
@@ -25628,7 +25757,7 @@ var WarningBlock = /*#__PURE__*/React.memo(function (_ref) {
|
|
|
25628
25757
|
var size = getBlockSize(width);
|
|
25629
25758
|
var highlightOutlineColor = theme.palette.geowebColors.typographyAndIcons.iconLinkActive;
|
|
25630
25759
|
var elements = [];
|
|
25631
|
-
if (!isCancelledAviation && (size === 'l' || width >= MIN_WIDTH_FOR_LETTER)) {
|
|
25760
|
+
if (!isCancelledAviation && !!letter && (size === 'l' || width >= MIN_WIDTH_FOR_LETTER)) {
|
|
25632
25761
|
elements.push(jsx(Box, {
|
|
25633
25762
|
sx: {
|
|
25634
25763
|
fontSize: 16,
|
|
@@ -125103,7 +125232,8 @@ var warningListJSON = [
|
|
|
125103
125232
|
{
|
|
125104
125233
|
id: "f1e8981e-937c-11ee-a1bf-003kmdidki9",
|
|
125105
125234
|
lastUpdatedTime: "2024-05-28T09:45:33Z",
|
|
125106
|
-
status: "
|
|
125235
|
+
status: "DRAFT",
|
|
125236
|
+
gw_type: "UPDATE",
|
|
125107
125237
|
warningDetail: {
|
|
125108
125238
|
id: "f1e8981e-937c-11ee-a1bf-003kmdidki9",
|
|
125109
125239
|
phenomenon: "wind",
|
|
@@ -125173,7 +125303,8 @@ var warningListJSON = [
|
|
|
125173
125303
|
{
|
|
125174
125304
|
id: "550c2b5e-937d-11ee-a1bf-dki2883ke",
|
|
125175
125305
|
lastUpdatedTime: "2024-05-27T14:48:20Z",
|
|
125176
|
-
status: "
|
|
125306
|
+
status: "DRAFT",
|
|
125307
|
+
gw_type: "UPDATE",
|
|
125177
125308
|
editor: "user.name",
|
|
125178
125309
|
warningDetail: {
|
|
125179
125310
|
id: "550c2b5e-937d-11ee-a1bf-dki2883ke",
|
|
@@ -126288,7 +126419,7 @@ var publicWarningEndpoints = [http.get(/^.*\/maritime-warnings-config$/, /*#__PU
|
|
|
126288
126419
|
filtered = filtered.map(function (warning) {
|
|
126289
126420
|
var _warning$warningDetai3;
|
|
126290
126421
|
var validUntil = (_warning$warningDetai3 = warning.warningDetail) == null ? void 0 : _warning$warningDetai3.validUntil;
|
|
126291
|
-
var keepStatus = ['DRAFT', '
|
|
126422
|
+
var keepStatus = ['DRAFT', 'IGNORED'].includes(warning.status);
|
|
126292
126423
|
var hasExpired = validUntil && validUntil < now;
|
|
126293
126424
|
if (hasExpired && !keepStatus) {
|
|
126294
126425
|
return Object.assign({}, warning, {
|
|
@@ -26,6 +26,7 @@ export interface FormProps {
|
|
|
26
26
|
publicWarningDetails?: PublicWarningDetail;
|
|
27
27
|
error?: FormError;
|
|
28
28
|
isReadOnly?: boolean;
|
|
29
|
+
isExpiryMessage?: boolean;
|
|
29
30
|
onFormDirty?: (isFormDirty: boolean) => void;
|
|
30
31
|
isSnapshot?: boolean;
|
|
31
32
|
onAddDrawing?: () => void;
|
|
@@ -43,8 +44,10 @@ export interface FormProps {
|
|
|
43
44
|
isDrawPolygonActive?: boolean;
|
|
44
45
|
isDrawingModeActive?: boolean;
|
|
45
46
|
publicWarningStatus?: PublicWarningStatus;
|
|
47
|
+
isPublicUpdateDraft?: boolean;
|
|
46
48
|
}
|
|
47
49
|
export declare function warningLevelFeatureColors(level: WarningLevel | undefined, geoJSON: FeatureCollection<Geometry, GeoJsonProperties> | undefined, // Allow undefined
|
|
48
|
-
isAviationWarning?: boolean
|
|
50
|
+
isAviationWarning?: boolean, // Determines if it's an aviation warning
|
|
51
|
+
isExpiryMessage?: boolean): FeatureCollection<Geometry, GeoJsonProperties>;
|
|
49
52
|
export declare const PublicWarningsForm: React.FC<FormProps>;
|
|
50
53
|
export {};
|
|
@@ -13,4 +13,4 @@ export interface BlockStyle {
|
|
|
13
13
|
iconColor: string;
|
|
14
14
|
letterColor: string;
|
|
15
15
|
}
|
|
16
|
-
export declare const getBlockStyle: (level: WarningLevel | null, status: PublicWarningStatus | undefined, isAviation: boolean) => BlockStyle;
|
|
16
|
+
export declare const getBlockStyle: (level: WarningLevel | null, status: PublicWarningStatus | undefined, isAviation: boolean, isExpiryMessage?: boolean) => BlockStyle;
|
|
@@ -13,6 +13,7 @@ interface OverflowCheckResult {
|
|
|
13
13
|
isOverflowing: boolean;
|
|
14
14
|
}
|
|
15
15
|
export declare const getSortedStatus: (status: PublicWarningStatus) => PublicWarningStatus;
|
|
16
|
+
export declare const isExpireMessage: (warning?: Warning) => boolean;
|
|
16
17
|
export declare const isExpireOrWithdrawMessage: (warning: Warning) => boolean;
|
|
17
18
|
export declare const isPublicUpdateDraft: (warning?: Warning) => boolean;
|
|
18
19
|
export declare const getWarningWithoutIdStatusEditor: (warning: Warning) => Warning;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opengeoweb/warnings",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "21.0.0",
|
|
4
4
|
"description": "GeoWeb warinings library for the opengeoweb project",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"repository": {
|
|
@@ -20,24 +20,24 @@
|
|
|
20
20
|
}
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@opengeoweb/api": "
|
|
24
|
-
"@opengeoweb/shared": "
|
|
25
|
-
"@opengeoweb/store": "
|
|
26
|
-
"@opengeoweb/webmap-react": "
|
|
23
|
+
"@opengeoweb/api": "21.0.0",
|
|
24
|
+
"@opengeoweb/shared": "21.0.0",
|
|
25
|
+
"@opengeoweb/store": "21.0.0",
|
|
26
|
+
"@opengeoweb/webmap-react": "21.0.0",
|
|
27
27
|
"@tanstack/react-query": "^5.85.5",
|
|
28
28
|
"react-redux": "^9.2.0",
|
|
29
|
-
"@opengeoweb/theme": "
|
|
30
|
-
"@opengeoweb/form-fields": "
|
|
29
|
+
"@opengeoweb/theme": "21.0.0",
|
|
30
|
+
"@opengeoweb/form-fields": "21.0.0",
|
|
31
31
|
"react-hook-form": "^7.50.1",
|
|
32
32
|
"lodash": "^4.18.1",
|
|
33
33
|
"@reduxjs/toolkit": "^2.6.1",
|
|
34
|
-
"@opengeoweb/snackbar": "
|
|
34
|
+
"@opengeoweb/snackbar": "21.0.0",
|
|
35
35
|
"react-window": "^2.2.6",
|
|
36
36
|
"axios": "^1.20.0",
|
|
37
|
-
"@opengeoweb/core": "
|
|
38
|
-
"@opengeoweb/webmap": "
|
|
39
|
-
"@opengeoweb/authentication": "
|
|
40
|
-
"@opengeoweb/sigmet-airmet": "
|
|
37
|
+
"@opengeoweb/core": "21.0.0",
|
|
38
|
+
"@opengeoweb/webmap": "21.0.0",
|
|
39
|
+
"@opengeoweb/authentication": "21.0.0",
|
|
40
|
+
"@opengeoweb/sigmet-airmet": "21.0.0",
|
|
41
41
|
"react-i18next": "^15.1.1",
|
|
42
42
|
"i18next": "^25.0.1",
|
|
43
43
|
"@mui/material": "^9.0.1",
|