chore: update dependencies

terrestris · Dec 23, 2024 · e7fc751 · e7fc751
1 parent 5814db4
commit e7fc751
Show file tree

Hide file tree

Showing 10 changed files with 4,781 additions and 4,965 deletions.
diff --git a/.github/dependabot.disabled.yml → .github/dependabot.yml b/.github/dependabot.disabled.yml → .github/dependabot.yml
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -41,93 +41,97 @@
   ],
   "dependencies": {
     "@monaco-editor/react": "^4.6.0",
-    "@reduxjs/toolkit": "^2.3.0",
+    "@reduxjs/toolkit": "^2.5.0",
     "@terrestris/base-util": "^3.0.0",
     "@terrestris/mapfish-print-manager": "^16.0.1",
     "@terrestris/ol-util": "^21.0.0",
     "@terrestris/react-geo": "^26.2.1",
     "@terrestris/react-util": "^10.0.1",
     "@terrestris/shogun-e2e-tests": "^1.0.8",
     "@terrestris/shogun-util": "^10.2.0",
-    "antd": "^5.21.4",
+    "@types/color": "^4.2.0",
+    "@types/js-md5": "^0.7.2",
+    "@types/react": "^18.3.17",
+    "@types/react-dom": "^18.3.5",
+    "antd": "^5.22.5",
     "color": "^4.2.3",
-    "dotenv": "^16.4.5",
-    "geostyler-openlayers-parser": "^5.0.0",
-    "geostyler-style": "^9.1.0",
+    "dotenv": "^16.4.7",
     "geostyler": "^15.0.1",
-    "i18next-browser-languagedetector": "^8.0.0",
-    "i18next": "^23.16.0",
+    "geostyler-openlayers-parser": "^5.0.1",
+    "geostyler-style": "^9.2.0",
+    "i18next": "^24.2.0",
+    "i18next-browser-languagedetector": "^8.0.2",
     "js-md5": "^0.8.3",
-    "keycloak-js": "^26.0.0",
+    "keycloak-js": "^26.0.7",
     "normalize.css": "^8.0.1",
-    "ol": "^10.2.1",
+    "ol": "^10.3.1",
+    "react": "^18.3.1",
     "react-cookie-consent": "^9.0.0",
     "react-dom": "^18.3.1",
-    "react-i18next": "^15.0.3",
-    "react-redux": "^9.1.2",
-    "react": "^18.3.1",
+    "react-i18next": "^15.2.0",
+    "react-redux": "^9.2.0",
     "shapefile.js": "^1.1.4"
   },
   "devDependencies": {
-    "@babel/cli": "^7.25.7",
-    "@babel/core": "^7.25.8",
-    "@babel/preset-env": "^7.25.8",
-    "@babel/preset-react": "^7.25.7",
-    "@babel/preset-typescript": "^7.25.7",
-    "@babel/runtime": "^7.25.7",
+    "@babel/cli": "^7.26.4",
+    "@babel/core": "^7.26.0",
+    "@babel/preset-env": "^7.26.0",
+    "@babel/preset-react": "^7.26.3",
+    "@babel/preset-typescript": "^7.26.0",
+    "@babel/runtime": "^7.26.0",
     "@casualbot/jest-sonar-reporter": "^2.4.0",
-    "@commitlint/cli": "^19.5.0",
-    "@commitlint/config-conventional": "^19.5.0",
-    "@eslint/js": "^9.12.0",
-    "@module-federation/enhanced": "^0.6.11",
-    "@playwright/test": "^1.48.1",
-    "@rspack/cli": "^1.0.13",
-    "@rspack/core": "^1.0.13",
-    "@rspack/plugin-react-refresh": "^1.0.0",
+    "@commitlint/cli": "^19.6.1",
+    "@commitlint/config-conventional": "^19.6.0",
+    "@eslint/js": "^9.17.0",
+    "@module-federation/enhanced": "^0.8.5",
+    "@playwright/test": "^1.49.1",
+    "@rspack/cli": "^1.1.6",
+    "@rspack/core": "^1.1.6",
+    "@rspack/plugin-react-refresh": "^1.0.1",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "@semantic-release/github": "^11.0.0",
+    "@semantic-release/github": "^11.0.1",
     "@semantic-release/npm": "^12.0.1",
-    "@semantic-release/release-notes-generator": "^14.0.1",
-    "@stylistic/eslint-plugin": "^2.9.0",
-    "@swc/helpers": "^0.5.13",
-    "@terrestris/eslint-config-typescript-react": "^3.0.0",
+    "@semantic-release/release-notes-generator": "^14.0.2",
+    "@stylistic/eslint-plugin": "^2.12.1",
+    "@swc/helpers": "^0.5.15",
     "@terrestris/eslint-config-typescript": "^7.0.0",
-    "@testing-library/jest-dom": "^6.6.1",
-    "@testing-library/react": "^16.0.1",
+    "@terrestris/eslint-config-typescript-react": "^3.0.0",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",
-    "@types/color": "^3.0.6",
     "@types/eslint__js": "^8.42.3",
-    "@types/jest": "^29.5.13",
-    "@types/js-md5": "^0.7.2",
-    "@types/node": "^22.7.6",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^22.10.2",
     "babel-jest": "^29.7.0",
     "babel-loader": "^9.2.1",
     "buffer": "^6.0.3",
-    "chokidar": "^4.0.1",
-    "copy-webpack-plugin": "^12.0.2",
+    "chokidar": "^4.0.2",
     "css-loader": "^7.1.2",
+    "eslint": "^9.17.0",
     "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-react-refresh": "^0.4.12",
-    "eslint-plugin-react": "^7.37.1",
-    "eslint": "^9.12.0",
+    "eslint-plugin-react": "^7.37.2",
+    "eslint-plugin-react-refresh": "^0.4.16",
     "fs-extra": "^11.2.0",
-    "globals": "^15.11.0",
-    "husky": "^9.1.6",
+    "globals": "^15.14.0",
+    "husky": "^9.1.7",
     "ignore-loader": "^0.1.2",
-    "jest-environment-jsdom": "^29.7.0",
     "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "less": "^4.2.1",
     "less-loader": "^12.2.0",
-    "less": "^4.2.0",
-    "mini-css-extract-plugin": "^2.9.1",
-    "path-exists-cli": "2.0.0",
-    "react-refresh": "^0.14.2",
-    "semantic-release": "^24.1.2",
+    "nwsapi": "2.2.13",
+    "react-refresh": "^0.16.0",
+    "semantic-release": "^24.2.0",
     "style-loader": "^4.0.0",
-    "typescript-eslint": "^8.9.0",
-    "typescript": "^5.6.3",
+    "typescript": "^5.7.2",
+    "typescript-eslint": "^8.18.1",
     "webpack-merge": "^6.0.1"
   },
