Fix MLv1-MLv2 validation for aggregations and expressions (#31244)

frontend/src/metabase-lib/Dimension.ts

@@ -1307,6 +1307,10 @@ export class ExpressionDimension extends Dimension {
     });
   }
 
+  getMLv1CompatibleDimension() {
+    return this.withoutOptions("base-type", "effective-type");
+  }
+
   icon(): string {
     const field = this.field();
     return field ? field.icon() : "unknown";
@@ -1481,6 +1485,10 @@ export class AggregationDimension extends Dimension {
     });
   }
 
+  getMLv1CompatibleDimension() {
+    return this.withoutOptions("base-type", "effective-type");
+  }
+
   /**
    * Raw aggregation
    */
@@ -1529,6 +1537,19 @@ export class AggregationDimension extends Dimension {
     return ["aggregation", this._aggregationIndex, this._options];
   }
 
+  withoutOptions(...options: string[]): AggregationDimension {
+    if (!this._options) {
+      return this;
+    }
+
+    return new AggregationDimension(
+      this._aggregationIndex,
+      _.omit(this._options, ...options),
+      this._metadata,
+      this._query,
+    );
+  }
+
   icon() {
     return "int";
   }

frontend/src/metabase-lib/queries/structured/Aggregation.ts

@@ -159,7 +159,7 @@ export default class Aggregation extends MBQLClause {
     if (this.hasOptions()) {
       return this.aggregation().isValid();
     } else if (this.isStandard() && this.dimension()) {
-      const dimension = this.dimension();
+      const dimension = this.dimension()?.getMLv1CompatibleDimension();
       const aggregationOperator = this.query().aggregationOperator(this[0]);
       return (
         aggregationOperator &&

frontend/test/metabase-lib/lib/Dimension.unit.spec.js

@@ -755,6 +755,28 @@ describe("Dimension", () => {
           });
         });
       });
+
+      describe("getMLv1CompatibleDimension", () => {
+        it("should strip away *-type options", () => {
+          const dimension = Dimension.parseMBQL(
+            [
+              "expression",
+              "Hello World",
+              {
+                "base-type": "type/Text",
+                "effective-type": "type/Text",
+              },
+            ],
+            metadata,
+          );
+
+          expect(dimension.getMLv1CompatibleDimension().mbql()).toEqual([
+            "expression",
+            "Hello World",
+            null,
+          ]);
+        });
+      });
     });
 
     describe("dimensions()", () => {
@@ -968,6 +990,28 @@ describe("Dimension", () => {
           expect(base_type).toBe("type/Integer");
         });
       });
+
+      describe("getMLv1CompatibleDimension", () => {
+        it("should strip away *-type options", () => {
+          const dimension = Dimension.parseMBQL(
+            [
+              "aggregation",
+              1,
+              {
+                "base-type": "type/Integer",
+                "effective-type": "type/Integer",
+              },
+            ],
+            metadata,
+          );
+
+          expect(dimension.getMLv1CompatibleDimension().mbql()).toEqual([
+            "aggregation",
+            1,
+            null,
+          ]);
+        });
+      });
     });
   });