@adminforth/dashboard 1.1.0 → 1.2.0

package/dist/schema/widget.d.ts

@@ -163,18 +163,6 @@ export declare const ChartConfigSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     value_field: z.ZodOptional<z.ZodString>;
     colors: z.ZodOptional<z.ZodArray<z.ZodString>>;
 }, z.core.$strip>], "type">;
-export declare const DashboardWidgetQuerySchema: z.ZodObject<{
-    resource: z.ZodString;
-    select: z.ZodOptional<z.ZodArray<z.ZodString>>;
-    order: z.ZodOptional<z.ZodObject<{
-        field: z.ZodString;
-        direction: z.ZodEnum<{
-            asc: "asc";
-            desc: "desc";
-        }>;
-    }, z.core.$strip>>;
-    limit: z.ZodOptional<z.ZodNumber>;
-}, z.core.$strip>;
 export declare const EmptyWidgetConfigSchema: z.ZodObject<{
     id: z.ZodOptional<z.ZodString>;
     group_id: z.ZodOptional<z.ZodString>;
@@ -283,18 +271,6 @@ export declare const WidgetConfigSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     }, z.core.$strict>], "type">>;
     target: z.ZodLiteral<"table">;
     table: z.ZodOptional<z.ZodUnknown>;
-    query: z.ZodOptional<z.ZodObject<{
-        resource: z.ZodString;
-        select: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        order: z.ZodOptional<z.ZodObject<{
-            field: z.ZodString;
-            direction: z.ZodEnum<{
-                asc: "asc";
-                desc: "desc";
-            }>;
-        }, z.core.$strip>>;
-        limit: z.ZodOptional<z.ZodNumber>;
-    }, z.core.$strip>>;
 }, z.core.$strip>, z.ZodObject<{
     id: z.ZodOptional<z.ZodString>;
     group_id: z.ZodOptional<z.ZodString>;
@@ -402,18 +378,6 @@ export declare const WidgetConfigSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
         value_field: z.ZodOptional<z.ZodString>;
         colors: z.ZodOptional<z.ZodArray<z.ZodString>>;
     }, z.core.$strip>], "type">;
-    query: z.ZodOptional<z.ZodObject<{
-        resource: z.ZodString;
-        select: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        order: z.ZodOptional<z.ZodObject<{
-            field: z.ZodString;
-            direction: z.ZodEnum<{
-                asc: "asc";
-                desc: "desc";
-            }>;
-        }, z.core.$strip>>;
-        limit: z.ZodOptional<z.ZodNumber>;
-    }, z.core.$strip>>;
 }, z.core.$strip>, z.ZodObject<{
     id: z.ZodOptional<z.ZodString>;
     group_id: z.ZodOptional<z.ZodString>;
@@ -468,18 +432,6 @@ export declare const WidgetConfigSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     }, z.core.$strict>], "type">>;
     target: z.ZodLiteral<"kpi_card">;
     kpi_card: z.ZodOptional<z.ZodUnknown>;
-    query: z.ZodOptional<z.ZodObject<{
-        resource: z.ZodString;
-        select: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        order: z.ZodOptional<z.ZodObject<{
-            field: z.ZodString;
-            direction: z.ZodEnum<{
-                asc: "asc";
-                desc: "desc";
-            }>;
-        }, z.core.$strip>>;
-        limit: z.ZodOptional<z.ZodNumber>;
-    }, z.core.$strip>>;
 }, z.core.$strip>, z.ZodObject<{
     id: z.ZodOptional<z.ZodString>;
     group_id: z.ZodOptional<z.ZodString>;
@@ -534,18 +486,6 @@ export declare const WidgetConfigSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     }, z.core.$strict>], "type">>;
     target: z.ZodLiteral<"gauge_card">;
     gauge_card: z.ZodOptional<z.ZodUnknown>;
