#4647 small dependency updates (#10268)

* #4647: minor dep upgrades/cleanup A few packages had new minor versions or were unused. On Behalf of DB Systel * #4647: upgrade json2csv to remove 1 critical vulnerability On Behalf of DB Systel * #4647: remove some deprecation warnings On Behalf of DB Systel --------- Co-authored-by: Florian Kellner <[email protected]>
geosolutions-it · Sep 13, 2024 · 94aa5d2 · 94aa5d2
1 parent afd0011
commit 94aa5d2
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 31 deletions.
diff --git a/package.json b/package.json
@@ -126,10 +126,9 @@
     "@geosolutions/geostyler-sld-parser": "2.0.1-1",
     "@geosolutions/proj4": "2.4.9",
     "@geosolutions/react-joyride": "1.10.2",
-    "@geosolutions/wkt-parser": "1.2.2",
     "@googlemaps/js-api-loader": "1.12.9",
-    "@mapbox/geojsonhint": "2.0.1",
-    "@mapbox/togeojson": "0.16.0",
+    "@mapbox/geojsonhint": "3.3.0",
+    "@mapbox/togeojson": "0.16.2",
     "@mapstore/patcher": "https://github.com/geosolutions-it/Patcher/tarball/master",
     "@turf/along": "6.5.0",
     "@turf/area": "6.5.0",
@@ -146,8 +145,6 @@
     "@turf/difference": "6.5.0",
     "@turf/flatten": "6.5.0",
     "@turf/great-circle": "5.1.5",
-    "@turf/helpers": "6.5.0",
-    "@turf/inside": "4.1.0",
     "@turf/length": "6.5.0",
     "@turf/line-intersect": "4.1.0",
     "@turf/point-on-surface": "4.1.0",
@@ -167,11 +164,10 @@
     "cesium": "1.106.1",
     "chroma-js": "1.3.7",
     "classnames": "2.2.5",
-    "codemirror": "5.18.2",
+    "codemirror": "5.65.16",
     "colorbrewer": "1.0.0",
     "concurrently": "6.4.0",
     "connected-react-router": "6.3.2",
-    "create-react-class": "15.6.3",
     "d3-format": "3.1.0",
     "draft-js": "0.11.0",
     "draft-js-inline-toolbar-plugin": "3.0.1",
@@ -199,16 +195,12 @@
     "immutable": "4.0.0-rc.12",
     "intersection-observer": "0.7.0",
     "intl": "1.2.2",
-    "is-equal": "1.5.5",
     "ismobilejs": "0.5.0",
     "istanbul-instrumenter-loader": "3.0.1",
-    "jiff": "0.7.3",
-    "json-2-csv": "2.1.2",
-    "json-loader": "0.5.7",
+    "json-2-csv": "5.5.1",
     "jsonlint-mod": "1.7.5",
-    "jsonpath": "1.0.2",
-    "jszip": "3.1.5",
-    "keymirror": "0.1.1",
+    "jsonpath": "1.1.1",
+    "jszip": "3.10.1",
     "leaflet": "1.3.1",
     "leaflet-draw": "1.0.2",
     "leaflet-extra-markers": "1.0.6",
@@ -229,19 +221,16 @@
     "object-fit-images": "3.2.4",
     "ol": "7.4.0",
     "pdfmake": "0.2.7",
-    "pdfviewer": "0.3.2",
     "plotly.js-cartesian-dist": "2.5.1",
     "prop-types": "15.7.2",
     "qrcode.react": "0.9.3",
     "query-string": "6.9.0",
     "react": "16.10.1",
     "react-addons-css-transition-group": "15.6.2",
-    "react-addons-shallow-compare": "15.6.2",
     "react-bootstrap": "0.31.0",
     "react-checkbox-tree": "1.5.1",
     "react-codemirror2": "4.0.0",
     "react-color": "2.17.0",
-    "react-confirm-button": "0.0.2",
     "react-container-dimensions": "1.4.1",
     "react-contenteditable": "3.3.2",
     "react-copy-to-clipboard": "5.0.0",
@@ -270,9 +259,7 @@
     "react-quill": "1.1.0",
     "react-redux": "6.0.0",
     "react-resize-detector": "4.2.1",
-    "react-responsive": "1.3.0",
     "react-router": "4.1.1",
-    "react-router-dom": "4.2.2",
     "react-scroll-up": "1.3.7",
     "react-select": "1.3.0",
     "react-share": "1.15.1",
