Skip to content

Commit b5bcfbf

Browse files
authored
bring dataset tags into line with Job Tags (#2841)
Signed-off-by: sharpd <davidsharp7@gmail.com>
1 parent 66e2d7a commit b5bcfbf

2 files changed

Lines changed: 19 additions & 14 deletions

File tree

web/src/components/datasets/DatasetDetailPage.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,10 @@ const DatasetDetailPage: FunctionComponent<IProps> = (props) => {
316316
{tabIndex === 0 && (
317317
<Box display={'flex'} alignItems={'center'}>
318318
<FormControlLabel
319-
sx={{ textWrap: 'nowrap' }}
319+
sx={{
320+
textWrap: 'nowrap',
321+
'& .MuiFormControlLabel-label': { fontSize: '0.875rem' },
322+
}}
320323
control={
321324
<Switch
322325
size={'small'}

web/src/components/datasets/DatasetTags.tsx

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import Chip from '@mui/material/Chip'
2828
import Dialog from '@mui/material/Dialog'
2929
import DialogActions from '@mui/material/DialogActions'
3030
import DialogContent from '@mui/material/DialogContent'
31-
import DialogTitle from '@mui/material/DialogTitle'
3231
import LocalOfferIcon from '@mui/icons-material/LocalOffer'
3332
import MQText from '../core/text/MqText'
3433
import MQTooltip from '../core/tooltip/MQTooltip'
@@ -67,7 +66,7 @@ const DatasetTags: React.FC<IProps> = (props) => {
6766

6867
const [listTag, setListTag] = useState('')
6968
const [openTagDesc, setOpenTagDesc] = useState(false)
70-
const [tagDescription, setTagDescription] = useState('No Description')
69+
const [tagDescription, setTagDescription] = useState('')
7170
const [selectedTags, setSelectedTags] = useState<string[]>(datasetTags)
7271

7372
const handleButtonClick = () => {
@@ -80,13 +79,13 @@ const DatasetTags: React.FC<IProps> = (props) => {
8079
const handleTagDescClose = () => {
8180
setOpenTagDesc(false)
8281
setListTag('')
83-
setTagDescription('No Description')
82+
setTagDescription('')
8483
}
8584

8685
const handleTagDescChange = (_event: any, value: string) => {
8786
const selectedTagData = tagData.find((tag) => tag.name === value)
8887
setListTag(value)
89-
setTagDescription(selectedTagData ? selectedTagData.description : 'No Description')
88+
setTagDescription(selectedTagData ? selectedTagData.description : '')
9089
}
9190

9291
const handleDescriptionChange = (event: any) => {
@@ -135,7 +134,7 @@ const DatasetTags: React.FC<IProps> = (props) => {
135134
setSnackbarOpen(true)
136135
setOpenTagDesc(false)
137136
setListTag('')
138-
setTagDescription('No Description')
137+
setTagDescription('')
139138
}
140139

141140
const formatTags = (tags: string[], tag_desc: Tag[]) => {
@@ -189,8 +188,8 @@ const DatasetTags: React.FC<IProps> = (props) => {
189188
multiple
190189
disableCloseOnSelect
191190
id='dataset-tags'
192-
sx={{ flex : 1, width: datasetField ? 494 : 'auto' }}
193-
limitTags={!datasetField ? 8 : 6}
191+
sx={{ flex: 1, width: datasetField ? 494 : 'auto' }}
192+
limitTags={!datasetField ? 8 : 6}
194193
autoHighlight
195194
disableClearable
196195
disablePortal
@@ -209,8 +208,7 @@ const DatasetTags: React.FC<IProps> = (props) => {
209208
<div>
210209
<MQText bold>{option}</MQText>
211210
<MQText subdued overflowHidden>
212-
{tagData.find((tagItem) => tagItem.name === option)?.description ||
213-
'No Tag Description'}
211+
{tagData.find((tagItem) => tagItem.name === option)?.description || ''}
214212
</MQText>
215213
</div>
216214
</li>
@@ -245,9 +243,13 @@ const DatasetTags: React.FC<IProps> = (props) => {
245243
}
246244
}}
247245
>
248-
<DialogTitle>Select a Tag to change</DialogTitle>
249246
<DialogContent>
250-
<MQText subheading>Tag</MQText>
247+
<MQText label sx={{ fontSize: '1.25rem' }} bottomMargin>
248+
Select a Tag to change
249+
</MQText>
250+
<MQText label sx={{ fontSize: '0.85rem' }}>
251+
Tag
252+
</MQText>
251253
<Autocomplete
252254
options={tagData.map((option) => option.name)}
253255
autoSelect
@@ -271,7 +273,7 @@ const DatasetTags: React.FC<IProps> = (props) => {
271273
/>
272274
)}
273275
/>
274-
<MQText subheading bottomMargin>
276+
<MQText label sx={{ fontSize: '0.85rem' }} bottomMargin>
275277
Description
276278
</MQText>
277279
<TextField
@@ -280,7 +282,7 @@ const DatasetTags: React.FC<IProps> = (props) => {
280282
name='tag-description'
281283
fullWidth
282284
variant='outlined'
283-
placeholder={'No Description'}
285+
placeholder={''}
284286
onChange={handleDescriptionChange}
285287
rows={6}
286288
value={tagDescription}

0 commit comments

Comments
 (0)