@opengeoweb/warnings 21.1.0-nightly-20261112 → 21.2.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
CHANGED
|
@@ -34,6 +34,7 @@ import { http, HttpResponse, passthrough } from 'msw';
|
|
|
34
34
|
|
|
35
35
|
var en = {
|
|
36
36
|
"warning-original-load-error": "Could not load the original warning. Retry before publishing this update.",
|
|
37
|
+
"warning-original-ended": "The original warning has ended, so this update can no longer be published.",
|
|
37
38
|
"warning-button-retry": "Retry",
|
|
38
39
|
"timeline-view-too-small": "Resize to continue",
|
|
39
40
|
"timeline-view-too-small-description": "This feature requires a larger view. Please enlarge the view to use this feature.",
|
|
@@ -494,6 +495,7 @@ var en = {
|
|
|
494
495
|
};
|
|
495
496
|
var nl = {
|
|
496
497
|
"warning-original-load-error": "De oorspronkelijke waarschuwing kon niet worden geladen. Probeer opnieuw voordat u deze update publiceert.",
|
|
498
|
+
"warning-original-ended": "De oorspronkelijke waarschuwing is beëindigd, dus deze update kan niet meer worden gepubliceerd.",
|
|
497
499
|
"warning-button-retry": "Opnieuw proberen",
|
|
498
500
|
"drawing-tool-form-tools": "Gereedschap",
|
|
499
501
|
"drawing-tool-form-opacity": "Dekking",
|
|
@@ -899,6 +901,7 @@ var nl = {
|
|
|
899
901
|
};
|
|
900
902
|
var fi = {
|
|
901
903
|
"warning-original-load-error": "Alkuperäisen varoituksen lataaminen epäonnistui. Yritä uudelleen ennen päivityksen julkaisemista.",
|
|
904
|
+
"warning-original-ended": "ei käännetty",
|
|
902
905
|
"warning-button-retry": "Yritä uudelleen",
|
|
903
906
|
"drawing-tool-form-tools": "Työkalut",
|
|
904
907
|
"drawing-tool-form-opacity": "Peittävyys",
|
|
@@ -1260,6 +1263,7 @@ var fi = {
|
|
|
1260
1263
|
};
|
|
1261
1264
|
var no = {
|
|
1262
1265
|
"warning-original-load-error": "Kunne ikke laste det opprinnelige farevarselet. Prøv igjen før du publiserer oppdateringen.",
|
|
1266
|
+
"warning-original-ended": "Det opprinnelige farevarselet er avsluttet, så denne oppdateringen kan ikke lenger publiseres.",
|
|
1263
1267
|
"warning-button-retry": "Prøv igjen",
|
|
1264
1268
|
"drawing-tool-form-tools": "Verktøy",
|
|
1265
1269
|
"drawing-tool-form-opacity": "Gjennomsiktighet",
|
|
@@ -3660,14 +3664,11 @@ var getSortedStatus = function getSortedStatus(status) {
|
|
|
3660
3664
|
}
|
|
3661
3665
|
}
|
|
3662
3666
|
};
|
|
3663
|
-
var isExpireMessage = function isExpireMessage(warning) {
|
|
3664
|
-
return (warning == null ? void 0 : warning.type) === 'public' && warning.gw_type === PublicWarningGwType.EXPIRE;
|
|
3665
|
-
};
|
|
3666
3667
|
// The new message the backend creates when a public warning is expired or
|
|
3667
3668
|
// withdrawn (gw_type EXPIRE or WITHDRAW). It is only ever published, so it
|
|
3668
|
-
// cannot be updated, expired or withdrawn itself.
|
|
3669
|
+
// cannot be updated, expired or withdrawn itself, and always has level minor.
|
|
3669
3670
|
var isExpireOrWithdrawMessage = function isExpireOrWithdrawMessage(warning) {
|
|
3670
|
-
return warning.type === 'public' && (warning.gw_type === PublicWarningGwType.EXPIRE || warning.gw_type === PublicWarningGwType.WITHDRAW);
|
|
3671
|
+
return (warning == null ? void 0 : warning.type) === 'public' && (warning.gw_type === PublicWarningGwType.EXPIRE || warning.gw_type === PublicWarningGwType.WITHDRAW);
|
|
3671
3672
|
};
|
|
3672
3673
|
// Public update drafts use DRAFT + UPDATE; warning events retain DRAFT_PUBLISHED.
|
|
3673
3674
|
var isPublicUpdateDraft = function isPublicUpdateDraft(warning) {
|
|
@@ -10917,6 +10918,7 @@ var Form = function Form(_ref6) {
|
|
|
10917
10918
|
previousValidFrom = _ref6.previousValidFrom,
|
|
10918
10919
|
_ref6$isPublishDisabl = _ref6.isPublishDisabled,
|
|
10919
10920
|
isPublishDisabled = _ref6$isPublishDisabl === void 0 ? false : _ref6$isPublishDisabl,
|
|
10921
|
+
publishDisabledTooltip = _ref6.publishDisabledTooltip,
|
|
10920
10922
|
_ref6$originalWarning = _ref6.originalWarningLoadFailed,
|
|
10921
10923
|
originalWarningLoadFailed = _ref6$originalWarning === void 0 ? false : _ref6$originalWarning,
|
|
10922
10924
|
onRetryOriginalWarning = _ref6.onRetryOriginalWarning;
|
|
@@ -11729,24 +11731,33 @@ var Form = function Form(_ref6) {
|
|
|
11729
11731
|
xs: 12,
|
|
11730
11732
|
sm: 4
|
|
11731
11733
|
},
|
|
11732
|
-
children: jsx(
|
|
11733
|
-
|
|
11734
|
-
|
|
11735
|
-
|
|
11736
|
-
},
|
|
11737
|
-
sx: {
|
|
11738
|
-
width: '100%'
|
|
11739
|
-
},
|
|
11740
|
-
variant: "primary",
|
|
11741
|
-
children: jsxs("span", {
|
|
11734
|
+
children: jsx(CustomTooltip, {
|
|
11735
|
+
title: publishDisabledTooltip,
|
|
11736
|
+
children: jsx("span", {
|
|
11737
|
+
"data-testid": "warning-publish-tooltip-anchor",
|
|
11742
11738
|
style: {
|
|
11743
|
-
|
|
11739
|
+
display: 'block'
|
|
11744
11740
|
},
|
|
11745
|
-
children:
|
|
11746
|
-
|
|
11747
|
-
|
|
11748
|
-
|
|
11749
|
-
|
|
11741
|
+
children: jsx(Button, {
|
|
11742
|
+
disabled: isSaving || isFormInDrawingMode || isPublishDisabled,
|
|
11743
|
+
onClick: function onClick() {
|
|
11744
|
+
void (selectedAviationProduct ? handleSubmitAviationProduct(formState === 'amending' ? ProductAction.AMEND : ProductAction.PUBLISH, warningType) : onPressPublish());
|
|
11745
|
+
},
|
|
11746
|
+
sx: {
|
|
11747
|
+
width: '100%'
|
|
11748
|
+
},
|
|
11749
|
+
variant: "primary",
|
|
11750
|
+
children: jsxs("span", {
|
|
11751
|
+
style: {
|
|
11752
|
+
position: 'relative'
|
|
11753
|
+
},
|
|
11754
|
+
children: [isPublishing ? t('warning-button-publishing') : t('warning-button-publish'), !!isPublishing && jsx(CircularProgress, {
|
|
11755
|
+
color: "inherit",
|
|
11756
|
+
"data-testid": "spinner",
|
|
11757
|
+
sx: spinnerSx
|
|
11758
|
+
})]
|
|
11759
|
+
})
|
|
11760
|
+
})
|
|
11750
11761
|
})
|
|
11751
11762
|
})
|
|
11752
11763
|
})]
|
|
@@ -12043,6 +12054,8 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
|
|
|
12043
12054
|
var previousValidFrom = linkedPublicWarning == null ? void 0 : linkedPublicWarning.warningDetail.validFrom;
|
|
12044
12055
|
var isOriginalWarningUnavailable = isPublicUpdateDraft(warning) && (!previousValidFrom || !dateUtils.isValidIsoDateString(previousValidFrom));
|
|
12045
12056
|
var originalWarningLoadFailed = isOriginalWarningUnavailable && (!linkedPublicWarningId || originalWarningError || originalWarningFetched);
|
|
12057
|
+
// An update can't be published once the warning it points to has ended.
|
|
12058
|
+
var isOriginalWarningEnded = isPublicUpdateDraft(warning) && !!linkedPublicWarning && (isEndedStatus(linkedPublicWarning.status) || hasWarningEndTimePassed(linkedPublicWarning, new Date()));
|
|
12046
12059
|
var _usePostSigmet = usePostSigmet(),
|
|
12047
12060
|
postSigmet = _usePostSigmet.mutateAsync;
|
|
12048
12061
|
var _usePostAirmet = usePostAirmet(),
|
|
@@ -12062,6 +12075,12 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
|
|
|
12062
12075
|
}
|
|
12063
12076
|
throw new Error(t('warning-original-load-error'));
|
|
12064
12077
|
case 1:
|
|
12078
|
+
if (!isOriginalWarningEnded) {
|
|
12079
|
+
_context.n = 2;
|
|
12080
|
+
break;
|
|
12081
|
+
}
|
|
12082
|
+
throw new Error(t('warning-original-ended'));
|
|
12083
|
+
case 2:
|
|
12065
12084
|
return _context.a(2, publishWarning({
|
|
12066
12085
|
id: newFormValues.id || newFormValues.linked_to_id || '',
|
|
12067
12086
|
data: {
|
|
@@ -12247,9 +12266,9 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
|
|
|
12247
12266
|
formState: formState,
|
|
12248
12267
|
isDrawPolygonActive: isDrawPolygonActive,
|
|
12249
12268
|
isDrawingModeActive: isDrawingModeActive,
|
|
12250
|
-
isExpiryMessage: !!(warning != null && warning.id) && warning
|
|
12269
|
+
isExpiryMessage: !!(warning != null && warning.id) && isExpireOrWithdrawMessage(warning),
|
|
12251
12270
|
isPublicUpdateDraft: isPublicUpdateDraft(warning),
|
|
12252
|
-
isPublishDisabled: isOriginalWarningUnavailable,
|
|
12271
|
+
isPublishDisabled: isOriginalWarningUnavailable || isOriginalWarningEnded,
|
|
12253
12272
|
isReadOnly: isReadOnly,
|
|
12254
12273
|
linkedMapIds: selectedMapIds,
|
|
12255
12274
|
mode: formMode,
|
|
@@ -12270,6 +12289,7 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
|
|
|
12270
12289
|
previousValidFrom: previousValidFrom,
|
|
12271
12290
|
publicWarningDetails: warning == null ? void 0 : warning.warningDetail,
|
|
12272
12291
|
publicWarningStatus: warningStatus,
|
|
12292
|
+
publishDisabledTooltip: isOriginalWarningEnded ? t('warning-original-ended') : undefined,
|
|
12273
12293
|
selectedAviationProduct: selectedAviationProduct,
|
|
12274
12294
|
setWarningLevel: setWarningLevel,
|
|
12275
12295
|
storedEndGeoJSON: storedEndGeoJSON,
|
|
@@ -12520,7 +12540,7 @@ var AreaDrawingLoaderConnect = function AreaDrawingLoaderConnect(_ref) {
|
|
|
12520
12540
|
}
|
|
12521
12541
|
return ((_selectedWarning$warn4 = selectedWarning == null || (_selectedWarning$warn5 = selectedWarning.warningDetail) == null ? void 0 : _selectedWarning$warn5.areas) != null ? _selectedWarning$warn4 : []).reduce(function (layersById, area, index) {
|
|
12522
12542
|
var _selectedWarning$warn6, _ref3, _Object$assign;
|
|
12523
|
-
var styledGeoJSON = warningLevelFeatureColors(selectedWarning == null || (_selectedWarning$warn6 = selectedWarning.warningDetail) == null ? void 0 : _selectedWarning$warn6.level, area.geoJSON, isAviationWarning,
|
|
12543
|
+
var styledGeoJSON = warningLevelFeatureColors(selectedWarning == null || (_selectedWarning$warn6 = selectedWarning.warningDetail) == null ? void 0 : _selectedWarning$warn6.level, area.geoJSON, isAviationWarning, isExpireOrWithdrawMessage(selectedWarning));
|
|
12524
12544
|
if (!styledGeoJSON.features.length) {
|
|
12525
12545
|
return layersById;
|
|
12526
12546
|
}
|
|
@@ -22632,7 +22652,7 @@ var WarningListItem = function WarningListItem(_ref) {
|
|
|
22632
22652
|
isIncidentoverflowing = _useOverflowCheck3.isOverflowing;
|
|
22633
22653
|
var incidentName = warning.productStatus !== 'DRAFT' && warning.warningDetail.incident !== undefined ? warning.warningDetail.incident : '-';
|
|
22634
22654
|
var levelDetails = levelOptionsDict[warning.warningDetail.level];
|
|
22635
|
-
var isExpiryMessage =
|
|
22655
|
+
var isExpiryMessage = isExpireOrWithdrawMessage(warning);
|
|
22636
22656
|
var status = getDisplayStatus(warning) || mapProductStatusToWarningStatus(warning.productStatus);
|
|
22637
22657
|
var levelTranslation = levelDetails == null ? void 0 : levelDetails.translationKey;
|
|
22638
22658
|
var defaultLevelText = React.useMemo(function () {
|
|
@@ -24339,7 +24359,7 @@ var useWarningListFeatureSync = function useWarningListFeatureSync(_ref) {
|
|
|
24339
24359
|
var _warning$warningDetai6, _area$areaId;
|
|
24340
24360
|
var level = warning == null || (_warning$warningDetai6 = warning.warningDetail) == null ? void 0 : _warning$warningDetai6.level;
|
|
24341
24361
|
var isAviationWarning = level === 'SIG' || level === 'AIR';
|
|
24342
|
-
var styledGeoJSON = level ||
|
|
24362
|
+
var styledGeoJSON = level || isExpireOrWithdrawMessage(warning) ? warningLevelFeatureColors(isAviationWarning ? undefined : level, area.geoJSON, isAviationWarning, isExpireOrWithdrawMessage(warning)) : area.geoJSON;
|
|
24343
24363
|
return {
|
|
24344
24364
|
id: originalId + ((_area$areaId = area.areaId) != null ? _area$areaId : ''),
|
|
24345
24365
|
originalId: originalId,
|
|
@@ -24527,7 +24547,7 @@ var createWarningFilterPredicate = function createWarningFilterPredicate(warning
|
|
|
24527
24547
|
if (!savedDomainFilter[levelDomain]) {
|
|
24528
24548
|
return false;
|
|
24529
24549
|
}
|
|
24530
|
-
var level =
|
|
24550
|
+
var level = isExpireOrWithdrawMessage(warning) ? Level.minor : getValue(Level, warning.warningDetail.level);
|
|
24531
24551
|
if (!pickedLevelFilter[level]) {
|
|
24532
24552
|
return false;
|
|
24533
24553
|
}
|
|
@@ -26273,7 +26293,7 @@ var getTooltipContent = function getTooltipContent(warning, t) {
|
|
|
26273
26293
|
var probability = type === 'warningsEvent' ? (_probablityOptions$fi = probablityOptions.find(function (probability) {
|
|
26274
26294
|
return probability.value === warningDetail.probability;
|
|
26275
26295
|
})) == null ? void 0 : _probablityOptions$fi.name : warningDetail.probability;
|
|
26276
|
-
var line1 = isAviation ? [type.toUpperCase(), phenomenonLabel].filter(Boolean).join(' · ') : [phenomenonLabel,
|
|
26296
|
+
var line1 = isAviation ? [type.toUpperCase(), phenomenonLabel].filter(Boolean).join(' · ') : [phenomenonLabel, isExpireOrWithdrawMessage(warning) ? t('warning-level-minor') : warningDetail.level, warningDetail.probability ? probability + "%" : null].filter(Boolean).join(' · ');
|
|
26277
26297
|
var period = warningDetail.validFrom && warningDetail.validUntil ? formatPeriod(warningDetail.validFrom, warningDetail.validUntil) : null;
|
|
26278
26298
|
var meta = [author, status].filter(Boolean).join(' · ');
|
|
26279
26299
|
return jsxs(Box, {
|
|
@@ -26326,7 +26346,7 @@ var WarningBlock = /*#__PURE__*/React.memo(function (_ref) {
|
|
|
26326
26346
|
type = warning.type;
|
|
26327
26347
|
var author = getWarningAuthor(warning);
|
|
26328
26348
|
var isAviation = type === 'sigmet' || type === 'airmet';
|
|
26329
|
-
var isExpiryMessage =
|
|
26349
|
+
var isExpiryMessage = isExpireOrWithdrawMessage(warning);
|
|
26330
26350
|
var level = isExpiryMessage ? null : warningDetail.level || null;
|
|
26331
26351
|
var letter = level ? t("warning-level-letter-" + level) : '';
|
|
26332
26352
|
var effectiveStatus = getEffectiveStatus(warning);
|
|
@@ -14,8 +14,7 @@ interface OverflowCheckResult {
|
|
|
14
14
|
isOverflowing: boolean;
|
|
15
15
|
}
|
|
16
16
|
export declare const getSortedStatus: (status: PublicWarningStatus) => PublicWarningStatus;
|
|
17
|
-
export declare const
|
|
18
|
-
export declare const isExpireOrWithdrawMessage: (warning: Warning) => boolean;
|
|
17
|
+
export declare const isExpireOrWithdrawMessage: (warning?: Warning) => boolean;
|
|
19
18
|
export declare const isPublicUpdateDraft: (warning?: Warning) => boolean;
|
|
20
19
|
export declare const getWarningWithoutIdStatusEditor: (warning: Warning) => Warning;
|
|
21
20
|
export declare const getWarningWithLinkedToId: (warning: Warning) => Warning;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opengeoweb/warnings",
|
|
3
|
-
"version": "21.
|
|
3
|
+
"version": "21.2.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": "21.
|
|
24
|
-
"@opengeoweb/shared": "21.
|
|
25
|
-
"@opengeoweb/store": "21.
|
|
26
|
-
"@opengeoweb/webmap-react": "21.
|
|
23
|
+
"@opengeoweb/api": "21.2.0",
|
|
24
|
+
"@opengeoweb/shared": "21.2.0",
|
|
25
|
+
"@opengeoweb/store": "21.2.0",
|
|
26
|
+
"@opengeoweb/webmap-react": "21.2.0",
|
|
27
27
|
"@tanstack/react-query": "^5.85.5",
|
|
28
28
|
"react-redux": "^9.2.0",
|
|
29
|
-
"@opengeoweb/theme": "21.
|
|
30
|
-
"@opengeoweb/form-fields": "21.
|
|
29
|
+
"@opengeoweb/theme": "21.2.0",
|
|
30
|
+
"@opengeoweb/form-fields": "21.2.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": "21.
|
|
34
|
+
"@opengeoweb/snackbar": "21.2.0",
|
|
35
35
|
"react-window": "^2.2.6",
|
|
36
36
|
"axios": "^1.20.0",
|
|
37
|
-
"@opengeoweb/core": "21.
|
|
38
|
-
"@opengeoweb/webmap": "21.
|
|
39
|
-
"@opengeoweb/authentication": "21.
|
|
40
|
-
"@opengeoweb/sigmet-airmet": "21.
|
|
37
|
+
"@opengeoweb/core": "21.2.0",
|
|
38
|
+
"@opengeoweb/webmap": "21.2.0",
|
|
39
|
+
"@opengeoweb/authentication": "21.2.0",
|
|
40
|
+
"@opengeoweb/sigmet-airmet": "21.2.0",
|
|
41
41
|
"react-i18next": "^15.1.1",
|
|
42
42
|
"i18next": "^25.0.1",
|
|
43
43
|
"@mui/material": "^9.0.1",
|