Skip to content

Commit 7307c52

Browse files
adityatoshniwaladityatoshniwal
committed
Rebase fork pgadmin-org/react-data-grid to get latest changes and update pgAdmin package.json
1 parent e8cb962 commit 7307c52

File tree

5 files changed

+72
-82
lines changed

5 files changed

+72
-82
lines changed

‎web/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ module.exports = {
5151
],
5252
'testEnvironment': 'jsdom',
5353
'transformIgnorePatterns': [
54-
'[/\\\\]node_modules[/\\\\](?!react-dnd|dnd-core|@react-dnd|react-resize-detector).+\\.(js|jsx|mjs|cjs|ts|tsx)$',
54+
'[/\\\\]node_modules[/\\\\](?!react-dnd|dnd-core|@react-dnd|react-resize-detector|react-data-grid).+\\.(js|jsx|mjs|cjs|ts|tsx)$',
5555
'^.+\\.module\\.(css|sass|scss)$'
5656
]
5757
};

‎web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
"react-arborist": "^3.2.0",
131131
"react-aspen": "^1.1.0",
132132
"react-checkbox-tree": "^1.7.2",
133-
"react-data-grid": "https://github.com/pgadmin-org/react-data-grid.git#3dfc2ca01a046d55c1c7a45392dcec104815dc76",
133+
"react-data-grid": "https://github.com/pgadmin-org/react-data-grid.git#da939d3b434e70781e6b228efebc5235e542d002",
134134
"react-dnd": "^16.0.1",
135135
"react-dnd-html5-backend": "^16.0.1",
136136
"react-dom": "^18.2.0",

‎web/pgadmin/static/js/components/PgReactDataGrid.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88
//////////////////////////////////////////////////////////////
99
import React, { useCallback, useContext, useEffect, useMemo } from 'react';
10-
import ReactDataGrid, { Row } from 'react-data-grid';
10+
import {DataGrid as ReactDataGrid, Row } from 'react-data-grid';
1111
import { Box } from '@mui/material';
1212
import PropTypes from 'prop-types';
1313
import CustomPropTypes from '../custom_prop_types';

‎web/regression/javascript/__mocks__/react-data-grid.jsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@ import React, { useRef } from 'react';
22
import PropTypes from 'prop-types';
33
export * from 'react-data-grid';
44