-    query: z.ZodOptional<z.ZodObject<{
-        resource: z.ZodString;
-        select: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        order: z.ZodOptional<z.ZodObject<{
-            field: z.ZodString;
-            direction: z.ZodEnum<{
-                asc: "asc";
-                desc: "desc";
-            }>;
-        }, z.core.$strip>>;
-        limit: z.ZodOptional<z.ZodNumber>;
-    }, z.core.$strip>>;
 }, z.core.$strip>, z.ZodObject<{
     id: z.ZodOptional<z.ZodString>;
     group_id: z.ZodOptional<z.ZodString>;
@@ -600,18 +540,6 @@ export declare const WidgetConfigSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     }, z.core.$strict>], "type">>;
     target: z.ZodLiteral<"pivot_table">;
     pivot_table: z.ZodOptional<z.ZodUnknown>;
-    query: z.ZodOptional<z.ZodObject<{
-        resource: z.ZodString;
-        select: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        order: z.ZodOptional<z.ZodObject<{
-            field: z.ZodString;
-            direction: z.ZodEnum<{
-                asc: "asc";
-                desc: "desc";
-            }>;
-        }, z.core.$strip>>;
-        limit: z.ZodOptional<z.ZodNumber>;
-    }, z.core.$strip>>;
 }, z.core.$strip>], "target">;
 export declare const StoredWidgetConfigSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     id: z.ZodOptional<z.ZodString>;
@@ -720,18 +648,6 @@ export declare const StoredWidgetConfigSchema: z.ZodDiscriminatedUnion<[z.ZodObj
     }, z.core.$strict>], "type">>;
     target: z.ZodLiteral<"table">;
     table: z.ZodOptional<z.ZodUnknown>;
-    query: z.ZodOptional<z.ZodObject<{
-        resource: z.ZodString;
-        select: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        order: z.ZodOptional<z.ZodObject<{
-            field: z.ZodString;
-            direction: z.ZodEnum<{
-                asc: "asc";
-                desc: "desc";
-            }>;
-        }, z.core.$strip>>;
-        limit: z.ZodOptional<z.ZodNumber>;
-    }, z.core.$strip>>;
 }, z.core.$strip>, z.ZodObject<{
     id: z.ZodOptional<z.ZodString>;
     group_id: z.ZodOptional<z.ZodString>;
@@ -839,18 +755,6 @@ export declare const StoredWidgetConfigSchema: z.ZodDiscriminatedUnion<[z.ZodObj
         value_field: z.ZodOptional<z.ZodString>;
         colors: z.ZodOptional<z.ZodArray<z.ZodString>>;
     }, z.core.$strip>], "type">;
-    query: z.ZodOptional<z.ZodObject<{
-        resource: z.ZodString;
-        select: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        order: z.ZodOptional<z.ZodObject<{
-            field: z.ZodString;
-            direction: z.ZodEnum<{
-                asc: "asc";
-                desc: "desc";
-            }>;
-        }, z.core.$strip>>;
-        limit: z.ZodOptional<z.ZodNumber>;
-    }, z.core.$strip>>;
 }, z.core.$strip>, z.ZodObject<{
     id: z.ZodOptional<z.ZodString>;
     group_id: z.ZodOptional<z.ZodString>;
@@ -905,18 +809,6 @@ export declare const StoredWidgetConfigSchema: z.ZodDiscriminatedUnion<[z.ZodObj
     }, z.core.$strict>], "type">>;
     target: z.ZodLiteral<"kpi_card">;
     kpi_card: z.ZodOptional<z.ZodUnknown>;
-    query: z.ZodOptional<z.ZodObject<{
-        resource: z.ZodString;
-        select: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        order: z.ZodOptional<z.ZodObject<{
-            field: z.ZodString;
-            direction: z.ZodEnum<{
-                asc: "asc";
-                desc: "desc";
-            }>;
-        }, z.core.$strip>>;
-        limit: z.ZodOptional<z.ZodNumber>;
-    }, z.core.$strip>>;
 }, z.core.$strip>, z.ZodObject<{
     id: z.ZodOptional<z.ZodString>;
     group_id: z.ZodOptional<z.ZodString>;
@@ -971,18 +863,6 @@ export declare const StoredWidgetConfigSchema: z.ZodDiscriminatedUnion<[z.ZodObj
     }, z.core.$strict>], "type">>;
     target: z.ZodLiteral<"gauge_card">;
     gauge_card: z.ZodOptional<z.ZodUnknown>;
