Minor follow ups to measure filter API changes

proto/rill/ui/v1/dashboard.proto

@@ -4,6 +4,7 @@ package rill.ui.v1;
 import "google/protobuf/timestamp.proto";
 import "rill/runtime/v1/time_grain.proto";
 import "rill/runtime/v1/queries.proto";
+import "rill/runtime/v1/expression.proto";
 
 // DashboardState represents the dashboard as seen by the user
 message DashboardState {
@@ -56,6 +57,10 @@ message DashboardState {
   DashboardTimeRange time_range = 1;
   // Dimension filters applied
   rill.runtime.v1.MetricsViewFilter filters = 2;
+  // Expression format for dimension filters
+  rill.runtime.v1.Expression where = 20;
+  // Expression format for measure filters
+  rill.runtime.v1.Expression having = 21;
   // Selected time granularity
   rill.runtime.v1.TimeGrain time_grain = 3;
 

runtime/queries/metricsview.go

@@ -386,6 +386,9 @@ func buildAndOrExpressions(mv *runtimev1.MetricsViewSpec, cond *runtimev1.Condit
 		if err != nil {
 			return "", nil, err
 		}
+		if strings.TrimSpace(clause) == "" {
+			continue
+		}
 		args = append(args, subArgs...)
 		clauses = append(clauses, fmt.Sprintf("(%s)", clause))
 	}

runtime/queries/metricsview_aggregation.go

@@ -485,7 +485,9 @@ func (q *MetricsViewAggregation) buildMetricsAggregationSQL(mv *runtimev1.Metric
 		if err != nil {
 			return "", nil, err
 		}
-		whereClause += " AND " + clause
+		if strings.TrimSpace(clause) != "" {
+			whereClause += " AND " + clause
+		}
 		args = append(args, clauseArgs...)
 	}
 	if policy != nil && policy.RowFilter != "" {
@@ -503,7 +505,9 @@ func (q *MetricsViewAggregation) buildMetricsAggregationSQL(mv *runtimev1.Metric
 		if err != nil {
 			return "", nil, err
 		}
-		havingClause = "HAVING " + havingClause
+		if strings.TrimSpace(havingClause) != "" {
+			havingClause = "HAVING " + havingClause
+		}
 		args = append(args, havingClauseArgs...)
 	}
 

runtime/queries/metricsview_comparison_toplist.go

@@ -308,7 +308,9 @@ func (q *MetricsViewComparison) buildMetricsTopListSQL(mv *runtimev1.MetricsView
 		if err != nil {
 			return "", nil, err
 		}
-		baseWhereClause += " AND " + clause
+		if strings.TrimSpace(clause) != "" {
+			baseWhereClause += " AND " + clause
+		}
 
 		args = append(args, clauseArgs...)
 	}
@@ -324,7 +326,9 @@ func (q *MetricsViewComparison) buildMetricsTopListSQL(mv *runtimev1.MetricsView
 		if err != nil {
 			return "", nil, err
 		}
-		havingClause = "HAVING " + havingClause
+		if strings.TrimSpace(havingClause) != "" {
+			havingClause = "HAVING " + havingClause
+		}
 		args = append(args, havingClauseArgs...)
 	}
 

runtime/queries/metricsview_rows.go

@@ -244,7 +244,9 @@ func (q *MetricsViewRows) buildMetricsRowsSQL(mv *runtimev1.MetricsViewSpec, dia
 		if err != nil {
 			return "", nil, err
 		}
-		whereClause += " AND " + clause
+		if strings.TrimSpace(clause) != "" {
+			whereClause += " AND " + clause
+		}
 		args = append(args, clauseArgs...)
 	}
 

runtime/queries/metricsview_timeseries.go

@@ -294,7 +294,9 @@ func (q *MetricsViewTimeSeries) buildMetricsTimeseriesSQL(olap drivers.OLAPStore
 		if err != nil {
 			return "", "", nil, err
 		}
-		whereClause += " AND " + clause
+		if strings.TrimSpace(clause) != "" {
+			whereClause += " AND " + clause
+		}
 		args = append(args, clauseArgs...)
 	}
 
@@ -308,7 +310,9 @@ func (q *MetricsViewTimeSeries) buildMetricsTimeseriesSQL(olap drivers.OLAPStore
 		if err != nil {
 			return "", "", nil, err
 		}
-		havingClause = " HAVING " + clause
+		if strings.TrimSpace(clause) != "" {
+			havingClause = " HAVING " + clause
+		}
 		args = append(args, clauseArgs...)
 	}
 

runtime/queries/metricsview_toplist.go

@@ -222,7 +222,9 @@ func (q *MetricsViewToplist) buildMetricsTopListSQL(mv *runtimev1.MetricsViewSpe
 		if err != nil {
 			return "", nil, err
 		}
-		whereClause += " AND " + clause
+		if strings.TrimSpace(clause) != "" {
+			whereClause += " AND " + clause
+		}
 		args = append(args, clauseArgs...)
 	}
 
@@ -237,7 +239,9 @@ func (q *MetricsViewToplist) buildMetricsTopListSQL(mv *runtimev1.MetricsViewSpe
 		if err != nil {
 			return "", nil, err
 		}
-		havingClause = "HAVING " + havingClause
+		if strings.TrimSpace(havingClause) != "" {
+			havingClause = " HAVING " + havingClause
+		}
 		args = append(args, havingClauseArgs...)
 	}
 

runtime/queries/metricsview_totals.go

@@ -141,7 +141,9 @@ func (q *MetricsViewTotals) buildMetricsTotalsSQL(mv *runtimev1.MetricsViewSpec,
 		if err != nil {
 			return "", nil, err
 		}
-		whereClause += " AND " + clause
+		if strings.TrimSpace(clause) != "" {
+			whereClause += " AND " + clause
+		}
 		args = append(args, clauseArgs...)
 	}
 

web-common/src/proto/gen/rill/ui/v1/dashboard_pb.ts

@@ -6,6 +6,7 @@
 import type { BinaryReadOptions, FieldList, JsonReadOptions, JsonValue, PartialMessage, PlainMessage } from "@bufbuild/protobuf";
 import { Message, proto3, Timestamp } from "@bufbuild/protobuf";
 import { MetricsViewFilter } from "../../runtime/v1/queries_pb.js";
+import { Expression } from "../../runtime/v1/expression_pb.js";
 import { TimeGrain } from "../../runtime/v1/time_grain_pb.js";
 
 /**
@@ -28,6 +29,20 @@ export class DashboardState extends Message<DashboardState> {
    */
   filters?: MetricsViewFilter;
 
+  /**
+   * Expression format for dimension filters
+   *
+   * @generated from field: rill.runtime.v1.Expression where = 20;
+   */
+  where?: Expression;
+
+  /**
+   * Expression format for measure filters
+   *
+   * @generated from field: rill.runtime.v1.Expression having = 21;
+   */
+  having?: Expression;
+
   /**
    * Selected time granularity
    *
@@ -137,6 +152,8 @@ export class DashboardState extends Message<DashboardState> {
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
     { no: 1, name: "time_range", kind: "message", T: DashboardTimeRange },
     { no: 2, name: "filters", kind: "message", T: MetricsViewFilter },
+    { no: 20, name: "where", kind: "message", T: Expression },
+    { no: 21, name: "having", kind: "message", T: Expression },
     { no: 3, name: "time_grain", kind: "enum", T: proto3.getEnumType(TimeGrain) },
     { no: 4, name: "compare_time_range", kind: "message", T: DashboardTimeRange },
     { no: 5, name: "leaderboard_measure", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
@@ -238,7 +255,7 @@ proto3.util.setEnumType(DashboardState_LeaderboardSortDirection, "rill.ui.v1.Das
 ]);
 
 /**
- * *
+ *
  * SortType is used to determine how to sort the leaderboard
  * and dimension detail table, as well as where to place the
  * sort arrow.