5-
6-
const ReactDataGrid = React.forwardRef((props, _ref)=>{
5+
const DataGrid = React.forwardRef((props, _ref)=>{
76
const ele = useRef();
87
return <div id={props.id} ref={ele} data-test="react-data-grid"/>;
98
});
109

11-
ReactDataGrid.displayName = 'ReactDataGrid';
12-
ReactDataGrid.propTypes = {
10+
DataGrid.displayName = 'DataGrid';
11+
DataGrid.propTypes = {
1312
id: PropTypes.any
1413
};
1514

16-
export default ReactDataGrid;
15+
export {DataGrid};

‎web/yarn.lock

Lines changed: 65 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1751,13 +1751,13 @@ __metadata:
17511751
linkType: hard
17521752

17531753
"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0":
1754-
version: 4.6.0
1755-
resolution: "@eslint-community/eslint-utils@npm:4.6.0"
1754+
version: 4.6.1
1755+
resolution: "@eslint-community/eslint-utils@npm:4.6.1"
17561756
dependencies:
17571757
eslint-visitor-keys: ^3.4.3
17581758
peerDependencies:
17591759
eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
1760-
checksum: 1d866093009949a269d5b5d19297fd8ed27c537edb1238f760af09b4ca7fd51d223393c223a664faa79b36dd4568a7d8fa78b2a96c4f90e412f8ce9720b2fd64
1760+
checksum: 924f38a069cc281dacd231f1293f5969dff98d4ad867f044ee384f1ad35937c27d12222a45a7da0b294253ffbaccc0a6f7878aed3eea8f4f9345f195ae24dea2
17611761
languageName: node
17621762
linkType: hard
17631763

@@ -1779,22 +1779,13 @@ __metadata:
17791779
languageName: node
17801780
linkType: hard
17811781

1782-
"@eslint/config-helpers@npm:^0.2.0":
1782+
"@eslint/config-helpers@npm:^0.2.1":
17831783
version: 0.2.1
17841784
resolution: "@eslint/config-helpers@npm:0.2.1"
17851785
checksum: b463805bc319608436a8b19c94fd533d8196b326c03361db54c0f3ec59d7bd6337c9764bc945ef15df94f50443973241dc265f661b07aceed4938f7d1cf2e822
17861786
languageName: node
17871787
linkType: hard
17881788

1789-
"@eslint/core@npm:^0.12.0":
1790-
version: 0.12.0
1791-
resolution: "@eslint/core@npm:0.12.0"
1792-
dependencies:
1793-
"@types/json-schema": ^7.0.15
1794-
checksum: 3979af324102a3af2742060360563ba6b9525b8e1e524ad3d3e31e65af27db554b61d1cdfeaa42e15fb7d9ce9097c44225fd9e4f8193576accc1772457b88c12
1795-
languageName: node
1796-
linkType: hard
1797-
17981789
"@eslint/core@npm:^0.13.0":
17991790
version: 0.13.0
18001791
resolution: "@eslint/core@npm:0.13.0"
@@ -1821,10 +1812,10 @@ __metadata:
18211812
languageName: node
18221813
linkType: hard
18231814

1824-
"@eslint/js@npm:9.24.0":
1825-
version: 9.24.0
1826-
resolution: "@eslint/js@npm:9.24.0"
1827-
checksum: 423c09a9a52ae596cd77f38f97491261447e04d31a6d681b49cec7ff25dadb64f9b30e48ee5fcfb0a238a3dc3f6ee7c678fdd6ec2415bf687a73ddebaa8adff4
1815+
"@eslint/js@npm:9.25.0":
1816+
version: 9.25.0
1817+
resolution: "@eslint/js@npm:9.25.0"
1818+
checksum: c2366db405fcf2e4522f351d8859f91917d920a57ecfa061b087332172907c614b7886f4362be2bb82e2561a8219d061fe8ad7be2377724cb938f00bcccf096b
18281819
languageName: node
18291820
linkType: hard
18301821

@@ -1835,7 +1826,7 @@ __metadata:
18351826
languageName: node
18361827
linkType: hard
18371828

1838-
"@eslint/plugin-kit@npm:^0.2.7":
1829+
"@eslint/plugin-kit@npm:^0.2.8":
18391830
version: 0.2.8
18401831
resolution: "@eslint/plugin-kit@npm:0.2.8"
18411832
dependencies:
@@ -2514,7 +2505,7 @@ __metadata:
25142505
languageName: node
25152506
linkType: hard
25162507

2517-
"@mui/utils@npm:^5.16.6 || ^6.0.0 || ^7.0.0 || ^7.0.0-beta":
2508+
"@mui/utils@npm:^5.16.6 || ^6.0.0 || ^7.0.0":
25182509
version: 7.0.2
25192510
resolution: "@mui/utils@npm:7.0.2"
25202511
dependencies:
@@ -2555,21 +2546,21 @@ __metadata:
25552546
linkType: hard
25562547

25572548
"@mui/x-date-pickers@npm:^7.28.2":
2558-
version: 7.28.3
2559-
resolution: "@mui/x-date-pickers@npm:7.28.3"
2549+
version: 7.29.0
2550+
resolution: "@mui/x-date-pickers@npm:7.29.0"
25602551
dependencies:
25612552
"@babel/runtime": ^7.25.7
2562-
"@mui/utils": ^5.16.6 || ^6.0.0 || ^7.0.0 || ^7.0.0-beta
2563-
"@mui/x-internals": 7.28.0
2553+
"@mui/utils": ^5.16.6 || ^6.0.0 || ^7.0.0
2554+
"@mui/x-internals": 7.29.0
25642555
"@types/react-transition-group": ^4.4.11
25652556
clsx: ^2.1.1
25662557
prop-types: ^15.8.1
25672558
react-transition-group: ^4.4.5
25682559
peerDependencies:
25692560
"@emotion/react": ^11.9.0
25702561
"@emotion/styled": ^11.8.1
2571-
"@mui/material": ^5.15.14 || ^6.0.0 || ^7.0.0 || ^7.0.0-beta
2572-
"@mui/system": ^5.15.14 || ^6.0.0 || ^7.0.0 || ^7.0.0-beta
2562+
"@mui/material": ^5.15.14 || ^6.0.0 || ^7.0.0
2563+
"@mui/system": ^5.15.14 || ^6.0.0 || ^7.0.0
25732564
date-fns: ^2.25.0 || ^3.2.0 || ^4.0.0
25742565
date-fns-jalali: ^2.13.0-0 || ^3.2.0-0 || ^4.0.0-0
25752566
dayjs: ^1.10.7
@@ -2598,19 +2589,19 @@ __metadata:
25982589
optional: true
25992590
moment-jalaali:
26002591
optional: true
2601-
checksum: afd32c391285fcc72e6228412dac40359cb6fdb48ce68c277c0f2131d5c8fa13182958403a04ec72067a70809305209799020bdf42a297b761f9aba1186dda43
2592+
checksum: 710204a08145b01a95b7d46bae4cc11a43a6e53020c87c23aff4b11366277f2471ce7723a770f655f148075269f46144e557b35589e2f19ec7b7c83a87b6ccbf
26022593
languageName: node
26032594
linkType: hard
26042595

2605-
"@mui/x-internals@npm:7.28.0":
2606-
version: 7.28.0
2607-
resolution: "@mui/x-internals@npm:7.28.0"
2596+
"@mui/x-internals@npm:7.29.0":
2597+
version: 7.29.0
2598+
resolution: "@mui/x-internals@npm:7.29.0"
26082599
dependencies:
26092600
"@babel/runtime": ^7.25.7
2610-
"@mui/utils": ^5.16.6 || ^6.0.0 || ^7.0.0 || ^7.0.0-beta
2601+
"@mui/utils": ^5.16.6 || ^6.0.0 || ^7.0.0
26112602
peerDependencies:
26122603
react: ^17.0.0 || ^18.0.0 || ^19.0.0
2613-
checksum: ca2a00dc7d6564d0a6c866f6e81ee6333c7a8f2643b85f78106aff5a0e835817d4f2fb834046ba28681dce003287b54eff53dd6b28cbbeb405070b11d3a7d332
2604+
checksum: 3e246226bddc03bafe2be7128ea22f9c4a44a5e94bc44f67e630e1c2288f601be3514dec034ab1f2b3bef6937715671cbcc65818338b218f50b89b34d9948290
26142605
languageName: node
26152606
linkType: hard
26162607

@@ -3904,9 +3895,9 @@ __metadata:
39043895
linkType: hard
39053896

39063897
"ace-builds@npm:^1.36.2":
3907-
version: 1.39.1
3908-
resolution: "ace-builds@npm:1.39.1"
3909-
checksum: c113358bd54344451e2bff2f76f9a1638e224b9a6d65df2588d212761be6da6bc45de0a26d81dcd67721b9a214784c6eab3af50179f562fd67b696f3c1daacf3
3898+
version: 1.40.0
3899+
resolution: "ace-builds@npm:1.40.0"
3900+
checksum: 606e3582779f0ce6efed8ce71863be964c357f98f858f43cd34d2dc0ec9d256e2e30fbbd55d75c948476e729e3cb7a7c981cbf2b00906937fe68c9c2a8cb9568
39103901
languageName: node
39113902
linkType: hard
39123903

@@ -4613,9 +4604,9 @@ __metadata:
46134604
linkType: hard
46144605

46154606
"bignumber.js@npm:^9.0.0, bignumber.js@npm:^9.2.0":
4616-
version: 9.2.1
4617-
resolution: "bignumber.js@npm:9.2.1"
4618-
checksum: 992da2b0e075ca94666c033a5d204ca29814dc29762b2fc97cef47ca94b9d31e4720224b38f125730606ee314c6114b508409a6466032ab9d28278dc3df3a43f
4607+
version: 9.3.0
4608+
resolution: "bignumber.js@npm:9.3.0"
4609+
checksum: 580d783d60246e758e527fa879ae0d282d8f250f555dd0fcee1227d680186ceba49ed7964c6d14e2e8d8eac7a2f4dd6ef1b7925dc52f5fc28a5a87639dd2dbd1
46194610
languageName: node
46204611
linkType: hard
46214612

@@ -5203,9 +5194,9 @@ __metadata:
52035194
linkType: hard
52045195

52055196
"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001688, caniuse-lite@npm:^1.0.30001702":
5206-
version: 1.0.30001713
5207-
resolution: "caniuse-lite@npm:1.0.30001713"
5208-
checksum: 45fd9ae77965a694818d495671ba3e9a87e4eed063824b2244c0b83b1ab0ba2d8e71dcd45441f638caadf8f0c99e154a4326bbef5c291327090cdc38feeda6fd
5197+
version: 1.0.30001715
5198+
resolution: "caniuse-lite@npm:1.0.30001715"
5199+
checksum: c8371dceca0177518e43de537c74a01e64428ea65250d597c13472cf8277ffbc800c9a729ff0e7d271c8445ae90976ba64a170232b4498aee9552d993287a4c4
52095200
languageName: node
52105201
linkType: hard
52115202

@@ -5256,11 +5247,11 @@ __metadata:
52565247
linkType: hard
52575248

52585249
"chart.js@npm:^4.4.7":
5259-
version: 4.4.8
5260-
resolution: "chart.js@npm:4.4.8"
5250+
version: 4.4.9
5251+
resolution: "chart.js@npm:4.4.9"
52615252
dependencies:
52625253
"@kurkle/color": ^0.3.0
5263-
checksum: f6d7532f3f014d8d28d5e2a95c2aac362d22d2bd09fcdabcb7529ac21affc81670fc6920f78400d97ca80c13f274df7036c54b76340efbb4b0be63ced13c602a
5254+
checksum: f41f3a2bb835c32431fe95ae765028d08fb4844347ea307f803dbe9fd84df4bf8d02750ff9c084d7ab9c47b22ae243f40eb97600bc9536192089a035929db88c
52645255
languageName: node
52655256
linkType: hard
52665257

@@ -6639,9 +6630,9 @@ __metadata:
66396630
linkType: hard
66406631

66416632
"electron-to-chromium@npm:^1.5.73":
6642-
version: 1.5.137
6643-
resolution: "electron-to-chromium@npm:1.5.137"
6644-
checksum: 000803b46f87a52fda756ffcb92b7e8baa1ccd5c2545fde46f35b8f10f9d7e1d0d8681532f8ef2e9ee2e0367c63772554f04966abd8576b3403204fdf684a2b5
6633+
version: 1.5.139
6634+
resolution: "electron-to-chromium@npm:1.5.139"
6635+
checksum: 7a229d57ad820c4d9964867bb35a8e03014bf5c9995fbfd5e3a9402e0328e55d79123b1c801bef912ef8da18a067e443d1467c356f5a64a7b2920fe805510a83
66456636
languageName: node
66466637
linkType: hard
66476638

@@ -7088,17 +7079,17 @@ __metadata:
70887079
linkType: hard
70897080

70907081
"eslint@npm:^9.23.0":
7091-
version: 9.24.0
7092-
resolution: "eslint@npm:9.24.0"
7082+
version: 9.25.0
7083+
resolution: "eslint@npm:9.25.0"
70937084
dependencies:
70947085
"@eslint-community/eslint-utils": ^4.2.0
70957086
"@eslint-community/regexpp": ^4.12.1
70967087
"@eslint/config-array": ^0.20.0
7097-
"@eslint/config-helpers": ^0.2.0
7098-
"@eslint/core": ^0.12.0
7088+
"@eslint/config-helpers": ^0.2.1
7089+
"@eslint/core": ^0.13.0
70997090
"@eslint/eslintrc": ^3.3.1
7100-
"@eslint/js": 9.24.0
7101-
"@eslint/plugin-kit": ^0.2.7
7091+
"@eslint/js": 9.25.0
7092+
"@eslint/plugin-kit": ^0.2.8
71027093
"@humanfs/node": ^0.16.6
71037094
"@humanwhocodes/module-importer": ^1.0.1
71047095
"@humanwhocodes/retry": ^0.4.2
@@ -7133,7 +7124,7 @@ __metadata:
71337124
optional: true
71347125
bin:
71357126
eslint: bin/eslint.js
7136-
checksum: fb4cdca007fe8b66d6c1ae8e682ce504afc116ab9a0ba264a69ff7cd40833ad02d9b86394685563175d202c31dbb57b31de46687cfa10ed890c7ae560f560871
7127+
checksum: 1835db3b2e5ace70b719de89212e56c529f3d0c6be5a7cc7bb3d0403b31ba64b46c2d5fe3d4aaf8e1bd9d854becebb1ee400e21bb72bf792ac2a1977bf5e33b6
71377128
languageName: node
71387129
linkType: hard
71397130

@@ -7454,15 +7445,15 @@ __metadata:
74547445
languageName: node
74557446
linkType: hard
74567447

7457-
"fdir@npm:^6.4.3":
7458-
version: 6.4.3
7459-
resolution: "fdir@npm:6.4.3"
7448+
"fdir@npm:^6.4.4":
7449+
version: 6.4.4
7450+
resolution: "fdir@npm:6.4.4"
74607451
peerDependencies:
74617452
picomatch: ^3 || ^4
74627453
peerDependenciesMeta:
74637454
picomatch:
74647455
optional: true
7465-
checksum: fa53e13c63e8c14add5b70fd47e28267dd5481ebbba4b47720ec25aae7d10a800ef0f2e33de350faaf63c10b3d7b64138925718832220d593f75e724846c736d
7456+
checksum: 79043610236579ffbd0647c508b43bd030a2d034a17c43cf96813a00e8e92e51acdb115c6ddecef3b5812cc2692b976155b4f6413e51e3761f1e772fa019a321
74667457
languageName: node
74677458
linkType: hard
74687459

@@ -12898,15 +12889,15 @@ __metadata:
1289812889
languageName: node
1289912890
linkType: hard
1290012891

12901-
"react-data-grid@https://github.com/pgadmin-org/react-data-grid.git#3dfc2ca01a046d55c1c7a45392dcec104815dc76":
12902-
version: 7.0.0-beta.47
12903-
resolution: "react-data-grid@https://github.com/pgadmin-org/react-data-grid.git#commit=3dfc2ca01a046d55c1c7a45392dcec104815dc76"
12892+
"react-data-grid@https://github.com/pgadmin-org/react-data-grid.git#da939d3b434e70781e6b228efebc5235e542d002":
12893+
version: 7.0.0-beta.52
12894+
resolution: "react-data-grid@https://github.com/pgadmin-org/react-data-grid.git#commit=da939d3b434e70781e6b228efebc5235e542d002"
1290412895
dependencies:
1290512896
clsx: ^2.0.0
1290612897
peerDependencies:
12907-
react: ^18.0 || ^19.0
12908-
react-dom: ^18.0 || ^19.0
12909-
checksum: 47c06eebc3b957e22256552a54193e234d4ea7117f8efa6842abcb2f7f9f6c9f8a936a39ff4870dd5fc4f8a9c834a05a301c4bff065ebd0bac7735d7bb53a8d3
12898+
react: ^19.0
12899+
react-dom: ^19.0
12900+
checksum: 4abe0be01befcf0e8fbc4ac73761faf6f0f7b02b9ed48fdf75e5719fe5d0498d95799119707c7479684e4308b0d875f618b2ffed8a91bdf21d912a01f28d2c72
1291012901
languageName: node
1291112902
linkType: hard
1291212903

@@ -13696,7 +13687,7 @@ __metadata:
1369613687
react-arborist: ^3.2.0
1369713688
react-aspen: ^1.1.0
1369813689
react-checkbox-tree: ^1.7.2
13699-
react-data-grid: "https://github.com/pgadmin-org/react-data-grid.git#3dfc2ca01a046d55c1c7a45392dcec104815dc76"
13690+
react-data-grid: "https://github.com/pgadmin-org/react-data-grid.git#da939d3b434e70781e6b228efebc5235e542d002"
1370013691
react-dnd: ^16.0.1
1370113692
react-dnd-html5-backend: ^16.0.1
1370213693
react-dom: ^18.2.0
@@ -14375,14 +14366,14 @@ __metadata:
1437514366
linkType: hard
1437614367

1437714368
"sql-formatter@npm:^15.5.1":
14378-
version: 15.5.2
14379-
resolution: "sql-formatter@npm:15.5.2"
14369+
version: 15.6.0
14370+
resolution: "sql-formatter@npm:15.6.0"
1438014371
dependencies:
1438114372
argparse: ^2.0.1
1438214373
nearley: ^2.20.1
1438314374
bin:
1438414375
sql-formatter: bin/sql-formatter-cli.cjs
14385-
checksum: 0593149956814435e104b84a5ed5adc7bb5256ff02f2fc38b2fbc47d61053c789581662b52af5ecbc58ad252c6cea3cafced444925970bc547e2c7281a998eab
14376+
checksum: 8657834daf9286c3855b4a04198040a03824cd22aefde33c0a4e807686d3199bbdf85b0caa463852c35b01a89e3b24c1b2d7d549a4aa9233d9f1bfd836966271
1438614377
languageName: node
1438714378
linkType: hard
1438814379

@@ -15051,12 +15042,12 @@ __metadata:
1505115042
linkType: hard
1505215043

1505315044
"tinyglobby@npm:^0.2.12":
15054-
version: 0.2.12
15055-
resolution: "tinyglobby@npm:0.2.12"
15045+
version: 0.2.13
15046+
resolution: "tinyglobby@npm:0.2.13"
1505615047
dependencies:
15057-
fdir: ^6.4.3
15048+
fdir: ^6.4.4
1505815049
picomatch: ^4.0.2
15059-
checksum: ef9357fa1b2b661afdccd315cb4995f5f36bce948faaace68aae85fe57bdd8f837883045c88efc50d3186bac6586e4ae2f31026b9a3aac061b884217e6092e23
15050+
checksum: 3a2e87a2518cb3616057b0aa58be4f17771ae78c6890556516ae1e631f8ce4cfee1ba1dcb62fcc54a64e2bdd6c3104f4f3d021e1a3e3f8fb0875bca380b913e5
1506015051
languageName: node
1506115052
linkType: hard
1506215053

@@ -15868,8 +15859,8 @@ __metadata:
1586815859
linkType: hard
1586915860

1587015861
"webpack@npm:^5.98.0":
15871-
version: 5.99.5
15872-
resolution: "webpack@npm:5.99.5"
15862+
version: 5.99.6
15863+
resolution: "webpack@npm:5.99.6"
1587315864
dependencies:
1587415865
"@types/eslint-scope": ^3.7.7
1587515866
"@types/estree": ^1.0.6
@@ -15899,7 +15890,7 @@ __metadata:
1589915890
optional: true
1590015891
bin:
1590115892
webpack: bin/webpack.js
15902-
checksum: e21e513752eca2bd50f6f17bba904383d633d223b981e824ca581699b18c262bc6598c81ab93020cb722409740cdff475b4f0951593f1060f9a445b25f3d6c98
15893+
checksum: 3be2e88c874cde705aefae11715d290c9b4cf3d678d435736c6f67772db5a365c312a2c8dac7dc1d4c6f56b1df8966ad4b46a69f77914595e46cce6947327521
1590315894
languageName: node
1590415895
linkType: hard
1590515896

0 commit comments

Comments
 (0)