Skip to content

feat: Tag View UI Tweaks #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cbolles merged 4 commits into from
Apr 16, 2024
Merged

feat: Tag View UI Tweaks #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
22378c7
Remove outer container around tag view
cbolles Apr 16, 2024
337547f
Add spacing around the video fields
cbolles Apr 16, 2024
418c09b
Add in toolbar to the tag view
cbolles Apr 16, 2024
478a6b5
Change wording on tag view
cbolles Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/client/public/locales/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"newStudy": "New Study",
"studyControl": "Study Control",
"entryControl": "Entry Control",
"viewTags": "Download Tags",
"viewTags": "View Tags",
"datasets": "Datasets",
"datasetControl": "Dataset Control",
"projectAccess": "Project Access",
Expand Down Expand Up @@ -181,4 +181,4 @@
"resetPassword": "Reset Password"
}
}
}
}
3 changes: 2 additions & 1 deletion packages/client/src/components/tag/view/TagGridView.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useTranslation } from 'react-i18next';
import { GetGridColDefs, TagViewTest } from '../../../types/TagColumnView';
import { Entry, Study } from '../../../graphql/graphql';
import { GridColDef, GridRenderCellParams } from '@mui/x-data-grid';
import { GridColDef, GridRenderCellParams, GridToolbar } from '@mui/x-data-grid';
import { DataGrid } from '@mui/x-data-grid';
import { GetTagsQuery, useRemoveTagMutation } from '../../../graphql/tag/tag';
import { freeTextTest, getTextCols } from './FreeTextGridView.component';
Expand Down Expand Up @@ -104,6 +104,7 @@ export const TagGridView: React.FC<TagGridViewProps> = ({ tags, study, refetchTa
rows={tags}
columns={entryColumns.concat(tagMetaColumns).concat(dataColunms).concat(tagRedoColumns)}
getRowId={(row) => row._id}
slots={{ toolbar: GridToolbar }}
/>
);
};
2 changes: 1 addition & 1 deletion packages/client/src/components/tag/view/VideoGridView.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const getVideoCols: GetGridColDefs = (uischema, schema, property) => {
columns.push({
field: `${property}-video-${i + 1}`,
headerName: `${property}: ${i18next.t('common.video')} ${i + 1}`,
width: 300,
width: 350,
renderCell: (params) =>
params.row.data &&
params.row.data[property] && (
Expand Down
6 changes: 3 additions & 3 deletions packages/client/src/pages/studies/TagView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Container, Typography } from '@mui/material';
import { Typography } from '@mui/material';
import { useTranslation } from 'react-i18next';
import { useStudy } from '../../context/Study.context';
import { TagGridView } from '../../components/tag/view/TagGridView.component';
Expand Down Expand Up @@ -31,9 +31,9 @@ export const TagView: React.FC = () => {
};

return (
<Container sx={{ position: 'center', display: 'flex', flexDirection: 'column', justifyContext: 'space-between' }}>
<>
<Typography variant="h3"> {t('menu.viewTags')}</Typography>
{study && <TagGridView study={study} tags={tags} refetchTags={refetchTags} />}
</Container>
</>
);
};