@allurereport/plugin-awesome 3.1.0 → 3.2.0

package/dist/converters.js

@@ -1,3 +1,6 @@
+import MarkdownIt from "markdown-it";
+const md = new MarkdownIt();
+const markdownToHtml = (value) => (value ? md.render(value) : undefined);
 const mapLabelsByName = (labels) => {
     return labels.reduce((acc, { name, value }) => {
         acc[name] = acc[name] || [];
@@ -28,6 +31,7 @@ export const convertTestResult = (tr) => {
         steps: tr.steps,
         error: tr.error,
         testCase: tr.testCase,
+        descriptionHtml: tr.descriptionHtml ?? markdownToHtml(tr.description),
         environment: tr.environment,
         setup: [],
         teardown: [],

package/dist/generateTimeline.d.ts

@@ -1,7 +1,7 @@
-import type { AllureStore } from "@allurereport/plugin-api";
+import type { AwesomeTestResult } from "@allurereport/web-awesome";
 import type { AwesomeOptions } from "./model.js";
 type Writer = {
     writeWidget(fileName: string, data: any): Promise<void>;
 };
-export declare const generateTimeline: (writer: Writer, store: AllureStore, options: AwesomeOptions) => Promise<void>;
+export declare const generateTimeline: (writer: Writer, trs: AwesomeTestResult[], options: AwesomeOptions) => Promise<void>;
 export {};

package/dist/generateTimeline.js

@@ -1,16 +1,12 @@
-import { hasLabels } from "@allurereport/web-commons";
 const DEFAULT_MIN_DURATION = 1;
-const HOST_LABEL = "host";
-const THREAD_LABEL = "thread";
 const DEFAULT_TIMELINE_OPTIONS = {
     minDuration: DEFAULT_MIN_DURATION,
 };
-export const generateTimeline = async (writer, store, options) => {
+export const generateTimeline = async (writer, trs, options) => {
     const { timeline = DEFAULT_TIMELINE_OPTIONS } = options;
     const { minDuration = DEFAULT_MIN_DURATION } = timeline;
-    const testResults = await store.allTestResults({ includeHidden: true });
     const result = [];
-    for (const test of testResults) {
+    for (const test of trs) {
         const hasStart = Number.isInteger(test.start);
         const hasStop = Number.isInteger(test.stop);
         if (!hasStart || !hasStop) {
@@ -20,7 +16,8 @@ export const generateTimeline = async (writer, store, options) => {
         if (duration < minDuration) {
             continue;
         }
-        if (!hasLabels(test, [HOST_LABEL, THREAD_LABEL])) {
+        const { host, thread } = test.groupedLabels;
+        if (!host?.length || !thread?.length) {
             continue;
         }
         result.push({
@@ -29,10 +26,10 @@ export const generateTimeline = async (writer, store, options) => {
             name: test.name,
             status: test.status,
             hidden: test.hidden,
-            labels: test.labels,
+            host: host[0],
+            thread: thread[0],
             environment: test.environment,
             start: test.start,
-            stop: test.stop,
             duration,
         });
     }

package/dist/generators.d.ts

@@ -1,10 +1,10 @@
 import { type AttachmentLink, type EnvironmentItem, type Statistic, type TestEnvGroup, type TestError, type TestResult } from "@allurereport/core-api";
-import type { AllureStore, ExitCode, PluginContext, QualityGateValidationResult, ReportFiles, ResultFile, TestResultFilter } from "@allurereport/plugin-api";
+import type { AllureStore, ExitCode, PluginContext, QualityGateValidationResult, ReportFiles, ResultFile } from "@allurereport/plugin-api";
 import type { AwesomeTestResult } from "@allurereport/web-awesome";
 import type { AwesomeOptions, TemplateManifest } from "./model.js";
 import type { AwesomeDataWriter, ReportFile } from "./writer.js";
 export declare const readTemplateManifest: (singleFileMode?: boolean) => Promise<TemplateManifest>;
-export declare const generateTestResults: (writer: AwesomeDataWriter, store: AllureStore, trs: TestResult[], filter?: TestResultFilter) => Promise<AwesomeTestResult[]>;
+export declare const generateTestResults: (writer: AwesomeDataWriter, store: AllureStore, trs: TestResult[]) => Promise<AwesomeTestResult[]>;
 export declare const generateTestCases: (writer: AwesomeDataWriter, trs: AwesomeTestResult[]) => Promise<void>;
 export declare const generateTestEnvGroups: (writer: AwesomeDataWriter, groups: TestEnvGroup[]) => Promise<void>;
 export declare const generateNav: (writer: AwesomeDataWriter, trs: AwesomeTestResult[], filename?: string) => Promise<void>;
@@ -27,7 +27,7 @@ export declare const generateGlobals: (writer: AwesomeDataWriter, payload: {
     globalErrors?: TestError[];
     contentFunction: (id: string) => Promise<ResultFile | undefined>;
 }) => Promise<void>;
-export declare const generateQualityGateResults: (writer: AwesomeDataWriter, qualityGateResults?: QualityGateValidationResult[]) => Promise<void>;
+export declare const generateQualityGateResults: (writer: AwesomeDataWriter, qualityGateResults?: Record<string, QualityGateValidationResult[]>) => Promise<void>;
 export declare const generateStaticFiles: (payload: AwesomeOptions & {
     id: string;
     allureVersion: string;
@@ -37,4 +37,4 @@ export declare const generateStaticFiles: (payload: AwesomeOptions & {
     reportName: string;
 }) => Promise<void>;
 export declare const generateAllCharts: (writer: AwesomeDataWriter, store: AllureStore, options: AwesomeOptions, context: PluginContext) => Promise<void>;
-export declare const generateTreeFilters: (writer: AwesomeDataWriter, store: AllureStore) => Promise<void>;
+export declare const generateTreeFilters: (writer: AwesomeDataWriter, testResults: AwesomeTestResult[]) => Promise<void>;

package/dist/generators.js

@@ -73,10 +73,9 @@ const createBreadcrumbs = (convertedTr) => {
         return acc;
     }, []);
 };
-export const generateTestResults = async (writer, store, trs, filter) => {
-    const allTr = trs.filter((tr) => (filter ? filter(tr) : true));
+export const generateTestResults = async (writer, store, trs) => {
     let convertedTrs = [];
-    for (const tr of allTr) {
+    for (const tr of trs) {
         const trFixtures = await store.fixturesByTrId(tr.id);
         const convertedTrFixtures = trFixtures.map(convertFixtureResult);
         const convertedTr = convertTestResult(tr);
@@ -283,7 +282,7 @@ export const generateGlobals = async (writer, payload) => {
     }
     await writer.writeWidget("globals.json", globals);
 };
-export const generateQualityGateResults = async (writer, qualityGateResults = []) => {
+export const generateQualityGateResults = async (writer, qualityGateResults = {}) => {
     await writer.writeWidget("quality-gate.json", qualityGateResults);
 };
 export const generateStaticFiles = async (payload) => {
@@ -359,23 +358,20 @@ export const generateStaticFiles = async (payload) => {
     }
 };
 export const generateAllCharts = async (writer, store, options, context) => {
-    const { charts = defaultChartsConfig } = options;
-    const generatedChartsData = await generateCharts(charts, store, context.reportName, randomUUID);
+    const { charts = defaultChartsConfig, filter } = options;
+    const generatedChartsData = await generateCharts(charts, store, context.reportName, randomUUID, filter);
     if (Object.keys(generatedChartsData.general).length > 0) {
         await writer.writeWidget("charts.json", generatedChartsData);
     }
 };
-export const generateTreeFilters = async (writer, store) => {
+export const generateTreeFilters = async (writer, testResults) => {
     const trTags = new Set();
-    const trs = await store.allTestResults({ includeHidden: false });
-    for (const tr of trs) {
+    for (const tr of testResults) {
         if (tr.labels.length === 0) {
             continue;
         }
-        tr.labels.forEach((label) => {
-            if (label.name === "tag" && !!label.value) {
-                trTags.add(label.value);
-            }
+        Object.values(tr.groupedLabels.tag ?? []).forEach((tag) => {
+            trTags.add(tag);
         });
     }
     if (trTags.size === 0) {

package/dist/model.d.ts

@@ -5,7 +5,7 @@ export type AwesomeOptions = {
     singleFile?: boolean;
     logo?: string;
     theme?: "light" | "dark" | "auto";
-    reportLanguage?: "en";
+    reportLanguage?: string;
     groupBy?: string[];
     layout?: "base" | "split";
     environments?: Record<string, EnvironmentsConfig>;

package/dist/plugin.js

@@ -27,7 +27,7 @@ export class AwesomePlugin {
             const environmentItems = await store.metadataByKey("allure_environment");
             const reportEnvironments = await store.allEnvironments();
             const attachments = await store.allAttachments();
-            const allTrs = await store.allTestResults({ includeHidden: true });
+            const allTrs = await store.allTestResults({ includeHidden: true, filter });
             const statistics = await store.testsStatistic(filter);
             const environments = await store.allEnvironments();
             const envStatistics = new Map();
@@ -35,7 +35,7 @@ export class AwesomePlugin {
             const globalAttachments = await store.allGlobalAttachments();
             const globalExitCode = await store.globalExitCode();
             const globalErrors = await store.allGlobalErrors();
-            const qualityGateResults = await store.qualityGateResults();
+            const qualityGateResults = await store.qualityGateResultsByEnv();
             for (const env of environments) {
                 envStatistics.set(env, await store.testsStatistic(filterEnv(env, filter)));
             }
@@ -45,9 +45,9 @@ export class AwesomePlugin {
                 envs: environments,
             });
             await generateAllCharts(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), store, this.options, context);
-            await generateTimeline(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), store, this.options);
-            const convertedTrs = await generateTestResults(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), store, allTrs, this.options.filter);
+            const convertedTrs = await generateTestResults(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), store, allTrs);
             const hasGroupBy = groupBy.length > 0;
+            await generateTimeline(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), convertedTrs, this.options);
             const treeLabels = hasGroupBy
                 ? preciseTreeLabels(groupBy, convertedTrs, ({ labels }) => labels.map(({ name }) => name))
                 : [];
@@ -63,7 +63,7 @@ export class AwesomePlugin {
                 });
                 await generateNav(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), envConvertedTrs, join(reportEnvironment, "nav.json"));
             }
-            await generateTreeFilters(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), store);
+            await generateTreeFilters(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), convertedTrs);
             await generateEnvirontmentsList(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), store);
             await generateVariables(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), store);
             if (environmentItems?.length) {
@@ -114,8 +114,8 @@ export class AwesomePlugin {
         };
     }
     async info(context, store) {
-        const allTrs = (await store.allTestResults()).filter((tr) => this.options.filter ? this.options.filter(tr) : true);
-        const newTrs = await store.allNewTestResults();
+        const allTrs = await store.allTestResults({ filter: this.options.filter });
+        const newTrs = await store.allNewTestResults(this.options.filter);
         const retryTrs = allTrs.filter((tr) => !!tr?.retries?.length);
         const flakyTrs = allTrs.filter((tr) => !!tr?.flaky);
         const duration = allTrs.reduce((acc, { duration: trDuration = 0 }) => acc + trDuration, 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/plugin-awesome",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Allure Awesome Plugin – brand new HTML report with modern design and new features",
   "keywords": [
     "allure",
@@ -30,18 +30,20 @@
     "test": "rimraf ./out && vitest run"
   },
   "dependencies": {
-    "@allurereport/charts-api": "3.1.0",
-    "@allurereport/core-api": "3.1.0",
-    "@allurereport/plugin-api": "3.1.0",
-    "@allurereport/web-awesome": "3.1.0",
-    "@allurereport/web-commons": "3.1.0",
+    "@allurereport/charts-api": "3.2.0",
+    "@allurereport/core-api": "3.2.0",
+    "@allurereport/plugin-api": "3.2.0",
+    "@allurereport/web-awesome": "3.2.0",
+    "@allurereport/web-commons": "3.2.0",
     "d3-shape": "^3.2.0",
-    "handlebars": "^4.7.8"
+    "handlebars": "^4.7.8",
+    "markdown-it": "^14.1.0"
   },
   "devDependencies": {
     "@stylistic/eslint-plugin": "^2.6.1",
     "@types/d3-shape": "^3.1.6",
     "@types/eslint": "^8.56.11",
+    "@types/markdown-it": "^14.1.2",
     "@types/node": "^20.17.9",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "@typescript-eslint/parser": "^8.0.0",