Skip to content

Commit 497fed5

Browse files
authored
chore: Frontend Dependency Upgrades (#134)
* Upgraded frontend packages * MUI, react, json forms
1 parent 95481f5 commit 497fed5

17 files changed

Lines changed: 7858 additions & 17439 deletions

packages/client/package-lock.json

Lines changed: 7818 additions & 17389 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/client/package.json

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,56 +9,47 @@
99
"prettier": "prettier -l \"src/**/*.ts(x)\"",
1010
"prettier:fix": "prettier -wl \"src/**/*.ts(x)\"",
1111
"preview": "vite preview",
12-
"storybook": "storybook dev -p 6006",
13-
"build-storybook": "storybook build",
1412
"introspection": "graphql-codegen --config graphql-codegen.yml",
1513
"i18next": "i18next -s",
1614
"prepare": "husky"
1715
},
1816
"dependencies": {
1917
"@apollo/client": "^3.8.3",
20-
"@bu-sail/saas-view": "^0.0.2",
18+
"@bu-sail/saas-view": "^0.0.4",
2119
"@emotion/react": "^11.11.1",
2220
"@emotion/styled": "^11.11.0",
2321
"@firebase/app": "^0.14.7",
2422
"@firebase/auth": "^1.12.0",
25-
"@jsonforms/core": "3.2.0",
26-
"@jsonforms/material-renderers": "3.2.0",
27-
"@jsonforms/react": "3.2.0",
28-
"@mui/icons-material": "^5.11.16",
29-
"@mui/material": "^5.13.5",
30-
"@mui/x-data-grid": "^6.11.0",
31-
"@mui/x-data-grid-pro": "^6.10.1",
32-
"@mui/x-date-pickers": "^6.9.0",
23+
"@jsonforms/core": "^3.7.0",
24+
"@jsonforms/material-renderers": "^3.7.0",
25+
"@jsonforms/react": "^3.7.0",
26+
"@mui/icons-material": "^7.3.9",
27+
"@mui/material": "^7.3.9",
28+
"@mui/x-data-grid": "^7.3.9",
29+
"@mui/x-data-grid-pro": "^7.3.9",
30+
"@mui/x-date-pickers": "^8.0.0",
3331
"ajv": "^8.12.0",
3432
"ajv-errors": "^3.0.0",
3533
"axios": "^1.6.2",
3634
"esbuild": "^0.19.0",
3735
"firebaseui": "^6.1.0",
3836
"graphql": "^16.8.0",
39-
"i18next": "^23.8.2",
37+
"i18next": "^25.10.9",
4038
"i18next-browser-languagedetector": "^7.2.0",
4139
"i18next-http-backend": "^2.4.3",
4240
"injection-js": "^2.4.0",
4341
"jwt-decode": "^3.1.2",
44-
"react": "^18.2.0",
45-
"react-dom": "^18.2.0",
46-
"react-i18next": "^14.0.1",
47-
"react-router-dom": "^6.12.1",
42+
"react": "^19.2.0",
43+
"react-dom": "^19.2.0",
44+
"react-i18next": "^16.6.1",
45+
"react-router-dom": "^7.13.2",
4846
"styled-components": "^5.3.10"
4947
},
5048
"devDependencies": {
5149
"@graphql-codegen/cli": "^5.0.0",
5250
"@graphql-codegen/client-preset": "^4.1.0",
5351
"@graphql-codegen/near-operation-file-preset": "^2.5.0",
5452
"@graphql-codegen/typescript-react-apollo": "^3.3.7",
55-
"@storybook/addon-essentials": "^7.0.20",
56-
"@storybook/addon-interactions": "^7.0.20",
57-
"@storybook/addon-links": "^7.0.20",
58-
"@storybook/blocks": "^7.0.20",
59-
"@storybook/react": "^7.0.20",
60-
"@storybook/react-vite": "^7.0.20",
61-
"@storybook/testing-library": "^0.0.14-next.2",
6253
"@types/react": "^18.0.37",
6354
"@types/react-dom": "^18.0.11",
6455
"@types/styled-components": "^5.1.26",
@@ -73,7 +64,6 @@
7364
"i18next-parser": "^9.0.0",
7465
"prettier": "2.8.8",
7566
"prop-types": "^15.8.1",
76-
"storybook": "^7.0.20",
7767
"typescript": "^5.0.2",
7868
"vite": "^4.3.9"
7969
},

