@bakers-build/addon-bakers-ui 0.2.0 → 0.3.0

package/dist/src/Statistics/client.d.ts

@@ -23,13 +23,20 @@ export interface StatisticFilter {
     value: string;
     options: StatisticFilterOption[];
 }
+declare const GROUPINGS: readonly ["day", "week", "month", "quarter"];
+declare const WIDGETS: readonly ["matrix", "line", "grouped_horizontal_bars", "bars", "tiles", "flow", "table"];
 export interface StatisticFigure {
     id: string;
     label: string;
     description: string;
-    widget: 'matrix' | 'line' | 'grouped_horizontal_bars';
+    /** `tiles`, `flow`, `table` and `bars` render through the bars fallback. */
+    widget: (typeof WIDGETS)[number];
     generated: string;
     filters: Record<string, StatisticFilter>;
+    /** Bucket size of the selected period; absent on `windows` figures. */
+    period?: {
+        grouping: (typeof GROUPINGS)[number];
+    };
     categories: StatisticCategory[];
     measurements: StatisticMeasurement[];
     empty: {
@@ -63,3 +70,4 @@ export declare function errorResultOf(caught: unknown): {
     message: string;
 };
 export declare function loadGroupStatistics(client: DropshClient, contexts: StatisticsContexts, filters?: StatisticsFilters): Promise<GroupStatisticsResult>;
+export {};

package/dist/src/Statistics/client.js

@@ -1,4 +1,14 @@
 import { DrupalJsonApiParams } from 'drupal-jsonapi-params';
+const GROUPINGS = ['day', 'week', 'month', 'quarter'];
+const WIDGETS = [
+    'matrix',
+    'line',
+    'grouped_horizontal_bars',
+    'bars',
+    'tiles',
+    'flow',
+    'table',
+];
 function statusOf(caught) {
     if (typeof caught !== 'object' || caught === null)
         return undefined;
@@ -113,7 +123,7 @@ function figureOf(value) {
         typeof row.id !== 'string' ||
         typeof row.label !== 'string' ||
         typeof row.description !== 'string' ||
-        !['matrix', 'line', 'grouped_horizontal_bars'].includes(String(row.widget)) ||
+        !WIDGETS.includes(String(row.widget)) ||
         typeof row.generated !== 'string' ||
         !Array.isArray(row.categories) ||
         !Array.isArray(row.measurements) ||
@@ -129,8 +139,14 @@ function figureOf(value) {
     const measurements = row.measurements.map(measurementOf);
     if (categories.includes(undefined) || measurements.includes(undefined))
         return undefined;
+    const grouping = recordOf(row.period)?.grouping;
+    const period = GROUPINGS.find((item) => item === grouping);
     const parsedFilters = {};
     for (const [key, item] of Object.entries(filters)) {
+        // An entity filter (project, team, person) picks UUIDs in the web UI; the
+        // cockpit offers no picker for it, so it is left out, not refused.
+        if (recordOf(item)?.type === 'entities')
+            continue;
         const parsed = filterOf(item);
         if (!parsed)
             return undefined;
@@ -143,6 +159,7 @@ function figureOf(value) {
         widget: row.widget,
         generated: row.generated,
         filters: parsedFilters,
+        ...(period ? { period: { grouping: period } } : {}),
         categories: categories,
         measurements: measurements,
         empty: {
@@ -163,7 +180,10 @@ function groupOf(value) {
         typeof row.label !== 'string' ||
         !Array.isArray(row.figures))
         return undefined;
-    const figures = row.figures.map(figureOf);
+    // A figure whose widget the CLI cannot draw is skipped, not malformed.
+    const figures = row.figures
+        .filter((figure) => WIDGETS.includes(String(recordOf(figure)?.widget)))
+        .map(figureOf);
     if (figures.includes(undefined))
         return undefined;
     return {
@@ -193,5 +213,8 @@ export async function loadGroupStatistics(client, contexts, filters = {}) {
     const groups = source.map(groupOf);
     if (groups.includes(undefined))
         return { kind: 'error', message: 'malformed statistics document' };
-    return { kind: 'ok', groups: groups };
+    return {
+        kind: 'ok',
+        groups: groups.filter((group) => group.figures.length > 0),
+    };
 }

package/dist/src/Statistics/figures.js

@@ -50,11 +50,11 @@ function matrixDisplay(id, figure, width) {
     });
 }
 function partialPeriodUnit(figure) {
-    return figure.filters.period?.value === '365' ? 'month' : 'day';
+    return figure.period?.grouping ?? 'day';
 }
 // Shared above every widget: which trailing period is still filling in (the
 // figure's own categories carry the `partial` flag — see
-// MeasurementEvaluator::days()/months()) and what the figure means, in the
+// MeasurementEvaluator::buckets()) and what the figure means, in the
 // figure's own words. Rendered once here rather than per-widget so every
 // shipped widget (matrix, grouped_horizontal_bars) gets both without having
 // to know about them.

package/dist/src/Statistics/screen.d.ts

@@ -20,14 +20,9 @@ export declare abstract class StatisticsScreen<T> extends AsyncScreen<T> {
     private activeGroup;
     private shiftActiveGroup;
     protected statisticsFilters(): StatisticsFilters;
-    /**
-     * Maps a preset's raw period value to the granularity legible label
-     * (BB-548 scope change 7): `7`/`30` are daily buckets, `365` is monthly.
-     */
-    private static rangeLabel;
     private periodFilter;
     /**
-     * One boxed filter chip cycling the three fixed period+granularity presets
+     * One boxed filter chip cycling the period kinds
      * (BB-548 scope change 7, replacing the former two independent
      * period/granularity chips of addendum 4). Rendered via
      * `filterBadgeStrip` inside `renderReady`, below Overview — see the

package/dist/src/Statistics/screen.js

@@ -60,13 +60,6 @@ export class StatisticsScreen extends AsyncScreen {
             filters.period = this.period;
         return filters;
     }
-    /**
-     * Maps a preset's raw period value to the granularity legible label
-     * (BB-548 scope change 7): `7`/`30` are daily buckets, `365` is monthly.
-     */
-    static rangeLabel(value) {
-        return value === '365' ? '1y·monthly' : `${value}d·daily`;
-    }
     periodFilter() {
         const result = this.readyValue === undefined
             ? undefined
@@ -79,14 +72,19 @@ export class StatisticsScreen extends AsyncScreen {
                 if (filter)
                     return {
                         value: filter.value,
-                        options: filter.options.map((option) => option.value),
+                        label: filter.options.find((option) => option.value === filter.value)
+                            ?.label ?? filter.value,
+                        // Custom needs start and end dates, which this screen cannot supply.
+                        options: filter.options
+                            .map((option) => option.value)
+                            .filter((value) => value !== 'custom'),
                     };
             }
         }
         return undefined;
     }
     /**
-     * One boxed filter chip cycling the three fixed period+granularity presets
+     * One boxed filter chip cycling the period kinds
      * (BB-548 scope change 7, replacing the former two independent
      * period/granularity chips of addendum 4). Rendered via
      * `filterBadgeStrip` inside `renderReady`, below Overview — see the
@@ -99,7 +97,7 @@ export class StatisticsScreen extends AsyncScreen {
         return [
             {
                 id: 'period',
-                label: `t Range(${StatisticsScreen.rangeLabel(period.value)})`,
+                label: `t Range(${period.label})`,
             },
         ];
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bakers-build/addon-bakers-ui",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "bakers.build TUI: interactive terminal UI (dashboard, projects, tickets) as a dropsh `tui` renderer plugin.",
   "type": "module",
   "license": "MIT",
@@ -29,7 +29,7 @@
     "zustand": "^5.0.15"
   },
   "peerDependencies": {
-    "@bakers-build/core": "^0.2.0",
-    "@bakers-build/message": "^0.2.0"
+    "@bakers-build/core": "^0.3.0",
+    "@bakers-build/message": "^0.3.0"
   }
 }