Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions web/src/components/datasets/DatasetVersions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { formatUpdatedAt } from '../../helpers'
import { useTheme } from '@emotion/react'
import DatasetInfo from './DatasetInfo'
import IconButton from '@mui/material/IconButton'
import MQTooltip from '../core/tooltip/MQTooltip'
import MqCopy from '../core/copy/MqCopy'
import MqPaging from '../paging/MqPaging'
import MqText from '../core/text/MqText'
Expand Down Expand Up @@ -144,7 +145,9 @@ const DatasetVersions: FunctionComponent<DatasetVersionsProps & DispatchProps> =
>
<TableCell align='left'>
<Box display={'flex'} alignItems={'center'}>
{version.version.substring(0, 8)}...
<MQTooltip title={version.version}>
<MqText font={'mono'}>{version.version.substring(0, 8)}...</MqText>
</MQTooltip>
<MqCopy string={version.version} />
</Box>
</TableCell>
Expand All @@ -154,7 +157,7 @@ const DatasetVersions: FunctionComponent<DatasetVersionsProps & DispatchProps> =
<Box display={'flex'} alignItems={'center'}>
{version.createdByRun ? (
<>
{version.createdByRun.id.substring(0, 8)}...
<MqText font={'mono'}>{version.createdByRun.id.substring(0, 8)}...</MqText>
<MqCopy string={version.createdByRun.id} />
</>
) : (
Expand Down
7 changes: 7 additions & 0 deletions web/src/helpers/text.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ export const truncateText = (text: string, maxLength: number) => {
return text
}

export const truncateTextFront = (text: string, maxLength: number) => {
if (text.length > maxLength) {
return `...${text.substring(text.length - maxLength)}`
}
return text
}

export const pluralize = (count: number, singular: string, plural: string) => {
const noun = count === 1 ? singular : plural
return `${count} ${noun}`
Expand Down
10 changes: 7 additions & 3 deletions web/src/routes/dashboard/JobRunItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,13 @@ const JobRunItem: React.FC<Props> = ({ job }) => {
>
<Box display={'flex'} alignItems={'center'} justifyContent={'space-between'} mb={1}>
<Box display={'flex'} alignItems={'center'}>
<MqText bold font='mono' sx={{ mr: 2 }}>
{truncateText(job.name, 40)}
</MqText>
<MQTooltip title={job.name} placement={'top'}>
<Box>
<MqText bold font='mono' sx={{ mr: 2 }}>
{truncateText(job.name, 75)}
</MqText>
</Box>
</MQTooltip>
{job.tags.slice(0, 3).map((tag, index) => (
<Chip key={index} sx={{ mr: 1 }} size={'small'} label={tag} />
))}
Expand Down
6 changes: 3 additions & 3 deletions web/src/routes/table-level/TableLineageDatasetNode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { datasetFacetsQualityAssertions, datasetFacetsStatus } from '../../helpe
import { faDatabase } from '@fortawesome/free-solid-svg-icons/faDatabase'
import { fetchDataset, resetDataset } from '../../store/actionCreators'
import { formatUpdatedAt } from '../../helpers'
import { truncateText } from '../../helpers/text'
import { truncateText, truncateTextFront } from '../../helpers/text'
import { useNavigate, useParams, useSearchParams } from 'react-router-dom'
import Box from '@mui/system/Box'
import IconButton from '@mui/material/IconButton'
Expand Down Expand Up @@ -72,15 +72,15 @@ const TableLineageDatasetNode = ({
Namespace:
</MqText>
<MqText block font={'mono'}>
{truncateText(lineageDataset.namespace, 40)}
{truncateTextFront(lineageDataset.namespace, 40)}
</MqText>
</Box>
<Box display={'flex'} justifyContent={'space-between'}>
<MqText block bold sx={{ mr: 6 }}>
Name:
</MqText>
<MqText block font={'mono'}>
{truncateText(lineageDataset.name, 40)}
{truncateTextFront(lineageDataset.name, 40)}
</MqText>
</Box>
{lineageDataset.description && (
Expand Down
6 changes: 3 additions & 3 deletions web/src/routes/table-level/TableLineageJobNode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { faCog } from '@fortawesome/free-solid-svg-icons/faCog'
import { formatUpdatedAt } from '../../helpers'
import { runStateColor } from '../../helpers/nodes'
import { theme } from '../../helpers/theme'
import { truncateText } from '../../helpers/text'
import { truncateText, truncateTextFront } from '../../helpers/text'
import { useNavigate, useParams } from 'react-router-dom'
import Box from '@mui/system/Box'
import MQTooltip from '../../components/core/tooltip/MQTooltip'
Expand Down Expand Up @@ -49,15 +49,15 @@ const TableLineageJobNode = ({ node }: TableLineageJobNodeProps & StateProps) =>
Namespace:
</MqText>
<MqText block font={'mono'}>
{truncateText(job.namespace, 40)}
{truncateTextFront(job.namespace, 40)}
</MqText>
</Box>
<Box display={'flex'} justifyContent={'space-between'}>
<MqText block bold sx={{ mr: 6 }}>
Name:
</MqText>
<MqText block font={'mono'}>
{truncateText(job.name, 40)}
{truncateTextFront(job.name, 40)}
</MqText>
</Box>
{job.description && (
Expand Down
Loading