@opengeoweb/warnings 7.0.0 → 8.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/warnings",
-  "version": "7.0.0",
+  "version": "8.1.0",
   "description": "GeoWeb warinings library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -9,15 +9,20 @@
   },
   "dependencies": {
     "@mui/material": "5.12.0",
-    "@opengeoweb/api": "7.0.0",
-    "@opengeoweb/core": "7.0.0",
-    "@opengeoweb/shared": "7.0.0",
-    "@opengeoweb/store": "7.0.0",
-    "@opengeoweb/theme": "7.0.0",
-    "@opengeoweb/webmap-react": "7.0.0",
+    "@opengeoweb/api": "8.1.0",
+    "@opengeoweb/core": "8.1.0",
+    "@opengeoweb/form-fields": "8.1.0",
+    "@opengeoweb/shared": "8.1.0",
+    "@opengeoweb/store": "8.1.0",
+    "@opengeoweb/theme": "8.1.0",
+    "@opengeoweb/webmap": "8.1.0",
+    "@opengeoweb/webmap-react": "8.1.0",
     "@reduxjs/toolkit": "1.9.5",
     "axios": "1.5.0",
+    "immer": "9.0.21",
+    "lodash": "4.17.21",
     "react": "18.2.0",
+    "react-hook-form": "7.46.2",
     "react-redux": "8.1.2",
     "redux-saga": "1.2.3"
   },

package/src/index.d.ts

@@ -1,3 +1,5 @@
-export * from './lib/components/AreaManager';
+export * from './lib/components/ObjectManager';
 export * from './lib/components/WarningsModuleProvider';
+export * from './lib/components/DrawingTool';
+export * from './lib/components/DrawingToolForm';
 export * from './lib/store/config';

package/src/lib/Warnings.stories.d.ts

@@ -4,4 +4,4 @@ declare const _default: {
 };
 export default _default;
 export declare const WarningsDemo: () => React.ReactElement;
-export declare const WarningsDemoErrorSaveDrawing: () => React.ReactElement;
+export declare const DrawingsDemo: () => React.ReactElement;

package/src/lib/WarningsErrors.stories.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+declare const _default: {
+    title: string;
+};
+export default _default;
+export declare const SaveDrawingError: () => React.ReactElement;
+export declare const DeleteDrawingError: () => React.ReactElement;

package/src/lib/components/DrawingTool/DrawingTool.stories.d.ts

@@ -0,0 +1,34 @@
+import React from 'react';
+declare const _default: {
+    title: string;
+};
+export default _default;
+export declare const DrawingToolDockedLight: {
+    (): React.ReactElement;
+    parameters: {
+        zeplinLink: {
+            name: string;
+            link: string;
+        }[];
+    };
+    storyName: string;
+};
+export declare const DrawingToolDockedDark: {
+    (): React.ReactElement;
+    parameters: {
+        zeplinLink: {
+            name: string;
+            link: string;
+        }[];
+    };
+    storyName: string;
+};
+export declare const DrawingToolErrorLight: {
+    (): React.ReactElement;
+    parameters: {
+        zeplinLink: {
+            name: string;
+            link: string;
+        }[];
+    };
+};

package/src/lib/components/DrawingTool/DrawingToolConnect.d.ts

@@ -0,0 +1,14 @@
+import * as React from 'react';
+import { uiTypes } from '@opengeoweb/store';
+export declare const getDialogType: (mapId: string, isMultiMap: boolean, isDocked: boolean) => string;
+interface DrawingToolConnectProps {
+    mapId?: string;
+    bounds?: string;
+    title?: string;
+    showMapIdInTitle?: boolean;
+    isMultiMap?: boolean;
+    isDocked?: boolean;
+    source?: uiTypes.Source;
+}
+declare const DrawingToolConnect: React.FC<DrawingToolConnectProps>;
+export default DrawingToolConnect;

