Rollback mbqlv2 drills - sort, fk-filter, summarize-column-by-time (#35917)

frontend/src/metabase/visualizations/click-actions/Mode/Mode.ts

-import * as Lib from "metabase-lib";
-import type { DrillThru } from "metabase-lib";
 import type Question from "metabase-lib/Question";
 import type {
   ClickAction,
   ClickObject,
   QueryClickActionsMode,
 } from "../../types";
-import { DRILL_TYPE_TO_HANDLER_MAP } from "./constants";
 
 export class Mode {
   _question: Question;
@@ -34,58 +31,7 @@ export class Mode {
     const question = this._question;
     const props = { question, settings, clicked, extraData };
 
-    let drills: ClickAction[] = [];
-
-    // FIXME: this try catch is needed to mitigate Lib runtime error, it doesn't work properly with custom columns. Remove when this gets fixed
-    try {
-      const query = question._getMLv2Query();
-      const stageIndex = -1;
-
-      const applyDrillAndGetNewQuestion = (
-        drill: DrillThru,
-        ...args: any[]
-      ) => {
-        const updatedQuery = Lib.drillThru(query, stageIndex, drill, ...args);
-        return question.setDatasetQuery(Lib.toLegacyQuery(updatedQuery));
-      };
-
-      // TODO: those calculations are really expensive and must be memoized at some level
-      // check `_visualizationIsClickableCached` from TableInteractive
-      const availableDrillThrus = Lib.availableDrillThrus(
-        query,
-        stageIndex,
-        clicked?.column,
-        clicked?.value,
-        clicked?.data,
-        clicked?.dimensions,
-      );
-
-      drills = availableDrillThrus
-        .flatMap(drill => {
-          const drillDisplayInfo = Lib.displayInfo(query, stageIndex, drill);
-
-          const drillHandler = DRILL_TYPE_TO_HANDLER_MAP[drillDisplayInfo.type];
-
-          if (!drillHandler) {
-            return null;
-          }
-
-          return drillHandler({
-            ...props,
-            drill,
-            drillDisplayInfo,
-            applyDrill: applyDrillAndGetNewQuestion,
-          });
-        })
-        .filter(Boolean) as ClickAction[]; // TODO [31004]: remove this after all drills have been added
-    } catch (e) {
-      console.error("error getting available drills from MLv2", e);
-    }
-
-    const additionalClickActions =
-      mode.clickActions?.flatMap(drill => drill(props)) || [];
-
-    const actions = [...drills, ...additionalClickActions];
+    const actions = mode.clickActions.flatMap(drill => drill(props));
 
     if (!actions.length && mode.fallback) {
       return mode.fallback(props);

frontend/src/metabase/visualizations/click-actions/Mode/Mode.unit.spec.ts

@@ -72,7 +72,9 @@ describe("Mode", function () {
             type: "query",
             query: {
               "source-table": ORDERS_ID,
-              "order-by": [["asc", ["field", ORDERS.ID, null]]],
+              "order-by": [
+                ["asc", ["field", ORDERS.ID, { "base-type": "type/Integer" }]],
+              ],
             },
           },
         });

frontend/src/metabase/visualizations/click-actions/actions/HideColumnAction/HideColumnAction.tsx

@@ -25,7 +25,7 @@ export const HideColumnAction: LegacyDrill = ({
 
   return [
     {
-      name: "formatting",
+      name: "formatting-hide",
       title: t`Hide column`,
       section: "sort",
       buttonType: "sort",

frontend/src/metabase/visualizations/click-actions/drills/SortDrill.ts

+import { t } from "ttag";
+import type {
+  ClickActionBase,
+  ClickActionProps,
+  QuestionChangeClickAction,
+} from "metabase/visualizations/types";
+import {
+  sortDrill,
+  sortDrillQuestion,
+} from "metabase-lib/queries/drills/sort-drill";
+
+const ACTIONS: Record<string, ClickActionBase> = {
+  asc: {
+    name: "sort-ascending",
+    icon: "arrow_up",
+    section: "sort",
+    buttonType: "sort",
+    tooltip: t`Sort ascending`,
+  },
+  desc: {
+    name: "sort-descending",
+    icon: "arrow_down",
+    section: "sort",
+    buttonType: "sort",
+    tooltip: t`Sort descending`,
+  },
+};
+
+const SortDrill = ({
+  question,
+  clicked,
+}: ClickActionProps): QuestionChangeClickAction[] => {
+  const drill = sortDrill({ question, clicked });
+  if (!drill) {
+    return [];
+  }
+
+  const { sortDirections } = drill;
+  return sortDirections.map(sortDirection => ({
+    ...ACTIONS[sortDirection],
+    question: () => sortDrillQuestion({ question, clicked, sortDirection }),
+  }));
+};
+
+// eslint-disable-next-line import/no-default-export -- deprecated usage
+export default SortDrill;

frontend/src/metabase/visualizations/click-actions/modes/DefaultMode.ts

@@ -4,6 +4,8 @@ import { QuickFilterDrill } from "metabase/visualizations/click-actions/drills/Q
 import { ObjectDetailDrill } from "metabase/visualizations/click-actions/drills/ObjectDetailDrill";
 import ZoomDrill from "metabase/visualizations/click-actions/drills/ZoomDrill";
 import { ColumnFilterDrill } from "metabase/visualizations/click-actions/drills/ColumnFilterDrill";
+import SortDrill from "metabase/visualizations/click-actions/drills/SortDrill";
+import ForeignKeyDrill from "metabase/visualizations/click-actions/drills/ForeignKeyDrill";
 import type { QueryClickActionsMode } from "../../types";
 import { ColumnFormattingAction } from "../actions/ColumnFormattingAction";
 import { HideColumnAction } from "../actions/HideColumnAction";
@@ -14,8 +16,10 @@ export const DefaultMode: QueryClickActionsMode = {
   clickActions: [
     UnderlyingRecordsDrill,
     ZoomDrill,
+    SortDrill,
     ObjectDetailDrill,
     QuickFilterDrill,
+    ForeignKeyDrill,
     ColumnFilterDrill,
     AutomaticInsightsDrill,
     HideColumnAction,

frontend/src/metabase/visualizations/click-actions/modes/SegmentMode.ts

 import SummarizeColumnDrill from "metabase/visualizations/click-actions/drills/SummarizeColumnDrill";
 import DistributionDrill from "metabase/visualizations/click-actions/drills/DistributionDrill";
+import SummarizeColumnByTimeDrill from "metabase/visualizations/click-actions/drills/SummarizeColumnByTimeDrill";
 import type { QueryClickActionsMode } from "../../types";
 import { DefaultMode } from "./DefaultMode";
 
@@ -8,6 +9,7 @@ export const SegmentMode: QueryClickActionsMode = {
   clickActions: [
     ...DefaultMode.clickActions,
     SummarizeColumnDrill,
+    SummarizeColumnByTimeDrill,
     DistributionDrill,
   ],
 };

frontend/src/metabase/visualizations/click-actions/modes/TimeseriesMode.ts

@@ -6,8 +6,8 @@ import { DefaultMode } from "./DefaultMode";
 export const TimeseriesMode: QueryClickActionsMode = {
   name: "timeseries",
   clickActions: [
-    ...DefaultMode.clickActions,
     getPivotDrill({ withTime: false }),
+    ...DefaultMode.clickActions,
   ],
   ModeFooter: TimeseriesModeFooter,
 };

frontend/src/metabase/visualizations/components/ClickActions/ClickActionsPopover.unit.spec.tsx

@@ -144,7 +144,12 @@ describe("ClickActionsPopover", function () {
               ...ORDERS_DATASET_QUERY,
               query: {
                 ...ORDERS_DATASET_QUERY.query,
-                "order-by": [["asc", ["field", ORDERS.ID, null]]],
+                "order-by": [
+                  [
+                    "asc",
+                    ["field", ORDERS.ID, { "base-type": "type/Integer" }],
+                  ],
+                ],
               },
             },
           }),
@@ -152,6 +157,7 @@ describe("ClickActionsPopover", function () {
             column: ORDERS_COLUMNS.ID,
             value: undefined,
           },
+          rowValues: undefined,
         });
 
         expect(queryIcon("arrow_up")).not.toBeInTheDocument();
@@ -185,7 +191,7 @@ describe("ClickActionsPopover", function () {
                       "field",
                       ORDERS.ID,
                       {
-                        "base-type": "type/BigInteger",
+                        "base-type": "type/Integer",
                       },
                     ],
                   ],
@@ -208,7 +214,7 @@ describe("ClickActionsPopover", function () {
               ORDERS.TOTAL,
               "type/Float",
             ),
-            display: "table",
+            display: "line",
           },
         },
         {
@@ -219,7 +225,7 @@ describe("ClickActionsPopover", function () {
               ORDERS.QUANTITY,
               "type/Integer",
             ),
-            display: "table",
+            display: "line",
           },
         },
       ])(
@@ -508,7 +514,6 @@ function getSummarizedOverTimeResultDatasetQuery(
           "field",
           ORDERS.CREATED_AT,
           {
-            "base-type": "type/DateTime",
             "temporal-unit": "month",
           },
         ],