@adminforth/dashboard 1.7.0 → 1.8.0

package/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 & {

package/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
 

package/dist/custom/model/dashboard.types.d.ts

@@ -87,7 +87,8 @@ export type QueryOrderByItem = {
     field: string;
     direction?: 'asc' | 'desc';
 };
-export type QueryConfig = {
+export type ResourceQueryConfig = {
+    source?: 'resource';
     resource: string;
     select?: QuerySelectItem[];
     sparkline?: {
@@ -112,16 +113,27 @@ export type QueryConfig = {
     calcs?: QueryCalcSelectItem[];
     formatting?: Record<string, JsonValue>;
 };
-export type FunnelQueryConfig = {
-    steps: FunnelQueryStep[];
-    calcs?: QueryCalcSelectItem[];
-};
-export type 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 QueryConfig = ResourceQueryConfig | StepsQueryConfig;
 export type FieldRef = string | {
     field: string;
     label?: string;
@@ -210,7 +222,7 @@ export type TableWidgetConfig = WidgetBaseConfig & {
 export type ChartDashboardWidgetConfig = WidgetBaseConfig & {
     target: 'chart';
     chart: ChartWidgetConfig;
-    query: QueryConfig | FunnelQueryConfig;
+    query: QueryConfig;
 };
 export type KpiCardWidgetConfig = WidgetBaseConfig & {
     target: 'kpi_card';

package/dist/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 & {