package/src/lib/components/{AreaManager/AreaManagerConnect.stories.d.ts → DrawingTool/DrawingToolConnect.stories.d.ts}

@@ -3,7 +3,7 @@ declare const _default: {
     title: string;
 };
 export default _default;
-export declare const AreaManagerConnectLight: {
+export declare const DrawingToolConnectLight: {
     (): React.ReactElement;
     parameters: {
         zeplinLink: {
@@ -13,7 +13,7 @@ export declare const AreaManagerConnectLight: {
     };
     storyName: string;
 };
-export declare const AreaManagerConnectDark: {
+export declare const DrawingToolConnectDark: {
     (): React.ReactElement;
     parameters: {
         zeplinLink: {

package/src/lib/components/DrawingTool/DrawingToolDialog.d.ts

@@ -0,0 +1,21 @@
+import * as React from 'react';
+import { HeaderSize, DialogPosition, DialogSize } from '@opengeoweb/shared';
+import { uiTypes } from '@opengeoweb/store';
+interface DrawingToolDialogProps {
+    bounds?: string;
+    title?: string;
+    onClose: () => void;
+    onMouseDown?: () => void;
+    isOpen: boolean;
+    order?: number;
+    source?: uiTypes.Source;
+    isLoading?: boolean;
+    isDocked?: boolean;
+    size?: DialogSize;
+    startPosition?: DialogPosition;
+    setFocused?: (focused: boolean) => void;
+    headerSize?: HeaderSize;
+    children: React.ReactNode;
+}
+declare const DrawingTool: React.FC<DrawingToolDialogProps>;
+export default DrawingTool;

package/src/lib/components/DrawingTool/DrawingToolMapButtonConnect.d.ts

@@ -0,0 +1,8 @@
+import * as React from 'react';
+import { uiTypes } from '@opengeoweb/store';
+interface DrawingToolMapButtonConnectProps {
+    mapId: string;
+    source?: uiTypes.Source;
+}
+declare const DrawingToolMapButtonConnect: React.FC<DrawingToolMapButtonConnectProps>;
+export default DrawingToolMapButtonConnect;

package/src/lib/components/DrawingTool/index.d.ts

@@ -0,0 +1,3 @@
+export { default as DrawingToolMapButtonConnect } from './DrawingToolMapButtonConnect';
+export { default as DrawingToolConnect } from './DrawingToolConnect';
+export { useObjectDrawDialogAction } from './useObjectDrawDialogAction';

package/src/lib/components/DrawingTool/useObjectDrawDialogAction.d.ts

@@ -0,0 +1,24 @@
+import { uiTypes } from '@opengeoweb/store';
+export declare const objectDialogType = uiTypes.DialogTypes.ObjectManager;
+export declare const drawingDialogType = uiTypes.DialogTypes.DrawingTool;
+export declare const useCloseDrawDialog: ({ mapId, source, }: {
+    mapId: string;
+    source?: uiTypes.Source | undefined;
+}) => {
+    closeDrawDialog: () => void;
+};
+export declare const useCloseObjectDialog: ({ mapId, source, }: {
+    mapId: string;
+    source?: uiTypes.Source | undefined;
+}) => {
+    closeObjectDialog: (shouldReset?: boolean) => void;
+};
+export declare const useObjectDrawDialogAction: ({ mapId, source, }: {
+    mapId: string;
+    source?: uiTypes.Source | undefined;
+}) => {
+    openDrawDialog: (geoJSON?: GeoJSON.FeatureCollection) => void;
+    closeDrawDialog: () => void;
+    openObjectDialog: () => void;
+    closeObjectDialog: (shouldReset?: boolean) => void;
+};

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

@@ -0,0 +1,35 @@
+import * as React from 'react';
+import { DrawMode } from '@opengeoweb/webmap-react';
+import { FeatureCollection, GeoJsonProperties, Geometry } from 'geojson';
+export declare const opacityOptions: number[];
+export declare const getObjectName: (objectName: string) => string;
+export declare const SAVE_OBJECT_BUTTON = "Save new object";
+export declare const UPDATE_OBJECT_BUTTON = "Update object";
+export declare const INPUT_OBJECT = "Object name";
+export declare const INPUT_OPACITY = "Opacity";
+export declare const DRAW_EXIT_MODE_MESSAGE = "press ESC to exit draw mode";
+export declare const coordinatesEmptyMessage = "An object drawing is required";
+export interface DrawingToolFormValues {
+    objectName: string;
+    geoJSON: GeoJSON.FeatureCollection;
+    id: string;
+}
+export interface DrawingToolFormComponentProps {
+    onSubmitForm: (formValues: DrawingToolFormValues) => void;
+    objectName?: string;
+    isLoading?: boolean;
+    error?: string;
+    id?: string;
+    drawModes: DrawMode[];
+    onChangeDrawMode: (newMode: DrawMode) => void;
+    activeDrawModeId: string;
+    onDeactivateTool: () => void;
+    isInEditMode: boolean;
+    geoJSONProperties: GeoJSON.GeoJsonProperties;
+    onChangeProperties: (properties: GeoJSON.GeoJsonProperties) => void;
+    onChangeName: (name: string) => void;
+    geoJSON: FeatureCollection<Geometry, GeoJsonProperties> | undefined;
+}
+declare const Wrapper: React.FC<DrawingToolFormComponentProps>;
+export { Wrapper as DrawingToolForm };
+export default Wrapper;

package/src/lib/components/DrawingToolForm/DrawingToolForm.spec.d.ts

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

package/src/lib/components/DrawingToolForm/DrawingToolFormConnect.d.ts

@@ -0,0 +1,2 @@
+import * as React from 'react';
+export declare const DrawingToolFormConnect: React.FC;

package/src/lib/components/DrawingToolForm/DrawingToolFormConnect.spec.d.ts

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

package/src/lib/components/DrawingToolForm/index.d.ts

@@ -0,0 +1,2 @@
+export { default as DrawingToolForm } from './DrawingToolForm';
+export { DrawingToolFormConnect } from './DrawingToolFormConnect';

package/src/lib/components/ObjectManager/ConfirmDeleteDialog.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+export declare const DELETE_TITLE = "Delete object";
+export declare const DELETE_CONFIRM = "Delete";
+export declare const CANCEL = "Cancel";
+export declare const getDeleteDescription: (objectName: string) => string;
+export declare const getDeleteSucces: (objectName: string) => string;
+export declare const ConfirmDeleteDialog: React.FC<{
+    objectId: string;
+    objectName: string;
+    onDeleteSucces: (objectId: string, objectName: string) => void;
+    onClose: () => void;
+}>;
+export default ConfirmDeleteDialog;

package/src/lib/components/ObjectManager/ConfirmDeleteDialog.spec.d.ts

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

package/src/lib/components/{AreaManager → ObjectManager}/Drawings.d.ts

@@ -1,8 +1,10 @@
 import { FC } from 'react';
 import { DrawingListItem } from '../../store/drawings/types';
-export declare const NO_AREAS_FOUND = "No areas found";
+export declare const NO_OBJECTS_FOUND = "No objects found";
 export declare const Drawings: FC<{
     drawings: DrawingListItem[];
     onClickDrawing: (drawing: DrawingListItem) => void;
+    onClickEdit: (drawingId: string) => void;
+    onClickDelete: (drawingId: string) => void;
     activeDrawing: string;
 }>;

package/src/lib/components/ObjectManager/Drawings.spec.d.ts

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

package/src/lib/components/{AreaManager/AreaManager.d.ts → ObjectManager/ObjectManager.d.ts}

@@ -1,18 +1,8 @@
 import * as React from 'react';
-import { HeaderSize } from '@opengeoweb/shared';
+import { HeaderSize, DialogPosition, DialogSize } from '@opengeoweb/shared';
 import { uiTypes } from '@opengeoweb/store';
 import { DrawingListItem } from '../../store/drawings/types';
-export type Size = {
-    width: number;
-    height: number;
-};
-export type Position = {
-    top: number;
-    left?: number;
-    right?: number;
-};
-export declare const calculateStartSize: (minSize: Size, prefSize: Size, startPosition: Position) => Size;
-export declare const AreaManager: React.FC<{
+export declare const ObjectManager: React.FC<{
     bounds?: string;
     title?: string;
     onClose: () => void;
@@ -20,12 +10,14 @@ export declare const AreaManager: React.FC<{
     isOpen: boolean;
     order?: number;
     source?: uiTypes.Source;
-    size?: Size;
-    startPosition?: Position;
+    size?: DialogSize;
+    startPosition?: DialogPosition;
     setFocused?: (focused: boolean) => void;
     headerSize?: HeaderSize;
     drawingListItems: DrawingListItem[];
     onClickDrawing?: (drawing: DrawingListItem) => void;
+    onEditDrawing?: (drawingId: string) => void;
+    onDeleteDrawing?: (drawingId: string) => void;
     activeDrawingId?: string;
     error?: string;
     isLoading?: boolean;

package/src/lib/components/ObjectManager/ObjectManager.spec.d.ts

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

package/src/lib/components/{AreaManager/AreaManager.stories.d.ts → ObjectManager/ObjectManager.stories.d.ts}

@@ -3,7 +3,7 @@ declare const _default: {
     title: string;
 };
 export default _default;
-export declare const AreaManagerLight: {
+export declare const ObjectManagerLight: {
     (): React.ReactElement;
     parameters: {
         zeplinLink: {
@@ -13,7 +13,7 @@ export declare const AreaManagerLight: {
     };
     storyName: string;
 };
-export declare const AreaManagerDark: {
+export declare const ObjectManagerDark: {
     (): React.ReactElement;
     parameters: {
         zeplinLink: {
@@ -23,11 +23,11 @@ export declare const AreaManagerDark: {
     };
     storyName: string;
 };
-export declare const AreaManagerLightNoResults: {
+export declare const ObjectManagerLightNoResults: {
     (): React.ReactElement;
     storyName: string;
 };
-export declare const AreaManagerDarkNoResults: {
+export declare const ObjectManagerDarkNoResults: {
     (): React.ReactElement;
     storyName: string;
 };

package/src/lib/components/ObjectManager/ObjectManagerConnect.d.ts

@@ -0,0 +1,10 @@
+import { uiTypes } from '@opengeoweb/store';
+import React from 'react';
+export declare const DELETE_TITLE = "Delete object";
+export declare const DELETE_CONFIRM = "Delete";
+export declare const getDeleteDescription: (objectName: string) => string;
+export declare const getDeleteSucces: (objectName: string) => string;
+export declare const ObjectManagerConnect: React.FC<{
+    bounds?: string;
+    source?: uiTypes.Source;
+}>;

package/src/lib/components/ObjectManager/ObjectManagerConnect.spec.d.ts

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

package/src/lib/components/ObjectManager/ObjectManagerConnect.stories.d.ts

@@ -0,0 +1,25 @@
+import React from 'react';
+declare const _default: {
+    title: string;
+};
+export default _default;
+export declare const ObjectManagerConnectLight: {
+    (): React.ReactElement;
+    parameters: {
+        zeplinLink: {
+            name: string;
+            link: string;
+        }[];
+    };
+    storyName: string;
+};
+export declare const ObjectManagerConnectDark: {
+    (): React.ReactElement;
+    parameters: {
+        zeplinLink: {
+            name: string;
+            link: string;
+        }[];
+    };
+    storyName: string;
+};

package/src/lib/components/{AreaManager/AreaManagerMapButtonConnect.d.ts → ObjectManager/ObjectManagerMapButtonConnect.d.ts}

@@ -1,6 +1,6 @@
 import React from 'react';
 import { uiTypes } from '@opengeoweb/store';
-export declare const AreaManagerMapButtonConnect: React.FC<{
+export declare const ObjectManagerMapButtonConnect: React.FC<{
     mapId: string;
     source?: uiTypes.Source;
 }>;

package/src/lib/components/ObjectManager/ObjectManagerMapButtonConnect.spec.d.ts

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

package/src/lib/components/ObjectManager/index.d.ts

@@ -0,0 +1,2 @@
+export { ObjectManagerMapButtonConnect } from './ObjectManagerMapButtonConnect';
+export { ObjectManagerConnect } from './ObjectManagerConnect';

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

@@ -0,0 +1,17 @@
+import * as React from 'react';
+import { DialogPosition, DialogSize, HeaderSize } from '@opengeoweb/shared';
+import { uiTypes } from '@opengeoweb/store';
+export declare const DIALOG_TITLE = "Public warnings";
+export declare const PublicWarnings: React.FC<{
+    bounds?: string;
+    title?: string;
+    onClose: () => void;
+    onMouseDown?: () => void;
+    isOpen: boolean;
+    order?: number;
+    source?: uiTypes.Source;
+    size?: DialogSize;
+    startPosition?: DialogPosition;
+    setFocused?: (focused: boolean) => void;
+    headerSize?: HeaderSize;
+}>;

package/src/lib/components/PublicWarnings/PublicWarnings.spec.d.ts

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

package/src/lib/components/PublicWarnings/PublicWarnings.stories.d.ts

@@ -0,0 +1,13 @@
+import * as React from 'react';
+declare const _default: {
+    title: string;
+};
+export default _default;
+export declare const PublicWarningsLight: {
+    (): React.ReactElement;
+    storyName: string;
+};
+export declare const PublicWarningsDark: {
+    (): React.ReactElement;
+    storyName: string;
+};

package/src/lib/components/PublicWarnings/PublicWarningsConnect.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import { uiTypes } from '@opengeoweb/store';
+export declare const publicWarningDialogType = uiTypes.DialogTypes.PublicWarnings;
+export declare const PublicWarningsConnect: React.FC<{
+    bounds?: string;
+    source?: uiTypes.Source;
+}>;

package/src/lib/components/PublicWarnings/PublicWarningsConnect.spec.d.ts

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

package/src/lib/components/PublicWarnings/PublicWarningsConnect.stories.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+declare const _default: {
+    title: string;
+};
+export default _default;
+export declare const PublicWarningsMap: () => React.ReactElement;

package/src/lib/components/PublicWarnings/index.d.ts

@@ -0,0 +1,2 @@
+export * from './PublicWarnings';
+export * from './PublicWarningsConnect';

package/src/lib/store/config.d.ts

@@ -1,7 +1,14 @@
+import { CoreAppStore } from '@opengeoweb/store';
 import drawingSagas from './drawings/sagas';
+import { DrawState } from './drawings/types';
+export interface WarningModuleStore extends CoreAppStore {
+    drawings?: DrawState;
+}
 export declare const drawingModuleConfig: {
     id: string;
-    reducersMap: {};
+    reducersMap: {
+        drawings: import("redux").Reducer<DrawState, import("redux").AnyAction>;
+    };
     sagas: (typeof drawingSagas)[];
 };
 export default drawingModuleConfig;

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

@@ -0,0 +1,9 @@
+import { PayloadAction, Draft } from '@reduxjs/toolkit';
+import { DrawItem, DrawState, SetDrawValuesPayload, SubmitDrawValuesPayload } from './types';
+export declare const drawAdapter: import("@reduxjs/toolkit").EntityAdapter<DrawItem>;
+export declare const initialState: DrawState;
+export declare const reducer: import("redux").Reducer<DrawState, import("redux").AnyAction>;
+export declare const drawActions: import("@reduxjs/toolkit").CaseReducerActions<{
+    setDrawValues: (draft: Draft<DrawState>, action: PayloadAction<SetDrawValuesPayload>) => void;
+    submitDrawValues: (draft: Draft<DrawState>, action: PayloadAction<SubmitDrawValuesPayload>) => void;
+}, "draw">;

package/src/lib/store/drawings/reducer.spec.d.ts

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

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

@@ -1,8 +1,11 @@
+import { uiTypes } from '@opengeoweb/store';
 import { SagaIterator } from 'redux-saga';
-export declare const SUBMIT_ERROR = "Something went wrong saving a drawing";
-export declare const getSnackbarMessage: (areaName: string, id: string) => string;
-export declare function submitDrawValuesSaga({ payload }: {
-    payload: any;
+import { SubmitDrawValuesPayload } from './types';
+export declare const getSnackbarMessage: (objectName: string, id: string) => string;
+export declare const drawDialogType = uiTypes.DialogTypes.DrawingTool;
+export declare const objectDialogType = uiTypes.DialogTypes.ObjectManager;
+export declare function submitDrawValuesSaga({ payload, }: {
+    payload: SubmitDrawValuesPayload;
 }): SagaIterator;
 declare function drawingSaga(): SagaIterator;
 export default drawingSaga;

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

@@ -0,0 +1,4 @@
+import { DrawState } from './types';
+import { WarningModuleStore } from '../config';
+export declare const getDrawStore: (store: WarningModuleStore) => DrawState;
+export declare const selectDrawByInstanceId: (state: WarningModuleStore, id: import("@reduxjs/toolkit").EntityId) => import("./types").DrawItem | undefined;

package/src/lib/store/drawings/selectors.spec.d.ts

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

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

@@ -1,10 +1,17 @@
-import { drawTypes } from '@opengeoweb/store';
+import { EntityState } from '@reduxjs/toolkit';
+export interface DrawItem {
+    id: string;
+    objectName: string;
+    drawingInstanceId: string;
+}
+export type DrawState = EntityState<DrawItem>;
+export type DrawingScope = 'user' | 'global';
 export interface DrawingListItem {
     id: string;
-    name: string;
+    objectName: string;
     lastUpdatedTime: string;
-    scope: drawTypes.DrawingScope;
-    area: GeoJSON.FeatureCollection;
+    scope: DrawingScope;
+    geoJSON: GeoJSON.FeatureCollection;
 }
 export interface DrawingFromBE extends DrawingListItem {
     username: string;
@@ -13,3 +20,11 @@ export interface DrawingDetails extends Omit<DrawingFromBE, 'id' | 'lastUpdatedT
     id?: string;
     lastUpdatedTime?: string;
 }
+export type SetDrawValuesPayload = DrawItem;
+export type SubmitDrawValuesPayload = {
+    id?: string;
+    geoJSON: GeoJSON.FeatureCollection;
+    objectName: string;
+    lastUpdatedTime?: string;
+    scope: DrawingScope;
+};

package/src/lib/storybookUtils/storyComponents.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+export declare const AppHamburgerMenu: React.FC<{
+    mapId: string;
+}>;

package/src/lib/storybookUtils/testUtils.d.ts

@@ -0,0 +1 @@
+export declare const testGeoJSON: GeoJSON.FeatureCollection;

package/src/lib/components/AreaManager/AreaManagerConnect.d.ts

@@ -1,6 +0,0 @@
-import { uiTypes } from '@opengeoweb/store';
-import React from 'react';
-export declare const AreaManagerConnect: React.FC<{
-    bounds?: string;
-    source?: uiTypes.Source;
-}>;

package/src/lib/components/AreaManager/index.d.ts

@@ -1,2 +0,0 @@
-export { AreaManagerMapButtonConnect } from './AreaManagerMapButtonConnect';
-export { AreaManagerConnect } from './AreaManagerConnect';