@allurereport/plugin-awesome 3.18.0 → 3.19.0

package/dist/categories.js

@@ -1,10 +1,12 @@
-import { EMPTY_VALUE, buildEnvironmentSortOrder, compareChildNodes, extractErrorMatchingData, findLastByLabelName, incrementStatistic, matchCategory, } from "@allurereport/core-api";
+import { EMPTY_VALUE, buildEnvironmentSortOrder, calculateRetryHash, compareChildNodes, extractErrorMatchingData, findLastByLabelName, incrementStatistic, matchCategory, } from "@allurereport/core-api";
 import { md5 } from "@allurereport/plugin-api";
 const emptyStat = () => ({
     total: 0,
 });
 const msgKey = (m) => (m && m.trim().length ? m : EMPTY_VALUE);
 const envKey = (m) => (m && m.trim().length ? m : EMPTY_VALUE);
+const environmentNeutralRetryHash = (testResult) => calculateRetryHash({ testCaseHash: testResult.testCaseHash, parametersHash: testResult.parametersHash }) ??
+    testResult.id;
 const formatEmptyValue = (key) => {
     if (key === "message") {
         return "No message";
@@ -98,11 +100,11 @@ const buildGroupLevels = (category, testResult, matchingData, environmentCount,
     }
     const groupEnvironments = computeGroupEnvironments(category, environmentCount, isSingleEnvironmentSelected);
     if (groupEnvironments) {
-        const testKeyValue = testResult.historyId ?? testResult.id;
+        const testKeyValue = environmentNeutralRetryHash(testResult);
         const testDisplayName = testResult.name ?? testKeyValue;
         levels.push({
             type: "history",
-            key: "historyId",
+            key: "retryHash",
             value: testKeyValue,
             name: testDisplayName,
         });
@@ -165,14 +167,14 @@ export const generateCategories = async (writer, { tests, categories, filename =
         let parentId = catId;
         for (const level of levels) {
             const levelId = `${level.type}:${md5(`${parentId}\n${level.key}\n${level.value}`)}`;
-            const historyId = level.type === "history" ? level.value : undefined;
+            const retryHash = level.type === "history" ? level.value : undefined;
             duplicateChecker({
                 id: levelId,
                 type: level.type,
                 name: level.name,
                 key: level.key,
                 value: level.value,
-                historyId,
+                retryHash,
                 statistic: emptyStat(),
                 childrenIds: [],
             });

package/dist/converters.js

@@ -21,7 +21,10 @@ export const convertTestResult = (tr, options = {}) => {
         duration: tr.duration,
         status: tr.status,
         fullName: tr.fullName,
-        historyId: tr.historyId,
+        retryHash: tr.retryHash,
+        testCaseHash: tr.testCaseHash,
+        parametersHash: tr.parametersHash,
+        environmentHash: tr.environmentHash,
         flaky: tr.flaky,
         muted: tr.muted,
         known: tr.known,
@@ -34,8 +37,8 @@ export const convertTestResult = (tr, options = {}) => {
         links: tr.links,
         steps: (tr.steps ?? []).map(convertTestStepResult),
         error: tr.error,
+        errors: tr.errors,
         testCase: tr.testCase,
-        retryHash: tr.retryHash,
         descriptionHtml: tr.descriptionHtml ?? markdownToHtml(tr.description),
         environment: tr.environment,
         setup: [],

package/dist/generateTimeline.d.ts

@@ -3,5 +3,5 @@ import type { AwesomeOptions } from "./model.js";
 type Writer = {
     writeWidget(fileName: string, data: any): Promise<void>;
 };
-export declare const generateTimeline: (writer: Writer, trs: TestResult[], options: AwesomeOptions, environmentIdByTrId: Map<string, string>) => Promise<void>;
+export declare const generateTimeline: (writer: Writer, trs: TestResult[], options: AwesomeOptions, environmentIdByTrId: Map<string, string>, environmentNameById?: Map<string, string>) => Promise<void>;
 export {};

package/dist/generateTimeline.js

@@ -2,7 +2,7 @@ const DEFAULT_MIN_DURATION = 1;
 const DEFAULT_TIMELINE_OPTIONS = {
     minDuration: DEFAULT_MIN_DURATION,
 };
-export const generateTimeline = async (writer, trs, options, environmentIdByTrId) => {
+export const generateTimeline = async (writer, trs, options, environmentIdByTrId, environmentNameById = new Map()) => {
     const { timeline = DEFAULT_TIMELINE_OPTIONS } = options;
     const { minDuration = DEFAULT_MIN_DURATION } = timeline;
     const result = [];
@@ -23,14 +23,14 @@ export const generateTimeline = async (writer, trs, options, environmentIdByTrId
         }
         result.push({
             id: test.id,
-            historyId: test.historyId,
+            retryHash: test.retryHash,
             name: test.name,
             status: test.status,
             isRetry: test.isRetry,
             host,
             thread,
             environment: environmentIdByTrId.get(test.id) ?? test.environment,
-            environmentName: test.environment,
+            environmentName: environmentNameById.get(test.environment ?? "") ?? test.environment,
             start: test.start,
             duration,
         });

package/dist/generators.js

@@ -159,18 +159,21 @@ const searchDocumentFactory = (test) => {
     });
     const links = (test.links ?? []).flatMap(({ name, url, type }) => [name, url, type]);
     const categories = test.categories?.map((category) => category.name);
+    const statusMessages = (test.errors?.length ? test.errors : test.error ? [test.error] : [])
+        .map((error) => error.message)
+        .filter(Boolean);
     return {
         id: test.id,
         nodeId: test.id,
         name: test.name,
         fullName: test.fullName,
-        historyId: test.historyId,
+        retryHash: test.retryHash,
         labels: joinSearchValues(labels),
         owner: joinSearchValues(test.groupedLabels.owner ?? []),
         tags: joinSearchValues(tags),
         parameters: joinSearchValues(parameters),
         categories: joinSearchValues(categories ?? []),
-        statusMessage: test.error?.message,
+        statusMessage: joinSearchValues(statusMessages),
         links: joinSearchValues(links),
     };
 };
@@ -270,10 +273,10 @@ const buildTreeByTitlePath = (tests) => {
     };
 };
 const buildTreeByLabelsAndTitlePathCombined = (tests, labels) => collapseTreeGroups(createTreeByLabelsAndTitlePath(tests, labels, leafFactory, undefined, (group, leaf) => incrementStatistic(group.statistic, leaf.status)));
-const leafFactory = ({ id, name, status, duration, flaky, start, retry, retriesCount, resolution, transition, tooltips, historyId, groupedLabels, categories, }) => {
+const leafFactory = ({ id, name, status, duration, flaky, start, retry, retriesCount, resolution, transition, tooltips, retryHash, groupedLabels, categories, }) => {
     const leaf = {
         nodeId: id,
-        id: historyId ?? id,
+        id: retryHash ?? id,
         name,
         status,
         duration,
@@ -306,7 +309,7 @@ const getResolutionGroupName = (test) => {
 };
 const resolutionTestResultFactory = (test, index) => ({
     nodeId: test.id,
-    id: test.historyId ?? test.id,
+    id: test.retryHash ?? test.id,
     name: test.name,
     status: test.status,
     duration: test.duration,

package/dist/plugin.js

@@ -137,13 +137,13 @@ export class AwesomePlugin {
                 tests: convertedTrs,
                 categories,
                 environmentCount: environments.length,
-                environments: environments.map(({ name }) => name),
+                environments: environments.map(({ id }) => id),
                 defaultEnvironment: "default",
                 selectedEnvironmentCount: environments.length,
             });
             await generateResolutionCategories(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), convertedTrs);
             const hasGroupBy = groupBy.length > 0;
-            await generateTimeline(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), allTrs, this.options, envIdByTrId);
+            await generateTimeline(__classPrivateFieldGet(this, _AwesomePlugin_writer, "f"), allTrs, this.options, envIdByTrId, new Map(environments.map(({ id, name }) => [id, name])));
             const treeLabels = hasGroupBy
                 ? preciseTreeLabels(groupBy, convertedTrs, ({ labels }) => labels.map(({ name }) => name))
                 : [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/plugin-awesome",
-  "version": "3.18.0",
+  "version": "3.19.0",
   "description": "Allure Awesome Plugin – brand new HTML report with modern design and new features",
   "keywords": [
     "allure",
@@ -30,16 +30,16 @@
     "lint:fix": "oxlint --import-plugin --fix src test features stories"
   },
   "dependencies": {
-    "@allurereport/charts-api": "3.18.0",
-    "@allurereport/core-api": "3.18.0",
-    "@allurereport/plugin-api": "3.18.0",
-    "@allurereport/web-commons": "3.18.0",
+    "@allurereport/charts-api": "3.19.0",
+    "@allurereport/core-api": "3.19.0",
+    "@allurereport/plugin-api": "3.19.0",
+    "@allurereport/web-commons": "3.19.0",
     "d3-shape": "^3.2.0",
     "handlebars": "^4.7.9",
     "markdown-it": "^14.2.0"
   },
   "devDependencies": {
-    "@allurereport/web-awesome": "3.18.0",
+    "@allurereport/web-awesome": "3.19.0",
     "@types/d3-shape": "^3.1.8",
     "@types/markdown-it": "^14.1.2",
     "@types/node": "^20",