@opengeoweb/warnings 9.8.0 → 9.10.0

package/index.esm.js

@@ -4225,17 +4225,16 @@ var DrawingToolForm = function DrawingToolForm(_ref) {
     _useFormContext$formS = _useFormContext.formState,
     errors = _useFormContext$formS.errors,
     isDirty = _useFormContext$formS.isDirty,
-    reset = _useFormContext.reset;
+    reset = _useFormContext.reset,
+    getValues = _useFormContext.getValues;
   useFormDirty({
     isDirty: isDirty,
     isLoading: isLoading,
     error: error,
     onFormDirty: onFormDirty,
     onSuccess: function onSuccess() {
-      // reset form dirty after successfull saving
-      reset({}, {
-        keepValues: true
-      });
+      // reset form dirty and update defaultvalues and formvalues after successfull saving
+      reset(getValues());
     }
   });
   React.useEffect(function () {
@@ -4335,7 +4334,7 @@ var DrawingToolForm = function DrawingToolForm(_ref) {
       onKeyDown: onKeyDown,
       disabled: isLoading,
       size: "medium"
-    }, getIcon(mode.drawModeId));
+    }, getIcon(mode.selectionType));
   }), isInEditMode && ( /*#__PURE__*/React.createElement(Typography, {
     component: "span",
     sx: {
@@ -4429,7 +4428,8 @@ var Wrapper = function Wrapper(props) {
       defaultValues: {
         id: id,
         objectName: getObjectName$1(objectName),
-        geoJSON: geoJSON
+        geoJSON: geoJSON,
+        opacity: 20
       }
     })
   }, /*#__PURE__*/React.createElement(DrawingToolForm, Object.assign({}, props)));
@@ -5238,10 +5238,10 @@ var MAX_HOURS_AFTER_CURRENT$1 = 168;
 var VALID_FROM_ERROR_BEFORE_CURRENT = 'Valid from time cannot be before current time';
 var VALID_FROM_ERROR_AFTER_CURRENT = "Valid from time can be no more than ".concat(MAX_HOURS_AFTER_CURRENT$1, " hours after current time");
 var isValueBeforeCurrentTime$1 = function isValueBeforeCurrentTime(value) {
-  return isXHoursBefore(value, dateUtils.dateToString(dateUtils.utc()), 0) || VALID_FROM_ERROR_BEFORE_CURRENT;
+  return isXHoursBefore(value, dateUtils.getCurrentTimeAsString(), 0) || VALID_FROM_ERROR_BEFORE_CURRENT;
 };
 var isMaxHoursAfterCurrentTime$1 = function isMaxHoursAfterCurrentTime(value) {
-  return isXHoursAfter(value, dateUtils.dateToString(dateUtils.utc()), MAX_HOURS_AFTER_CURRENT$1) || VALID_FROM_ERROR_AFTER_CURRENT;
+  return isXHoursAfter(value, dateUtils.getCurrentTimeAsString(), MAX_HOURS_AFTER_CURRENT$1) || VALID_FROM_ERROR_AFTER_CURRENT;
 };
 var ValidFrom = function ValidFrom(_ref) {
   var isDisabled = _ref.isDisabled,
@@ -5297,10 +5297,10 @@ var VALID_UNTIL_ERROR_BEFORE_CURRENT = 'Valid until time cannot be before curren
 var VALID_UNTIL_ERROR_AFTER_CURRENT = "Valid until time can be no more than ".concat(MAX_HOURS_AFTER_CURRENT, " hours after current time");
 var VALID_UNTIL_ERROR_AFTER_VALID_FROM = "Valid until time has to be at least ".concat(MIN_HOURS_AFTER_VALID_FROM, " hour after Valid from time");
 var isValueBeforeCurrentTime = function isValueBeforeCurrentTime(value) {
-  return isXHoursBefore(value, dateUtils.dateToString(dateUtils.utc()), 0) || VALID_UNTIL_ERROR_BEFORE_CURRENT;
+  return isXHoursBefore(value, dateUtils.getCurrentTimeAsString(), 0) || VALID_UNTIL_ERROR_BEFORE_CURRENT;
 };
 var isMaxHoursAfterCurrentTime = function isMaxHoursAfterCurrentTime(value) {
-  return isXHoursAfter(value, dateUtils.dateToString(dateUtils.utc()), MAX_HOURS_AFTER_CURRENT) || VALID_UNTIL_ERROR_AFTER_CURRENT;
+  return isXHoursAfter(value, dateUtils.getCurrentTimeAsString(), MAX_HOURS_AFTER_CURRENT) || VALID_UNTIL_ERROR_AFTER_CURRENT;
 };
 var _isMinHoursAfterValidFrom = function isMinHoursAfterValidFrom(value, validFromValue) {
   if (isEmpty(value) || isEmpty(validFromValue) || !isValidDate(validFromValue)) {
@@ -5362,7 +5362,10 @@ var getEmptyPublicWarning = function getEmptyPublicWarning() {
   };
 };
 var getFormData = function getFormData(publicWarningsDetails, object) {
-  var data = Object.assign(Object.assign({}, publicWarningsDetails ? Object.assign(Object.assign({}, getEmptyPublicWarning()), publicWarningsDetails) : getEmptyPublicWarning()), {
+  var data = Object.assign(Object.assign({
+    IS_DRAFT: '',
+    'translation-select': ''
+  }, publicWarningsDetails ? Object.assign(Object.assign({}, getEmptyPublicWarning()), publicWarningsDetails) : getEmptyPublicWarning()), {
     object: object
   });
   return data;
@@ -5482,7 +5485,8 @@ var Form = function Form(_ref5) {
   var _useFormContext = useFormContext(),
     handleSubmit = _useFormContext.handleSubmit,
     reset = _useFormContext.reset,
-    isDirty = _useFormContext.formState.isDirty;
+    isDirty = _useFormContext.formState.isDirty,
+    getValues = _useFormContext.getValues;
   var _useDraftFormHelpers = useDraftFormHelpers(),
     toggleIsDraft = _useDraftFormHelpers.toggleIsDraft,
     DraftFieldHelper = _useDraftFormHelpers.DraftFieldHelper;
@@ -5495,10 +5499,8 @@ var Form = function Form(_ref5) {
     error: error === null || error === void 0 ? void 0 : error.message,
     onFormDirty: onFormDirty,
     onSuccess: function onSuccess() {
-      // reset form dirty after successfull saving
-      reset({}, {
-        keepValues: true
-      });
+      // reset form dirty and update defaultvalues and formvalues after successfull saving
+      reset(getValues());
     }
   });
   var onPressPublish = function onPressPublish() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/warnings",
-  "version": "9.8.0",
+  "version": "9.10.0",
   "description": "GeoWeb warinings library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -14,10 +14,10 @@
     "@opengeoweb/store": "*",
     "@opengeoweb/webmap-react": "*",
     "react-redux": "^8.1.3",
-    "@mui/material": "5.12.0",
+    "@mui/material": "~5.15.11",
     "@opengeoweb/theme": "*",
     "@opengeoweb/form-fields": "*",
-    "react-hook-form": "7.47.0",
+    "react-hook-form": "^7.50.1",
     "lodash": "^4.17.21",
     "redux-saga": "^1.2.3",
     "@reduxjs/toolkit": "^1.9.7",

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

@@ -3,7 +3,7 @@ import { PublicWarningDetail } from '../../store/publicWarningForm/types';
 import { BaseDrawingListItem, DrawingListItem } from '../../store/drawings/types';
 import { FormAction, FormError } from '../../store/publicWarningForm/reducer';
 export declare const getEmptyPublicWarning: () => PublicWarningDetail;
-export declare const getFormData: (publicWarningsDetails: PublicWarningDetail | undefined, object?: DrawingListItem) => PublicWarningDetail;
+export declare const getFormData: (publicWarningsDetails: PublicWarningDetail | undefined, object?: DrawingListItem) => FormData;
 export declare const LABEL_PROBABILITY = "Probability";
 export declare const BUTTON_CLEAR = "Clear";
 export declare const BUTTON_SAVE = "Save";
@@ -11,7 +11,7 @@ export declare const BUTTON_SAVING = "Saving";
 export declare const BUTTON_PUBLISH = "Publish";
 export declare const BUTTON_PUBLISHING = "Publishing";
 interface FormData extends PublicWarningDetail {
-    IS_DRAFT?: boolean;
+    IS_DRAFT?: boolean | string;
     object?: BaseDrawingListItem;
     'translation-select'?: string;
 }

package/src/lib/store/drawings/types.d.ts

@@ -24,10 +24,10 @@ export interface DrawingDetails extends Omit<DrawingFromBE, 'id' | 'lastUpdatedT
     lastUpdatedTime?: string;
 }
 export type SetDrawValuesPayload = DrawItem;
-export type SubmitDrawValuesPayload = {
+export interface SubmitDrawValuesPayload {
     id?: string;
     geoJSON: GeoJSON.FeatureCollection;
     objectName: string;
     lastUpdatedTime?: string;
     scope: DrawingScope;
-};
+}

package/src/lib/store/publicWarningForm/reducer.d.ts

@@ -3,10 +3,10 @@ import { AlertColor } from '@mui/material';
 import { DrawingListItem } from '../drawings/types';
 import { PublicWarning } from './types';
 export type FormAction = '' | 'saving' | 'publishing' | 'readonly';
-export type FormError = {
+export interface FormError {
     severity?: AlertColor;
     message: string;
-};
+}
 export interface PublicWarningFormState {
     object?: DrawingListItem;
     publicWarning?: PublicWarning;

package/src/lib/store/publicWarningForm/types.d.ts

@@ -1,4 +1,4 @@
-export type PublicWarningDetail = {
+export interface PublicWarningDetail {
     id: string;
     phenomenon: string;
     geoJSON: GeoJSON.FeatureCollection;
@@ -12,12 +12,12 @@ export type PublicWarningDetail = {
     warningProposalSource?: string;
     authority?: string;
     type?: number;
-};
+}
 export type PublicWarningStatus = 'DRAFT' | 'PUBLISHED' | 'TODO' | 'EXPIRED';
-export type PublicWarning = {
+export interface PublicWarning {
     status?: PublicWarningStatus;
     editor?: string;
     warningDetail: PublicWarningDetail;
     id?: string;
     lastUpdatedTime?: string;
-};
+}

package/src/lib/store/publicWarnings/types.d.ts

@@ -1,12 +1,12 @@
 import { EntityState } from '@reduxjs/toolkit';
 import { PublicWarning } from '../publicWarningForm/types';
-export type PublicWarningError = {
+export interface PublicWarningError {
     name: string;
     message: string;
-};
-export type PublicWarningsState = {
+}
+export interface PublicWarningsState {
     warnings: EntityState<PublicWarning>;
     isLoading: boolean;
     lastUpdatedTime: string;
     error?: PublicWarningError;
-};
+}

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

@@ -4,7 +4,7 @@ import { DrawingDetails, DrawingFromBE, DrawingListItem } from '../store/drawing
 import { PublicWarning } from '../store/publicWarningForm/types';
 export declare const API_NAME = "warnings";
 export declare const getIdFromUrl: (url: string) => string;
-export type WarningsApi = {
+export interface WarningsApi {
     getDrawings: () => Promise<{
         data: DrawingListItem[];
     }>;
@@ -21,7 +21,7 @@ export type WarningsApi = {
     updateWarning: (warningId: string, data: PublicWarning) => Promise<void>;
     deleteWarning: (warningId: string) => Promise<void>;
     toggleEditorWarning: (warningId: string, isEditor: boolean) => Promise<void>;
-};
+}
 export declare const getApiRoutes: (axiosInstance: AxiosInstance) => WarningsApi;
 export declare const getWarningsApi: () => WarningsApi;
 export declare const createApi: (props: CreateApiProps) => WarningsApi;