Skip to content

Commit b44b44b

Browse files
committed
merge: merge branch 'THU/upgrade_dependencies_PROD-14745'
2 parents f8f4b33 + ebc4b21 commit b44b44b

File tree

7 files changed

+2211
-1909
lines changed

7 files changed

+2211
-1909
lines changed

.github/workflows/eslint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout git repository
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v5
1717
- name: Enable Corepack
1818
run: corepack enable
1919
- name: Setup Node
20-
uses: actions/setup-node@v4
20+
uses: actions/setup-node@v5
2121
with:
22-
node-version: '18'
22+
node-version: '24'
2323
cache: 'yarn'
2424
- name: Run eslint
2525
run: yarn install && yarn eslint .

.github/workflows/track_dependencies.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
- name: Enable Corepack
1616
run: corepack enable
1717
- name: Setup Node
18-
uses: actions/setup-node@v4
18+
uses: actions/setup-node@v5
1919
with:
20-
node-version: '18'
20+
node-version: '24'
2121
cache: 'yarn'
2222
- name: Generate SBOM
2323
run: yarn dlx -q @cyclonedx/yarn-plugin-cyclonedx -o sbom.json

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v18
1+
v24

package.json

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,59 +25,59 @@
2525
},
2626
"homepage": "https://github.com/Cosmo-Tech/webapp-component-ui#readme",
2727
"devDependencies": {
28-
"@babel/core": "^7.27.7",
29-
"@babel/preset-env": "^7.27.2",
28+
"@babel/core": "^7.28.4",
29+
"@babel/preset-env": "^7.28.3",
3030
"@babel/preset-react": "^7.27.1",
3131
"@cosmotech/azure": "^2.0.1",
3232
"@cosmotech/core": "^2.0.0",
3333
"@emotion/react": "^11.14.0",
3434
"@emotion/styled": "^11.14.1",
35-
"@eslint/compat": "^1.3.1",
35+
"@eslint/compat": "^1.3.2",
3636
"@eslint/eslintrc": "^3.3.1",
37-
"@eslint/js": "^9.30.0",
38-
"@mui/icons-material": "^6.4.12",
37+
"@eslint/js": "^9.35.0",
38+
"@mui/icons-material": "^6.5.0",
3939
"@mui/lab": "^5.0.0-alpha.170",
40-
"@mui/material": "^6.4.12",
41-
"@mui/styles": "^6.4.12",
40+
"@mui/material": "^6.5.0",
41+
"@mui/styles": "^6.5.0",
4242
"@rollup/plugin-babel": "^6.0.4",
4343
"@rollup/plugin-commonjs": "^28.0.6",
4444
"@rollup/plugin-image": "^3.0.3",
45-
"@rollup/plugin-node-resolve": "^15.3.1",
46-
"@testing-library/dom": "^10.4.0",
47-
"@testing-library/jest-dom": "^6.6.3",
45+
"@rollup/plugin-node-resolve": "^16.0.1",
46+
"@testing-library/dom": "^10.4.1",
47+
"@testing-library/jest-dom": "^6.8.0",
4848
"@testing-library/react": "^16.3.0",
4949
"@testing-library/user-event": "^14.6.1",
50-
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
51-
"babel-jest": "^29.7.0",
52-
"dayjs": "^1.11.13",
53-
"eslint": "^9.30.0",
54-
"eslint-config-prettier": "^9.1.0",
50+
"@trivago/prettier-plugin-sort-imports": "^5.2.2",
51+
"babel-jest": "^30.1.2",
52+
"dayjs": "^1.11.18",
53+
"eslint": "^9.35.0",
54+
"eslint-config-prettier": "^10.1.8",
5555
"eslint-plugin-import": "^2.32.0",
56-
"eslint-plugin-jest": "^28.14.0",
56+
"eslint-plugin-jest": "^29.0.1",
5757
"eslint-plugin-jest-dom": "^5.5.0",
58-
"eslint-plugin-n": "^17.20.0",
58+
"eslint-plugin-n": "^17.23.1",
5959
"eslint-plugin-node": "^11.1.0",
60-
"eslint-plugin-prettier": "^5.5.1",
60+
"eslint-plugin-prettier": "^5.5.4",
6161
"eslint-plugin-promise": "^7.2.1",
6262
"eslint-plugin-react": "^7.37.5",
6363
"eslint-plugin-react-hooks": "^5.2.0",
64-
"eslint-plugin-testing-library": "^6.5.0",
65-
"globals": "^15.15.0",
64+
"eslint-plugin-testing-library": "^7.8.0",
65+
"globals": "^16.4.0",
6666
"identity-obj-proxy": "^3.0.0",
67-
"jest": "^29.7.0",
67+
"jest": "^30.1.3",
6868
"jest-canvas-mock": "^2.5.2",
69-
"jest-environment-jsdom": "^29.7.0",
70-
"neostandard": "^0.11.9",
69+
"jest-environment-jsdom": "^30.1.2",
70+
"neostandard": "^0.12.2",
7171
"postcss": "^8.5.6",
7272
"prettier": "^3.6.2",
7373
"prop-types": "^15.8.1",
7474
"react": "^18.3.1",
7575
"react-dom": "^18.3.1",
76-
"react-i18next": "^15.5.3",
77-
"rollup": "^4.44.1",
76+
"react-i18next": "^15.7.3",
77+
"rollup": "^4.50.2",
7878
"rollup-plugin-peer-deps-external": "^2.2.4",
7979
"rollup-plugin-postcss": "^4.0.2",
80-
"rollup-plugin-visualizer": "^5.14.0"
80+
"rollup-plugin-visualizer": "^6.0.3"
8181
},
8282
"peerDependencies": {
8383
"@cosmotech/azure": "^2.0.1",
@@ -95,13 +95,13 @@
9595
"@emotion/styled": "^11.14.1",
9696
"@mui/x-date-pickers": "^7.29.4",
9797
"@nosferatu500/react-sortable-tree": "^3.0.6",
98-
"ag-grid-community": "~32.2.2",
99-
"ag-grid-react": "~32.2.2",
98+
"ag-grid-community": "~34.2.0",
99+
"ag-grid-react": "~34.2.0",
100100
"clsx": "^2.1.1",
101-
"cytoscape": "^3.32.0",
102-
"cytoscape-bubblesets": "^3.2.3",
101+
"cytoscape": "^3.33.1",
102+
"cytoscape-bubblesets": "^4.0.0",
103103
"cytoscape-dagre": "^2.5.0",
104-
"cytoscape-layers": "^2.4.6",
104+
"cytoscape-layers": "^3.0.0",
105105
"powerbi-client-react": "^1.4.0",
106106
"react-cytoscapejs": "^2.0.0",
107107
"react-lottie-player": "^2.1.0",
@@ -112,5 +112,5 @@
112112
"get-pkg-repo": "4.1.1",
113113
"hosted-git-info": "^2.1.4"
114114
},
115-
"packageManager": "yarn@4.3.1"
115+
"packageManager": "yarn@4.9.4"
116116
}

