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

feat(chart-controls): Show detailed data type tooltip when hovering type icon #23970

Merged
merged 10 commits into from
May 11, 2023
Merged

feat(chart-controls): Show detailed data type tooltip when hovering type icon #23970

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
78c3714
Added tooltip for column datatype in chart
ved-kashyap-samsung May 8, 2023
e436e0a
Added column datatype tooltip node creation logic
ved-kashyap-samsung May 8, 2023
df0a224
prettier issue fix in ColumnOption.tsx file
ved-kashyap-samsung May 8, 2023
4043aa2
prettier issue fix in Update labelUtils.tsx
ved-kashyap-samsung May 8, 2023
253be94
Added tests for column datatype tooltip
ved-kashyap-samsung May 8, 2023
d8ac7d9
Removed unused variables
ved-kashyap-samsung May 9, 2023
44584a7
Removed function parameter which was not required
ved-kashyap-samsung May 9, 2023
0ee7d41
Align tooltip arrow to point to icon of column datatype
ved-kashyap-samsung May 10, 2023
9f30967
Rendering tooltip conditionally
ved-kashyap-samsung May 10, 2023
c5a6c8c
Refactoring as per review comments
ved-kashyap-samsung May 11, 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
10 changes: 8 additions & 2 deletions superset-frontend/packages/superset-ui-chart-controls/src/components/ColumnOption.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { Tooltip } from './Tooltip';
import { ColumnTypeLabel } from './ColumnTypeLabel/ColumnTypeLabel';
import CertifiedIconWithTooltip from './CertifiedIconWithTooltip';
import { ColumnMeta } from '../types';
import { getColumnLabelText, getColumnTooltipNode } from './labelUtils';
import { getColumnLabelText, getColumnTooltipNode, getColumnTypeTooltipNode } from './labelUtils';
import { SQLPopover } from './SQLPopover';

export type ColumnOptionProps = {
Expand All @@ -48,14 +48,20 @@ export function ColumnOption({
const hasExpression = expression && expression !== column_name;
const type = hasExpression ? 'expression' : type_generic;
const [tooltipText, setTooltipText] = useState<ReactNode>(column.column_name);
const [columnTypeTooltipText, setcolumnTypeTooltipText] = useState<ReactNode>(column.type);

useLayoutEffect(() => {
setTooltipText(getColumnTooltipNode(column, labelRef));
setcolumnTypeTooltipText(getColumnTypeTooltipNode(column));
}, [labelRef, column]);

return (
<StyleOverrides>
{showType && type !== undefined && <ColumnTypeLabel type={type} />}
<Tooltip id="metric-type-tooltip" title={columnTypeTooltipText} placement="bottomRight">
<span>
{showType && type !== undefined && <ColumnTypeLabel type={type} />}
</span>
</Tooltip>
<Tooltip id="metric-name-tooltip" title={tooltipText}>
<span
className="option-label column-option-label"
Expand Down
13 changes: 13 additions & 0 deletions superset-frontend/packages/superset-ui-chart-controls/src/components/labelUtils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,19 @@ export const isLabelTruncated = (labelRef?: React.RefObject<any>): boolean =>
export const getColumnLabelText = (column: ColumnMeta): string =>
column.verbose_name || column.column_name;

export const getColumnTypeTooltipNode = (
column: ColumnMeta,
labelRef?: React.RefObject<any>,
): ReactNode => {
if (!column.type) {
return null;
}

return (
<TooltipSection label={t('Column datatype')} text={column.type.toLowerCase()} />
);
};

export const getColumnTooltipNode = (
column: ColumnMeta,
labelRef?: React.RefObject<any>,
Expand Down