diff --git a/app/src/components/attachments/list/AttachmentsList.test.tsx b/app/src/components/attachments/list/AttachmentsList.test.tsx index a61432efb8..55de4d84d2 100644 --- a/app/src/components/attachments/list/AttachmentsList.test.tsx +++ b/app/src/components/attachments/list/AttachmentsList.test.tsx @@ -118,7 +118,7 @@ describe('AttachmentsList', () => { handleDelete={jest.fn()} handleViewDetails={jest.fn()} handleRemoveOrResubmit={jest.fn()} - emptyStateText="No Shared Files" + emptyStateText="No shared files found" /> @@ -126,7 +126,7 @@ describe('AttachmentsList', () => { ); - expect(getByText('No Shared Files')).toBeInTheDocument(); + expect(getByText('No shared files found')).toBeInTheDocument(); }); it('renders correctly with attachments (of various sizes)', async () => { diff --git a/app/src/components/attachments/list/AttachmentsList.tsx b/app/src/components/attachments/list/AttachmentsList.tsx index b62588f6bd..81956fe33b 100644 --- a/app/src/components/attachments/list/AttachmentsList.tsx +++ b/app/src/components/attachments/list/AttachmentsList.tsx @@ -1,18 +1,14 @@ import { mdiFileOutline, mdiLockOutline } from '@mdi/js'; import Icon from '@mdi/react'; -import { Theme } from '@mui/material'; -import Box from '@mui/material/Box'; -import { grey } from '@mui/material/colors'; import Link from '@mui/material/Link'; +import Stack from '@mui/material/Stack'; import Table from '@mui/material/Table'; import TableBody from '@mui/material/TableBody'; import TableCell from '@mui/material/TableCell'; import TableContainer from '@mui/material/TableContainer'; import TableHead from '@mui/material/TableHead'; import TableRow from '@mui/material/TableRow'; -import { makeStyles } from '@mui/styles'; -import { SubmitStatusChip } from 'components/chips/SubmitStatusChip'; -import { ProjectRoleGuard, SystemRoleGuard } from 'components/security/Guards'; +import { ProjectRoleGuard } from 'components/security/Guards'; import { PublishStatus } from 'constants/attachments'; import { PROJECT_PERMISSION, SYSTEM_ROLE } from 'constants/roles'; import NoSurveySectionData from 'features/surveys/components/NoSurveySectionData'; @@ -23,30 +19,6 @@ import AttachmentsListItemMenuButton from './AttachmentsListItemMenuButton'; //TODO: PRODUCTION_BANDAGE: Remove -const useStyles = makeStyles((theme: Theme) => ({ - attachmentsTable: { - tableLayout: 'fixed' - }, - attachmentsTableLockIcon: { - marginTop: '3px', - color: grey[600] - }, - attachmentNameCol: { - overflow: 'hidden', - textOverflow: 'ellipsis' - }, - fileIcon: { - marginRight: theme.spacing(2), - marginLeft: theme.spacing(3), - color: '#1a5a96' - }, - noDocuments: { - height: '66px', - color: theme.palette.text.secondary, - fontWeight: 700 - } -})); - export interface IAttachmentsListProps { attachments: T[]; handleDownload: (attachment: T) => void; @@ -57,8 +29,6 @@ export interface IAttachmentsListProps(props: IAttachmentsListProps) => { - const classes = useStyles(); - const { attachments, handleDownload, handleDelete, handleViewDetails, handleRemoveOrResubmit } = props; const [rowsPerPage] = useState(10); @@ -70,14 +40,15 @@ const AttachmentsList = return ( - +
Name - Type - - Status - + Type @@ -90,30 +61,32 @@ const AttachmentsList = const icon: string = attachmentStatus === PublishStatus.SUBMITTED ? mdiLockOutline : mdiFileOutline; return ( - - - - - handleDownload(attachment)} - tabIndex={0}> + + + + + handleDownload(attachment)} tabIndex={0}> {attachment.fileName} - + {attachment.fileType} - - - - - diff --git a/app/src/components/data-grid/StyledDataGrid.tsx b/app/src/components/data-grid/StyledDataGrid.tsx index 95b378a4e1..5040309d88 100644 --- a/app/src/components/data-grid/StyledDataGrid.tsx +++ b/app/src/components/data-grid/StyledDataGrid.tsx @@ -25,17 +25,26 @@ export const StyledDataGrid = (props: StyledDataGridProps) => { '& *:focus-within': { outline: 'none !important' }, + '& .MuiDataGrid-columnHeaders': { + background: grey[50] + }, '& .MuiDataGrid-columnHeaderTitle': { textTransform: 'uppercase', fontWeight: 700 }, - '& .MuiDataGrid-row:nth-of-type(odd)': { - backgroundColor: grey[50] - }, '& .MuiDataGrid-row:last-of-type': { '& .MuiDataGrid-cell': { borderBottom: 'none' } + }, + '& .MuiDataGrid-row:hover': { + backgroundColor: 'transparent' + }, + '& .MuiDataGrid-columnHeader:first-of-type, .MuiDataGrid-cell:first-of-type': { + pl: 2 + }, + '& .MuiDataGrid-columnHeader:last-of-type, .MuiDataGrid-cell:last-of-type': { + pr: 2 } }} /> diff --git a/app/src/components/data-grid/StyledDataGridOverlay.tsx b/app/src/components/data-grid/StyledDataGridOverlay.tsx index a18f6a3a60..96f0d63422 100644 --- a/app/src/components/data-grid/StyledDataGridOverlay.tsx +++ b/app/src/components/data-grid/StyledDataGridOverlay.tsx @@ -2,7 +2,7 @@ import Typography from '@mui/material/Typography'; import { GridOverlay } from '@mui/x-data-grid'; const StyledDataGridOverlay = (props: { message?: string }) => ( - + {props.message ?? 'No records found'} diff --git a/app/src/components/publish/PublishSurveyDialog.tsx b/app/src/components/publish/PublishSurveyDialog.tsx index 2286a71081..1488a7ac90 100644 --- a/app/src/components/publish/PublishSurveyDialog.tsx +++ b/app/src/components/publish/PublishSurveyDialog.tsx @@ -146,11 +146,18 @@ const PublishSurveyDialog = (props: IPublishSurveyIdDialogProps) => { - + - Last Published: - {' '} - {publishDate} + {publishDate ? ( + + Status:  Published ({publishDate}) + + ) : ( + + Status:  Unpublished + + )} + = (props) => { - +
= (props) => { - +
= (props) => { {activeUsers.length > 0 && activeUsers.slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage).map((row, index) => ( - + {row.user_identifier || 'No identifier'} diff --git a/app/src/features/admin/users/UsersDetailProjects.tsx b/app/src/features/admin/users/UsersDetailProjects.tsx index e5cf5c4c95..0687584948 100644 --- a/app/src/features/admin/users/UsersDetailProjects.tsx +++ b/app/src/features/admin/users/UsersDetailProjects.tsx @@ -187,7 +187,7 @@ const UsersDetailProjects: React.FC = (props) => { - +
diff --git a/app/src/features/funding-sources/list/FundingSourcesListPage.tsx b/app/src/features/funding-sources/list/FundingSourcesListPage.tsx index aa77ba1c54..886a01cb1e 100644 --- a/app/src/features/funding-sources/list/FundingSourcesListPage.tsx +++ b/app/src/features/funding-sources/list/FundingSourcesListPage.tsx @@ -127,7 +127,7 @@ const FundingSourcesListPage: React.FC = () => { - + { diff --git a/app/src/features/funding-sources/list/FundingSourcesTable.test.tsx b/app/src/features/funding-sources/list/FundingSourcesTable.test.tsx index 1c7d673c9e..987507aebb 100644 --- a/app/src/features/funding-sources/list/FundingSourcesTable.test.tsx +++ b/app/src/features/funding-sources/list/FundingSourcesTable.test.tsx @@ -18,7 +18,7 @@ describe('FundingSourcesTable', () => { ); await waitFor(() => { - expect(getByText('No Funding Sources available')).toBeVisible(); + expect(getByText('No funding sources found')).toBeVisible(); }); }); diff --git a/app/src/features/funding-sources/list/FundingSourcesTable.tsx b/app/src/features/funding-sources/list/FundingSourcesTable.tsx index 3f87dc5520..b5891c99f9 100644 --- a/app/src/features/funding-sources/list/FundingSourcesTable.tsx +++ b/app/src/features/funding-sources/list/FundingSourcesTable.tsx @@ -63,7 +63,7 @@ const FundingSourcesTable = (props: IFundingSourcesTableTableProps) => { return ( `funding-source-${row.funding_source_id}`} diff --git a/app/src/features/projects/list/ProjectsListPage.tsx b/app/src/features/projects/list/ProjectsListPage.tsx index ec2449e937..7d155f8b6c 100644 --- a/app/src/features/projects/list/ProjectsListPage.tsx +++ b/app/src/features/projects/list/ProjectsListPage.tsx @@ -1,17 +1,15 @@ import { mdiFilterOutline, mdiPlus } from '@mdi/js'; import Icon from '@mdi/react'; -import { Theme } from '@mui/material'; import Box from '@mui/material/Box'; import Button from '@mui/material/Button'; -import { grey } from '@mui/material/colors'; import Container from '@mui/material/Container'; import Divider from '@mui/material/Divider'; import Link from '@mui/material/Link'; import Paper from '@mui/material/Paper'; import Toolbar from '@mui/material/Toolbar'; import Typography from '@mui/material/Typography'; -import { makeStyles } from '@mui/styles'; -import { DataGrid, GridColDef, GridOverlay, GridPaginationModel, GridSortModel } from '@mui/x-data-grid'; +import { GridColDef, GridPaginationModel, GridSortModel } from '@mui/x-data-grid'; +import { StyledDataGrid } from 'components/data-grid/StyledDataGrid'; import PageHeader from 'components/layout/PageHeader'; import { IProjectAdvancedFilters } from 'components/search-filter/ProjectAdvancedFilters'; import { SystemRoleGuard } from 'components/security/Guards'; @@ -21,56 +19,16 @@ import { CodesContext } from 'contexts/codesContext'; import { useBiohubApi } from 'hooks/useBioHubApi'; import useDataLoader from 'hooks/useDataLoader'; import { IProjectsListItemData } from 'interfaces/useProjectApi.interface'; -import { useCallback, useContext, useEffect, useState } from 'react'; +import { useContext, useEffect, useState } from 'react'; import { Link as RouterLink } from 'react-router-dom'; import { ApiPaginationRequestOptions } from 'types/misc'; import { firstOrNull, getFormattedDate } from 'utils/Utils'; import ProjectsListFilterForm from './ProjectsListFilterForm'; -const useStyles = makeStyles((theme: Theme) => ({ - projectsTable: { - tableLayout: 'fixed' - }, - linkButton: { - textAlign: 'left', - fontWeight: 700 - }, - noDataText: { - fontFamily: 'inherit !important', - fontSize: '0.875rem', - fontWeight: 700 - }, - dataGrid: { - border: 'none !important', - fontFamily: 'inherit !important', - '& .MuiDataGrid-columnHeaderTitle': { - textTransform: 'uppercase', - fontSize: '0.875rem', - fontWeight: 700, - color: grey[600] - }, - '& .MuiDataGrid-cell:focus-within, & .MuiDataGrid-cellCheckbox:focus-within, & .MuiDataGrid-columnHeader:focus-within': - { - outline: 'none !important' - }, - '& .MuiDataGrid-row:hover': { - backgroundColor: 'transparent !important' - } - } -})); - interface IProjectsListTableRow extends Omit { project_programs: string; } -const NoRowsOverlay = (props: { className: string }) => ( - - - No projects found - - -); - const pageSizeOptions = [10, 25, 50]; /** @@ -79,7 +37,6 @@ const pageSizeOptions = [10, 25, 50]; * @return {*} */ const ProjectsListPage = () => { - const classes = useStyles(); const [paginationModel, setPaginationModel] = useState({ page: 0, pageSize: pageSizeOptions[0] @@ -135,7 +92,7 @@ const ProjectsListPage = () => { disableColumnMenu: true, renderCell: (params) => ( { } ]; - const NoRowsOverlayStyled = useCallback(() => , [classes.noDataText]); - // Refresh projects when pagination or sort changes useEffect(() => { refreshProjectsList(); @@ -230,9 +185,9 @@ const ProjectsListPage = () => { handleReset={() => refreshProjectsList()} /> )} - - + { disableColumnFilter disableColumnMenu sortingOrder={['asc', 'desc']} - slots={{ - noRowsOverlay: NoRowsOverlayStyled - }} /> diff --git a/app/src/features/projects/view/ProjectAttachments.test.tsx b/app/src/features/projects/view/ProjectAttachments.test.tsx index f6accc5977..ad7fca0140 100644 --- a/app/src/features/projects/view/ProjectAttachments.test.tsx +++ b/app/src/features/projects/view/ProjectAttachments.test.tsx @@ -128,7 +128,7 @@ describe('ProjectAttachments', () => { ); await waitFor(() => { - expect(getByText('No Shared Files')).toBeInTheDocument(); + expect(getByText('No shared files found')).toBeInTheDocument(); }); }); diff --git a/app/src/features/projects/view/ProjectAttachments.tsx b/app/src/features/projects/view/ProjectAttachments.tsx index b73f2ea371..92526dbd85 100644 --- a/app/src/features/projects/view/ProjectAttachments.tsx +++ b/app/src/features/projects/view/ProjectAttachments.tsx @@ -3,7 +3,6 @@ import Icon from '@mdi/react'; import Box from '@mui/material/Box'; import Button from '@mui/material/Button'; import Divider from '@mui/material/Divider'; -import Paper from '@mui/material/Paper'; import { IReportMetaForm } from 'components/attachments/ReportMetaForm'; import FileUploadWithMetaDialog from 'components/dialog/attachments/FileUploadWithMetaDialog'; import { IUploadHandler } from 'components/file-upload/FileUploadItem'; @@ -108,10 +107,8 @@ const ProjectAttachments = () => { )} /> - - - - + + ); diff --git a/app/src/features/projects/view/ProjectAttachmentsList.tsx b/app/src/features/projects/view/ProjectAttachmentsList.tsx index cbc11b61a1..687bb17795 100644 --- a/app/src/features/projects/view/ProjectAttachmentsList.tsx +++ b/app/src/features/projects/view/ProjectAttachmentsList.tsx @@ -146,7 +146,7 @@ const ProjectAttachmentsList = () => { handleDelete={handleDelete} handleViewDetails={handleViewDetailsOpen} handleRemoveOrResubmit={handleRemoveOrResubmit} - emptyStateText="No Shared Files" + emptyStateText="No shared files found" /> ); diff --git a/app/src/features/projects/view/ProjectDetails.tsx b/app/src/features/projects/view/ProjectDetails.tsx index e67bc231c0..0957a6a13d 100644 --- a/app/src/features/projects/view/ProjectDetails.tsx +++ b/app/src/features/projects/view/ProjectDetails.tsx @@ -1,6 +1,5 @@ import { Theme } from '@mui/material'; import Box from '@mui/material/Box'; -import { grey } from '@mui/material/colors'; import Divider from '@mui/material/Divider'; import Toolbar from '@mui/material/Toolbar'; import Typography from '@mui/material/Typography'; @@ -38,7 +37,6 @@ const useStyles = makeStyles((theme: Theme) => ({ fontWeight: 700, letterSpacing: '0.02rem', textTransform: 'uppercase', - color: grey[600], '& + hr': { marginTop: theme.spacing(1.5), marginBottom: theme.spacing(1.5) diff --git a/app/src/features/surveys/components/NoSurveySectionData.tsx b/app/src/features/surveys/components/NoSurveySectionData.tsx index a727d7e71b..5df756ae0f 100644 --- a/app/src/features/surveys/components/NoSurveySectionData.tsx +++ b/app/src/features/surveys/components/NoSurveySectionData.tsx @@ -1,29 +1,17 @@ -import Paper, { PaperProps } from '@mui/material/Paper'; +import Stack from '@mui/material/Stack'; import Typography from '@mui/material/Typography'; interface NoSurveySectionDataProps { text: string; - paperVariant?: PaperProps['variant']; } -const NoSurveySectionData = ({ text, paperVariant }: NoSurveySectionDataProps) => { +const NoSurveySectionData = ({ text }: NoSurveySectionDataProps) => { return ( - <> - - - {text} - - - + + + {text} + + ); }; diff --git a/app/src/features/surveys/list/SurveysListPage.tsx b/app/src/features/surveys/list/SurveysListPage.tsx index 94221bc1d9..c7e188cd50 100644 --- a/app/src/features/surveys/list/SurveysListPage.tsx +++ b/app/src/features/surveys/list/SurveysListPage.tsx @@ -3,68 +3,26 @@ import Icon from '@mdi/react'; import { Link, Toolbar, Typography } from '@mui/material'; import Box from '@mui/material/Box'; import Button from '@mui/material/Button'; -import { grey } from '@mui/material/colors'; import Divider from '@mui/material/Divider'; -import { makeStyles } from '@mui/styles'; -import { DataGrid, GridColDef, GridOverlay, GridPaginationModel, GridSortModel } from '@mui/x-data-grid'; +import { GridColDef, GridPaginationModel, GridSortModel } from '@mui/x-data-grid'; +import { StyledDataGrid } from 'components/data-grid/StyledDataGrid'; import { ProjectRoleGuard } from 'components/security/Guards'; import { PROJECT_PERMISSION, SYSTEM_ROLE } from 'constants/roles'; import { ProjectContext } from 'contexts/projectContext'; import { SurveyBasicFieldsObject } from 'interfaces/useSurveyApi.interface'; -import { useCallback, useContext, useEffect, useState } from 'react'; +import { useContext, useEffect, useState } from 'react'; import { Link as RouterLink } from 'react-router-dom'; import { ApiPaginationRequestOptions } from 'types/misc'; import { firstOrNull } from 'utils/Utils'; const pageSizeOptions = [10, 25, 50]; -const useStyles = makeStyles(() => ({ - projectsTable: { - tableLayout: 'fixed' - }, - linkButton: { - textAlign: 'left', - fontWeight: 700 - }, - noDataText: { - fontFamily: 'inherit !important', - fontSize: '0.875rem', - fontWeight: 700 - }, - dataGrid: { - border: 'none !important', - fontFamily: 'inherit !important', - '& .MuiDataGrid-columnHeaderTitle': { - textTransform: 'uppercase', - fontSize: '0.875rem', - fontWeight: 700, - color: grey[600] - }, - '& .MuiDataGrid-cell:focus-within, & .MuiDataGrid-cellCheckbox:focus-within, & .MuiDataGrid-columnHeader:focus-within': - { - outline: 'none !important' - }, - '& .MuiDataGrid-row:hover': { - backgroundColor: 'transparent !important' - } - } -})); - -const NoRowsOverlay = (props: { className: string }) => ( - - - No surveys found - - -); - /** * List of Surveys belonging to a Project. * * @return {*} */ const SurveysListPage = () => { - const classes = useStyles(); const projectContext = useContext(ProjectContext); const [paginationModel, setPaginationModel] = useState({ page: 0, @@ -99,7 +57,7 @@ const SurveysListPage = () => { disableColumnMenu: true, renderCell: (params) => ( { flex: 1, disableColumnMenu: true, sortable: false, - renderCell: (params) => {params.value.join(', ')} + renderCell: (params) => {params.value.join(', ')} } ]; - const NoRowsOverlayStyled = useCallback(() => , [classes.noDataText]); - return ( <> @@ -146,9 +102,9 @@ const SurveysListPage = () => { - - + { disableColumnFilter disableColumnMenu sortingOrder={['asc', 'desc']} - slots={{ - noRowsOverlay: NoRowsOverlayStyled - }} /> diff --git a/app/src/features/surveys/observations/observations-table/ObservationsTable.tsx b/app/src/features/surveys/observations/observations-table/ObservationsTable.tsx index e0268dbf10..f6fb4fef81 100644 --- a/app/src/features/surveys/observations/observations-table/ObservationsTable.tsx +++ b/app/src/features/surveys/observations/observations-table/ObservationsTable.tsx @@ -561,7 +561,8 @@ const ObservationsTable = (props: ISpeciesObservationTableProps) => { borderLeft: '1px solid' + grey[300] }, '& .MuiDataGrid-columnHeaders': { - position: 'relative' + position: 'relative', + background: grey[50] }, '& .MuiDataGrid-columnHeader:focus-within': { outline: 'none', diff --git a/app/src/features/surveys/telemetry/ManualTelemetrySection.tsx b/app/src/features/surveys/telemetry/ManualTelemetrySection.tsx index 8eca559ae7..38a1548bc8 100644 --- a/app/src/features/surveys/telemetry/ManualTelemetrySection.tsx +++ b/app/src/features/surveys/telemetry/ManualTelemetrySection.tsx @@ -23,8 +23,8 @@ const ManualTelemetrySection = () => { - - + + ); diff --git a/app/src/features/surveys/telemetry/telemetry-table/ManualTelemetryTable.tsx b/app/src/features/surveys/telemetry/telemetry-table/ManualTelemetryTable.tsx index 0cbf4cb110..f25153e983 100644 --- a/app/src/features/surveys/telemetry/telemetry-table/ManualTelemetryTable.tsx +++ b/app/src/features/surveys/telemetry/telemetry-table/ManualTelemetryTable.tsx @@ -336,7 +336,8 @@ const ManualTelemetryTable = (props: IManualTelemetryTableProps) => { border: 'none', borderRadius: 0, '& .MuiDataGrid-columnHeaders': { - position: 'relative' + position: 'relative', + background: grey[50] }, '& .MuiDataGrid-columnHeader:focus-within': { outline: 'none', diff --git a/app/src/features/surveys/view/SurveyAnimals.tsx b/app/src/features/surveys/view/SurveyAnimals.tsx index 26f048e514..1bc513ccee 100644 --- a/app/src/features/surveys/view/SurveyAnimals.tsx +++ b/app/src/features/surveys/view/SurveyAnimals.tsx @@ -129,14 +129,14 @@ const SurveyAnimals: React.FC = () => { variant="contained" startIcon={} sx={{ - m: -1 + my: -1 }}> Manage Animals - + {critterData?.length ? ( { }} /> ) : ( - + )} { ); await waitFor(() => { - expect(getByText('No Documents')).toBeInTheDocument(); + expect(getByText('No documents found')).toBeInTheDocument(); }); }); diff --git a/app/src/features/surveys/view/SurveyAttachments.tsx b/app/src/features/surveys/view/SurveyAttachments.tsx index c5d369e1f5..8c7960594f 100644 --- a/app/src/features/surveys/view/SurveyAttachments.tsx +++ b/app/src/features/surveys/view/SurveyAttachments.tsx @@ -3,7 +3,6 @@ import Icon from '@mdi/react'; import Box from '@mui/material/Box'; import Button from '@mui/material/Button'; import Divider from '@mui/material/Divider'; -import Paper from '@mui/material/Paper'; import { IReportMetaForm } from 'components/attachments/ReportMetaForm'; import FileUploadWithMetaDialog from 'components/dialog/attachments/FileUploadWithMetaDialog'; import { IUploadHandler } from 'components/file-upload/FileUploadItem'; @@ -120,10 +119,8 @@ const SurveyAttachments: React.FC = () => { )} /> - - - - + + diff --git a/app/src/features/surveys/view/SurveyAttachmentsList.tsx b/app/src/features/surveys/view/SurveyAttachmentsList.tsx index bf36cf9005..029ef01d7d 100644 --- a/app/src/features/surveys/view/SurveyAttachmentsList.tsx +++ b/app/src/features/surveys/view/SurveyAttachmentsList.tsx @@ -135,6 +135,7 @@ const SurveyAttachmentsList: React.FC = () => { handleDelete={handleDelete} handleViewDetails={handleViewDetails} handleRemoveOrResubmit={handleRemoveOrResubmit} + emptyStateText="No documents found" /> ); diff --git a/app/src/features/surveys/view/SurveyHeader.tsx b/app/src/features/surveys/view/SurveyHeader.tsx index 7c2fe0f7a5..c642ea8238 100644 --- a/app/src/features/surveys/view/SurveyHeader.tsx +++ b/app/src/features/surveys/view/SurveyHeader.tsx @@ -1,4 +1,4 @@ -import { mdiChevronDown, mdiCog, mdiPencil, mdiTrashCanOutline } from '@mdi/js'; +import { mdiChevronDown, mdiCogOutline, mdiPencilOutline, mdiTrashCanOutline } from '@mdi/js'; import Icon from '@mdi/react'; import Breadcrumbs from '@mui/material/Breadcrumbs'; import Button from '@mui/material/Button'; @@ -156,33 +156,28 @@ const SurveyHeader = () => { - + {BIOHUB_FEATURE_FLAG && ( {publishDate ? ( - <> - - Published: - - - {publishDate} - - + + Status:  Published ({publishDate}) + ) : ( - - Never Published - + + Status:  Unpublished + )} @@ -229,7 +224,7 @@ const SurveyHeader = () => { onClose={() => setMenuAnchorEl(null)}> history.push('edit')}> - + Edit Survey Details diff --git a/app/src/features/surveys/view/components/spatial-data/SurveySpatialData.tsx b/app/src/features/surveys/view/components/spatial-data/SurveySpatialData.tsx index 875b3c6d6d..8bb2f94428 100644 --- a/app/src/features/surveys/view/components/spatial-data/SurveySpatialData.tsx +++ b/app/src/features/surveys/view/components/spatial-data/SurveySpatialData.tsx @@ -223,7 +223,7 @@ const SurveySpatialData = () => { - + {activeView === SurveySpatialDatasetViewEnum.OBSERVATIONS && ( )} diff --git a/app/src/features/surveys/view/components/spatial-data/SurveySpatialToolbar.tsx b/app/src/features/surveys/view/components/spatial-data/SurveySpatialToolbar.tsx index 7fda0209a8..9715144008 100644 --- a/app/src/features/surveys/view/components/spatial-data/SurveySpatialToolbar.tsx +++ b/app/src/features/surveys/view/components/spatial-data/SurveySpatialToolbar.tsx @@ -116,7 +116,7 @@ const SurveySpatialToolbar = (props: ISurveySptialToolbarProps) => { startIcon={} endIcon={} sx={{ - m: -1 + my: -1 }}> Manage diff --git a/app/src/themes/appTheme.ts b/app/src/themes/appTheme.ts index 89c8c68480..43e592eb03 100644 --- a/app/src/themes/appTheme.ts +++ b/app/src/themes/appTheme.ts @@ -1,4 +1,4 @@ -import { grey } from '@mui/material/colors'; +import grey from '@mui/material/colors/grey'; import { createTheme } from '@mui/material/styles'; import 'styles.scss'; import 'styles/fonts.scss'; @@ -300,29 +300,41 @@ const appTheme = createTheme({ MuiTable: { styleOverrides: { root: { - fontSize: '0.9rem', + fontSize: '0.875rem', + '& tr:last-of-type td': { + borderBottom: 'none' + }, + '& thead': { + background: grey[50] + }, '& th': { letterSpacing: '0.02rem', textTransform: 'uppercase', paddingTop: '12px', - paddingBottom: '12px' + paddingBottom: '12px', + height: '52px' }, - '& tr:last-of-type td': { - borderBottom: 'none' + '& td': { + height: '52px' + }, + '& th:first-of-type, td:first-of-type': { + paddingLeft: '16px' }, - '& .MuiLink-root': { - fontFamily: 'inherit', - fontSize: 'inherit' + '& th:last-of-type, td:last-of-type': { + paddingRight: '16px' } } } }, MuiTableCell: { styleOverrides: { + root: { + paddingRight: '8px', + paddingLeft: '8px' + }, head: { fontSize: '0.875rem', - fontWeight: 700, - color: grey[600] + fontWeight: 700 } } },