src/inputs/SelectWithAction/SelectWithAction.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ describe('SelectWithAction', () => {
125125
await SelectElement.openMenu();
126126
await SelectElement.selectMenuItem(actionToSelect.label);
127127

128-
expect(mockActionClick).toBeCalledWith(actionToSelect.id);
128+
expect(mockActionClick).toHaveBeenCalledWith(actionToSelect.id);
129129
});
130130
});
131131

src/inputs/Table/Table.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import PropTypes from 'prop-types';
66
import UploadFileIcon from '@mui/icons-material/UploadFile';
77
import { Stack, Typography, Box, Button } from '@mui/material';
88
import makeStyles from '@mui/styles/makeStyles';
9+
import { AllCommunityModule, ModuleRegistry, provideGlobalGridOptions } from 'ag-grid-community';
910
import 'ag-grid-community/styles/ag-grid.css';
1011
import 'ag-grid-community/styles/ag-theme-balham.css';
1112
import rfdc from 'rfdc';
@@ -17,6 +18,9 @@ import { TABLE_DATA_STATUS } from './TableDataStatus';
1718
import { TableToolbar } from './components';
1819
import { TABLE_TOOLBAR_HEIGHT } from './components/TableToolbar/style.js';
1920

21+
ModuleRegistry.registerModules([AllCommunityModule]);
22+
provideGlobalGridOptions({ theme: 'legacy' });
23+
2024
const clone = rfdc();
2125

2226
const useStyles = makeStyles((theme) => ({
@@ -386,7 +390,12 @@ export const Table = (props) => {
386390
rowData={rows}
387391
context={context}
388392
stopEditingWhenCellsLoseFocus={true}
389-
rowSelection={'multiple'}
393+
rowSelection={{
394+
mode: 'multiRow',
395+
checkboxes: false,
396+
headerCheckbox: false,
397+
enableClickSelection: true,
398+
}}
390399
onSelectionChanged={onSelectionChanged}
391400
/>
392401
);

0 commit comments

Comments
 (0)