Dataset Version call simplification (#2938)

* Fixing data quality display.

Signed-off-by: phixMe <[email protected]>

* Fixing dataset version calls.

Signed-off-by: phixMe <[email protected]>

---------

Signed-off-by: phixMe <[email protected]>

Author: phixMe

web/src/components/datasets/DatasetDetailPage.tsx

@@ -15,7 +15,7 @@ import {
 } from '@mui/material'
 import { CalendarIcon } from '@mui/x-date-pickers'
 import { CircularProgress } from '@mui/material'
-import { Dataset, DatasetVersion } from '../../types/api'
+import { Dataset } from '../../types/api'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { IState } from '../../store/reducers'
 import { LineageDataset } from '../../types/lineage'
@@ -28,7 +28,6 @@ import {
   deleteDataset,
   dialogToggle,
   fetchDataset,
-  fetchInitialDatasetVersions,
   resetDataset,
   resetDatasetVersions,
   setTabIndex,
@@ -57,15 +56,12 @@ interface StateProps {
   lineageDataset: LineageDataset
   dataset: Dataset
   isDatasetLoading: boolean
-  initVersions: DatasetVersion[]
-  initVersionsLoading: boolean
   datasets: IState['datasets']
   display: IState['display']
   tabIndex: IState['lineage']['tabIndex']
 }
 
 interface DispatchProps {
-  fetchInitialDatasetVersions: typeof fetchInitialDatasetVersions
   fetchDataset: typeof fetchDataset
   resetDatasetVersions: typeof resetDatasetVersions
   resetDataset: typeof resetDataset
@@ -92,11 +88,8 @@ const DatasetDetailPage: FunctionComponent<IProps> = (props) => {
     fetchDataset,
     resetDataset,
     resetDatasetVersions,
-    fetchInitialDatasetVersions,
     deleteDataset,
     dialogToggle,
-    initVersions,
-    initVersionsLoading,
     lineageDataset,
     tabIndex,
     setTabIndex,
@@ -118,7 +111,6 @@ const DatasetDetailPage: FunctionComponent<IProps> = (props) => {
 
   // might need to map first version to its own state
   useEffect(() => {
-    fetchInitialDatasetVersions(lineageDataset.namespace, lineageDataset.name)
     fetchDataset(lineageDataset.namespace, lineageDataset.name)
   }, [lineageDataset.name])
 
@@ -133,19 +125,14 @@ const DatasetDetailPage: FunctionComponent<IProps> = (props) => {
     setTabIndex(newValue)
   }
 
-  if (!dataset || isDatasetLoading || (initVersionsLoading && initVersions.length === 0)) {
+  if (!dataset || isDatasetLoading) {
     return (
       <Box display={'flex'} justifyContent={'center'} mt={2}>
         <CircularProgress color='primary' />
       </Box>
     )
   }
 
-  if (initVersions.length === 0) {
-    return null
-  }
-
-  const firstVersion = initVersions[0]
   const { name, tags, description } = dataset
   const facetsStatus = datasetFacetsStatus(dataset.facets)
   const assertions = datasetFacetsQualityAssertions(dataset.facets)
@@ -328,7 +315,7 @@ const DatasetDetailPage: FunctionComponent<IProps> = (props) => {
                   checked={showTags}
                   onChange={() => setShowTags(!showTags)}
                   inputProps={{ 'aria-label': 'toggle show tags' }}
-                  disabled={initVersionsLoading}
+                  disabled={isDatasetLoading}
                 />
               }
               label={i18next.t('datasets.show_field_tags')}
@@ -341,7 +328,6 @@ const DatasetDetailPage: FunctionComponent<IProps> = (props) => {
           dataset={dataset}
           datasetFields={dataset.fields}
           facets={dataset.facets}
-          run={firstVersion.createdByRun}
           showTags={showTags}
           isCurrentVersion
         />
@@ -356,15 +342,12 @@ const mapStateToProps = (state: IState) => ({
   dataset: state.dataset.result,
   isDatasetLoading: state.dataset.isLoading,
   display: state.display,
-  initVersions: state.datasetVersions.initDsVersion.versions,
-  initVersionsLoading: state.datasetVersions.isInitDsVerLoading,
   tabIndex: state.lineage.tabIndex,
 })
 
 const mapDispatchToProps = (dispatch: Redux.Dispatch) =>
   bindActionCreators(
     {
-      fetchInitialDatasetVersions: fetchInitialDatasetVersions,
       fetchDataset: fetchDataset,
       resetDatasetVersions: resetDatasetVersions,
       resetDataset: resetDataset,

web/src/components/datasets/DatasetInfo.tsx

@@ -1,65 +1,32 @@
 // Copyright 2018-2024 contributors to the Marquez project
 // SPDX-License-Identifier: Apache-2.0
-import * as Redux from 'redux'
 import { Box, Chip, Table, TableBody, TableCell, TableHead, TableRow } from '@mui/material'
-import { Dataset, Field, Run } from '../../types/api'
-import { IState } from '../../store/reducers'
+import { Dataset, Field } from '../../types/api'
 import { Link } from 'react-router-dom'
-import { connect, useSelector } from 'react-redux'
 import { encodeQueryString } from '../../routes/column-level/ColumnLineageColumnNode'
-import { fetchJobFacets, resetFacets } from '../../store/actionCreators'
 import DatasetTags from './DatasetTags'
 import IconButton from '@mui/material/IconButton'
 import MQTooltip from '../core/tooltip/MQTooltip'
 import MqEmpty from '../core/empty/MqEmpty'
 import MqJsonView from '../core/json-view/MqJsonView'
 import MqText from '../core/text/MqText'
-import React, { FunctionComponent, useEffect } from 'react'
+import React, { FunctionComponent } from 'react'
 import SplitscreenIcon from '@mui/icons-material/Splitscreen'
 
-export interface DispatchProps {
-  fetchJobFacets: typeof fetchJobFacets
-  resetFacets: typeof resetFacets
-}
-
-interface JobFacets {
-  [key: string]: object
-}
-
 export interface JobFacetsProps {
-  jobFacets: JobFacets
   isCurrentVersion?: boolean
   dataset: Dataset
 }
 
 type DatasetInfoProps = {
   datasetFields: Field[]
   facets?: object
-  run?: Run
   showTags?: boolean
-} & JobFacetsProps &
-  DispatchProps
+} & JobFacetsProps
 
 const DatasetInfo: FunctionComponent<DatasetInfoProps> = (props) => {
-  const { datasetFields, facets, run, dataset, fetchJobFacets, resetFacets, showTags } = props
+  const { datasetFields, facets, dataset, showTags } = props
   const i18next = require('i18next')
-  const dsNamespace = useSelector(
-    (state: IState) => state.datasetVersions.initDsVersion.versions[0].namespace
-  )
-  const dsName = useSelector(
-    (state: IState) => state.datasetVersions.initDsVersion.versions[0].name
-  )
-
-  useEffect(() => {
-    run && fetchJobFacets(run.id)
-  }, [run])
-
-  useEffect(
-    () => () => {
-      resetFacets()
-    },
-    []
-  )
 
   return (
     <Box>
@@ -159,8 +126,8 @@ const DatasetInfo: FunctionComponent<DatasetInfoProps> = (props) => {
                       {showTags && (
                         <TableCell align='left'>
                           <DatasetTags
-                            namespace={dsNamespace}
-                            datasetName={dsName}
+                            namespace={dataset.namespace}
+                            datasetName={dataset.name}
                             datasetTags={field.tags}
                             datasetField={field.name}
                           />
@@ -186,17 +153,4 @@ const DatasetInfo: FunctionComponent<DatasetInfoProps> = (props) => {
   )
 }
 
-const mapStateToProps = (state: IState) => ({
-  jobFacets: state.facets.result,
-})
-
-const mapDispatchToProps = (dispatch: Redux.Dispatch) =>
-  Redux.bindActionCreators(
-    {
-      fetchJobFacets: fetchJobFacets,
-      resetFacets: resetFacets,
-    },
-    dispatch
-  )
-
-export default connect(mapStateToProps, mapDispatchToProps)(DatasetInfo)
+export default DatasetInfo

web/src/components/datasets/DatasetVersions.tsx

@@ -96,7 +96,6 @@ const DatasetVersions: FunctionComponent<DatasetVersionsProps & DispatchProps> =
           dataset={dataset}
           datasetFields={infoView.fields}
           facets={infoView.facets}
-          run={infoView.createdByRun}
         />
       </>
     )