Skip to content

Minor dataset tags revisions #2754

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
merged 5 commits into from
Feb 25, 2024
Merged

Minor dataset tags revisions #2754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d16177
Feedback updates for lineage graph
Feb 21, 2024
afbe960
Making display better.
Feb 22, 2024
16ad8bd
Removing log.
Feb 22, 2024
8b404bb
Minor UI changes for dataset tags.
Feb 22, 2024
fa50517
Merge branch 'main' into web/cleanup-dataset-tags
phixMe Feb 22, 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
64 changes: 33 additions & 31 deletions web/src/components/datasets/DatasetDetailPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,37 +128,12 @@ const DatasetDetailPage: FunctionComponent<IProps> = (props) => {
}}
>
<Box>
<DatasetTags
datasetTags={tags}
datasetName={lineageDataset.name}
namespace={lineageDataset.namespace}
/>
<Box display={'flex'} justifyContent={'space-between'} mb={2}>
<Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
<Tabs
value={tabIndex}
onChange={handleChange}
textColor='primary'
indicatorColor='primary'
>
<Tab
label={i18next.t('datasets.latest_tab')}
{...a11yProps(0)}
disableRipple={true}
/>
<Tab label={'I/O'} {...a11yProps(1)} disableRipple={true} />
<Tab
label={i18next.t('datasets.history_tab')}
{...a11yProps(2)}
disableRipple={true}
/>
<Tab
label={i18next.t('datasets.column_lineage_tab')}
{...a11yProps(3)}
disableRipple={true}
/>
</Tabs>
</Box>
<Box display={'flex'} justifyContent={'space-between'} alignItems={'center'}>
<DatasetTags
datasetTags={tags}
datasetName={lineageDataset.name}
namespace={lineageDataset.namespace}
/>
<Box display={'flex'} alignItems={'center'}>
<Box mr={1}>
<Button
Expand Down Expand Up @@ -192,6 +167,33 @@ const DatasetDetailPage: FunctionComponent<IProps> = (props) => {
</IconButton>
</Box>
</Box>
<Box display={'flex'} justifyContent={'space-between'} mb={2}>
<Box sx={{ borderBottom: 1, borderColor: 'divider', width: '100%' }}>
<Tabs
value={tabIndex}
onChange={handleChange}
textColor='primary'
indicatorColor='primary'
>
<Tab
label={i18next.t('datasets.latest_tab')}
{...a11yProps(0)}
disableRipple={true}
/>
<Tab label={'I/O'} {...a11yProps(1)} disableRipple={true} />
<Tab
label={i18next.t('datasets.history_tab')}
{...a11yProps(2)}
disableRipple={true}
/>
<Tab
label={i18next.t('datasets.column_lineage_tab')}
{...a11yProps(3)}
disableRipple={true}
/>
</Tabs>
</Box>
</Box>
<Box display={'flex'} alignItems={'center'}>
{facetsStatus && (
<Box mr={1}>
Expand Down
13 changes: 11 additions & 2 deletions web/src/components/datasets/DatasetInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,21 @@ const DatasetInfo: FunctionComponent<DatasetInfoProps> = (props) => {
{datasetFields.map((field, index) => {
return (
<React.Fragment key={field.name}>
<TableRow onClick={() => toggleRow(index)} className='expandable-row'>
<TableRow
sx={{ cursor: 'pointer' }}
onClick={() => toggleRow(index)}
className='expandable-row'
>
<TableCell align='left'>{field.name}</TableCell>
<TableCell align='left'>{field.type}</TableCell>
<TableCell align='left'>{field.description || 'no description'}</TableCell>
<TableCell align='right'>
<KeyboardArrowDownIcon />
<KeyboardArrowDownIcon
sx={{
rotate: expandedRows.includes(index) ? '180deg' : 0,
transition: 'rotate .3s',
}}
/>
</TableCell>
</TableRow>
<TableRow>
Expand Down
9 changes: 5 additions & 4 deletions web/src/components/datasets/DatasetTags.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ const DatasetTags: React.FC<IProps> = (props) => {

const formatTags = (tags: string[], tag_desc: Tag[]) => {
const theme = createTheme(useTheme())
return tags.map((tag, index) => {
return tags.map((tag) => {
const tagDescription = tag_desc.find((tagItem) => tagItem.name === tag)
const tooltipTitle = tagDescription?.description || 'No Tag Description'
return (
Expand All @@ -102,7 +102,7 @@ const DatasetTags: React.FC<IProps> = (props) => {
onDelete={() => handleDelete(tag)}
style={{
display: 'row',
marginRight: index < tags.length - 1 ? theme.spacing(1) : 0,
marginLeft: theme.spacing(1),
}}
/>
</MQTooltip>
Expand All @@ -114,7 +114,8 @@ const DatasetTags: React.FC<IProps> = (props) => {
<>
<Box display={'flex'} alignItems={'center'}>
<MQText subheading>{i18next.t('dataset_tags.tags')}</MQText>
<MQTooltip placement='left' title={i18next.t('dataset_tags.tooltip')} key='tag-tooltip'>
{formatTags(datasetTags, tagData)}
<MQTooltip placement='top' title={i18next.t('dataset_tags.tooltip')} key='tag-tooltip'>
<IconButton
onClick={openDialog}
size='small'
Expand All @@ -126,7 +127,7 @@ const DatasetTags: React.FC<IProps> = (props) => {
</IconButton>
</MQTooltip>
</Box>
{formatTags(datasetTags, tagData)}

<Dialog open={isDialogOpen} onClose={closeDialog} fullWidth maxWidth='sm'>
<DialogTitle>{i18next.t('dataset_tags.dialogtitle')}</DialogTitle>
<DialogContent>
Expand Down