separating upload modal and fixing broken test reference in package.json

Smithsonian · Feb 5, 2025 · e2811bb · e2811bb
1 parent 4d44ab5
commit e2811bb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git 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 (
     <>
       <GridToolbarContainer>
@@ -250,11 +254,18 @@ const EditToolbar = (props: EditToolbarProps) => {
             >
               Export as CSV...
             </Button>
+            {uploadButton && (
+              <Tooltip title={uploadButton.tooltip} placement="bottom">
+                <Button variant="plain" color="primary" onClick={uploadButton.onClick} startDecorator={<UploadIcon />}>
+                  {uploadButton.label}
+                </Button>
+              </Tooltip>
+            )}
             <Stack direction={'row'} spacing={2}>
               <Dropdown>
                 <MenuButton>Other</MenuButton>
                 <Menu>
-                  {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
@@ -33,13 +33,7 @@ export const LoginLogout = () => {
           <Typography level="title-sm">Login to access</Typography>
           <Typography level="body-xs">your information</Typography>
         </Box>
-        <IconButton
-          size="sm"
-          variant="plain"
-          color="neutral"
-          onClick={() => handleRetryLogin()}
-          aria-label={'Login' + ' button'}
-        >
+        <IconButton size="sm" variant="plain" color="neutral" onClick={() => handleRetryLogin()} aria-label={'Login' + ' button'}>
           <LoginRoundedIcon />
         </IconButton>
       </Box>

diff --git 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",