SBIN2010 commented on code in PR #45680:
URL: https://github.com/apache/superset/pull/45680#discussion_r4416303949
##########
superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/EchartsWaterfall.tsx:
##########
@@ -16,21 +16,146 @@
* specific language governing permissions and limitations
* under the License.
*/
+import { useMemo } from 'react';
+import {
+ ContextMenuFilters,
+ getColumnLabel,
+ TimeGranularity,
+} from '@superset-ui/core';
import Echart from '../components/Echart';
import { WaterfallChartTransformedProps } from './types';
import { EventHandlers } from '../types';
import { useLegendEventHandlers } from '../utils/legendEventHandlers';
+import {
+ getSelectedWaterfallKeys,
+ getWaterfallCrossFilterDataMask,
+ getWaterfallDrillFilters,
+} from './crossFilter';
+
+const noop = () => {};
+
+type WaterfallBarEvent = {
+ dataIndex?: number;
+ event?: { stop: () => void; event: PointerEvent };
+};
export default function EchartsWaterfall(
props: WaterfallChartTransformedProps,
) {
- const { height, width, echartOptions, refs, onLegendStateChanged, formData }
=
- props;
+ const {
+ categories,
+ coltypeMapping,
+ echartOptions,
+ emitCrossFilters,
+ filterState,
+ formData,
+ height,
+ onContextMenu,
+ onLegendStateChanged,
+ refs,
+ setDataMask = noop,
+ width,
+ } = props;
+ const { xAxisTimeFormat } = formData;
+ const timeGrain: TimeGranularity | undefined =
+ formData.extraFormData?.time_grain_sqla ?? formData.timeGrainSqla;
// The waterfall legend has a fixed set of three entries, so it never
// paginates and has no scroll position to preserve.
- const eventHandlers: EventHandlers =
- useLegendEventHandlers(onLegendStateChanged);
+ const legendEventHandlers = useLegendEventHandlers(onLegendStateChanged);
+
+ const crossFilterHandlers: EventHandlers = useMemo(() => {
+ const selectedKeys = getSelectedWaterfallKeys(filterState?.selectedValues);
+ const categoryAt = (event: WaterfallBarEvent) => {
+ if (event.dataIndex == null) {
+ return undefined;
+ }
+ const category = categories[event.dataIndex];
+ if (!category || category.isGrandTotal) {
+ return undefined;
+ }
+ return category;
+ };
+
+ return {
+ click: (event: WaterfallBarEvent) => {
+ if (!emitCrossFilters) {
+ return;
+ }
+ const category = categoryAt(event);
+ if (!category) {
+ return;
+ }
+ setDataMask(
+ getWaterfallCrossFilterDataMask({
+ category,
+ selectedKeys,
+ coltypeMapping,
+ timeFormat: xAxisTimeFormat,
+ timeGrain,
+ }).dataMask,
+ );
+ },
+ contextmenu: (event: WaterfallBarEvent) => {
+ if (!onContextMenu) {
+ return;
+ }
+ const category = categoryAt(event);
+ if (!category) {
+ return;
+ }
+ event.event?.stop();
+ const pointerEvent = event.event?.event;
+ if (!pointerEvent) {
+ return;
+ }
+ // IS NULL is unary. The menu types only binary operators, and both
+ // drill paths forward `op` unchanged.
+ const drillFilters = getWaterfallDrillFilters({
+ category,
+ coltypeMapping,
+ timeFormat: xAxisTimeFormat,
+ timeGrain,
+ }) as NonNullable<ContextMenuFilters['drillToDetail']>;
+ const xColumnLabel = getColumnLabel(category.xColumn);
Review Comment:
`adhocBucketColumn` returns a copy of the column; the previous
check—`filter.col === category.xColumn`—would have incorrectly routed a Custom
SQL axis into the breakdown filters instead of the "Drill by" area. Existing
tests only covered string-type columns, where both approaches yield the same
result. A context menu call has been added for a temporary ad-hoc axis with
monthly granularity: the filter now correctly remains in `xAxisFilters`, while
the breakdown list remains empty.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
