diff --git a/src/main/webapp/package.json b/src/main/webapp/package.json index 6aca96d75d..e200de6bdf 100644 --- a/src/main/webapp/package.json +++ b/src/main/webapp/package.json @@ -18,7 +18,7 @@ "last 2 Opera versions" ], "dependencies": { - "@ag-grid-community/csv-export": "27.1.0", + "@ag-grid-community/csv-export": "31.3.4", "@ant-design/icons": "4.7.0", "@ant-design/plots": "1.0.9", "@antv/color-util": "2.0.6", @@ -35,8 +35,8 @@ "@luma.gl/webgl": "8.5.14", "@phylocanvas/phylocanvas.gl": "1.43.0", "@reduxjs/toolkit": "1.8.5", - "ag-grid-community": "27.1.0", - "ag-grid-react": "27.1.0", + "ag-grid-community": "31.3.4", + "ag-grid-react": "31.3.4", "antd": "4.19.5", "axios": "0.28.0", "clipboard": "1.7.1", diff --git a/src/main/webapp/pnpm-lock.yaml b/src/main/webapp/pnpm-lock.yaml index bbde561e8b..9ce2da1a39 100644 --- a/src/main/webapp/pnpm-lock.yaml +++ b/src/main/webapp/pnpm-lock.yaml @@ -20,8 +20,8 @@ importers: .: dependencies: '@ag-grid-community/csv-export': - specifier: 27.1.0 - version: 27.1.0 + specifier: 31.3.4 + version: 31.3.4 '@ant-design/icons': specifier: 4.7.0 version: 4.7.0(react-dom@17.0.2(react@17.0.2))(react@17.0.2) @@ -71,11 +71,11 @@ importers: specifier: 1.8.5 version: 1.8.5(react-redux@7.2.8(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(react@17.0.2) ag-grid-community: - specifier: 27.1.0 - version: 27.1.0 + specifier: 31.3.4 + version: 31.3.4 ag-grid-react: - specifier: 27.1.0 - version: 27.1.0(ag-grid-community@27.1.0)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) + specifier: 31.3.4 + version: 31.3.4(react-dom@17.0.2(react@17.0.2))(react@17.0.2) antd: specifier: 4.19.5 version: 4.19.5(react-dom@17.0.2(react@17.0.2))(react@17.0.2) @@ -244,7 +244,7 @@ importers: version: 10.4.4(postcss@8.4.31) babel-loader: specifier: 8.2.4 - version: 8.2.4(@babel/core@7.19.6)(webpack@5.96.1(webpack-cli@4.10.0)) + version: 8.2.4(@babel/core@7.19.6)(webpack@5.96.1) babel-plugin-import: specifier: 1.13.5 version: 1.13.5 @@ -253,10 +253,10 @@ importers: version: 4.20.2 css-loader: specifier: 6.7.1 - version: 6.7.1(webpack@5.96.1(webpack-cli@4.10.0)) + version: 6.7.1(webpack@5.96.1) css-minimizer-webpack-plugin: specifier: 3.4.1 - version: 3.4.1(webpack@5.96.1(webpack-cli@4.10.0)) + version: 3.4.1(webpack@5.96.1) eslint: specifier: 9.14.0 version: 9.14.0 @@ -268,7 +268,7 @@ importers: version: 7.37.2(eslint@9.14.0) expose-loader: specifier: 3.1.0 - version: 3.1.0(webpack@5.96.1(webpack-cli@4.10.0)) + version: 3.1.0(webpack@5.96.1) jest: specifier: 27.5.1 version: 27.5.1 @@ -277,10 +277,10 @@ importers: version: 4.1.2 less-loader: specifier: 10.2.0 - version: 10.2.0(less@4.1.2)(webpack@5.96.1(webpack-cli@4.10.0)) + version: 10.2.0(less@4.1.2)(webpack@5.96.1) mini-css-extract-plugin: specifier: 2.6.0 - version: 2.6.0(webpack@5.96.1(webpack-cli@4.10.0)) + version: 2.6.0(webpack@5.96.1) postcss: specifier: 8.4.31 version: 8.4.31 @@ -289,7 +289,7 @@ importers: version: 14.1.0(postcss@8.4.31) postcss-loader: specifier: 6.2.1 - version: 6.2.1(postcss@8.4.31)(webpack@5.96.1(webpack-cli@4.10.0)) + version: 6.2.1(postcss@8.4.31)(webpack@5.96.1) postcss-preset-env: specifier: 7.4.3 version: 7.4.3(postcss@8.4.31) @@ -307,10 +307,10 @@ importers: version: 1.10.1 speed-measure-webpack-plugin: specifier: 1.5.0 - version: 1.5.0(webpack@5.96.1(webpack-cli@4.10.0)) + version: 1.5.0(webpack@5.96.1) terser-webpack-plugin: specifier: 5.3.1 - version: 5.3.1(webpack@5.96.1(webpack-cli@4.10.0)) + version: 5.3.1(webpack@5.96.1) typescript: specifier: 4.7.2 version: 4.7.2 @@ -319,18 +319,18 @@ importers: version: 5.96.1(webpack-cli@4.10.0) webpack-assets-manifest: specifier: 5.1.0 - version: 5.1.0(webpack@5.96.1(webpack-cli@4.10.0)) + version: 5.1.0(webpack@5.96.1) webpack-cli: specifier: 4.10.0 version: 4.10.0(webpack@5.96.1) packages: - '@ag-grid-community/core@27.1.0': - resolution: {integrity: sha512-f7AgQwCQSlCwmNTI/h31+S/12pQqw4vln98XAFKRDplsDqzOoGFxB6au7Ky93E5iS+Bi7kHQTSMCqCzzsTHHsg==} + '@ag-grid-community/core@31.3.4': + resolution: {integrity: sha512-Fz7P4lMAYDo9rG6jOA8OXlAXta/4E+PiCdjT7M9OloaXAJtU47oO4f3VKV7rdbVCC8SGSo0cBCateddQTAFCNQ==} - '@ag-grid-community/csv-export@27.1.0': - resolution: {integrity: sha512-uKSchVAsU7GzvVJnpzhVMir5s9MeK55OjS6vq+W2YwBkrSTVO98/h8+DKxA7QzULFQexJKjKATa4JjGqdvW7gA==} + '@ag-grid-community/csv-export@31.3.4': + resolution: {integrity: sha512-+eWHgZoTjygj29ZDbw27C4WCqpGUQSVNYCyQpYTalTqq6UE3rupdR3/L3uoWpmN4loIqDIHFAWALJCd6vhRxFA==} '@ampproject/remapping@2.3.0': resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==} @@ -1902,15 +1902,14 @@ packages: resolution: {integrity: sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==} engines: {node: '>=0.8'} - ag-grid-community@27.1.0: - resolution: {integrity: sha512-SWzIJTNa7C6Vinizelcoc1FAJQRt1pDn+A8XHQDO2GTQT+VjBnPL8fg94fLJy0EEvqaN5IhDybNS0nD07SKIQw==} + ag-grid-community@31.3.4: + resolution: {integrity: sha512-jOxQO86C6eLnk1GdP24HB6aqaouFzMWizgfUwNY5MnetiWzz9ZaAmOGSnW/XBvdjXvC5Fpk3gSbvVKKQ7h9kBw==} - ag-grid-react@27.1.0: - resolution: {integrity: sha512-AfRwH6BL/LribvLJ2594Fq0/MfZf/17WebjGj927bM3vABDr2OBX3qgMIaQE+kpV9mABPb51rlWLMmbCvltv2g==} + ag-grid-react@31.3.4: + resolution: {integrity: sha512-WmPASHRFGSTxCMRStWG5bRtln0Ugsdqbb3+Y8sEyGHeLw4hXqfpqie3lT9kqCOl7wPWUjCpwmFdXzRnWPmyyeg==} peerDependencies: - ag-grid-community: ~27.1.0 - react: ^16.3.0 || ^17.0.0 - react-dom: ^16.3.0 || ^17.0.0 + react: ^16.3.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.3.0 || ^17.0.0 || ^18.0.0 agent-base@6.0.2: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} @@ -5751,11 +5750,14 @@ packages: snapshots: - '@ag-grid-community/core@27.1.0': {} + '@ag-grid-community/core@31.3.4': + dependencies: + tslib: 2.3.1 - '@ag-grid-community/csv-export@27.1.0': + '@ag-grid-community/csv-export@31.3.4': dependencies: - '@ag-grid-community/core': 27.1.0 + '@ag-grid-community/core': 31.3.4 + tslib: 2.3.1 '@ampproject/remapping@2.3.0': dependencies: @@ -7926,17 +7928,17 @@ snapshots: '@webassemblyjs/ast': 1.14.1 '@xtuc/long': 4.2.2 - '@webpack-cli/configtest@1.2.0(webpack-cli@4.10.0(webpack@5.96.1))(webpack@5.96.1(webpack-cli@4.10.0))': + '@webpack-cli/configtest@1.2.0(webpack-cli@4.10.0)(webpack@5.96.1)': dependencies: webpack: 5.96.1(webpack-cli@4.10.0) webpack-cli: 4.10.0(webpack@5.96.1) - '@webpack-cli/info@1.5.0(webpack-cli@4.10.0(webpack@5.96.1))': + '@webpack-cli/info@1.5.0(webpack-cli@4.10.0)': dependencies: envinfo: 7.14.0 webpack-cli: 4.10.0(webpack@5.96.1) - '@webpack-cli/serve@1.7.0(webpack-cli@4.10.0(webpack@5.96.1))': + '@webpack-cli/serve@1.7.0(webpack-cli@4.10.0)': dependencies: webpack-cli: 4.10.0(webpack@5.96.1) @@ -7963,11 +7965,11 @@ snapshots: adler-32@1.3.1: {} - ag-grid-community@27.1.0: {} + ag-grid-community@31.3.4: {} - ag-grid-react@27.1.0(ag-grid-community@27.1.0)(react-dom@17.0.2(react@17.0.2))(react@17.0.2): + ag-grid-react@31.3.4(react-dom@17.0.2(react@17.0.2))(react@17.0.2): dependencies: - ag-grid-community: 27.1.0 + ag-grid-community: 31.3.4 prop-types: 15.8.1 react: 17.0.2 react-dom: 17.0.2(react@17.0.2) @@ -8209,7 +8211,7 @@ snapshots: transitivePeerDependencies: - supports-color - babel-loader@8.2.4(@babel/core@7.19.6)(webpack@5.96.1(webpack-cli@4.10.0)): + babel-loader@8.2.4(@babel/core@7.19.6)(webpack@5.96.1): dependencies: '@babel/core': 7.19.6 find-cache-dir: 3.3.2 @@ -8547,7 +8549,7 @@ snapshots: postcss: 8.4.31 postcss-selector-parser: 6.1.2 - css-loader@6.7.1(webpack@5.96.1(webpack-cli@4.10.0)): + css-loader@6.7.1(webpack@5.96.1): dependencies: icss-utils: 5.1.0(postcss@8.4.31) postcss: 8.4.31 @@ -8559,7 +8561,7 @@ snapshots: semver: 7.6.3 webpack: 5.96.1(webpack-cli@4.10.0) - css-minimizer-webpack-plugin@3.4.1(webpack@5.96.1(webpack-cli@4.10.0)): + css-minimizer-webpack-plugin@3.4.1(webpack@5.96.1): dependencies: cssnano: 5.1.15(postcss@8.4.31) jest-worker: 27.5.1 @@ -9137,7 +9139,7 @@ snapshots: jest-matcher-utils: 27.5.1 jest-message-util: 27.5.1 - expose-loader@3.1.0(webpack@5.96.1(webpack-cli@4.10.0)): + expose-loader@3.1.0(webpack@5.96.1): dependencies: webpack: 5.96.1(webpack-cli@4.10.0) @@ -10082,7 +10084,7 @@ snapshots: ktx-parse@0.0.4: {} - less-loader@10.2.0(less@4.1.2)(webpack@5.96.1(webpack-cli@4.10.0)): + less-loader@10.2.0(less@4.1.2)(webpack@5.96.1): dependencies: klona: 2.0.6 less: 4.1.2 @@ -10394,7 +10396,7 @@ snapshots: mimic-fn@2.1.0: {} - mini-css-extract-plugin@2.6.0(webpack@5.96.1(webpack-cli@4.10.0)): + mini-css-extract-plugin@2.6.0(webpack@5.96.1): dependencies: schema-utils: 4.2.0 webpack: 5.96.1(webpack-cli@4.10.0) @@ -10739,7 +10741,7 @@ snapshots: postcss: 8.4.31 postcss-value-parser: 4.2.0 - postcss-loader@6.2.1(postcss@8.4.31)(webpack@5.96.1(webpack-cli@4.10.0)): + postcss-loader@6.2.1(postcss@8.4.31)(webpack@5.96.1): dependencies: cosmiconfig: 7.1.0 klona: 2.0.6 @@ -11433,7 +11435,7 @@ snapshots: dependencies: '@babel/runtime': 7.26.0 focus-lock: 0.9.2 - prop-types: 15.8.1 + prop-types: 15.7.2 react: 17.0.2 react-clientside-effect: 1.2.6(react@17.0.2) use-callback-ref: 1.2.5(@types/react@17.0.45)(react@17.0.2) @@ -11847,7 +11849,7 @@ snapshots: space-separated-tokens@2.0.1: {} - speed-measure-webpack-plugin@1.5.0(webpack@5.96.1(webpack-cli@4.10.0)): + speed-measure-webpack-plugin@1.5.0(webpack@5.96.1): dependencies: chalk: 4.1.2 webpack: 5.96.1(webpack-cli@4.10.0) @@ -12034,7 +12036,7 @@ snapshots: ansi-escapes: 4.3.2 supports-hyperlinks: 2.3.0 - terser-webpack-plugin@5.3.1(webpack@5.96.1(webpack-cli@4.10.0)): + terser-webpack-plugin@5.3.1(webpack@5.96.1): dependencies: jest-worker: 27.5.1 schema-utils: 3.3.0 @@ -12043,7 +12045,7 @@ snapshots: terser: 5.36.0 webpack: 5.96.1(webpack-cli@4.10.0) - terser-webpack-plugin@5.3.10(webpack@5.96.1(webpack-cli@4.10.0)): + terser-webpack-plugin@5.3.10(webpack@5.96.1): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 @@ -12339,7 +12341,7 @@ snapshots: webidl-conversions@6.1.0: {} - webpack-assets-manifest@5.1.0(webpack@5.96.1(webpack-cli@4.10.0)): + webpack-assets-manifest@5.1.0(webpack@5.96.1): dependencies: chalk: 4.1.2 deepmerge: 4.3.1 @@ -12353,9 +12355,9 @@ snapshots: webpack-cli@4.10.0(webpack@5.96.1): dependencies: '@discoveryjs/json-ext': 0.5.7 - '@webpack-cli/configtest': 1.2.0(webpack-cli@4.10.0(webpack@5.96.1))(webpack@5.96.1(webpack-cli@4.10.0)) - '@webpack-cli/info': 1.5.0(webpack-cli@4.10.0(webpack@5.96.1)) - '@webpack-cli/serve': 1.7.0(webpack-cli@4.10.0(webpack@5.96.1)) + '@webpack-cli/configtest': 1.2.0(webpack-cli@4.10.0)(webpack@5.96.1) + '@webpack-cli/info': 1.5.0(webpack-cli@4.10.0) + '@webpack-cli/serve': 1.7.0(webpack-cli@4.10.0) colorette: 2.0.20 commander: 7.2.0 cross-spawn: 7.0.5 @@ -12396,7 +12398,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 - terser-webpack-plugin: 5.3.10(webpack@5.96.1(webpack-cli@4.10.0)) + terser-webpack-plugin: 5.3.10(webpack@5.96.1) watchpack: 2.4.2 webpack-sources: 3.2.3 optionalDependencies: diff --git a/src/main/webapp/resources/js/pages/projects/linelist/components/Table/Table.jsx b/src/main/webapp/resources/js/pages/projects/linelist/components/Table/Table.jsx index 3b8efe894b..02fdc21b6c 100644 --- a/src/main/webapp/resources/js/pages/projects/linelist/components/Table/Table.jsx +++ b/src/main/webapp/resources/js/pages/projects/linelist/components/Table/Table.jsx @@ -3,8 +3,8 @@ import { connect } from "react-redux"; import { Button, notification, Spin } from "antd"; import isEqual from "lodash/isEqual"; import { AgGridReact } from "ag-grid-react"; -import "ag-grid-community/dist/styles/ag-grid.css"; -import "ag-grid-community/dist/styles/ag-theme-material.css"; +import "ag-grid-community/styles/ag-grid.css"; +import "ag-grid-community/styles/ag-theme-material.css"; import { CsvExportModule } from "@ag-grid-community/csv-export"; import LoadingOverlay from "./LoadingOverlay"; import { @@ -172,7 +172,7 @@ export class TableComponent extends React.Component { /* Resize the icons since no extra space is needed. */ - this.columnApi.autoSizeColumns([FIELDS.icons]); + this.api.autoSizeColumns([FIELDS.icons]); }; /** @@ -180,7 +180,7 @@ export class TableComponent extends React.Component { * table. */ onColumnDropped = () => { - const colOrder = [...this.columnApi.getColumnState()]; + const colOrder = [...this.api.getColumnState()]; // Remove sample name colOrder.shift(); @@ -245,7 +245,7 @@ export class TableComponent extends React.Component { * Get the visible columns. Need to ignore the icon columns since * it does not contain any data that we want. */ - const filteredColIds = this.columnApi + const filteredColIds = this.api .getColumnState() .filter((c) => !c.hide && c.colId !== "icons") .map((c) => c.colId); @@ -386,6 +386,7 @@ export class TableComponent extends React.Component { return ( diff --git a/src/main/webapp/webpack.config.js b/src/main/webapp/webpack.config.js index 2d0ad953a2..5a93eb768b 100644 --- a/src/main/webapp/webpack.config.js +++ b/src/main/webapp/webpack.config.js @@ -53,6 +53,9 @@ module.exports = (env, argv) => { resolve: { extensions: [".js", ".jsx", ".ts", ".tsx"], symlinks: false, + alias: { + "react-dom/server": "react-dom/server.browser.js", + }, }, output: { path: path.resolve(__dirname, "dist"),