Merge branch 'main' into fix/display-symlinks-datasets-and-lineage

MarquezProject · Mar 5, 2024 · e832a6f · e832a6f
2 parents 0178bb3 + cc9c2c0
commit e832a6f
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 56 deletions.
diff --git a/api/build.gradle b/api/build.gradle
@@ -24,7 +24,7 @@ ext {
     jdbi3Version = '3.40.0'
     prometheusVersion = '0.16.0'
     testcontainersVersion = '1.18.3'
-    sentryVersion = '6.33.1'
+    sentryVersion = '6.34.0'
 }
 
 dependencies {
@@ -43,7 +43,7 @@ dependencies {
     implementation "org.jdbi:jdbi3-jackson2:${jdbi3Version}"
     implementation "org.jdbi:jdbi3-postgres:${jdbi3Version}"
     implementation "org.jdbi:jdbi3-sqlobject:${jdbi3Version}"
-    implementation 'com.google.guava:guava:32.1.2-jre'
+    implementation 'com.google.guava:guava:32.1.3-jre'
     implementation 'org.dhatim:dropwizard-sentry:2.1.6'
     implementation "io.sentry:sentry:${sentryVersion}"
     implementation 'org.flywaydb:flyway-core:8.5.13'

diff --git a/build.gradle b/build.gradle
@@ -52,12 +52,12 @@ subprojects {
 
     ext {
         assertjVersion = '3.24.2'
-        dropwizardVersion = '2.1.10'
-        jacocoVersion = '0.8.10'
-        junit5Version = '5.10.0'
+        dropwizardVersion = '2.1.12'
+        jacocoVersion = '0.8.11'
+        junit5Version = '5.10.2'
         lombokVersion = '1.18.30'
         mockitoVersion = '5.4.0'
-        openlineageVersion = '1.5.0'
+        openlineageVersion = '1.9.1'
         slf4jVersion = '1.7.36'
         postgresqlVersion = '42.6.0'
     }

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew.bat b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

diff --git a/stats/oss/requirements.txt b/stats/oss/requirements.txt
@@ -1,5 +1,5 @@
 pendulum==2.1.2
-PyGithub==1.57
+PyGithub==1.59.1
 python_dateutil==2.8.2
-rich==13.3.1
+rich==13.7.1
 rich_click==1.6.1
diff --git a/web/src/components/datasets/DatasetDetailPage.tsx b/web/src/components/datasets/DatasetDetailPage.tsx
@@ -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
@@ -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}>

diff --git a/web/src/components/datasets/DatasetInfo.tsx b/web/src/components/datasets/DatasetInfo.tsx
@@ -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>

diff --git a/web/src/components/datasets/DatasetTags.tsx b/web/src/components/datasets/DatasetTags.tsx
@@ -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 (
@@ -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>
@@ -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'
@@ -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>