Skip to content
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

Jump to bottom

ui:add HTML Tool Tip #2601

Merged
merged 2 commits into from
Aug 21, 2023
Merged

ui:add HTML Tool Tip #2601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b032c70
readd work on new branch
Aug 17, 2023
1bc209c
remove comments as per feedback.
Aug 21, 2023
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
36 changes: 36 additions & 0 deletions web/src/components/core/tooltip/MQTooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// Copyright 2018-2023 contributors to the Marquez project
// SPDX-License-Identifier: Apache-2.0

import { createTheme } from '@mui/material/styles'
import { useTheme } from '@emotion/react'
import React, { ReactElement } from 'react'
import Tooltip from '@mui/material/Tooltip'

interface MqToolTipProps {
title: string | ReactElement
children: ReactElement
}

const MQTooltip: React.FC<MqToolTipProps> = ({ title, children }) => {
const theme = createTheme(useTheme())
return (
<Tooltip
title={title}
componentsProps={{
tooltip: {
sx: {
backgroundColor: theme.palette.background.default,
color: theme.palette.common.white,
border: `1px solid ${theme.palette.common.white}`,
maxWidth: '600px',
fontSize: 14,
},
},
}}
>
{children}
</Tooltip>
)
}

export default MQTooltip
135 changes: 77 additions & 58 deletions web/src/components/lineage/components/node/Node.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import { Link } from 'react-router-dom'
import { MqNode } from '../../types'
import { NodeText } from './NodeText'
import { bindActionCreators } from 'redux'

import { connect } from 'react-redux'
import { encodeNode, isDataset, isJob } from '../../../../helpers/nodes'
import { faCog } from '@fortawesome/free-solid-svg-icons/faCog'
import { faDatabase } from '@fortawesome/free-solid-svg-icons/faDatabase'
import { setSelectedNode } from '../../../../store/actionCreators'
import { theme } from '../../../../helpers/theme'
import MQTooltip from '../../../core/tooltip/MQTooltip'

const RADIUS = 14
const ICON_SIZE = 16
Expand All @@ -43,69 +43,88 @@ const Node: React.FC<NodeProps> = ({ node, selectedNode, setSelectedNode }) => {
return '/'
}

const addToToolTip = (inputData: GraphNode<MqNode>) => {
return (
<>
<b>{'Namespace: '}</b>
{inputData.data.namespace}
<br></br>
<b>{'Name: '}</b>
{inputData.data.name}
<br></br>
<b>{'Description: '}</b>
{inputData.data.description === null ? 'No Description' : inputData.data.description}
<br></br>
</>
)
}

const job = isJob(node)
const isSelected = selectedNode === node.label
const ariaJobLabel = 'Job'
const ariaDatasetLabel = 'Dataset'

return (
<Link to={determineLink(node)} onClick={() => node.label && setSelectedNode(node.label)}>
{job ? (
<g>
<circle
style={{ cursor: 'pointer' }}
r={RADIUS}
fill={isSelected ? theme.palette.secondary.main : theme.palette.common.white}
stroke={isSelected ? theme.palette.primary.main : theme.palette.secondary.main}
strokeWidth={BORDER / 2}
cx={node.x}
cy={node.y}
/>
<FontAwesomeIcon
title={ariaJobLabel}
aria-hidden={'true'}
style={{ transformOrigin: `${node.x}px ${node.y}px` }}
icon={faCog}
width={ICON_SIZE}
height={ICON_SIZE}
x={node.x - ICON_SIZE / 2}
y={node.y - ICON_SIZE / 2}
color={isSelected ? theme.palette.primary.main : theme.palette.secondary.main}
/>
</g>
) : (
<g>
<rect
style={{ cursor: 'pointer' }}
x={node.x - RADIUS}
y={node.y - RADIUS}
fill={isSelected ? theme.palette.secondary.main : theme.palette.common.white}
stroke={isSelected ? theme.palette.primary.main : theme.palette.secondary.main}
strokeWidth={BORDER / 2}
width={RADIUS * 2}
height={RADIUS * 2}
rx={4}
/>
<rect
style={{ cursor: 'pointer' }}
x={node.x - (RADIUS - 2)}
y={node.y - (RADIUS - 2)}
fill={isSelected ? theme.palette.secondary.main : theme.palette.common.white}
width={(RADIUS - 2) * 2}
height={(RADIUS - 2) * 2}
rx={4}
/>
<FontAwesomeIcon
title={ariaDatasetLabel}
aria-hidden={'true'}
icon={faDatabase}
width={ICON_SIZE}
height={ICON_SIZE}
x={node.x - ICON_SIZE / 2}
y={node.y - ICON_SIZE / 2}
color={isSelected ? theme.palette.primary.main : theme.palette.secondary.main}
/>
</g>
)}
<MQTooltip title={addToToolTip(node)}>
{job ? (
<g>
<circle
style={{ cursor: 'pointer' }}
r={RADIUS}
fill={isSelected ? theme.palette.secondary.main : theme.palette.common.white}
stroke={isSelected ? theme.palette.primary.main : theme.palette.secondary.main}
strokeWidth={BORDER / 2}
cx={node.x}
cy={node.y}
/>
<FontAwesomeIcon
aria-hidden={'true'}
title={ariaJobLabel}
style={{ transformOrigin: `${node.x}px ${node.y}px` }}
icon={faCog}
width={ICON_SIZE}
height={ICON_SIZE}
x={node.x - ICON_SIZE / 2}
y={node.y - ICON_SIZE / 2}
color={isSelected ? theme.palette.primary.main : theme.palette.secondary.main}
/>
</g>
) : (
<g>
<rect
style={{ cursor: 'pointer' }}
x={node.x - RADIUS}
y={node.y - RADIUS}
fill={isSelected ? theme.palette.secondary.main : theme.palette.common.white}
stroke={isSelected ? theme.palette.primary.main : theme.palette.secondary.main}
strokeWidth={BORDER / 2}
width={RADIUS * 2}
height={RADIUS * 2}
rx={4}
/>
<rect
style={{ cursor: 'pointer' }}
x={node.x - (RADIUS - 2)}
y={node.y - (RADIUS - 2)}
fill={isSelected ? theme.palette.secondary.main : theme.palette.common.white}
width={(RADIUS - 2) * 2}
height={(RADIUS - 2) * 2}
rx={4}
/>
<FontAwesomeIcon
aria-hidden={'true'}
title={ariaDatasetLabel}
icon={faDatabase}
width={ICON_SIZE}
height={ICON_SIZE}
x={node.x - ICON_SIZE / 2}
y={node.y - ICON_SIZE / 2}
color={isSelected ? theme.palette.primary.main : theme.palette.secondary.main}
/>
</g>
)}
</MQTooltip>
<NodeText node={node} />
</Link>
)
Expand Down
Loading