+  "engines": {
+    "node": ">=20",
+    "npm": ">=9"
+  },
   "publishConfig": {
     "access": "public"
   },
@@ -142,10 +146,6 @@
     "usePathForSuiteName": "true",
     "relativePaths": "true"
   },
-  "engines": {
-    "node": ">=20",
-    "npm": ">=9"
-  },
   "overrides": {
     "ol": "$ol"
   }

diff --git a/src/components/DocumentationButton/index.tsx b/src/components/DocumentationButton/index.tsx
@@ -1,6 +1,8 @@
 import React from 'react';
 
-import { faCircleQuestion } from '@fortawesome/free-solid-svg-icons';
+import {
+  faCircleQuestion
+} from '@fortawesome/free-solid-svg-icons';
 import {
   FontAwesomeIcon
 } from '@fortawesome/react-fontawesome';

diff --git a/src/components/EditFeatureDrawer/EditFeatureForm/index.spec.tsx b/src/components/EditFeatureDrawer/EditFeatureForm/index.spec.tsx
@@ -2,14 +2,25 @@ import React from 'react';
 
 import { render } from '@testing-library/react';
 
-import { FormInstance } from 'antd';
+import { Form } from 'antd';
 
 import { createReduxWrapper } from '../../../utils/testUtils';
 
