@adminforth/dashboard 1.8.0 → 1.10.0

package/dist/custom/skills/adminforth-dashboard/SKILL.md

@@ -169,21 +169,18 @@ query:
   steps:
     - name: Leads
       resource: leads
-      metric:
-        agg: count
-        as: value
+      select:
+        - 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
+      select:
+        - agg: count_distinct
+          field: customer_id
+          as: value
 
 Do not use bare query.steps without source: steps.
+Do not use metric. Use select even when a step has only one aggregate.
 
 ## Date range rules
 
@@ -224,22 +221,18 @@ select raw token totals:
 - sum output_tokens as output_tokens
 
 then query.calcs:
-- calculate total_spend from those aliases and lookup variables
+- calculate total_spend from those aliases with explicit constants
 
 For today vs yesterday KPI, use multiple aggregate select items with filters and distinct aliases, then calcs.
 
-## Calc variables
+## Calc rules
 
-Use variables for static maps/rates.
-Use lookup($variables.some.map, row_field, default_number) in query.calcs.
+Calcs can reference only fields already present in the current row.
+Use explicit constants for rates.
 
 Minimal example:
 
-variables:
-  prices:
-    gpt-5.4: 2.5
-
 query:
   calcs:
-    - calc: tokens / 1000000 * lookup($variables.prices, model, 0)
+    - calc: tokens / 1000000 * 2.5
       as: cost

package/dist/endpoint/groups.js

@@ -8,19 +8,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { randomUUID } from 'crypto';
-import { DashboardApiResponseSchema, GroupIdRequestSchema, MoveGroupRequestSchema, SetGroupConfigRequestSchema, SlugRequestSchema, } from '../schema/api.js';
+import { DashboardMutationResponseSchema, GroupIdRequestSchema, MoveGroupRequestSchema, SetGroupConfigRequestSchema, SlugRequestSchema, } from '../schema/api.js';
 export function registerGroupEndpoints(server, ctx) {
     server.endpoint({
         method: 'POST',
         path: '/dashboard/add_dashboard_group',
         description: 'Adds a new group to a dashboard configuration. Superadmin only.',
         request_schema: SlugRequestSchema,
-        response_schema: DashboardApiResponseSchema,
+        response_schema: DashboardMutationResponseSchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response }) {
             if (!ctx.canEditDashboard(adminUser)) {
                 response.setStatus(403);
-                return { error: 'Dashboard edit is not allowed' };
+                return { ok: false, error: 'Dashboard edit is not allowed' };
             }
+            let groupId = null;
             const updatedDashboard = yield ctx.updateDashboardConfig(body.slug, (config) => {
                 const nextOrder = config.groups.length + 1;
                 const group = {
@@ -28,13 +29,14 @@ export function registerGroupEndpoints(server, ctx) {
                     label: 'New group',
                     order: nextOrder,
                 };
+                groupId = group.id;
                 return Object.assign(Object.assign({}, config), { groups: [...config.groups, group] });
             });
             if (!updatedDashboard) {
                 response.setStatus(404);
-                return { error: 'Dashboard not found' };
+                return { ok: false, error: 'Dashboard not found' };
             }
-            return updatedDashboard;
+            return { ok: true, groupId };
         }),
     });
     server.endpoint({
@@ -42,11 +44,11 @@ export function registerGroupEndpoints(server, ctx) {
         path: '/dashboard/set_dashboard_group_config',
         description: 'Replaces editable JSON configuration for a dashboard group while preserving group id and order. Superadmin only.',
         request_schema: SetGroupConfigRequestSchema,
-        response_schema: DashboardApiResponseSchema,
+        response_schema: DashboardMutationResponseSchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response }) {
             if (!ctx.canEditDashboard(adminUser)) {
                 response.setStatus(403);
-                return { error: 'Dashboard edit is not allowed' };
+                return { ok: false, error: 'Dashboard edit is not allowed' };
             }
             const groupId = body.groupId;
             let mutationError = null;
@@ -63,13 +65,13 @@ export function registerGroupEndpoints(server, ctx) {
             });
             if (!updatedDashboard) {
                 response.setStatus(404);
-                return { error: 'Dashboard not found' };
+                return { ok: false, error: 'Dashboard not found' };
             }
             if (mutationError) {
                 response.setStatus(404);
-                return { error: mutationError };
+                return { ok: false, error: mutationError };
             }
-            return updatedDashboard;
+            return { ok: true };
         }),
     });
     server.endpoint({
@@ -77,11 +79,11 @@ export function registerGroupEndpoints(server, ctx) {
         path: '/dashboard/move_dashboard_group',
         description: 'Moves a dashboard group up or down in its dashboard. Superadmin only.',
         request_schema: MoveGroupRequestSchema,
-        response_schema: DashboardApiResponseSchema,
+        response_schema: DashboardMutationResponseSchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response }) {
             if (!ctx.canEditDashboard(adminUser)) {
                 response.setStatus(403);
-                return { error: 'Dashboard edit is not allowed' };
+                return { ok: false, error: 'Dashboard edit is not allowed' };
             }
             let mutationError = null;
             const updatedDashboard = yield ctx.updateDashboardConfig(body.slug, (config) => {
@@ -102,13 +104,13 @@ export function registerGroupEndpoints(server, ctx) {
             });
             if (!updatedDashboard) {
                 response.setStatus(404);
-                return { error: 'Dashboard not found' };
+                return { ok: false, error: 'Dashboard not found' };
             }
             if (mutationError) {
                 response.setStatus(404);
-                return { error: mutationError };
+                return { ok: false, error: mutationError };
             }
-            return updatedDashboard;
+            return { ok: true };
         }),
     });
     server.endpoint({
@@ -116,11 +118,11 @@ export function registerGroupEndpoints(server, ctx) {
         path: '/dashboard/remove_dashboard_group',
         description: 'Removes a dashboard group and all widgets inside it. Superadmin only.',
         request_schema: GroupIdRequestSchema,
-        response_schema: DashboardApiResponseSchema,
+        response_schema: DashboardMutationResponseSchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response }) {
             if (!ctx.canEditDashboard(adminUser)) {
                 response.setStatus(403);
-                return { error: 'Dashboard edit is not allowed' };
+                return { ok: false, error: 'Dashboard edit is not allowed' };
             }
             const groupId = body.groupId;
             let mutationError = null;
@@ -134,13 +136,13 @@ export function registerGroupEndpoints(server, ctx) {
             });
             if (!updatedDashboard) {
                 response.setStatus(404);
-                return { error: 'Dashboard not found' };
+                return { ok: false, error: 'Dashboard not found' };
             }
             if (mutationError) {
                 response.setStatus(404);
-                return { error: mutationError };
+                return { ok: false, error: mutationError };
             }
-            return updatedDashboard;
+            return { ok: true };
         }),
     });
 }

