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.

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

feat: Adds drill to detail context menu to Table #21168

Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -365,8 +365,8 @@ export default function PivotTableChart(props: PivotTableProps) {
const handleContextMenu = useCallback(
(
e: MouseEvent,
colKey: DataRecordValue[] | undefined,
rowKey: DataRecordValue[] | undefined,
colKey: (string | number | boolean)[] | undefined,
rowKey: (string | number | boolean)[] | undefined,
) => {
if (onContextMenu) {
e.preventDefault();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import React, {
HTMLProps,
MutableRefObject,
CSSProperties,
MouseEvent,
} from 'react';
import {
useTable,
Expand Down Expand Up @@ -66,6 +67,7 @@ export interface DataTableProps<D extends object> extends TableOptions<D> {
rowCount: number;
wrapperRef?: MutableRefObject<HTMLDivElement>;
onColumnOrderChange: () => void;
onContextMenu?: (value: D, clientX: number, clientY: number) => void;
}

export interface RenderHTMLCellProps extends HTMLProps<HTMLTableCellElement> {
Expand Down Expand Up @@ -98,6 +100,7 @@ export default typedMemo(function DataTable<D extends object>({
serverPagination,
wrapperRef: userWrapperRef,
onColumnOrderChange,
onContextMenu,
...moreUseTableOptions
}: DataTableProps<D>): JSX.Element {
const tableHooks: PluginHook<D>[] = [
Expand Down Expand Up @@ -270,7 +273,20 @@ export default typedMemo(function DataTable<D extends object>({
prepareRow(row);
const { key: rowKey, ...rowProps } = row.getRowProps();
return (
<tr key={rowKey || row.id} {...rowProps}>
<tr
key={rowKey || row.id}
{...rowProps}
onContextMenu={(e: MouseEvent) => {
if (onContextMenu) {
e.preventDefault();
onContextMenu(
row.original,
e.nativeEvent.clientX,
e.nativeEvent.clientY,
);
}
}}
>
{row.cells.map(cell =>
cell.render('Cell', { key: cell.column.id }),
)}
Expand Down
21 changes: 21 additions & 0 deletions superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import {
ensureIsArray,
GenericDataType,
getTimeFormatterForGranularity,
QueryObjectFilterClause,
styled,
t,
tn,
Expand Down Expand Up @@ -205,6 +206,7 @@ export default function TableChart<D extends DataRecord = DataRecord>(
sticky = true, // whether to use sticky header
columnColorFormatters,
allowRearrangeColumns = false,
onContextMenu,
} = props;
const timestampFormatter = useCallback(
value => getTimeFormatterForGranularity(timeGrain)(value),
Expand Down Expand Up @@ -576,6 +578,24 @@ export default function TableChart<D extends DataRecord = DataRecord>(

const { width: widthFromState, height: heightFromState } = tableSize;

const handleContextMenu =
onContextMenu && !isRawRecords
? (value: D, clientX: number, clientY: number) => {
const filters: QueryObjectFilterClause[] = [];
columnsMeta.forEach(col => {
if (!col.isMetric) {
filters.push({
col: col.key,
op: '==',
val: value[col.key] as string | number | boolean,
formattedVal: String(value[col.key]),
});
}
});
onContextMenu(filters, clientX, clientY);
}
: undefined;

return (
<Styles>
<DataTable<D>
Expand All @@ -598,6 +618,7 @@ export default function TableChart<D extends DataRecord = DataRecord>(
selectPageSize={pageSize !== null && SelectPageSize}
// not in use in Superset, but needed for unit tests
sticky={sticky}
onContextMenu={handleContextMenu}
/>
</Styles>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,11 @@ const transformProps = (
queriesData = [],
filterState,
ownState: serverPaginationData,
hooks: { onAddFilter: onChangeFilter, setDataMask = () => {} },
hooks: {
onAddFilter: onChangeFilter,
setDataMask = () => {},
onContextMenu,
},
} = chartProps;

const {
Expand Down Expand Up @@ -274,6 +278,7 @@ const transformProps = (
columnColorFormatters,
timeGrain,
allowRearrangeColumns,
onContextMenu,
};
};

Expand Down
6 changes: 6 additions & 0 deletions superset-frontend/plugins/plugin-chart-table/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
ChartDataResponseResult,
QueryFormData,
SetDataMaskHook,
QueryObjectFilterClause,
} from '@superset-ui/core';
import { ColorFormatters, ColumnConfig } from '@superset-ui/chart-controls';

Expand Down Expand Up @@ -111,6 +112,11 @@ export interface TableChartTransformedProps<D extends DataRecord = DataRecord> {
onChangeFilter?: ChartProps['hooks']['onAddFilter'];
columnColorFormatters?: ColorFormatters;
allowRearrangeColumns?: boolean;
onContextMenu?: (
filters: QueryObjectFilterClause[],
clientX: number,
clientY: number,
) => void;
}

export default {};