Skip to content

Commit e832a6f

Browse files
wslulciucwslulciuc
authored
Merge branch 'main' into fix/display-symlinks-datasets-and-lineage
2 parents 0178bb3 + cc9c2c0 commit e832a6f

9 files changed

Lines changed: 68 additions & 56 deletions

File tree

‎api/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ext {
2424
jdbi3Version = '3.40.0'
2525
prometheusVersion = '0.16.0'
2626
testcontainersVersion = '1.18.3'
27-
sentryVersion = '6.33.1'
27+
sentryVersion = '6.34.0'
2828
}
2929

3030
dependencies {
@@ -43,7 +43,7 @@ dependencies {
4343
implementation "org.jdbi:jdbi3-jackson2:${jdbi3Version}"
4444
implementation "org.jdbi:jdbi3-postgres:${jdbi3Version}"
4545
implementation "org.jdbi:jdbi3-sqlobject:${jdbi3Version}"
46-
implementation 'com.google.guava:guava:32.1.2-jre'
46+
implementation 'com.google.guava:guava:32.1.3-jre'
4747
implementation 'org.dhatim:dropwizard-sentry:2.1.6'
4848
implementation "io.sentry:sentry:${sentryVersion}"
4949
implementation 'org.flywaydb:flyway-core:8.5.13'

‎build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ subprojects {
5252

5353
ext {
5454
assertjVersion = '3.24.2'
55-
dropwizardVersion = '2.1.10'
56-
jacocoVersion = '0.8.10'
57-
junit5Version = '5.10.0'
55+
dropwizardVersion = '2.1.12'
56+
jacocoVersion = '0.8.11'
57+
junit5Version = '5.10.2'
5858
lombokVersion = '1.18.30'
5959
mockitoVersion = '5.4.0'
60-
openlineageVersion = '1.5.0'
60+
openlineageVersion = '1.9.1'
6161
slf4jVersion = '1.7.36'
6262
postgresqlVersion = '42.6.0'
6363
}

‎gradle/wrapper/gradle-wrapper.jar‎

-19.8 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradlew.bat‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎stats/oss/requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pendulum==2.1.2
2-
PyGithub==1.57
2+
PyGithub==1.59.1
33
python_dateutil==2.8.2
4-
rich==13.3.1
4+
rich==13.7.1
55
rich_click==1.6.1

‎web/src/components/datasets/DatasetDetailPage.tsx‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -128,37 +128,12 @@ const DatasetDetailPage: FunctionComponent<IProps> = (props) => {
128128
}}
129129
>
130130
<Box>
131-
<DatasetTags
132-
datasetTags={tags}
133-
datasetName={lineageDataset.name}
134-
namespace={lineageDataset.namespace}
135-
/>
136-
<Box display={'flex'} justifyContent={'space-between'} mb={2}>
137-
<Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
138-
<Tabs
139-
value={tabIndex}
140-
onChange={handleChange}
141-
textColor='primary'
142-
indicatorColor='primary'
143-
>
144-
<Tab
145-
label={i18next.t('datasets.latest_tab')}
146-
{...a11yProps(0)}
147-
disableRipple={true}
148-
/>
149-
<Tab label={'I/O'} {...a11yProps(1)} disableRipple={true} />
150-
<Tab
151-
label={i18next.t('datasets.history_tab')}
152-
{...a11yProps(2)}
153-
disableRipple={true}
154-
/>
155-
<Tab
156-
label={i18next.t('datasets.column_lineage_tab')}
157-
{...a11yProps(3)}
158-
disableRipple={true}
159-
/>
160-
</Tabs>
161-
</Box>
131+
<Box display={'flex'} justifyContent={'space-between'} alignItems={'center'}>
132+
<DatasetTags
133+
datasetTags={tags}
134+
datasetName={lineageDataset.name}
135+
namespace={lineageDataset.namespace}
136+
/>
162137
<Box display={'flex'} alignItems={'center'}>
163138
<Box mr={1}>
164139
<Button
@@ -192,6 +167,33 @@ const DatasetDetailPage: FunctionComponent<IProps> = (props) => {
192167
</IconButton>
193168
</Box>
194169
</Box>
170+
<Box display={'flex'} justifyContent={'space-between'} mb={2}>
171+
<Box sx={{ borderBottom: 1, borderColor: 'divider', width: '100%' }}>
172+
<Tabs
173+
value={tabIndex}
174+
onChange={handleChange}
175+
textColor='primary'
176+
indicatorColor='primary'
177+
>
178+
<Tab
179+
label={i18next.t('datasets.latest_tab')}
180+
{...a11yProps(0)}
181+
disableRipple={true}
182+
/>
183+
<Tab label={'I/O'} {...a11yProps(1)} disableRipple={true} />
184+
<Tab
185+
label={i18next.t('datasets.history_tab')}
186+
{...a11yProps(2)}
187+
disableRipple={true}
188+
/>
189+
<Tab
190+
label={i18next.t('datasets.column_lineage_tab')}
191+
{...a11yProps(3)}
192+
disableRipple={true}
193+
/>
194+
</Tabs>
195+
</Box>
196+
</Box>
195197
<Box display={'flex'} alignItems={'center'}>
196198
{facetsStatus && (
197199
<Box mr={1}>

‎web/src/components/datasets/DatasetInfo.tsx‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,21 @@ const DatasetInfo: FunctionComponent<DatasetInfoProps> = (props) => {
131131
{datasetFields.map((field, index) => {
132132
return (
133133
<React.Fragment key={field.name}>
134-
<TableRow onClick={() => toggleRow(index)} className='expandable-row'>
134+
<TableRow
135+
sx={{ cursor: 'pointer' }}
136+
onClick={() => toggleRow(index)}
137+
className='expandable-row'
138+
>
135139
<TableCell align='left'>{field.name}</TableCell>
136140
<TableCell align='left'>{field.type}</TableCell>
137141
<TableCell align='left'>{field.description || 'no description'}</TableCell>
138142
<TableCell align='right'>
139-
<KeyboardArrowDownIcon />
143+
<KeyboardArrowDownIcon
144+
sx={{
145+
rotate: expandedRows.includes(index) ? '180deg' : 0,
146+
transition: 'rotate .3s',
147+
}}
148+
/>
140149
</TableCell>
141150
</TableRow>
142151
<TableRow>

‎web/src/components/datasets/DatasetTags.tsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ const DatasetTags: React.FC<IProps> = (props) => {
9090

9191
const formatTags = (tags: string[], tag_desc: Tag[]) => {
9292
const theme = createTheme(useTheme())
93-
return tags.map((tag, index) => {
93+
return tags.map((tag) => {
9494
const tagDescription = tag_desc.find((tagItem) => tagItem.name === tag)
9595
const tooltipTitle = tagDescription?.description || 'No Tag Description'
9696
return (
@@ -102,7 +102,7 @@ const DatasetTags: React.FC<IProps> = (props) => {
102102
onDelete={() => handleDelete(tag)}
103103
style={{
104104
display: 'row',
105-
marginRight: index < tags.length - 1 ? theme.spacing(1) : 0,
105+
marginLeft: theme.spacing(1),
106106
}}
107107
/>
108108
</MQTooltip>
@@ -114,7 +114,8 @@ const DatasetTags: React.FC<IProps> = (props) => {
114114
<>
115115
<Box display={'flex'} alignItems={'center'}>
116116
<MQText subheading>{i18next.t('dataset_tags.tags')}</MQText>
117-
<MQTooltip placement='left' title={i18next.t('dataset_tags.tooltip')} key='tag-tooltip'>
117+
{formatTags(datasetTags, tagData)}
118+
<MQTooltip placement='top' title={i18next.t('dataset_tags.tooltip')} key='tag-tooltip'>
118119
<IconButton
119120
onClick={openDialog}
120121
size='small'
@@ -126,7 +127,7 @@ const DatasetTags: React.FC<IProps> = (props) => {
126127
</IconButton>
127128
</MQTooltip>
128129
</Box>
129-
{formatTags(datasetTags, tagData)}
130+
130131
<Dialog open={isDialogOpen} onClose={closeDialog} fullWidth maxWidth='sm'>
131132
<DialogTitle>{i18next.t('dataset_tags.dialogtitle')}</DialogTitle>
132133
<DialogContent>

0 commit comments

Comments
 (0)
⚡