package/dist/endpoint/widgets.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { randomUUID } from 'crypto';
-import { ConfigureBarChartWidgetRequestSchema, ConfigureFunnelChartWidgetRequestSchema, ConfigureGaugeCardWidgetRequestSchema, ConfigureHistogramChartWidgetRequestSchema, ConfigureKpiCardWidgetRequestSchema, ConfigureLineChartWidgetRequestSchema, ConfigurePieChartWidgetRequestSchema, ConfigurePivotTableWidgetRequestSchema, ConfigureStackedBarChartWidgetRequestSchema, ConfigureTableWidgetRequestSchema, DashboardApiResponseSchema, DashboardWidgetDataResponseSchema, GroupIdRequestSchema, MoveWidgetRequestSchema, SetWidgetConfigRequestSchema, WidgetDataRequestSchema, WidgetIdRequestSchema, } from '../schema/api.js';
+import { ConfigureBarChartWidgetRequestSchema, ConfigureFunnelChartWidgetRequestSchema, ConfigureGaugeCardWidgetRequestSchema, ConfigureHistogramChartWidgetRequestSchema, ConfigureKpiCardWidgetRequestSchema, ConfigureLineChartWidgetRequestSchema, ConfigurePieChartWidgetRequestSchema, ConfigurePivotTableWidgetRequestSchema, ConfigureStackedBarChartWidgetRequestSchema, ConfigureTableWidgetRequestSchema, DashboardMutationResponseSchema, DashboardWidgetDataResponseSchema, GroupIdRequestSchema, MoveWidgetRequestSchema, SetWidgetConfigRequestSchema, WidgetDataRequestSchema, WidgetIdRequestSchema, } from '../schema/api.js';
 function replaceWidgetConfig(ctx, slug, widgetId, widgetConfig) {
     return __awaiter(this, void 0, void 0, function* () {
         let mutationError = null;
@@ -35,23 +35,23 @@ function registerConfigureWidgetEndpoint(server, ctx, options) {
         path: options.path,
         description: options.description,
         request_schema: options.requestSchema,
-        response_schema: DashboardApiResponseSchema,
+        response_schema: DashboardMutationResponseSchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response }) {
             if (!ctx.canEditDashboard(adminUser)) {
                 response.setStatus(403);
-                return { error: 'Dashboard edit is not allowed' };
+                return { ok: false, error: 'Dashboard edit is not allowed' };
             }
             const request = body;
             const { updatedDashboard, mutationError } = yield replaceWidgetConfig(ctx, request.slug, request.widgetId, request.config);
             if (!updatedDashboard) {
                 response.setStatus(404);
-                return { error: 'Dashboard not found' };
+                return { ok: false, error: 'Dashboard not found' };
             }
             if (mutationError) {
                 response.setStatus(404);
-                return { error: mutationError };
+                return { ok: false, error: mutationError };
             }
-            return updatedDashboard;
+            return { ok: true };
         }),
     });
 }