-import EditFeatureForm from '.';
+import EditFeatureForm, {
+  EditFeatureFormProps
+} from '.';
 
 describe('<EditFeatureForm />', () => {
-  let mockedForm: FormInstance<any>;
+  const EditFeatureFormWrapper = (props: Omit<EditFeatureFormProps, 'form'>) => {
+    const [form] = Form.useForm();
+
+    return (
+      <EditFeatureForm
+        {...props}
+        form={form}
+      />
+    );
+  };
 
   it('is defined', () => {
     expect(EditFeatureForm).toBeDefined();
@@ -19,9 +30,7 @@ describe('<EditFeatureForm />', () => {
     const {
       container
     } = render(
-      <EditFeatureForm
-        form={mockedForm}
-      />,
+      <EditFeatureFormWrapper />,
       {
         wrapper: createReduxWrapper()
       });

diff --git a/src/components/EditFeatureDrawer/EditFeatureFullForm/index.spec.tsx b/src/components/EditFeatureDrawer/EditFeatureFullForm/index.spec.tsx
@@ -5,21 +5,14 @@ import {
   render
 } from '@testing-library/react';
 
-import {
-  Feature
-} from 'geojson';
-
-import { WmsLayer } from '@terrestris/ol-util/dist/typeUtils/typeUtils';
+import OlLayerTile from 'ol/layer/Tile';
+import OlSourceTileWMS from 'ol/source/TileWMS';
 
 import { createReduxWrapper } from '../../../utils/testUtils';
 
 import EditFeatureFullForm from '.';
 
-let layer: WmsLayer;
-let feature: Feature;
-
 describe('<EditFeatureFullForm />', () => {
-
   afterEach(() => {
     cleanup();
   });
@@ -29,13 +22,23 @@ describe('<EditFeatureFullForm />', () => {
   });
 
   it('can be rendered', () => {
-
     const {
       container
     } = render(
       <EditFeatureFullForm
-        feature={feature}
-        layer={layer}
+        feature={{
+          type: 'Feature',
+          geometry: {
+            coordinates: [0, 0],
+            type: 'Point'
+          },
+          properties: {
+            foo: 'bar'
+          }
+        }}
+        layer={new OlLayerTile({
+          source: new OlSourceTileWMS()
+        })}
       />, {
         wrapper: createReduxWrapper()
       }

diff --git a/src/components/EditFeatureDrawer/EditFeatureSwitch/index.tsx b/src/components/EditFeatureDrawer/EditFeatureSwitch/index.tsx
@@ -129,6 +129,13 @@ export const EditFeatureSwitch: React.FC<EditFeatureSwitchProps> = ({
           return 'MultiPolygon';
         case 'gml:Polygon':
           return 'Polygon';
+        case 'xsd:boolean':
+        case 'xsd:date':
+        case 'xsd:int':
+        case 'xsd:number':
+        case 'xsd:string':
+        case undefined:
+          return;
         default:
           break;
       }

diff --git a/src/components/EditFeatureDrawer/EditFeatureTabs/index.spec.tsx b/src/components/EditFeatureDrawer/EditFeatureTabs/index.spec.tsx
@@ -2,22 +2,23 @@ import React from 'react';
 
 import { render } from '@testing-library/react';
 
-import { FormInstance } from 'antd';
-
-import {
-  PropertyFormItemEditConfig,
-  PropertyFormTabConfig
-} from '@terrestris/shogun-util/dist/model/Layer';
+import { Form } from 'antd';
 
 import { createReduxWrapper } from '../../../utils/testUtils';
 
-import EditFeatureTabs from '.';
-
-let mockTabConfig: PropertyFormTabConfig<PropertyFormItemEditConfig>[] | undefined;
-let mockForm: FormInstance<any>;
-let mockProperties: Record<string, any>;
+import EditFeatureTabs, { EditFeatureTabsProps } from '.';
 
 describe('<EditFeatureTabs />', () => {
+  const EditFeatureTabsWrapper = (props: Omit<EditFeatureTabsProps, 'form'>) => {
+    const [form] = Form.useForm();
+
+    return (
+      <EditFeatureTabs
+        {...props}
+        form={form}
+      />
+    );
+  };
 
   it('is defined', () => {
     expect(EditFeatureTabs).toBeDefined();
@@ -26,11 +27,7 @@ describe('<EditFeatureTabs />', () => {
   it('can be rendered', () => {
     const { container } =
       render(
-        <EditFeatureTabs
-          tabConfig={mockTabConfig}
-          form={mockForm}
-          initialValues={mockProperties}
-        />,
+        <EditFeatureTabsWrapper />,
         {
           wrapper: createReduxWrapper()
         });

diff --git a/src/components/EditFeatureDrawer/EditFeatureToolbar/index.spec.tsx b/src/components/EditFeatureDrawer/EditFeatureToolbar/index.spec.tsx
@@ -11,21 +11,21 @@ import {
   screen
 } from '@testing-library/react';
 
-import { FormInstance } from 'antd/lib/form/hooks/useForm';
+import { Form } from 'antd';
 
 import {
   Feature
 } from 'geojson';
 
-import { Provider } from 'react-redux';
+import OlLayerTile from 'ol/layer/Tile';
+import OlSourceTileWMS from 'ol/source/TileWMS';
 
-import { WmsLayer } from '@terrestris/ol-util/dist/typeUtils/typeUtils';
+import { Provider } from 'react-redux';
 
 import { EditLevel } from '../../../store/editFeature';
 
-import EditFeatureToolbar from '.';
+import EditFeatureToolbar, { EditFeatureToolbarProps } from '.';
 
-let layer: WmsLayer;
 const feature: Feature = {
   type: 'Feature',
   geometry: {
@@ -37,7 +37,6 @@ const feature: Feature = {
 
 };
 let toolbarElem: HTMLInputElement | null;
-let form: FormInstance<any>;
 
 interface EditFeatureState {
   userEditMode: EditLevel[];
@@ -47,6 +46,16 @@ let initialEditFeatureState: EditFeatureState = {
   userEditMode: ['CREATE']
 };
 describe('<EditFeatureToolbar />', () => {
+  const EditFeatureToolbarWrapper = (props: Omit<EditFeatureToolbarProps, 'form'>) => {
+    const [form] = Form.useForm();
+
+    return (
+      <EditFeatureToolbar
+        {...props}
+        form={form}
+      />
+    );
+  };
 
   afterEach(() => {
     cleanup();
@@ -69,10 +78,11 @@ describe('<EditFeatureToolbar />', () => {
       container
     } = render(
       <Provider store={store}>
-        <EditFeatureToolbar
+        <EditFeatureToolbarWrapper
           feature={feature!}
-          layer={layer}
-          form={form}
+          layer={new OlLayerTile({
+            source: new OlSourceTileWMS()
+          })}
         />,
       </Provider>
     );