@opengeoweb/sigmet-airmet 9.1.0 → 9.2.0

package/index.esm.js

@@ -14,6 +14,7 @@ import 'react-dom';
 import { mapSelectors, syncGroupsActions, mapStoreActions, defaultLayers, syncConstants } from '@opengeoweb/store';
 import { LayerManagerMapButtonConnect, LegendMapButtonConnect, MultiDimensionSelectMapButtonsConnect, MapViewConnect, LegendConnect, LayerManagerConnect } from '@opengeoweb/core';
 import { TimeSliderConnect } from '@opengeoweb/timeslider';
+import { useAuthenticationContext } from '@opengeoweb/authentication';
 import { jsx } from 'react/jsx-runtime';
 
 function _iterableToArrayLimit(r, l) {
@@ -1046,7 +1047,11 @@ var getProductFormMode = function getProductFormMode(canBeOptions, productListIt
 var buttonStyle = {
   minWidth: 96
 };
-var getProductFormLifecycleButtons = function getProductFormLifecycleButtons(canBe, onButtonPress) {
+var getProductFormLifecycleButtons = function getProductFormLifecycleButtons(_ref) {
+  var canBe = _ref.canBe,
+    onButtonPress = _ref.onButtonPress,
+    _ref$areActionsDisabl = _ref.areActionsDisabled,
+    areActionsDisabled = _ref$areActionsDisabl === void 0 ? false : _ref$areActionsDisabl;
   var hasDiscardButton = canBe.includes('DISCARDED');
   var onDiscard = function onDiscard() {
     return onButtonPress('DISCARDED');
@@ -1068,13 +1073,15 @@ var getProductFormLifecycleButtons = function getProductFormLifecycleButtons(can
     action: onDiscard
   }] : []), _toConsumableArray(hasSaveButton ? [{
     text: 'Save',
-    action: onSave
+    action: onSave,
+    isDisabled: areActionsDisabled
   }] : []), _toConsumableArray(hasCancelButton ? [{
     text: 'Cancel',
     action: onCancel
   }] : []), _toConsumableArray(hasPublishButton ? [{
     text: 'Publish',
-    action: onPublish
+    action: onPublish,
+    isDisabled: areActionsDisabled
   }] : []));
   return /*#__PURE__*/React.createElement(Box$2, {
     sx: {
@@ -1098,7 +1105,8 @@ var getProductFormLifecycleButtons = function getProductFormLifecycleButtons(can
     variant: "tertiary",
     onClick: onSave,
     sx: buttonStyle,
-    "data-testid": "productform-dialog-draft"
+    "data-testid": "productform-dialog-draft",
+    disabled: areActionsDisabled
   }, "Save"), hasCancelButton && /*#__PURE__*/React.createElement(Button, {
     variant: "tertiary",
     onClick: onCancel,
@@ -1108,7 +1116,8 @@ var getProductFormLifecycleButtons = function getProductFormLifecycleButtons(can
     variant: "primary",
     onClick: onPublish,
     sx: buttonStyle,
-    "data-testid": "productform-dialog-publish"
+    "data-testid": "productform-dialog-publish",
+    disabled: areActionsDisabled
   }, "Publish")), /*#__PURE__*/React.createElement(Box$2, {
     display: {
       lg: 'none'
@@ -2557,6 +2566,7 @@ var Type = function Type(_ref) {
     isReadOnly: isReadOnly,
     size: "small",
     "data-testid": "type",
+    defaultValue: "NORMAL",
     onChange: function onChange() {
       triggerValidations(['validDateStart', 'validDateEnd'], getValues, trigger);
       _onChange();
@@ -8239,7 +8249,8 @@ var SigmetForm = function SigmetForm(_ref) {
     _ref$showMap = _ref.showMap,
     showMap = _ref$showMap === void 0 ? true : _ref$showMap,
     _ref$productConfig = _ref.productConfig,
-    productConfig = _ref$productConfig === void 0 ? sigmetConfig : _ref$productConfig;
+    productConfig = _ref$productConfig === void 0 ? sigmetConfig : _ref$productConfig,
+    setDialogActionsDisabled = _ref.setDialogActionsDisabled;
   var _useApiContext = useApiContext(),
     api = _useApiContext.api;
   var _useMapDrawTool = useMapDrawTool({
@@ -8351,10 +8362,11 @@ var SigmetForm = function SigmetForm(_ref) {
   };
   React__default.useEffect(function () {
     var isInDrawMode = activeStartTool !== '' || activeEndTool !== '';
+    setDialogActionsDisabled && setDialogActionsDisabled(isInDrawMode);
     if (!isReadOnly && isInDrawMode !== isDisabled) {
       setIsDisabled(isInDrawMode);
     }
-  }, [activeStartTool, activeEndTool, isReadOnly, isDisabled]);
+  }, [activeStartTool, activeEndTool, isReadOnly, isDisabled, setDialogActionsDisabled]);
   var _useConditionalFields = useConditionalFields$1(productConfig),
     hasVolcanicAshes = _useConditionalFields.hasVolcanicAshes,
     omitChange = _useConditionalFields.omitChange;
@@ -9138,6 +9150,7 @@ var ProductListRow = function ProductListRow(_ref2) {
 
 var ERROR_CONFIG = 'An error has occurred while loading the config';
 var ERROR_BACKEND = 'An error has occurred while retrieving the list, please try again';
+var ERROR_AUTH$1 = 'This feature is protected by authentication.';
 var validateConfig = function validateConfig(productType, productConfig) {
   var validatedConfig = productType === 'sigmet' ? validateSigmet(productConfig) : validateAirmet(productConfig);
   if (validatedConfig !== true && Array.isArray(validatedConfig)) {
@@ -9163,54 +9176,72 @@ var useProductApi = function useProductApi(productType, productConfig) {
   var _useApiContext = useApiContext(),
     api = _useApiContext.api;
   var requestList = productType === 'sigmet' ? api.getSigmetList : api.getAirmetList;
+  var _useAuthenticationCon = useAuthenticationContext(),
+    isLoggedIn = _useAuthenticationCon.isLoggedIn;
   var updateState = function updateState(newState) {
     if (isMounted.current) {
-      setState(Object.assign({}, newState));
+      setState(function (currentState) {
+        return Object.assign(Object.assign({}, currentState), newState);
+      });
     }
   };
   var fetchNewData = function fetchNewData() {
     return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _a, _yield$requestList, data, newError;
+      var _a, newError, _yield$requestList, data, _newError;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            if (!(!isLoggedIn && Array.isArray(isLoggedIn))) {
+              _context.next = 4;
+              break;
+            }
+            newError = {
+              name: ERROR_AUTH$1,
+              message: createReadableErrorMessage(isLoggedIn)
+            };
+            updateState(Object.assign(Object.assign({}, state), {
+              error: newError,
+              isLoading: false
+            }));
+            return _context.abrupt("return");
+          case 4:
             if (!(((_a = state.error) === null || _a === void 0 ? void 0 : _a.name) === ERROR_CONFIG || state.isLoading)) {
-              _context.next = 2;
+              _context.next = 6;
               break;
             }
             return _context.abrupt("return");
-          case 2:
+          case 6:
             updateState(Object.assign(Object.assign({}, state), {
               isLoading: true,
               error: undefined
             }));
-            _context.prev = 3;
-            _context.next = 6;
+            _context.prev = 7;
+            _context.next = 10;
             return requestList();
-          case 6:
+          case 10:
             _yield$requestList = _context.sent;
             data = _yield$requestList.data;
             updateState(Object.assign(Object.assign({}, state), {
               result: data,
               isLoading: false
             }));
-            _context.next = 15;
+            _context.next = 19;
             break;
-          case 11:
-            _context.prev = 11;
-            _context.t0 = _context["catch"](3);
-            newError = Object.assign(Object.assign({}, _context.t0), {
+          case 15:
+            _context.prev = 15;
+            _context.t0 = _context["catch"](7);
+            _newError = Object.assign(Object.assign({}, _context.t0), {
               name: ERROR_BACKEND
             });
             updateState(Object.assign(Object.assign({}, state), {
-              error: newError,
+              error: _newError,
               isLoading: false
             }));
-          case 15:
+          case 19:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[3, 11]]);
+      }, _callee, null, [[7, 15]]);
     }));
   };
   React__default.useEffect(function () {
@@ -9252,7 +9283,7 @@ var ProductList = function ProductList(_ref) {
     error = _ref.error,
     onClickProductRow = _ref.onClickProductRow,
     onClickNewProduct = _ref.onClickNewProduct;
-  var shouldHideCreateNew = error && error.name === ERROR_CONFIG;
+  var shouldHideCreateNew = error && (error.name === ERROR_AUTH$1 || error.name === ERROR_CONFIG);
   return /*#__PURE__*/React__default.createElement(Grid, {
     container: true,
     direction: "column",
@@ -9286,7 +9317,7 @@ var ProductList = function ProductList(_ref) {
     }
   }), error && /*#__PURE__*/React__default.createElement(AlertBanner, {
     severity: "error",
-    title: error.name || 'An error has occurred while retrieving the list, please try again',
+    title: error.name,
     info: error.message ? error.message : '',
     dataTestId: "productList-alert"
   }), productList && /*#__PURE__*/React__default.createElement(List, {
@@ -14059,6 +14090,10 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
     _React$useState6 = _slicedToArray(_React$useState5, 2),
     errorStoreMessageText = _React$useState6[0],
     setErrorStoreMessageText = _React$useState6[1];
+  var _React$useState7 = React.useState(false),
+    _React$useState8 = _slicedToArray(_React$useState7, 2),
+    dialogActionsDisabled = _React$useState8[0],
+    setDialogActionsDisabled = _React$useState8[1];
   var postProduct = function postProduct(productToPost, newStatus) {
     var uuid = product !== null && product.uuid ? product.uuid : null;
     var postProductParam = productType === 'sigmet' ? createSigmetPostParameter(productToPost, newStatus, uuid) : createAirmetPostParameter(productToPost, newStatus, uuid);
@@ -14169,7 +14204,11 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
       title: "An error has occurred while saving, please try again",
       info: errorStoreMessageText
     }) : null,
-    options: getProductFormLifecycleButtons(productCanBe, onProductButtonPress),
+    options: getProductFormLifecycleButtons({
+      canBe: productCanBe,
+      onButtonPress: onProductButtonPress,
+      areActionsDisabled: dialogActionsDisabled
+    }),
     style: {
       zIndex: 1000
     },
@@ -14183,7 +14222,8 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
     isCancelSigmet: product !== null && isInstanceOfCancelSigmet(product),
     initialSigmet: product !== null && !isInstanceOfCancelSigmet(product) ? product : null,
     initialCancelSigmet: product !== null && isInstanceOfCancelSigmet(product) ? product : null,
-    productConfig: productConfig
+    productConfig: productConfig,
+    setDialogActionsDisabled: setDialogActionsDisabled
   }) : /*#__PURE__*/React.createElement(AirmetForm, {
     mode: mode,
     isCancelAirmet: product !== null && isInstanceOfCancelAirmet(product),
@@ -14288,10 +14328,7 @@ var MetInfoWrapper = function MetInfoWrapper(_ref) {
     _React$useState4 = _slicedToArray(_React$useState3, 2),
     selectedProduct = _React$useState4[0],
     setSelectedProduct = _React$useState4[1];
-  var getNewProductList = function getNewProductList() {
-    fetchNewProductList();
-  };
-  usePoller([productList, errorList], getNewProductList, 60000);
+  usePoller([productList, errorList], fetchNewProductList, 60000);
   React__default.useEffect(function () {
     if (selectedProduct) {
       toggleDialogOpen();
@@ -14302,7 +14339,7 @@ var MetInfoWrapper = function MetInfoWrapper(_ref) {
     var shouldRefreshList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
     // Refresh list on closing dialog
     if (isFormDialogOpen === true && shouldRefreshList) {
-      getNewProductList();
+      fetchNewProductList();
     }
     setIsFormDialogOpen(!isFormDialogOpen);
   };
@@ -14358,11 +14395,14 @@ var MetInfoWrapper = function MetInfoWrapper(_ref) {
  * Copyright 2023 - Finnish Meteorological Institute (FMI)
  * */
 var ERROR_TITLE = 'Something went wrong with loading the configuration file';
+var ERROR_AUTH = 'This feature is protected by authentication. Please log in to proceed';
 var DownloadSigmetAirmetConfigWrapper = function DownloadSigmetAirmetConfigWrapper(_ref) {
   var productType = _ref.productType,
     productConfigKey = _ref.productConfigKey;
   var _useApiContext = useApiContext(),
     api = _useApiContext.api;
+  var _useAuthenticationCon = useAuthenticationContext(),
+    isLoggedIn = _useAuthenticationCon.isLoggedIn;
   var getConfigurationRequest = api[productType === 'sigmet' ? 'getSigmetConfiguration' : 'getAirmetConfiguration'];
   var _useApi = useApi(getConfigurationRequest, productConfigKey),
     productConfig = _useApi.result,
@@ -14382,7 +14422,7 @@ var DownloadSigmetAirmetConfigWrapper = function DownloadSigmetAirmetConfigWrapp
   if (error) {
     return /*#__PURE__*/React__default.createElement(AlertBanner, {
       title: ERROR_TITLE,
-      info: error.message
+      info: !isLoggedIn ? ERROR_AUTH : error.message
     });
   }
   return /*#__PURE__*/React__default.createElement(MetInfoWrapper, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "9.1.0",
+  "version": "9.2.0",
   "description": "GeoWeb Sigmet/Airmet library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {

package/src/lib/components/MetInfoWrapper/DownloadSigmetAirmetConfigWrapper.d.ts

@@ -5,5 +5,6 @@ interface ModuleWrapperProps {
     productConfigKey?: string;
 }
 export declare const ERROR_TITLE = "Something went wrong with loading the configuration file";
+export declare const ERROR_AUTH = "This feature is protected by authentication. Please log in to proceed";
 declare const DownloadSigmetAirmetConfigWrapper: React.FC<ModuleWrapperProps>;
 export default DownloadSigmetAirmetConfigWrapper;

package/src/lib/components/MetInfoWrapper/utils.d.ts

@@ -1,6 +1,7 @@
 import { AirmetFromBackend, ProductConfig, ProductType, SigmetFromBackend } from '../../types';
 export declare const ERROR_CONFIG = "An error has occurred while loading the config";
 export declare const ERROR_BACKEND = "An error has occurred while retrieving the list, please try again";
+export declare const ERROR_AUTH = "This feature is protected by authentication.";
 export declare const validateConfig: (productType: ProductType, productConfig: ProductConfig) => true | Error;
 type State = {
     isLoading: boolean;

package/src/lib/components/ProductForms/SigmetForm/SigmetForm.d.ts

@@ -7,6 +7,7 @@ export interface SigmetFormProps {
     initialCancelSigmet?: CancelSigmet;
     showMap?: boolean;
     productConfig?: ProductConfig;
+    setDialogActionsDisabled?: (disabled: boolean) => void;
 }
 declare const SigmetForm: React.FC<SigmetFormProps>;
 export default SigmetForm;

package/src/lib/components/ProductForms/utils.d.ts

@@ -32,7 +32,12 @@ export declare const getLevelInFeet: (level: number, unit: string) => number;
 export declare const isLevelLower: (ownValue: number | string, ownUnit: LevelUnits, otherValue: number, otherUnit: LevelUnits) => boolean;
 export declare const getDialogtitle: (product: AviationProduct, productType: ProductType) => string;
 export declare const getProductFormMode: (canBeOptions: ProductCanbe[], productListItem: SigmetFromBackend | AirmetFromBackend) => string;
-export declare const getProductFormLifecycleButtons: React.FC;
+interface ProductFormLifecycleButtonsProps {
+    canBe: string[];
+    onButtonPress: (newStatus: ProductStatus | 'DISCARDED') => void;
+    areActionsDisabled?: boolean;
+}
+export declare const getProductFormLifecycleButtons: React.FC<ProductFormLifecycleButtonsProps>;
 export declare const hasValue: (value: number | string) => boolean;
 export declare const prepareFormValues: <T extends AviationProduct>(product: T) => T;
 export declare const createSigmetPostParameter: (sigmetToPost: Sigmet | CancelSigmet, newStatus: ProductStatus, previousUuid: string) => SigmetFromFrontend;
@@ -66,3 +71,4 @@ export declare const firID = "drawtools-fir";
 export declare const getDrawTools: (type: StartOrEndDrawing, firShape: GeoJSON.FeatureCollection) => DrawMode[];
 export declare const updateDrawToolsWithFir: (drawTools: DrawMode[], newFirShape: GeoJSON.FeatureCollection) => DrawMode[];
 export declare const getToolIcon: (id: string) => React.ReactElement;
+export {};