@allurereport/plugin-dashboard 3.0.0-beta.20 → 3.0.0-beta.21

package/dist/generators.d.ts

@@ -1,9 +1,9 @@
-import { type AllureStore, type GeneratedChartsData, type PluginContext, type ReportFiles } from "@allurereport/plugin-api";
+import { type AllureStore, type PluginContext, type ReportFiles } from "@allurereport/plugin-api";
 import type { DashboardOptions, DashboardPluginOptions, TemplateManifest } from "./model.js";
 import type { DashboardDataWriter, ReportFile } from "./writer.js";
 export declare const readTemplateManifest: (singleFileMode?: boolean) => Promise<TemplateManifest>;
-export declare const generateCharts: (options: DashboardPluginOptions, store: AllureStore, context: PluginContext) => Promise<GeneratedChartsData | undefined>;
 export declare const generateAllCharts: (writer: DashboardDataWriter, store: AllureStore, options: DashboardPluginOptions, context: PluginContext) => Promise<void>;
+export declare const generateEnvirontmentsList: (writer: DashboardDataWriter, store: AllureStore) => Promise<void>;
 export declare const generateStaticFiles: (payload: DashboardOptions & {
     allureVersion: string;
     reportFiles: ReportFiles;

package/dist/generators.js

@@ -1,7 +1,7 @@
-import { ChartType, createBaseUrlScript, createFontLinkTag, createReportDataScript, createScriptTag, createStylesLinkTag, } from "@allurereport/core-api";
-import { generateBarChart, generateComingSoonChart, generateHeatMapChart, generatePieChart, generateTreeMapChart, generateTrendChart, } from "@allurereport/plugin-api";
-import { randomUUID } from "crypto";
+import { createBaseUrlScript, createFontLinkTag, createReportDataScript, createScriptTag, createStylesLinkTag, } from "@allurereport/core-api";
+import { generateCharts } from "@allurereport/web-commons";
 import Handlebars from "handlebars";
+import { randomUUID } from "node:crypto";
 import { readFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import { basename, join } from "node:path";
@@ -47,53 +47,19 @@ export const readTemplateManifest = async (singleFileMode) => {
     const templateManifest = await readFile(templateManifestSource, { encoding: "utf-8" });
     return JSON.parse(templateManifest);
 };
-export const generateCharts = async (options, store, context) => {
+export const generateAllCharts = async (writer, store, options, context) => {
     const { layout } = options;
     if (!layout) {
-        return undefined;
+        return;
     }
-    const storeData = await Promise.all([
-        store.allHistoryDataPoints(),
-        store.allTestResults(),
-        store.testsStatistic(),
-    ]).then(([historyDataPoints, testResults, statistic]) => ({
-        historyDataPoints,
-        testResults,
-        statistic,
-    }));
-    const chartsData = {};
-    for (const chartOptions of layout) {
-        const chartId = randomUUID();
-        let chart;
-        if (chartOptions.type === ChartType.Trend) {
-            chart = generateTrendChart(chartOptions, storeData, context);
-        }
-        else if (chartOptions.type === ChartType.Pie) {
-            chart = generatePieChart(chartOptions, storeData);
-        }
-        else if (chartOptions.type === ChartType.Bar) {
-            chart = generateBarChart(chartOptions, storeData);
-        }
-        else if (chartOptions.type === ChartType.TreeMap) {
-            chart = generateTreeMapChart(chartOptions, storeData);
-        }
-        else if (chartOptions.type === ChartType.HeatMap) {
-            chart = generateHeatMapChart(chartOptions, storeData);
-        }
-        if (chart) {
-            chartsData[chartId] = chart;
-        }
-        else {
-            chartsData[chartId] = generateComingSoonChart(chartOptions);
-        }
+    const generatedChartsData = await generateCharts(layout, store, context.reportName, randomUUID);
+    if (Object.keys(generatedChartsData.general).length > 0) {
+        await writer.writeWidget("charts.json", generatedChartsData);
     }
-    return chartsData;
 };
-export const generateAllCharts = async (writer, store, options, context) => {
-    const charts = await generateCharts(options, store, context);
-    if (charts && Object.keys(charts).length > 0) {
-        await writer.writeWidget("charts.json", charts);
-    }
+export const generateEnvirontmentsList = async (writer, store) => {
+    const environments = await store.allEnvironments();
+    await writer.writeWidget("environments.json", environments);
 };
 export const generateStaticFiles = async (payload) => {
     const { reportName = "Allure Report", reportLanguage = "en", singleFile, logo = "", theme = "light", reportFiles, reportDataFiles, reportUuid, allureVersion, } = payload;
@@ -154,7 +120,6 @@ export const generateStaticFiles = async (payload) => {
         if (err instanceof RangeError) {
             console.error("The report is too large to be generated in the single file mode!");
             process.exit(1);
-            return;
         }
         throw err;
     }

package/dist/model.d.ts

@@ -1,5 +1,5 @@
+import type { ChartOptions } from "@allurereport/charts-api";
 import type { TestResult } from "@allurereport/core-api";
-import type { ChartOptions } from "@allurereport/plugin-api";
 export type DashboardOptions = {
     reportName?: string;
     singleFile?: boolean;

package/dist/plugin.js

@@ -12,7 +12,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
 var _DashboardPlugin_writer, _DashboardPlugin_generate;
 import { getWorstStatus } from "@allurereport/core-api";
 import { convertToSummaryTestResult, } from "@allurereport/plugin-api";
-import { generateAllCharts, generateStaticFiles } from "./generators.js";
+import { generateAllCharts, generateEnvirontmentsList, generateStaticFiles } from "./generators.js";
 import { InMemoryDashboardDataWriter, ReportFileDashboardDataWriter } from "./writer.js";
 export class DashboardPlugin {
     constructor(options = {}) {
@@ -20,6 +20,7 @@ export class DashboardPlugin {
         _DashboardPlugin_writer.set(this, void 0);
         _DashboardPlugin_generate.set(this, async (context, store) => {
             await generateAllCharts(__classPrivateFieldGet(this, _DashboardPlugin_writer, "f"), store, this.options, context);
+            await generateEnvirontmentsList(__classPrivateFieldGet(this, _DashboardPlugin_writer, "f"), store);
             const reportDataFiles = this.options.singleFile ? __classPrivateFieldGet(this, _DashboardPlugin_writer, "f").reportFiles() : [];
             await generateStaticFiles({
                 ...this.options,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/plugin-dashboard",
-  "version": "3.0.0-beta.20",
+  "version": "3.0.0-beta.21",
   "description": "Allure Dashboard Plugin – plugin for generating dashboard with a mix of charts",
   "keywords": [
     "allure",
@@ -32,9 +32,11 @@
     "test": "rimraf ./out && vitest run"
   },
   "dependencies": {
-    "@allurereport/core-api": "3.0.0-beta.20",
-    "@allurereport/plugin-api": "3.0.0-beta.20",
-    "@allurereport/web-dashboard": "3.0.0-beta.20",
+    "@allurereport/charts-api": "3.0.0-beta.21",
+    "@allurereport/core-api": "3.0.0-beta.21",
+    "@allurereport/plugin-api": "3.0.0-beta.21",
+    "@allurereport/web-commons": "3.0.0-beta.21",
+    "@allurereport/web-dashboard": "3.0.0-beta.21",
     "d3-shape": "^3.2.0",
     "handlebars": "^4.7.8"
   },