@@ -297,7 +284,6 @@
     "shpjs": "3.4.2",
     "simple-statistics": "7.8.3",
     "stickybits": "3.6.6",
-    "stream": "0.0.2",
     "tinycolor2": "1.4.1",
     "turf-bbox": "3.0.10",
     "turf-point": "2.0.1",
@@ -310,7 +296,7 @@
     "web-ifc": "0.0.50",
     "webfontloader": "1.6.28",
     "wellknown": "0.5.0",
-    "xml2js": "0.4.17",
+    "xml2js": "0.6.2",
     "xpath": "0.0.27"
   },
   "scripts": {

diff --git a/web/client/actions/__tests__/catalog-test.js b/web/client/actions/__tests__/catalog-test.js
@@ -153,7 +153,7 @@ describe('Test correctness of the catalog actions', () => {
         expect(retval.service).toBe(service);
     });
     it('deleteService', () => {
-        var retval = deleteService(status);
+        var retval = deleteService();
 
         expect(retval).toExist();
         expect(retval.type).toBe(DELETE_SERVICE);

diff --git a/web/client/epics/widgets.js b/web/client/epics/widgets.js
@@ -54,7 +54,7 @@ import { LOCATION_CHANGE } from 'connected-react-router';
 import { saveAs } from 'file-saver';
 import {downloadCanvasDataURL} from '../utils/FileUtils';
 import {reprojectBbox} from '../utils/CoordinatesUtils';
-import converter from 'json-2-csv';
+import {json2csv} from 'json-2-csv';
 import { defaultGetZoomForExtent } from '../utils/MapUtils';
 import { updateDependenciesMapOfMapList, DEFAULT_MAP_SETTINGS } from "../utils/WidgetsUtils";
 
@@ -133,9 +133,9 @@ const configureDependency = (active, dependency, options) =>
 export const exportWidgetData = action$ =>
     action$.ofType(EXPORT_CSV)
         .do( ({data = [], title = "data"}) =>
-            converter.json2csv(data, (err, csv) => err ? null : saveAs(new Blob([
-                csv
-            ], {type: "text/csv"}), title + ".csv")))
+            saveAs(new Blob([
+                json2csv(data)
+            ], {type: "text/csv"}), title + ".csv"))
         .filter( () => false);
 /**
  * Intercepts changes to widgets to catch widgets that can share some dependencies.

diff --git a/web/client/plugins/__tests__/DrawerMenu-test.jsx b/web/client/plugins/__tests__/DrawerMenu-test.jsx
@@ -28,9 +28,12 @@ const SAMPLE_ITEM = {
 
 const mouseMove = (x, y, node) => {
     const doc = node ? node.ownerDocument : document;
-    const evt = doc.createEvent('MouseEvents');
-    evt.initMouseEvent('mousemove', true, true, window,
-        0, 0, 0, x, y, false, false, false, false, 0, null);
+    const evt = new MouseEvent(
+        'mousemove',
+        {
+            canBubble: true, cancelable: true, view: window, detail: 0, screenX: 0, screenY: 0, clientX: x, clientY: y,
+            ctrlKey: false, altKey: false, shiftKey: false, metaKey: false, button: 0, relatedTarget: null
+        });
     doc.dispatchEvent(evt);
     return evt;
 };

diff --git a/web/client/plugins/mapEditor/enhancers/editor.js b/web/client/plugins/mapEditor/enhancers/editor.js
@@ -22,7 +22,6 @@ import {backgroundListSelector} from '../../../selectors/backgroundselector';
 import {mapOptionsToSaveSelector} from '../../../selectors/mapsave';
 import {textSearchConfigSelector, bookmarkSearchConfigSelector} from '../../../selectors/searchconfig';
 import MapUtils from '../../../utils/MapUtils';
-import { isNull } from 'util';
 
 
 const saveSelector = createSelector(
@@ -52,7 +51,7 @@ export default compose(
             const mapData = MapUtils.saveMapConfiguration(map, layers, groups,
                 backgrounds, textSearchConfig, bookmarkSearchConfig, additionalOptions);
 
-            return save({...mapData.map, layers: mapData.map.layers.map(l => pickBy(l, (p) => p !== undefined && !isNull(p)))}, owner);
+            return save({...mapData.map, layers: mapData.map.layers.map(l => pickBy(l, (p) => p !== undefined && !(p === null)))}, owner);
         }
     }),
     WithConfirm,