@allurereport/web-commons 3.0.0-beta.22 → 3.0.0-beta.24

package/dist/charts/generateCurrentStatusChart.d.ts

@@ -0,0 +1,3 @@
+import { type AllureChartsStoreData, type CurrentStatusChartOptions } from "@allurereport/charts-api";
+import type { CurrentStatusChartData } from "./types.js";
+export declare const generateCurrentStatusChart: (options: CurrentStatusChartOptions, storeData: AllureChartsStoreData) => CurrentStatusChartData;

package/dist/charts/generateCurrentStatusChart.js

@@ -0,0 +1,10 @@
+import { ChartType } from "@allurereport/charts-api";
+export const generateCurrentStatusChart = (options, storeData) => {
+    return {
+        type: ChartType.CurrentStatus,
+        title: options.title,
+        data: storeData.statistic,
+        statuses: options.statuses,
+        metric: options.metric,
+    };
+};

package/dist/charts/generators.js

@@ -3,15 +3,15 @@ import { DEFAULT_ENVIRONMENT } from "@allurereport/core-api";
 import { generateBarChart } from "./bar.js";
 import { generateComingSoonChart } from "./comingSoon.js";
 import { generateFunnelChart } from "./funnel/index.js";
+import { generateCurrentStatusChart } from "./generateCurrentStatusChart.js";
 import { generateHeatMapChart } from "./heatMap.js";
 import { generateTrendChart } from "./line.js";
