@allurereport/plugin-awesome 3.0.1 → 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,3 +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, testResults: AwesomeTestResult[]) => Promise<void>;

package/dist/generators.js

@@ -16,6 +16,9 @@ const template = `<!DOCTYPE html>
     <title> {{ reportName }} </title>
     <link rel="icon" href="data:image/svg+xml,%3Csvg width='32' height='32' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M22.232 4.662a3.6 3.6 0 0 1 5.09.035c2.855 2.894 4.662 6.885 4.662 11.295a3.6 3.6 0 0 1-7.2 0c0-2.406-.981-4.61-2.587-6.24a3.6 3.6 0 0 1 .035-5.09Z' fill='url(%23a)'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M12.392 3.6a3.6 3.6 0 0 1 3.6-3.6c4.41 0 8.401 1.807 11.296 4.662a3.6 3.6 0 1 1-5.056 5.126C20.602 8.18 18.398 7.2 15.992 7.2a3.6 3.6 0 0 1-3.6-3.6Z' fill='url(%23b)'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M0 15.992C0 7.157 7.157 0 15.992 0a3.6 3.6 0 0 1 0 7.2A8.789 8.789 0 0 0 7.2 15.992c0 2.406.981 4.61 2.588 6.24a3.6 3.6 0 0 1-5.126 5.056C1.807 24.393 0 20.402 0 15.992Z' fill='url(%23c)'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M4.661 22.232a3.6 3.6 0 0 1 5.091-.035c1.63 1.606 3.834 2.587 6.24 2.587a3.6 3.6 0 0 1 0 7.2c-4.41 0-8.401-1.807-11.295-4.661a3.6 3.6 0 0 1-.036-5.091Z' fill='url(%23d)'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M28.384 12.392a3.6 3.6 0 0 1 3.6 3.6c0 8.835-7.157 15.992-15.992 15.992a3.6 3.6 0 0 1 0-7.2 8.789 8.789 0 0 0 8.792-8.792 3.6 3.6 0 0 1 3.6-3.6Z' fill='url(%23e)'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M28.385 12.392a3.6 3.6 0 0 1 3.6 3.6v12.392a3.6 3.6 0 0 1-7.2 0V15.992a3.6 3.6 0 0 1 3.6-3.6Z' fill='url(%23f)'/%3E%3Cg clip-path='url(%23g)'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M22.232 4.662a3.6 3.6 0 0 1 5.091.035c2.855 2.894 4.662 6.885 4.662 11.295a3.6 3.6 0 0 1-7.2 0c0-2.406-.982-4.61-2.588-6.24a3.6 3.6 0 0 1 .035-5.09Z' fill='url(%23h)'/%3E%3C/g%3E%3Cdefs%3E%3ClinearGradient id='a' x1='26.4' y1='9.6' x2='28.8' y2='15' gradientUnits='userSpaceOnUse'%3E%3Cstop stop-color='%237E22CE'/%3E%3Cstop offset='1' stop-color='%238B5CF6'/%3E%3C/linearGradient%3E%3ClinearGradient id='b' x1='26.8' y1='9.4' x2='17.8' y2='3.6' gradientUnits='userSpaceOnUse'%3E%3Cstop stop-color='%23EF4444'/%3E%3Cstop offset='1' stop-color='%23DC2626'/%3E%3C/linearGradient%3E%3ClinearGradient id='c' x1='3.6' y1='14' x2='5.4' y2='24.8' gradientUnits='userSpaceOnUse'%3E%3Cstop stop-color='%2322C55E'/%3E%3Cstop offset='1' stop-color='%2315803D'/%3E%3C/linearGradient%3E%3ClinearGradient id='d' x1='4.8' y1='22.2' x2='14.4' y2='29.2' gradientUnits='userSpaceOnUse'%3E%3Cstop stop-color='%2394A3B8'/%3E%3Cstop offset='.958' stop-color='%2364748B'/%3E%3Cstop offset='1' stop-color='%2364748B'/%3E%3C/linearGradient%3E%3ClinearGradient id='e' x1='28.4' y1='22.173' x2='22.188' y2='28.384' gradientUnits='userSpaceOnUse'%3E%3Cstop stop-color='%23D97706'/%3E%3Cstop offset='1' stop-color='%23FBBF24'/%3E%3C/linearGradient%3E%3ClinearGradient id='f' x1='29.2' y1='54.4' x2='30.626' y2='54.256' gradientUnits='userSpaceOnUse'%3E%3Cstop stop-color='%23FBBF24'/%3E%3Cstop offset='1' stop-color='%23FBBF24'/%3E%3C/linearGradient%3E%3ClinearGradient id='h' x1='26.4' y1='9.6' x2='28.8' y2='15' gradientUnits='userSpaceOnUse'%3E%3Cstop stop-color='%237E22CE'/%3E%3Cstop offset='1' stop-color='%238B5CF6'/%3E%3C/linearGradient%3E%3CclipPath id='g'%3E%3Cpath fill='%23fff' transform='translate(24.8 12)' d='M0 0h7.2v8H0z'/%3E%3C/clipPath%3E%3C/defs%3E%3C/svg%3E" />
     {{{ headTags }}}
+    <script>
+      window.allureReportOptions = {{{ reportOptions }}}
+    </script>
 </head>
 <body>
     <div id="app"></div>
@@ -38,9 +41,6 @@ const template = `<!DOCTYPE html>
         });
     </script>
     {{/if}}
