feat: refactor query configuration types and update widget data handling for resource and steps queries

Author: NoOne7135

custom/model/dashboard.types.ts

@@ -117,7 +117,8 @@ export type QueryOrderByItem = {
   direction?: 'asc' | 'desc'
 }
 
-export type QueryConfig = {
+export type ResourceQueryConfig = {
+  source?: 'resource'
   resource: string
   select?: QuerySelectItem[]
   sparkline?: {
@@ -139,17 +140,31 @@ export type QueryConfig = {
   formatting?: Record<string, JsonValue>
 }
 
-export type FunnelQueryConfig = {
-  steps: FunnelQueryStep[]
+export type StepsQueryStepConfig =
+  | {
+      name: string
+      resource: string
+      metric: QueryAggregateSelectItem
+      filters?: FilterExpression
+    }
+  | {
+      name: string
+      resource: string
+      select: QueryAggregateSelectItem[]
+      filters?: FilterExpression
+    }
+
+export type StepsQueryConfig = {
+  source: 'steps'
+  steps: StepsQueryStepConfig[]
   calcs?: QueryCalcSelectItem[]
+  order_by?: QueryOrderByItem[]
+  limit?: number
+  offset?: number
+  formatting?: Record<string, JsonValue>
 }
 
-export type FunnelQueryStep = {
-  name: string
-  resource: string
-  metric: QueryAggregateSelectItem
-  filters?: FilterExpression
-}
+export type QueryConfig = ResourceQueryConfig | StepsQueryConfig
 
 export type FieldRef = string | {
   field: string
@@ -246,7 +261,7 @@ export type TableWidgetConfig = WidgetBaseConfig & {
 export type ChartDashboardWidgetConfig = WidgetBaseConfig & {
   target: 'chart'
   chart: ChartWidgetConfig
-  query: QueryConfig | FunnelQueryConfig
+  query: QueryConfig
 }
 
 export type KpiCardWidgetConfig = WidgetBaseConfig & {

custom/skills/adminforth-dashboard/SKILL.md

@@ -151,8 +151,8 @@ Use resource, not resourceId.
 
 ## Query shape rules
 
-Use dashboard_configure_funnel_chart_widget for funnel charts and set query.steps.
-Do not use query.steps for kpi_card, gauge_card, table, pivot_table, line, bar, stacked bar, pie, or histogram charts.
+All chart widgets, including funnel charts, use the same query shape.
+Use a single-resource query by default.
 
 For kpi_card and normal charts, use:
 - query.resource
@@ -162,6 +162,29 @@ For kpi_card and normal charts, use:
 - optional query.order_by
 - optional query.calcs
 
+For multi-resource charts or widgets, use the general steps source:
+
+query:
+  source: steps
+  steps:
+    - name: Leads
+      resource: leads
+      metric:
+        agg: count
+        as: value
+    - name: Customers
+      resource: orders
+      metric:
+        agg: count_distinct
+        field: customer_id
+        as: value
+
+Each step may use either:
+- metric for one aggregate
+- select for multiple aggregate fields
+
+Do not use bare query.steps without source: steps.
+
 ## Date range rules
 
 Use only query.filters for time ranges.
@@ -203,7 +226,7 @@ select raw token totals:
 then query.calcs:
 - calculate total_spend from those aliases and lookup variables
 
-For today vs yesterday KPI, use multiple aggregate select items with filters and distinct aliases, then calcs. Do not use query.steps.
+For today vs yesterday KPI, use multiple aggregate select items with filters and distinct aliases, then calcs.
 
 ## Calc variables
 

schema/api.ts

@@ -2,7 +2,6 @@ import { toJSONSchema, z } from 'zod'
 import {
   BarChartSchema,
   FunnelChartSchema,
-  FunnelQueryConfigSchema,
   GaugeCardViewConfigSchema,
   HistogramChartSchema,
   KpiCardViewConfigSchema,
@@ -153,7 +152,7 @@ const ConfigurableHistogramChartWidgetConfigSchema = WidgetEditableBaseSchema.ex
 const ConfigurableFunnelChartWidgetConfigSchema = WidgetEditableBaseSchema.extend({
   target: z.literal('chart'),
   chart: FunnelChartSchema,
-  query: FunnelQueryConfigSchema,
+  query: QueryConfigSchema,
 })
 
 const ConfigurablePivotTableWidgetConfigSchema = WidgetEditableBaseSchema.extend({

schema/widget.ts

@@ -33,7 +33,6 @@ export {
 } from './widgets/table.js'
 export {
   EmptyWidgetConfigSchema,
-  FunnelQueryConfigSchema,
   QueryConfigSchema,
   WidgetEditableBaseSchema,
 } from './widgets/common.js'

schema/widgets/charts.ts

@@ -1,7 +1,6 @@
 import { z } from 'zod'
 import {
   ChartFieldRefSchema,
-  FunnelQueryConfigSchema,
   QueryConfigSchema,
   WidgetBaseSchema,
 } from './common.js'
@@ -100,7 +99,7 @@ export const HistogramChartWidgetConfigSchema = WidgetBaseSchema.extend({
 export const FunnelChartWidgetConfigSchema = WidgetBaseSchema.extend({
   target: z.literal('chart'),
   chart: FunnelChartSchema,
-  query: FunnelQueryConfigSchema,
+  query: QueryConfigSchema,
 })
 
 export const ChartWidgetTargetConfigSchema = z.union([

schema/widgets/common.ts

@@ -140,7 +140,8 @@ export const QueryCalcItemSchema = z.object({
   as: z.string(),
 }).strict()
 
-export const QueryConfigSchema = z.object({
+const ResourceQueryConfigSchema = z.object({
+  source: z.literal('resource').optional(),
   resource: z.string(),
   select: z.array(QuerySelectItemSchema).optional(),
   sparkline: z.object({
@@ -159,18 +160,36 @@ export const QueryConfigSchema = z.object({
   formatting: z.record(z.string(), z.unknown()).optional(),
 }).strict()
 
-const FunnelQueryStepSchema = z.object({
+const StepsQueryMetricStepSchema = z.object({
   name: z.string(),
   resource: z.string(),
   metric: QueryAggregateSelectItemSchema,
   filters: FilterExpressionSchema.optional(),
 }).strict()
 
-export const FunnelQueryConfigSchema = z.object({
-  steps: z.array(FunnelQueryStepSchema).min(1),
-  calcs: z.array(QueryCalcItemSchema).optional(),
+const StepsQuerySelectStepSchema = z.object({
+  name: z.string(),
+  resource: z.string(),
+  select: z.array(QueryAggregateSelectItemSchema).min(1),
+  filters: FilterExpressionSchema.optional(),
 }).strict()
 
+export const QueryConfigSchema = z.union([
+  ResourceQueryConfigSchema,
+  z.object({
+    source: z.literal('steps'),
+    steps: z.array(z.union([
+      StepsQueryMetricStepSchema,
+      StepsQuerySelectStepSchema,
+    ])).min(1),
+    calcs: z.array(QueryCalcItemSchema).optional(),
+    order_by: z.array(QueryOrderByItemSchema).optional(),
+    limit: z.number().int().positive().optional(),
+    offset: z.number().int().nonnegative().optional(),
+    formatting: z.record(z.string(), z.unknown()).optional(),
+  }).strict(),
+])
+
 export const WidgetPersistedFieldsSchema = z.object({
   id: z.string(),
   group_id: z.string(),