-    query: z.ZodOptional<z.ZodObject<{
-        resource: z.ZodString;
-        select: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        order: z.ZodOptional<z.ZodObject<{
-            field: z.ZodString;
-            direction: z.ZodEnum<{
-                asc: "asc";
-                desc: "desc";
-            }>;
-        }, z.core.$strip>>;
-        limit: z.ZodOptional<z.ZodNumber>;
-    }, z.core.$strip>>;
 }, z.core.$strip>, z.ZodObject<{
     id: z.ZodOptional<z.ZodString>;
     group_id: z.ZodOptional<z.ZodString>;
@@ -1037,16 +917,4 @@ export declare const StoredWidgetConfigSchema: z.ZodDiscriminatedUnion<[z.ZodObj
     }, z.core.$strict>], "type">>;
     target: z.ZodLiteral<"pivot_table">;
     pivot_table: z.ZodOptional<z.ZodUnknown>;
-    query: z.ZodOptional<z.ZodObject<{
-        resource: z.ZodString;
-        select: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        order: z.ZodOptional<z.ZodObject<{
-            field: z.ZodString;
-            direction: z.ZodEnum<{
-                asc: "asc";
-                desc: "desc";
-            }>;
-        }, z.core.$strip>>;
-        limit: z.ZodOptional<z.ZodNumber>;
-    }, z.core.$strip>>;
 }, z.core.$strip>], "target">;

package/dist/schema/widget.js

@@ -130,24 +130,21 @@ export const ChartConfigSchema = z.discriminatedUnion('type', [
     HistogramChartSchema,
     FunnelChartSchema,
 ]);