@@ -61,13 +61,14 @@ export function registerWidgetEndpoints(server, ctx) {
         path: '/dashboard/add_dashboard_widget',
         description: 'Adds a new empty widget to a dashboard group. Superadmin only.',
         request_schema: GroupIdRequestSchema,
-        response_schema: DashboardApiResponseSchema,
+        response_schema: DashboardMutationResponseSchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response }) {
             if (!ctx.canEditDashboard(adminUser)) {
                 response.setStatus(403);
-                return { error: 'Dashboard edit is not allowed' };
+                return { ok: false, error: 'Dashboard edit is not allowed' };
             }
             let mutationError = null;
+            let widgetId = null;
             const updatedDashboard = yield ctx.updateDashboardConfig(body.slug, (config) => {
                 const group = config.groups.find((item) => item.id === body.groupId);
                 if (!group) {
@@ -83,17 +84,18 @@ export function registerWidgetEndpoints(server, ctx) {
                     order: nextOrder,
                     target: 'empty',
                 };
+                widgetId = widget.id;
                 return Object.assign(Object.assign({}, config), { widgets: [...config.widgets, widget] });
             });
             if (!updatedDashboard) {
                 response.setStatus(404);
-                return { error: 'Dashboard not found' };
+                return { ok: false, error: 'Dashboard not found' };
             }
             if (mutationError) {
                 response.setStatus(404);
-                return { error: mutationError };
+                return { ok: false, error: mutationError };
             }
-            return updatedDashboard;
+            return { ok: true, widgetId };
         }),
     });
     server.endpoint({
@@ -101,11 +103,11 @@ export function registerWidgetEndpoints(server, ctx) {
         path: '/dashboard/move_dashboard_widget',
         description: 'Moves a dashboard widget up or down inside its group. Superadmin only.',
         request_schema: MoveWidgetRequestSchema,
-        response_schema: DashboardApiResponseSchema,
+        response_schema: DashboardMutationResponseSchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response }) {
             if (!ctx.canEditDashboard(adminUser)) {
                 response.setStatus(403);
-                return { error: 'Dashboard edit is not allowed' };
+                return { ok: false, error: 'Dashboard edit is not allowed' };
             }
             let mutationError = null;
             const updatedDashboard = yield ctx.updateDashboardConfig(body.slug, (config) => {
@@ -133,13 +135,13 @@ export function registerWidgetEndpoints(server, ctx) {
             });
             if (!updatedDashboard) {
                 response.setStatus(404);
-                return { error: 'Dashboard not found' };
+                return { ok: false, error: 'Dashboard not found' };
             }
             if (mutationError) {
                 response.setStatus(404);
-                return { error: mutationError };
+                return { ok: false, error: mutationError };
             }
-            return updatedDashboard;
+            return { ok: true };
         }),
     });
     server.endpoint({
@@ -147,11 +149,11 @@ export function registerWidgetEndpoints(server, ctx) {
         path: '/dashboard/remove_dashboard_widget',
         description: 'Removes one dashboard widget by id. Superadmin only.',
         request_schema: WidgetIdRequestSchema,
-        response_schema: DashboardApiResponseSchema,
+        response_schema: DashboardMutationResponseSchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response }) {
             if (!ctx.canEditDashboard(adminUser)) {
                 response.setStatus(403);
-                return { error: 'Dashboard edit is not allowed' };
+                return { ok: false, error: 'Dashboard edit is not allowed' };
             }
             let mutationError = null;
             const updatedDashboard = yield ctx.updateDashboardConfig(body.slug, (config) => {
@@ -164,13 +166,13 @@ export function registerWidgetEndpoints(server, ctx) {
             });
             if (!updatedDashboard) {
                 response.setStatus(404);
-                return { error: 'Dashboard not found' };
+                return { ok: false, error: 'Dashboard not found' };
             }
             if (mutationError) {
                 response.setStatus(404);
-                return { error: mutationError };
+                return { ok: false, error: mutationError };
             }
-            return updatedDashboard;
+            return { ok: true };
         }),
     });
     server.endpoint({
@@ -178,23 +180,23 @@ export function registerWidgetEndpoints(server, ctx) {
         path: '/dashboard/set_widget_config',
         description: 'Replaces editable JSON configuration for a dashboard widget while preserving widget id, group id, and order. Superadmin only.',
         request_schema: SetWidgetConfigRequestSchema,
-        response_schema: DashboardApiResponseSchema,
+        response_schema: DashboardMutationResponseSchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response }) {
             if (!ctx.canEditDashboard(adminUser)) {
                 response.setStatus(403);
-                return { error: 'Dashboard edit is not allowed' };
+                return { ok: false, error: 'Dashboard edit is not allowed' };
             }
             const request = body;
             const { updatedDashboard, mutationError } = yield replaceWidgetConfig(ctx, request.slug, request.widgetId, request.config);
             if (!updatedDashboard) {
                 response.setStatus(404);
-                return { error: 'Dashboard not found' };
+                return { ok: false, error: 'Dashboard not found' };
             }
             if (mutationError) {
                 response.setStatus(404);
-                return { error: mutationError };
+                return { ok: false, error: mutationError };
             }
-            return updatedDashboard;
+            return { ok: true };
         }),
     });
     registerConfigureWidgetEndpoint(server, ctx, {