File tree Expand file tree Collapse file tree 4 files changed +7
-35
lines changed
web-common/src/features/canvas Expand file tree Collapse file tree 4 files changed +7
-35
lines changed Original file line number Diff line number Diff line change @@ -16,7 +16,6 @@ import {
1616import type { ExploreState } from "@rilldata/web-common/features/dashboards/stores/explore-state" ;
1717import { DashboardState_ActivePage } from "@rilldata/web-common/proto/gen/rill/ui/v1/dashboard_pb" ;
1818import {
19- MetricsViewSpecDimensionType ,
2019 type V1MetricsViewSpec ,
2120 type V1Resource ,
2221} from "@rilldata/web-common/runtime-client" ;
@@ -126,11 +125,7 @@ export class LeaderboardComponent extends BaseCanvasComponent<LeaderboardSpec> {
126125 metricsViewSpec ?. measures ?. slice ( 0 , 1 ) . map ( ( m ) => m . name as string ) ?? [ ] ; // TODO: change to 3
127126
128127 const dimensions =
129- [ ...( metricsViewSpec ?. dimensions || [ ] ) ]
130- . filter (
131- ( d ) =>
132- d . type === MetricsViewSpecDimensionType . DIMENSION_TYPE_CATEGORICAL ,
133- )
128+ metricsViewSpec ?. dimensions
134129 ?. slice ( 0 , 3 )
135130 . map ( ( d ) => d . name || ( d . column as string ) ) ?? [ ] ;
136131
Original file line number Diff line number Diff line change @@ -11,7 +11,6 @@ import type {
1111import type { ExploreState } from "@rilldata/web-common/features/dashboards/stores/explore-state" ;
1212import { DashboardState_ActivePage } from "@rilldata/web-common/proto/gen/rill/ui/v1/dashboard_pb" ;
1313import {
14- MetricsViewSpecDimensionType ,
1514 type V1MetricsViewSpec ,
1615 type V1Resource ,
1716} from "@rilldata/web-common/runtime-client" ;
@@ -177,10 +176,6 @@ export class PivotCanvasComponent extends BaseCanvasComponent<
177176
178177 const dimensions =
179178 metricsViewSpec ?. dimensions
180- ?. filter (
181- ( d ) =>
182- d . type === MetricsViewSpecDimensionType . DIMENSION_TYPE_CATEGORICAL ,
183- )
184179 ?. slice ( 0 , 3 )
185180 . map ( ( d ) => d . name || ( d . column as string ) ) ?? [ ] ;
186181
@@ -213,12 +208,8 @@ export class PivotCanvasComponent extends BaseCanvasComponent<
213208 const allMeasures =
214209 metricsViewSpec ?. measures ?. map ( ( m ) => m . name as string ) || [ ] ;
215210 const allDimensions =
216- metricsViewSpec ?. dimensions
217- ?. filter (
218- ( d ) =>
219- d . type === MetricsViewSpecDimensionType . DIMENSION_TYPE_CATEGORICAL ,
220- )
221- ?. map ( ( d ) => d . name || ( d . column as string ) ) || [ ] ;
211+ metricsViewSpec ?. dimensions ?. map ( ( d ) => d . name || ( d . column as string ) ) ||
212+ [ ] ;
222213
223214 let newSpec : PivotSpec | TableSpec ;
224215
Original file line number Diff line number Diff line change 1- import {
2- MetricsViewSpecDimensionType ,
3- type V1MetricsViewSpec ,
4- } from "@rilldata/web-common/runtime-client" ;
1+ import { type V1MetricsViewSpec } from "@rilldata/web-common/runtime-client" ;
52
63export const isMeasureValid = (
74 metricsViewSpec : V1MetricsViewSpec ,
@@ -17,12 +14,7 @@ export const isDimensionValid = (
1714 dimensionName : string ,
1815) : boolean => {
1916 return (
20- metricsViewSpec ?. dimensions
21- ?. filter (
22- ( d ) =>
23- d . type === MetricsViewSpecDimensionType . DIMENSION_TYPE_CATEGORICAL ,
24- )
25- . some ( ( d ) => d . name === dimensionName ) || false
17+ metricsViewSpec ?. dimensions ?. some ( ( d ) => d . name === dimensionName ) || false
2618 ) ;
2719} ;
2820
Original file line number Diff line number Diff line change @@ -7,10 +7,7 @@ import {
77import type { FileArtifact } from "@rilldata/web-common/features/entity-management/file-artifact" ;
88import { TIME_GRAIN } from "@rilldata/web-common/lib/time/config" ;
99import { isGrainBigger } from "@rilldata/web-common/lib/time/grains" ;
10- import {
11- MetricsViewSpecDimensionType ,
12- V1TimeGrain ,
13- } from "@rilldata/web-common/runtime-client" ;
10+ import { V1TimeGrain } from "@rilldata/web-common/runtime-client" ;
1411import { derived } from "svelte/store" ;
1512import { parseDocument } from "yaml" ;
1613
@@ -41,10 +38,7 @@ export function useMetricFieldData(
4138 const displayMap : Record < string , { label : string ; type : FieldType } > = { } ;
4239
4340 const measures = metricsViewSpec ?. measures ?? [ ] ;
44- const dimensions = ( metricsViewSpec ?. dimensions ?? [ ] ) . filter (
45- ( d ) =>
46- d . type === MetricsViewSpecDimensionType . DIMENSION_TYPE_CATEGORICAL ,
47- ) ;
41+ const dimensions = metricsViewSpec ?. dimensions ?? [ ] ;
4842 const timeDimension = metricsViewSpec ?. timeDimension ;
4943
5044 if ( type . includes ( "measure" ) ) {
You can’t perform that action at this time.
0 commit comments