packages/client/src/components/DatasetTable.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export const DatasetTable: React.FC<DatasetTableProps> = (props) => {
2121
const { pushSnackbarMessage } = useSnackbar();
2222
const [deleteEntryMutation] = useDeleteEntryMutation();
2323
const confirmation = useConfirmation();
24-
const [selectedRows, setSelectedRows] = useState<GridRowId[]>([]);
24+
const [selectedRows, setSelectedRows] = useState<readonly GridRowId[]>([]);
2525
const [paginationModel, setPaginationModel] = useState<{ page: number; pageSize: number }>({ page: 0, pageSize: 10 });
2626

2727
const defaultColumns: GridColDef[] = [

packages/client/src/components/Environment.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ function FieldSelector<T>(props: FieldSelectorProps<T>) {
6161
<InputLabel>{props.label}</InputLabel>
6262
<Select
6363
value={props.value || ''}
64-
onChange={(event, _child) => handleChange(event.target.value)}
64+
onChange={(event, _child) => handleChange(event.target.value as any)}
6565
renderValue={(option) => props.display(option)}
6666
>
6767
{props.options.map((option) => (

packages/client/src/components/TagTraining.component.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export const TagTrainingComponent: React.FC<TagTrainingComponentProps> = (props)
5858
headerName: 'Training',
5959
width: 200,
6060
sortable: false,
61-
valueGetter: (params) => !!trainingSet.find((id) => params.row._id == id),
61+
valueGetter: (_value, row) => !!trainingSet.find((id) => row._id == id),
6262
renderHeader: (_params: GridColumnHeaderParams) => {
6363
const grid = useGridApiContext();
6464
const entryIDs = new Set<string>(Array.from(grid.current.getRowModels().keys()).map((id) => id.toString()));
@@ -88,7 +88,7 @@ export const TagTrainingComponent: React.FC<TagTrainingComponentProps> = (props)
8888
headerName: 'Available for Tagging',
8989
width: 250,
9090
sortable: false,
91-
valueGetter: (params) => !!taggingSet.find((id) => params.row._id == id),
91+
valueGetter: (_value, row) => !!taggingSet.find((id) => row._id == id),
9292
renderHeader: (_params: GridColumnHeaderParams) => {
9393
const grid = useGridApiContext();
9494
const entryIDs = new Set<string>(Array.from(grid.current.getRowModels().keys()).map((id) => id.toString()));

packages/client/src/components/tag/view/AslLexGridView.component.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,21 @@ export const getAslLexCols: GetGridColDefs = (uischema, schema, property) => {
4747
field: `${property}-video`,
4848
headerName: `${property}: ${i18next.t('common.video')}`,
4949
width: 350,
50-
valueGetter: (params) => params.row.data[property]?.field?.lexiconEntry.video,
50+
valueGetter: (_value, row) => row.data[property]?.field?.lexiconEntry.video,
5151
renderCell: (params) =>
5252
params.value && <AslLexGridViewVideo data={params.value} schema={schema} uischema={uischema} />
5353
},
5454
{
5555
field: `${property}-key`,
5656
headerName: `${property}: ${i18next.t('common.key')}`,
57-
valueGetter: (params) => params.row.data[property]?.field?.lexiconEntry.key,
57+
valueGetter: (_value, row) => row.data[property]?.field?.lexiconEntry.key,
5858
renderCell: (params) =>
5959
params.value && <AslLexGridViewKey data={params.value} schema={schema} uischema={uischema} />
6060
},
6161
{
6262
field: `${property}-primary`,
6363
headerName: `${property}: ${i18next.t('common.primary')}`,
64-
valueGetter: (params) => params.row.data[property]?.field?.lexiconEntry.primary,
64+
valueGetter: (_value, row) => row.data[property]?.field?.lexiconEntry.primary,
6565
renderCell: (params) =>
6666
params.value && <AslLexGridViewPrimary data={params.value} schema={schema} uischema={uischema} />
6767
}

packages/client/src/components/tag/view/BooleanGridView.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const getBoolCols: GetGridColDefs = (uischema, schema, property) => {
1919
{
2020
field: property,
2121
headerName: property,
22-
valueGetter: (params) => params.row.data[property]?.field?.boolValue,
22+
valueGetter: (_value, row) => row.data[property]?.field?.boolValue,
2323
renderCell: (params) =>
2424
params.value && <BooleanGridView data={params.row.data[property]} schema={schema} uischema={uischema} />
2525
}

packages/client/src/components/tag/view/FreeTextGridView.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const getTextCols: GetGridColDefs = (uischema, schema, property) => {
1818
{
1919
field: property,
2020
headerName: property,
21-
valueGetter: (params) => params.row.data[property]?.field?.textValue,
21+
valueGetter: (_value, row) => row.data[property]?.field?.textValue,
2222
renderCell: (params) =>
2323
params.value && <FreeTextGridView data={params.value} schema={schema} uischema={uischema} />
2424
}

packages/client/src/components/tag/view/NumericGridView.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const getNumericCols: GetGridColDefs = (uischema, schema, property) => {
1818
{
1919
field: property,
2020
headerName: property,
21-
valueGetter: (params) => params.row.data[property]?.field?.numericValue,
21+
valueGetter: (_value, row) => row.data[property]?.field?.numericValue,
2222
renderCell: (params) =>
2323
params.value && <NumericGridView data={params.value} schema={schema} uischema={uischema} />
2424
}

packages/client/src/components/tag/view/SliderGridView.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const getSliderCols: GetGridColDefs = (uischema, schema, property) => {
1818
{
1919
field: property,
2020
headerName: property,
21-
valueGetter: (params) => params.row.data && params.row.data[property],
21+
valueGetter: (_value, row) => row.data && row.data[property],
2222
renderCell: (params) =>
2323
params.value && <SliderGridView data={params.row.value} schema={schema} uischema={uischema} />
2424
}

0 commit comments

Comments
 (0)