Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions web-common/src/features/canvas/components/pivot/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ export class PivotCanvasComponent extends BaseCanvasComponent<
this.parent,
derived(this.specStore, ($specStore) => $specStore.metrics_view),
this.config,
this.visible,
);
}

Expand Down
3 changes: 2 additions & 1 deletion web-common/src/features/canvas/components/pivot/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -266,12 +266,13 @@ export const usePivotForCanvas = (
canvas: CanvasEntity,
metricsViewStore: Readable<string>,
pivotConfig: Readable<PivotDataStoreConfig>,
visible: Readable<boolean>,
) => {
const pivotDashboardContext: PivotDashboardContext = {
runtimeClient: canvas.client,
metricsViewName: metricsViewStore,
queryClient: queryClient,
enabled: !!canvas,
enabled: visible,
};

const pivotDataStore = createPivotDataStore(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ export const usePivotForExplore = memoizeMetricsStore<PivotDataStore>(
runtimeClient: ctx.runtimeClient,
metricsViewName: ctx.metricsViewName,
queryClient: ctx.queryClient,
enabled: !!ctx.dashboardStore,
enabled: readable(!!ctx.dashboardStore),
};
return createPivotDataStore(pivotDashboardContext, pivotConfig);
},
Expand Down
68 changes: 35 additions & 33 deletions web-common/src/features/dashboards/pivot/pivot-queries.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { ConnectError } from "@connectrpc/connect";
import {
createAndExpression,
createInExpression,
Expand All @@ -11,9 +12,8 @@ import {
type V1MetricsViewAggregationResponse,
type V1MetricsViewAggregationResponseDataItem,
type V1MetricsViewAggregationSort,
createQueryServiceMetricsViewAggregation,
} from "@rilldata/web-common/runtime-client";
import type { ConnectError } from "@connectrpc/connect";
import { createQueryServiceMetricsViewAggregation } from "@rilldata/web-common/runtime-client";
import {
type CreateQueryResult,
keepPreviousData,
Expand Down Expand Up @@ -71,39 +71,41 @@ export function createPivotAggregationRowQuery(
hasComparison = true;
}

return derived([ctx.metricsViewName], ([metricsViewName], set) =>
createQueryServiceMetricsViewAggregation(
ctx.runtimeClient,
{
metricsView: metricsViewName,
measures: prepareMeasureForComparison(measures),
dimensions,
where: sanitiseExpression(whereFilter, undefined),
timeRange: {
start: timeRange?.start ? timeRange.start : config.time.timeStart,
end: timeRange?.end ? timeRange.end : config.time.timeEnd,
timeDimension: config.time.timeDimension,
return derived(
[ctx.metricsViewName, ctx.enabled],
([metricsViewName, enabled], set) =>
createQueryServiceMetricsViewAggregation(
ctx.runtimeClient,
{
metricsView: metricsViewName,
measures: prepareMeasureForComparison(measures),
dimensions,
where: sanitiseExpression(whereFilter, undefined),
timeRange: {
start: timeRange?.start ? timeRange.start : config.time.timeStart,
end: timeRange?.end ? timeRange.end : config.time.timeEnd,
timeDimension: config.time.timeDimension,
},
comparisonTimeRange:
hasComparison && comparisonTime
? {
start: comparisonTime.start,
end: comparisonTime.end,
timeDimension: config.time.timeDimension,
}
: undefined,
sort,
limit,
offset,
},
comparisonTimeRange:
hasComparison && comparisonTime
? {
start: comparisonTime.start,
end: comparisonTime.end,
timeDimension: config.time.timeDimension,
}
: undefined,
sort,
limit,
offset,
},
{
query: {
enabled: ctx.enabled,
placeholderData: keepPreviousData,
{
query: {
enabled,
placeholderData: keepPreviousData,
},
},
},
ctx.queryClient,
).subscribe(set),
ctx.queryClient,
).subscribe(set),
);
}

Expand Down
2 changes: 1 addition & 1 deletion web-common/src/features/dashboards/pivot/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export interface PivotDashboardContext {
runtimeClient: RuntimeClient;
metricsViewName: Readable<string>;
queryClient: QueryClient;
enabled: boolean;
enabled: Readable<boolean>;
}

export interface PivotState {
Expand Down
Loading