-import { generatePieChart } from "./pie.js";
 import { generateTreeMapChart } from "./treeMap.js";
 const generateChartData = async (props) => {
     const { env, chartsOptions, store, reportName, generateUuid } = props;
     const result = {};
     const storeData = await Promise.all([
-        await store.allHistoryDataPoints(),
+        env ? await store.allHistoryDataPointsByEnvironment(env) : await store.allHistoryDataPoints(),
         env ? await store.testResultsByEnvironment(env) : await store.allTestResults(),
         env ? await store.testsStatistic((tr) => tr.environment === env) : await store.testsStatistic(),
     ]).then(([historyDataPoints, testResults, statistic]) => ({
@@ -25,8 +25,8 @@ const generateChartData = async (props) => {
             case ChartType.Trend:
                 result[chartId] = generateTrendChart(chartOption, storeData, reportName);
                 break;
-            case ChartType.Pie:
-                result[chartId] = generatePieChart(chartOption, storeData);
+            case ChartType.CurrentStatus:
+                result[chartId] = generateCurrentStatusChart(chartOption, storeData);
                 break;
             case ChartType.Bar:
                 result[chartId] = generateBarChart(chartOption, storeData);

package/dist/charts/index.d.ts

@@ -4,7 +4,6 @@ export * from "./colors.js";
 export * from "./chart-utils.js";
 export * from "./bar.js";
 export * from "./line.js";
-export * from "./pie.js";
 export * from "./treeMap.js";
 export * from "./heatMap.js";
 export * from "./comingSoon.js";

package/dist/charts/index.js

@@ -3,7 +3,6 @@ export * from "./colors.js";
 export * from "./chart-utils.js";
 export * from "./bar.js";
 export * from "./line.js";
-export * from "./pie.js";
 export * from "./treeMap.js";
 export * from "./heatMap.js";
 export * from "./comingSoon.js";

package/dist/charts/types.d.ts

@@ -1,4 +1,5 @@
-import type { BarChartType, BarGroup, BarGroupMode, BaseTrendSliceMetadata, ChartDataType, ChartId, ChartMode, ChartType, FunnelChartType, HeatMapSerie, PieSlice, TreeMapChartType, TreeMapNode, TrendPointId, TrendSlice, TrendSliceId } from "@allurereport/charts-api";
+import type { BarChartType, BarGroup, BarGroupMode, BaseTrendSliceMetadata, ChartDataType, ChartId, ChartMode, ChartType, FunnelChartType, HeatMapSerie, TreeMapChartType, TreeMapNode, TrendPointId, TrendSlice, TrendSliceId } from "@allurereport/charts-api";
+import type { Statistic, TestStatus } from "@allurereport/core-api";
 export type TreeMapTooltipAccessor = <T>(node: T) => string[];
 export interface Point {
     x: Date | string | number;
@@ -20,11 +21,12 @@ export interface ResponseTrendChartData<SeriesType extends string = string, Meta
     slices: Record<TrendSliceId, TrendSlice<Metadata>>;
     series: Record<SeriesType, TrendPointId[]>;
 }
-export interface ResponsePieChartData {
-    type: ChartType.Pie;
+export interface CurrentStatusChartData {
+    type: ChartType.CurrentStatus;
     title?: string;
-    percentage: number;
-    slices: PieSlice[];
+    data: Statistic;
+    statuses?: TestStatus[];
+    metric?: TestStatus;
 }
 export interface ResponseBarChartData {
     type: ChartType.Bar;
@@ -52,9 +54,9 @@ export interface ResponseHeatMapChartData {
     data: HeatMapSerie[];
 }
 export type ChartsResponse<SeriesType extends string = string, Metadata extends BaseTrendSliceMetadata = BaseTrendSliceMetadata> = {
-    general: Record<ChartId, ResponseTrendChartData<SeriesType, Metadata> | ResponsePieChartData | ResponseBarChartData | ResponseComingSoonChartData | ResponseTreeMapChartData | ResponseHeatMapChartData>;
+    general: Record<ChartId, ResponseTrendChartData<SeriesType, Metadata> | CurrentStatusChartData | ResponseBarChartData | ResponseComingSoonChartData | ResponseTreeMapChartData | ResponseHeatMapChartData>;
     byEnv: {
-        [env: string]: Record<ChartId, ResponseTrendChartData<SeriesType, Metadata> | ResponsePieChartData | ResponseBarChartData | ResponseComingSoonChartData | ResponseTreeMapChartData | ResponseHeatMapChartData>;
+        [env: string]: Record<ChartId, ResponseTrendChartData<SeriesType, Metadata> | CurrentStatusChartData | ResponseBarChartData | ResponseComingSoonChartData | ResponseTreeMapChartData | ResponseHeatMapChartData>;
     };
 };
 export interface UITrendChartData<Metadata extends BaseTrendSliceMetadata = BaseTrendSliceMetadata> {
@@ -67,7 +69,7 @@ export interface UITrendChartData<Metadata extends BaseTrendSliceMetadata = Base
     slices: TrendSlice<Metadata>[];
     title?: string;
 }
-export type UIPieChartData = ResponsePieChartData;
+export type UICurrentStatusChartData = CurrentStatusChartData;
 export interface UIBarChartData extends ResponseBarChartData {
     colors: Record<string, string>;
     xAxisConfig?: {
@@ -107,8 +109,8 @@ export interface ResponseTestingPyramidChartData {
         percentage: number;
     }[];
 }
-export type ChartData<SeriesType extends string = string, Metadata extends BaseTrendSliceMetadata = BaseTrendSliceMetadata> = ResponseTrendChartData<SeriesType, Metadata> | ResponsePieChartData | ResponseBarChartData | ResponseComingSoonChartData | ResponseTreeMapChartData | ResponseHeatMapChartData | ResponseTestingPyramidChartData;
-export type UIChartData<Metadata extends BaseTrendSliceMetadata = BaseTrendSliceMetadata> = UITrendChartData<Metadata> | UIPieChartData | UIBarChartData | UIComingSoonChartData | UITreeMapChartData | UIHeatMapChartData | UITestingPyramidChartData;
+export type ChartData<SeriesType extends string = string, Metadata extends BaseTrendSliceMetadata = BaseTrendSliceMetadata> = ResponseTrendChartData<SeriesType, Metadata> | CurrentStatusChartData | ResponseBarChartData | ResponseComingSoonChartData | ResponseTreeMapChartData | ResponseHeatMapChartData | ResponseTestingPyramidChartData;
+export type UIChartData<Metadata extends BaseTrendSliceMetadata = BaseTrendSliceMetadata> = UITrendChartData<Metadata> | UICurrentStatusChartData | UIBarChartData | UIComingSoonChartData | UITreeMapChartData | UIHeatMapChartData | UITestingPyramidChartData;
 export type ChartsData<SeriesType extends string = string, Metadata extends BaseTrendSliceMetadata = BaseTrendSliceMetadata> = Record<ChartId, ChartData<SeriesType, Metadata>>;
 export type ChartsDataWithEnvs<SeriesType extends string = string, Metadata extends BaseTrendSliceMetadata = BaseTrendSliceMetadata> = {
     general: Record<ChartId, ChartData<SeriesType, Metadata>>;

package/dist/charts/utils.js

@@ -198,7 +198,10 @@ export const createHeatMapChartData = (chartId, res) => {
 };
 export const createCharts = (res) => {
     return Object.entries(res).reduce((acc, [chartId, chart]) => {
-        if (chart.type === ChartType.Trend) {
+        if (chart.type === ChartType.CurrentStatus) {
+            acc[chartId] = res[chartId];
+        }
+        else if (chart.type === ChartType.Trend) {
             const chartData = createaTrendChartData(chartId, chart, res);
             if (chartData) {
                 acc[chartId] = chartData;
@@ -228,7 +231,7 @@ export const createCharts = (res) => {
                 acc[chartId] = chartData;
             }
         }
-        else if ([ChartType.Pie, ChartType.ComingSoon].includes(chart.type)) {
+        else if ([ChartType.ComingSoon].includes(chart.type)) {
             return acc;
         }
         return acc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/web-commons",
-  "version": "3.0.0-beta.22",
+  "version": "3.0.0-beta.24",
   "description": "Collection of utilities used across the web Allure reports",
   "keywords": [
     "allure",
@@ -23,9 +23,9 @@
     "clean": "rimraf ./dist"
   },
   "dependencies": {
-    "@allurereport/charts-api": "3.0.0-beta.22",
-    "@allurereport/core-api": "3.0.0-beta.22",
-    "@allurereport/plugin-api": "3.0.0-beta.22",
+    "@allurereport/charts-api": "3.0.0-beta.24",
+    "@allurereport/core-api": "3.0.0-beta.24",
+    "@allurereport/plugin-api": "3.0.0-beta.24",
     "ansi-to-html": "^0.7.2",
     "d3-interpolate": "^3.0.1",
     "d3-scale": "^4.0.2",

package/dist/charts/pie.d.ts

@@ -1,6 +0,0 @@
-import type { PieChartData, PieChartOptions } from "@allurereport/charts-api";
-import type { Statistic } from "@allurereport/core-api";
-export declare const getPieChartData: (stats: Statistic, chartOptions: PieChartOptions) => PieChartData;
-export declare const generatePieChart: (options: PieChartOptions, stores: {
-    statistic: Statistic;
-}) => PieChartData;

package/dist/charts/pie.js

@@ -1,10 +0,0 @@
-import { getPieChartValues } from "./d3pie.js";
-export const getPieChartData = (stats, chartOptions) => ({
-    type: chartOptions.type,
-    title: chartOptions?.title,
-    ...getPieChartValues(stats),
-});
-export const generatePieChart = (options, stores) => {
-    const { statistic } = stores;
-    return getPieChartData(statistic, options);
-};