-    <script>
-      window.allureReportOptions = {{{ reportOptions }}}
-    </script>
     {{{ reportFilesScript }}}
 </body>
 </html>
@@ -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);
@@ -135,7 +134,9 @@ export const generateTree = async (writer, treeFilename, labels, tests, options)
     await writer.writeWidget(treeFilename, tree);
 };
 const buildTreeByLabels = (tests, labels) => {
-    return createTreeByLabels(tests, labels, leafFactory, undefined, (group, leaf) => incrementStatistic(group.statistic, leaf.status));
+    return createTreeByLabels(tests, labels, leafFactory, undefined, (group, leaf) => {
+        incrementStatistic(group.statistic, leaf.status);
+    });
 };
 const buildTreeByTitlePath = (tests) => {
     const testsWithTitlePath = [];
@@ -188,18 +189,25 @@ const buildTreeByTitlePath = (tests) => {
     };
 };
 const buildTreeByLabelsAndTitlePathCombined = (tests, labels) => createTreeByLabelsAndTitlePath(tests, labels, leafFactory, undefined, (group, leaf) => incrementStatistic(group.statistic, leaf.status));
-const leafFactory = ({ id, name, status, duration, flaky, start, retry, retriesCount, transition, tooltips, }) => ({
-    nodeId: id,
-    name,
-    status,
-    duration,
-    flaky,
-    start,
-    retry,
-    retriesCount,
-    transition,
-    tooltips,
-});
+const leafFactory = ({ id, name, status, duration, flaky, start, retry, retriesCount, transition, tooltips, historyId, groupedLabels, }) => {
+    const leaf = {
+        nodeId: id,
+        id: historyId ?? id,
+        name,
+        status,
+        duration,
+        flaky,
+        start,
+        retry,
+        retriesCount,
+        transition,
+        tooltips,
+    };
+    if (groupedLabels.tag && groupedLabels.tag.length > 0) {
+        leaf.tags = groupedLabels.tag;
+    }
+    return leaf;
+};
 export const generateEnvironmentJson = async (writer, env) => {
     await writer.writeWidget("allure_environment.json", env);
 };
@@ -274,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) => {
@@ -350,9 +358,25 @@ 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, testResults) => {
+    const trTags = new Set();
+    for (const tr of testResults) {
+        if (tr.labels.length === 0) {
+            continue;
+        }
+        Object.values(tr.groupedLabels.tag ?? []).forEach((tag) => {
+            trTags.add(tag);
+        });
+    }
+    if (trTags.size === 0) {
+        return Promise.resolve();
+    }
+    const tags = Array.from(trTags).sort((a, b) => a.localeCompare(b));
+    await writer.writeWidget("tree-filters.json", { tags });
+};

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

@@ -16,7 +16,7 @@ import { preciseTreeLabels } from "@allurereport/plugin-api";
 import { join } from "node:path";
 import { filterEnv } from "./environments.js";
 import { generateTimeline } from "./generateTimeline.js";
-import { generateAllCharts, generateAttachmentsFiles, generateEnvironmentJson, generateEnvirontmentsList, generateGlobals, generateHistoryDataPoints, generateNav, generateQualityGateResults, generateStaticFiles, generateStatistic, generateTestCases, generateTestEnvGroups, generateTestResults, generateTree, generateVariables, } from "./generators.js";
+import { generateAllCharts, generateAttachmentsFiles, generateEnvironmentJson, generateEnvirontmentsList, generateGlobals, generateHistoryDataPoints, generateNav, generateQualityGateResults, generateStaticFiles, generateStatistic, generateTestCases, generateTestEnvGroups, generateTestResults, generateTree, generateTreeFilters, generateVariables, } from "./generators.js";
 import { InMemoryReportDataWriter, ReportFileDataWriter } from "./writer.js";
 export class AwesomePlugin {
     constructor(options = {}) {
@@ -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,6 +63,7 @@ export class AwesomePlugin {
                 });
                 await generateNav(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), envConvertedTrs, join(reportEnvironment, "nav.json"));
             }
+            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) {
@@ -113,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.0.1",
+  "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.0.1",
-    "@allurereport/core-api": "3.0.1",
-    "@allurereport/plugin-api": "3.0.1",
-    "@allurereport/web-awesome": "3.0.1",
-    "@allurereport/web-commons": "3.0.1",
+    "@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",