-export const DashboardWidgetQuerySchema = z.object({
-    resource: z.string().min(1, 'Query resource must be a non-empty string'),
-    select: z.array(z.string()).optional(),
-    order: z.object({
-        field: z.string().min(1, 'Order field is required'),
-        direction: z.enum(['asc', 'desc']),
-    }).optional(),
-    limit: z.number().optional(),
-});
 export const EmptyWidgetConfigSchema = WidgetBaseSchema.extend({
     target: z.literal('empty'),
 });
 const TableWidgetConfigSchema = WidgetBaseSchema.extend({
     target: z.literal('table'),
     table: z.unknown().optional(),
-    query: DashboardWidgetQuerySchema.optional(),
 }).superRefine((widget, ctx) => {
     var _a;
+    if (!widget.dataSource) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ['dataSource'],
+            message: 'Table widget must have dataSource config',
+        });
+    }
     if (((_a = widget.dataSource) === null || _a === void 0 ? void 0 : _a.type) === 'aggregate') {
         ctx.addIssue({
             code: z.ZodIssueCode.custom,
@@ -159,14 +156,13 @@ const TableWidgetConfigSchema = WidgetBaseSchema.extend({
 const ChartWidgetTargetConfigSchema = WidgetBaseSchema.extend({
     target: z.literal('chart'),
     chart: ChartConfigSchema,
-    query: DashboardWidgetQuerySchema.optional(),
 }).superRefine((widget, ctx) => {
     var _a, _b;
-    if (!widget.query && !widget.dataSource) {
+    if (!widget.dataSource) {
         ctx.addIssue({
             code: z.ZodIssueCode.custom,
             path: ['dataSource'],
-            message: 'Chart widget must have query or dataSource config',
+            message: 'Chart widget must have dataSource config',
         });
     }
     if (((_a = widget.dataSource) === null || _a === void 0 ? void 0 : _a.type) === 'resource') {
@@ -187,9 +183,15 @@ const ChartWidgetTargetConfigSchema = WidgetBaseSchema.extend({
 const KpiCardWidgetConfigSchema = WidgetBaseSchema.extend({
     target: z.literal('kpi_card'),
     kpi_card: z.unknown().optional(),
-    query: DashboardWidgetQuerySchema.optional(),
 }).superRefine((widget, ctx) => {
     var _a;
+    if (!widget.dataSource) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ['dataSource'],
+            message: 'KPI card widget must have dataSource config',
+        });
+    }
     if (((_a = widget.dataSource) === null || _a === void 0 ? void 0 : _a.type) === 'aggregate' && widget.dataSource.groupBy) {
         ctx.addIssue({
             code: z.ZodIssueCode.custom,
@@ -201,9 +203,15 @@ const KpiCardWidgetConfigSchema = WidgetBaseSchema.extend({
 const GaugeCardWidgetConfigSchema = WidgetBaseSchema.extend({
     target: z.literal('gauge_card'),
     gauge_card: z.unknown().optional(),
-    query: DashboardWidgetQuerySchema.optional(),
 }).superRefine((widget, ctx) => {
     var _a;
+    if (!widget.dataSource) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ['dataSource'],
+            message: 'Gauge card widget must have dataSource config',
+        });
+    }
     if (((_a = widget.dataSource) === null || _a === void 0 ? void 0 : _a.type) === 'aggregate' && widget.dataSource.groupBy) {
         ctx.addIssue({
             code: z.ZodIssueCode.custom,
@@ -215,9 +223,15 @@ const GaugeCardWidgetConfigSchema = WidgetBaseSchema.extend({
 const PivotTableWidgetConfigSchema = WidgetBaseSchema.extend({
     target: z.literal('pivot_table'),
     pivot_table: z.unknown().optional(),
-    query: DashboardWidgetQuerySchema.optional(),
 }).superRefine((widget, ctx) => {
     var _a;
+    if (!widget.dataSource) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ['dataSource'],
+            message: 'Pivot table widget must have dataSource config',
+        });
+    }
     if (((_a = widget.dataSource) === null || _a === void 0 ? void 0 : _a.type) === 'aggregate' && !widget.dataSource.groupBy) {
         ctx.addIssue({
             code: z.ZodIssueCode.custom,

package/dist/services/widgetConfigValidator.js

@@ -1,10 +1,11 @@
+import { normalizeChartWidgetConfig } from '../custom/widgets/chart/chart.types.js';
 export function validateDashboardWidgetApiConfig(adminforth, widget) {
-    var _a, _b;
     if (widget.target !== 'chart') {
         return [];
     }
     const errors = [];
-    if (!widget.chart) {
+    const chart = normalizeChartWidgetConfig(widget.chart);
+    if (!chart) {
         errors.push({
             field: 'chart',
             message: 'Chart widget must have chart config',
@@ -16,63 +17,22 @@ export function validateDashboardWidgetApiConfig(adminforth, widget) {
         const resource = adminforth.config.resources.find((item) => item.resourceId === aggregateDataSource.resourceId);
         if (!resource) {
             errors.push({
-                field: 'dataSource.resourceId',
+                field: 'data_source.resource_id',
                 message: `Resource "${aggregateDataSource.resourceId}" is not registered`,
             });
         }
         if (!aggregateDataSource.groupBy) {
             errors.push({
-                field: 'dataSource.groupBy',
+                field: 'data_source.group_by',
                 message: 'Chart aggregate dataSource must define groupBy',
             });
         }
         return errors;
     }
-    if (!widget.query) {
-        errors.push({
-            field: 'query',
-            message: 'Chart widget must have query or aggregate dataSource config',
-        });
-        return errors;
-    }
-    const query = widget.query;
-    const chart = widget.chart;
-    const resource = adminforth.config.resources.find((item) => item.resourceId === query.resource);
-    if (!resource) {
-        errors.push({
-            field: 'query.resource',
-            message: `Resource "${query.resource}" is not registered`,
-        });
-        return errors;
-    }
-    if (!query.select) {
-        return errors;
-    }
-    const resourceFields = resource.columns.map((column) => column.name);
-    for (const field of query.select) {
-        if (!resourceFields.includes(field)) {
-            errors.push({
-                field: 'query.select',
-                message: `Field "${field}" is not in resource "${query.resource}"`,
-            });
-        }
-    }
-    const chartFields = [
-        chart.x_field,
-        chart.y_field,
-        chart.label_field,
-        chart.value_field,
-        chart.bucket_field,
-        ...((_b = (_a = chart.series) === null || _a === void 0 ? void 0 : _a.map((series) => series.field)) !== null && _b !== void 0 ? _b : []),
-    ].filter((field) => typeof field === 'string');
-    for (const field of chartFields) {
-        if (!query.select.includes(field)) {
-            errors.push({
-                field: 'query.select',
-                message: `Query select must include chart field "${field}"`,
-            });
-        }
-    }
+    errors.push({
+        field: 'data_source',
+        message: 'Chart widget must have aggregate dataSource config',
+    });
     return errors;
 }
 export function createWidgetConfigValidatorService(adminforth) {

package/dist/services/widgetDataService.d.ts

@@ -1,14 +1,5 @@
 import type { IAdminForth } from 'adminforth';
 import type { DashboardWidgetConfig, DashboardWidgetData } from '../custom/model/dashboard.types.js';
-export type DashboardWidgetQueryConfig = {
-    resource: string;
-    select?: string[];
-    order?: {
-        field: string;
-        direction: 'asc' | 'desc';
-    };
-    limit?: number;
-};
 export type DashboardWidgetDataOptions = {
     pagination?: {
         page: number;

package/dist/services/widgetDataService.js

@@ -10,32 +10,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { Aggregates, GroupBy, Sorts } from 'adminforth';
 export function getWidgetData(adminforth_1, widget_1) {
     return __awaiter(this, arguments, void 0, function* (adminforth, widget, options = {}) {
-        const legacyQuery = getLegacyQueryConfig(widget.query);
-        const dataSource = getWidgetDataSource(widget, legacyQuery);
+        const dataSource = getWidgetDataSource(widget.dataSource);
         if (!dataSource) {
             return null;
         }
         if (dataSource.type === 'aggregate') {
             return getAggregateWidgetData(adminforth, dataSource);
         }
-        return getResourceWidgetData(adminforth, dataSource, legacyQuery, options);
+        return getResourceWidgetData(adminforth, dataSource, options);
     });
 }
-function getResourceWidgetData(adminforth, dataSource, legacyQuery, options) {
+function getResourceWidgetData(adminforth, dataSource, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b;
         const resource = adminforth.resource(dataSource.resourceId);
         const filters = normalizeFilters(dataSource.filters);
-        const sort = normalizeSort((_a = dataSource.sort) !== null && _a !== void 0 ? _a : legacyQuery === null || legacyQuery === void 0 ? void 0 : legacyQuery.order);
+        const sort = normalizeSort(dataSource.sort);
         const pagination = options.pagination;
         const offset = pagination ? (pagination.page - 1) * pagination.pageSize : 0;
-        const queryLimit = legacyQuery === null || legacyQuery === void 0 ? void 0 : legacyQuery.limit;
-        const limit = pagination
-            ? Math.max(Math.min(pagination.pageSize, (queryLimit !== null && queryLimit !== void 0 ? queryLimit : Infinity) - offset), 0)
-            : queryLimit;
+        const limit = pagination ? pagination.pageSize : undefined;
         const rows = yield resource.list(filters, limit !== null && limit !== void 0 ? limit : undefined, offset, sort);
-        const columns = (_c = (_b = dataSource.columns) !== null && _b !== void 0 ? _b : legacyQuery === null || legacyQuery === void 0 ? void 0 : legacyQuery.select) !== null && _c !== void 0 ? _c : Object.keys((_d = rows[0]) !== null && _d !== void 0 ? _d : {});
-        const total = pagination ? Math.min(yield resource.count(filters), queryLimit !== null && queryLimit !== void 0 ? queryLimit : Infinity) : 0;
+        const columns = (_a = dataSource.columns) !== null && _a !== void 0 ? _a : Object.keys((_b = rows[0]) !== null && _b !== void 0 ? _b : {});
+        const total = pagination ? yield resource.count(filters) : 0;
         return Object.assign({ columns, rows: rows.map((row) => (Object.fromEntries(columns.map((column) => [column, row[column]])))) }, (pagination ? {
             pagination: {
                 page: pagination.page,
@@ -71,25 +67,11 @@ function getAggregateWidgetData(adminforth, dataSource) {
         };
     });
 }
-function getLegacyQueryConfig(query) {
-    if (!isRecord(query) || typeof query.resource !== 'string') {
-        return undefined;
-    }
-    return query;
-}
-function getWidgetDataSource(widget, legacyQuery) {
-    if (isWidgetDataSource(widget.dataSource)) {
-        return widget.dataSource;
+function getWidgetDataSource(dataSource) {
+    if (isWidgetDataSource(dataSource)) {
+        return dataSource;
     }
-    if (!legacyQuery) {
-        return undefined;
-    }
-    return {
-        type: 'resource',
-        resourceId: legacyQuery.resource,
-        columns: legacyQuery.select,
-        sort: legacyQuery.order,
-    };
+    return undefined;
 }
 function isWidgetDataSource(value) {
     return isRecord(value)

package/endpoint/widgets.ts

@@ -37,11 +37,34 @@ type WidgetEndpointsContext = {
 
 function formatWidgetConfigValidationErrors(error: { issues: { path: PropertyKey[], message: string }[] }) {
   return error.issues.map((issue) => ({
-    field: issue.path.length ? issue.path.map(String).join('.') : 'config',
+    field: issue.path.length ? formatWidgetConfigFieldPath(issue.path.map(String).join('.')) : 'config',
     message: issue.message,
   }));
 }
 
+function formatWidgetConfigApiValidationErrors(errors: DashboardWidgetConfigValidationError[]) {
+  return errors.map((error) => ({
+    ...error,
+    field: formatWidgetConfigFieldPath(error.field),
+  }));
+}
+
+function formatWidgetConfigFieldPath(field: string) {
+  const fieldAliases = new Map([
+    ['minWidth', 'min_width'],
+    ['maxWidth', 'max_width'],
+    ['dataSource', 'data_source'],
+    ['resourceId', 'resource_id'],
+    ['groupBy', 'group_by'],
+    ['pageSize', 'page_size'],
+  ]);
+
+  return field
+    .split('.')
+    .map((segment) => fieldAliases.get(segment) ?? segment)
+    .join('.');
+}
+
 export function registerWidgetEndpoints(
   server: IHttpServer,
   ctx: WidgetEndpointsContext,
@@ -229,7 +252,7 @@ export function registerWidgetEndpoints(
         response.setStatus(422);
         return {
           error: 'Invalid widget config',
-          validationErrors: apiValidationErrors,
+          validationErrors: formatWidgetConfigApiValidationErrors(apiValidationErrors),
         };
       }
 
@@ -250,7 +273,7 @@ export function registerWidgetEndpoints(
   server.endpoint({
     method: 'POST',
     path: '/dashboard/get_dashboard_widget_data',
-    description: 'Loads query result data for one dashboard widget by dashboard slug and widget id.',
+    description: 'Loads widget data for one dashboard widget by dashboard slug and widget id.',
     request_schema: WidgetDataRequestSchema,
     response_schema: DashboardWidgetDataResponseSchema,
     handler: async ({ body, response }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/dashboard",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/schema/widget.ts

@@ -154,16 +154,6 @@ export const ChartConfigSchema = z.discriminatedUnion('type', [
   FunnelChartSchema,
 ])
 
-export const DashboardWidgetQuerySchema = z.object({
-  resource: z.string().min(1, 'Query resource must be a non-empty string'),
-  select: z.array(z.string()).optional(),
-  order: z.object({
-    field: z.string().min(1, 'Order field is required'),
-    direction: z.enum(['asc', 'desc']),
-  }).optional(),
-  limit: z.number().optional(),
-})
-
 export const EmptyWidgetConfigSchema = WidgetBaseSchema.extend({
   target: z.literal('empty'),
 })
@@ -171,8 +161,15 @@ export const EmptyWidgetConfigSchema = WidgetBaseSchema.extend({
 const TableWidgetConfigSchema = WidgetBaseSchema.extend({
   target: z.literal('table'),
   table: z.unknown().optional(),
-  query: DashboardWidgetQuerySchema.optional(),
 }).superRefine((widget, ctx) => {
+  if (!widget.dataSource) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      path: ['dataSource'],
+      message: 'Table widget must have dataSource config',
+    })
+  }
+
   if (widget.dataSource?.type === 'aggregate') {
     ctx.addIssue({
       code: z.ZodIssueCode.custom,
@@ -185,13 +182,12 @@ const TableWidgetConfigSchema = WidgetBaseSchema.extend({
 const ChartWidgetTargetConfigSchema = WidgetBaseSchema.extend({
   target: z.literal('chart'),
   chart: ChartConfigSchema,
-  query: DashboardWidgetQuerySchema.optional(),
 }).superRefine((widget, ctx) => {
-  if (!widget.query && !widget.dataSource) {
+  if (!widget.dataSource) {
     ctx.addIssue({
       code: z.ZodIssueCode.custom,
       path: ['dataSource'],
-      message: 'Chart widget must have query or dataSource config',
+      message: 'Chart widget must have dataSource config',
     })
   }
 
@@ -215,8 +211,15 @@ const ChartWidgetTargetConfigSchema = WidgetBaseSchema.extend({
 const KpiCardWidgetConfigSchema = WidgetBaseSchema.extend({
   target: z.literal('kpi_card'),
   kpi_card: z.unknown().optional(),
-  query: DashboardWidgetQuerySchema.optional(),
 }).superRefine((widget, ctx) => {
+  if (!widget.dataSource) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      path: ['dataSource'],
+      message: 'KPI card widget must have dataSource config',
+    })
+  }
+
   if (widget.dataSource?.type === 'aggregate' && widget.dataSource.groupBy) {
     ctx.addIssue({
       code: z.ZodIssueCode.custom,
@@ -229,8 +232,15 @@ const KpiCardWidgetConfigSchema = WidgetBaseSchema.extend({
 const GaugeCardWidgetConfigSchema = WidgetBaseSchema.extend({
   target: z.literal('gauge_card'),
   gauge_card: z.unknown().optional(),
-  query: DashboardWidgetQuerySchema.optional(),
 }).superRefine((widget, ctx) => {
+  if (!widget.dataSource) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      path: ['dataSource'],
+      message: 'Gauge card widget must have dataSource config',
+    })
+  }
+
   if (widget.dataSource?.type === 'aggregate' && widget.dataSource.groupBy) {
     ctx.addIssue({
       code: z.ZodIssueCode.custom,
@@ -243,8 +253,15 @@ const GaugeCardWidgetConfigSchema = WidgetBaseSchema.extend({
 const PivotTableWidgetConfigSchema = WidgetBaseSchema.extend({
   target: z.literal('pivot_table'),
   pivot_table: z.unknown().optional(),
-  query: DashboardWidgetQuerySchema.optional(),
 }).superRefine((widget, ctx) => {
+  if (!widget.dataSource) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      path: ['dataSource'],
+      message: 'Pivot table widget must have dataSource config',
+    })
+  }
+
   if (widget.dataSource?.type === 'aggregate' && !widget.dataSource.groupBy) {
     ctx.addIssue({
       code: z.ZodIssueCode.custom,