diff --git a/frontend/components/datagrids/measurementscommons.tsx b/frontend/components/datagrids/measurementscommons.tsx index 519e947f..d555e126 100644 --- a/frontend/components/datagrids/measurementscommons.tsx +++ b/frontend/components/datagrids/measurementscommons.tsx @@ -28,6 +28,7 @@ import DeleteIcon from '@mui/icons-material/DeleteOutlined'; import SaveIcon from '@mui/icons-material/Save'; import CancelIcon from '@mui/icons-material/Close'; import RefreshIcon from '@mui/icons-material/Refresh'; +import UploadIcon from '@mui/icons-material/Upload'; import Box from '@mui/joy/Box'; import { Button, @@ -193,6 +194,9 @@ const EditToolbar = (props: EditToolbarProps) => { .filter(column => !Object.keys(apiRef.current.state.columns.columnVisibilityModel).includes(column.field)) .map(column => column.field); + const uploadButton = dynamicButtons.find((button: any) => button.label === 'Upload'); + const otherButtons = dynamicButtons.filter((button: any) => button.label !== 'Upload'); + return ( <> @@ -250,11 +254,18 @@ const EditToolbar = (props: EditToolbarProps) => { > Export as CSV... + {uploadButton && ( + + + + )} Other - {dynamicButtons.map((button: any, index: number) => ( + {otherButtons.map((button: any, index: number) => ( <> {button.tooltip ? ( <> diff --git a/frontend/components/loginlogout.tsx b/frontend/components/loginlogout.tsx index 6e81fe4e..12a441e4 100644 --- a/frontend/components/loginlogout.tsx +++ b/frontend/components/loginlogout.tsx @@ -33,13 +33,7 @@ export const LoginLogout = () => { Login to access your information - handleRetryLogin()} - aria-label={'Login' + ' button'} - > + handleRetryLogin()} aria-label={'Login' + ' button'}> diff --git a/frontend/package.json b/frontend/package.json index b486fd54..223d79cc 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -19,7 +19,6 @@ "lint": "next lint --fix && prettier --write .", "format": "prettier --write .", "cypress:open": "cypress open", - "test": "npm run component:headless && npm run e2e:headless", "e2e": "start-server-and-test dev http://localhost:3000 \"cypress open --e2e\"", "e2e:headless": "start-server-and-test start http://localhost:3000 \"cypress run --e2e\"", "component": "cypress open --component",