Skip to content

bring dataset tags into line with Job Tags #2841

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
phixMe merged 1 commit into from
Jun 24, 2024
Merged

bring dataset tags into line with Job Tags #2841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion web/src/components/datasets/DatasetDetailPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,10 @@ const DatasetDetailPage: FunctionComponent<IProps> = (props) => {
{tabIndex === 0 && (
<Box display={'flex'} alignItems={'center'}>
<FormControlLabel
sx={{ textWrap: 'nowrap' }}
sx={{
textWrap: 'nowrap',
'& .MuiFormControlLabel-label': { fontSize: '0.875rem' },
}}
control={
<Switch
size={'small'}
Expand Down
28 changes: 15 additions & 13 deletions web/src/components/datasets/DatasetTags.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import Chip from '@mui/material/Chip'
import Dialog from '@mui/material/Dialog'
import DialogActions from '@mui/material/DialogActions'
import DialogContent from '@mui/material/DialogContent'
import DialogTitle from '@mui/material/DialogTitle'
import LocalOfferIcon from '@mui/icons-material/LocalOffer'
import MQText from '../core/text/MqText'
import MQTooltip from '../core/tooltip/MQTooltip'
Expand Down Expand Up @@ -67,7 +66,7 @@ const DatasetTags: React.FC<IProps> = (props) => {

const [listTag, setListTag] = useState('')
const [openTagDesc, setOpenTagDesc] = useState(false)
const [tagDescription, setTagDescription] = useState('No Description')
const [tagDescription, setTagDescription] = useState('')
const [selectedTags, setSelectedTags] = useState<string[]>(datasetTags)

const handleButtonClick = () => {
Expand All @@ -80,13 +79,13 @@ const DatasetTags: React.FC<IProps> = (props) => {
const handleTagDescClose = () => {
setOpenTagDesc(false)
setListTag('')
setTagDescription('No Description')
setTagDescription('')
}

const handleTagDescChange = (_event: any, value: string) => {
const selectedTagData = tagData.find((tag) => tag.name === value)
setListTag(value)
setTagDescription(selectedTagData ? selectedTagData.description : 'No Description')
setTagDescription(selectedTagData ? selectedTagData.description : '')
}

const handleDescriptionChange = (event: any) => {
Expand Down Expand Up @@ -135,7 +134,7 @@ const DatasetTags: React.FC<IProps> = (props) => {
setSnackbarOpen(true)
setOpenTagDesc(false)
setListTag('')
setTagDescription('No Description')
setTagDescription('')
}

const formatTags = (tags: string[], tag_desc: Tag[]) => {
Expand Down Expand Up @@ -189,8 +188,8 @@ const DatasetTags: React.FC<IProps> = (props) => {
multiple
disableCloseOnSelect
id='dataset-tags'
sx={{ flex : 1, width: datasetField ? 494 : 'auto' }}
limitTags={!datasetField ? 8 : 6}
sx={{ flex: 1, width: datasetField ? 494 : 'auto' }}
limitTags={!datasetField ? 8 : 6}
autoHighlight
disableClearable
disablePortal
Expand All @@ -209,8 +208,7 @@ const DatasetTags: React.FC<IProps> = (props) => {
<div>
<MQText bold>{option}</MQText>
<MQText subdued overflowHidden>
{tagData.find((tagItem) => tagItem.name === option)?.description ||
'No Tag Description'}
{tagData.find((tagItem) => tagItem.name === option)?.description || ''}
</MQText>
</div>
</li>
Expand Down Expand Up @@ -245,9 +243,13 @@ const DatasetTags: React.FC<IProps> = (props) => {
}
}}
>
<DialogTitle>Select a Tag to change</DialogTitle>
<DialogContent>
<MQText subheading>Tag</MQText>
<MQText label sx={{ fontSize: '1.25rem' }} bottomMargin>
Select a Tag to change
</MQText>
<MQText label sx={{ fontSize: '0.85rem' }}>
Tag
</MQText>
<Autocomplete
options={tagData.map((option) => option.name)}
autoSelect
Expand All @@ -271,7 +273,7 @@ const DatasetTags: React.FC<IProps> = (props) => {
/>
)}
/>
<MQText subheading bottomMargin>
<MQText label sx={{ fontSize: '0.85rem' }} bottomMargin>
Description
</MQText>
<TextField
Expand All @@ -280,7 +282,7 @@ const DatasetTags: React.FC<IProps> = (props) => {
name='tag-description'
fullWidth
variant='outlined'
placeholder={'No Description'}
placeholder={''}
onChange={handleDescriptionChange}
rows={6}
value={tagDescription}
Expand Down
⚡