@allurereport/web-commons 3.20.1 → 3.21.0

package/dist/attachments.d.ts

@@ -31,8 +31,9 @@ export declare const fetchAttachment: (id: string, ext: string, contentType?: st
 export declare const blobAttachment: (id: string, ext: string, contentType: string) => Promise<Blob>;
 export declare const downloadAttachment: (id: string, ext: string, contentType: string) => Promise<void>;
 export declare const openAttachmentInNewTab: (id: string, ext: string, contentType: string) => Promise<void>;
-export type AttachmentType = "css" | "json" | "image" | "svg" | "code" | "text" | "markdown" | "html" | "table" | "video" | "uri" | "archive" | "image-diff" | "http";
-export declare const PREVIEWABLE_CONTENT_TYPES: readonly ["text/html", "text/csv", "text/markdown", "text/tab-separated-values", "text/uri-list"];
+export type AttachmentType = "css" | "json" | "image" | "svg" | "code" | "text" | "markdown" | "html" | "table" | "video" | "uri" | "archive" | "image-diff" | "http" | "mermaid";
+export declare const MERMAID_CONTENT_TYPE = "application/vnd.allure.diagrams.mermaid";
+export declare const PREVIEWABLE_CONTENT_TYPES: readonly ["application/vnd.allure.diagrams.mermaid", "text/html", "text/csv", "text/markdown", "text/tab-separated-values", "text/uri-list"];
 export declare const isPreviewableContentType: (type?: string) => boolean;
 export declare const extname: (str: string) => string | undefined;
 export declare const isSyntaxHighlightSupported: (payload?: {

package/dist/attachments.js

@@ -30,6 +30,7 @@ export const fetchAttachment = async (id, ext, contentType) => {
         case "code":
         case "html":
         case "markdown":
+        case "mermaid":
         case "table":
         case "text": {
             const text = await response.text();
@@ -77,14 +78,16 @@ export const openAttachmentInNewTab = async (id, ext, contentType) => {
     const linkUrl = URL.createObjectURL(blob);
     globalThis.open(linkUrl, "_blank");
 };
+export const MERMAID_CONTENT_TYPE = "application/vnd.allure.diagrams.mermaid";
 export const PREVIEWABLE_CONTENT_TYPES = [
+    MERMAID_CONTENT_TYPE,
     "text/html",
     "text/csv",
     "text/markdown",
     "text/tab-separated-values",
     "text/uri-list",
 ];
-export const isPreviewableContentType = (type) => !!type && PREVIEWABLE_CONTENT_TYPES.includes(type);
+export const isPreviewableContentType = (type) => !!type && PREVIEWABLE_CONTENT_TYPES.includes(type.split(";")[0].trim().toLowerCase());
 const HIGHLIGHT_EXTS = new Set([
     "js",
     "mjs",
@@ -263,6 +266,8 @@ export const attachmentType = (type) => {
             return "image-diff";
         case "application/vnd.allure.http+json":
             return "http";
+        case MERMAID_CONTENT_TYPE:
+            return "mermaid";
         default:
             return null;
     }

package/dist/charts/generateDurationDynamicsChart.js

@@ -43,7 +43,8 @@ const getStats = (testResults) => {
 export const generateDurationDynamicsChart = (props) => {
     const { options, storeData } = props;
     const { title, limit = DEFAULT_CHART_HISTORY_LIMIT } = options;
-    const { historyDataPoints, testResults } = storeData;
+    const { historyDataPoints } = storeData;
+    const testResults = storeData.allTestResults ?? storeData.testResults;
     const limitedHistoryPoints = limitHistoryDataPoints(historyDataPoints, limit - 1).sort((a, b) => a.timestamp - b.timestamp);
     const currentReportTimestamp = testResults.reduce((acc, testResult) => Math.max(acc, testResult.stop ?? 0), 0);
     if (limitedHistoryPoints.length === 0) {
@@ -63,7 +64,7 @@ export const generateDurationDynamicsChart = (props) => {
         ...limitedHistoryPoints,
         {
             testResults: testResults.reduce((acc, testResult) => {
-                acc[testResult.retryHash ?? testResult.id] = testResult;
+                acc[testResult.id] = testResult;
                 return acc;
             }, {}),
             uuid: "current",

package/dist/charts/generateDurationsChart.js

@@ -51,7 +51,7 @@ const getBucketsFromDurations = (durations) => {
 export const generateDurationsChart = (props) => {
     const { options, storeData } = props;
     const { groupBy = BY_NONE, title } = options;
-    const { testResults } = storeData;
+    const testResults = storeData.allTestResults ?? storeData.testResults;
     const enrichedTrs = enrichAndFilterTrs(testResults, groupBy);
     const durations = getDurations(enrichedTrs);
     const buckets = durations.size > 0 ? getBucketsFromDurations(Array.from(durations)) : [];

package/dist/charts/generators.js

@@ -28,6 +28,19 @@ const generateChartData = async (props) => {
         }
         return trs;
     };
+    const getAllTrs = async () => {
+        let trs = [];
+        if (envId) {
+            trs = await store.testResultsByEnvironmentId(envId, { includeRetries: true });
+        }
+        else {
+            trs = await store.allTestResults({ includeRetries: true });
+        }
+        if (filter) {
+            trs = trs.filter(filter);
+        }
+        return trs;
+    };
     const getHistoryDataPoints = async () => {
         let historyDataPoints = [];
         if (envId) {
@@ -43,7 +56,7 @@ const generateChartData = async (props) => {
                     try {
                         return filter(tr);
                     }
-                    catch (error) {
+                    catch {
                         return false;
                     }
                 });
@@ -66,7 +79,7 @@ const generateChartData = async (props) => {
         getHistoryDataPoints(),
         getTrs(),
         getStatistic(),
-        store.allTestResults({ includeRetries: true }),
+        getAllTrs(),
     ]).then(([historyDataPoints, testResults, statistic, allTestResults]) => ({
         historyDataPoints,
         testResults,

package/dist/treeSubtreeToggle.d.ts

@@ -7,19 +7,18 @@ export type SubtreeNodeState = {
 };
 export declare const isSubtreeFirstLevelOnlyOpened: (rootId: string, rootOpenedByDefault: boolean, subtreeNodes: SubtreeNodeState[], isNodeOpened: (id: string, openedByDefault: boolean) => boolean) => boolean;
 export declare const isSubtreeExpandedAll: (subtreeNodes: SubtreeNodeState[], isNodeOpened: (id: string, openedByDefault: boolean) => boolean) => boolean;
-export declare const getNextSubtreeToggleState: (payload: {
+export type SubtreeTogglePayload = {
     hasOnlyLeafResults: boolean;
     isSubtreeCollapsedAll: boolean;
     isSubtreeFirstLevelOnly: boolean;
     isSubtreeExpandedAll: boolean;
     lastSubtreeToggle: SubtreeToggleState | null;
-}) => SubtreeToggleState;
+};
+export declare const getNextSubtreeToggleState: (payload: SubtreeTogglePayload) => SubtreeToggleState;
+export type SubtreeToggleAction = "expand-first-level" | "collapse-to-first-level" | "expand-all" | "collapse-all";
+export declare const getSubtreeToggleAction: (payload: SubtreeTogglePayload) => SubtreeToggleAction;
 export declare const resolveNextSubtreeToggleState: (subtreeNodes: SubtreeNodeState[], isNodeOpened: (id: string, openedByDefault: boolean) => boolean, lastSubtreeToggle: SubtreeToggleState | null) => {
     nextState: SubtreeToggleState;
     nextLastToggle: SubtreeToggleState | null;
 };
-export declare const getSubtreeToggleIcon: (payload: {
-    hasOnlyLeafResults: boolean;
-    isSubtreeCollapsedAll: boolean;
-    isSubtreeFirstLevelOnly: boolean;
-}) => SubtreeToggleIconState;
+export declare const getSubtreeToggleIcon: (payload: SubtreeTogglePayload) => SubtreeToggleIconState;

package/dist/treeSubtreeToggle.js

@@ -21,6 +21,16 @@ export const getNextSubtreeToggleState = (payload) => {
     }
     return "all";
 };
+export const getSubtreeToggleAction = (payload) => {
+    const nextState = getNextSubtreeToggleState(payload);
+    if (nextState === "all") {
+        return "expand-all";
+    }
+    if (nextState === "none") {
+        return "collapse-all";
+    }
+    return payload.isSubtreeCollapsedAll ? "expand-first-level" : "collapse-to-first-level";
+};
 export const resolveNextSubtreeToggleState = (subtreeNodes, isNodeOpened, lastSubtreeToggle) => {
     const root = subtreeNodes.find((node) => node.isRoot);
     if (!root || subtreeNodes.length === 0) {
@@ -43,15 +53,14 @@ export const resolveNextSubtreeToggleState = (subtreeNodes, isNodeOpened, lastSu
     };
 };
 export const getSubtreeToggleIcon = (payload) => {
-    const { hasOnlyLeafResults, isSubtreeCollapsedAll, isSubtreeFirstLevelOnly } = payload;
-    if (hasOnlyLeafResults) {
-        return isSubtreeCollapsedAll ? "single-down" : "single-up";
-    }
-    if (isSubtreeCollapsedAll) {
-        return "single-down";
-    }
-    if (isSubtreeFirstLevelOnly) {
-        return "double-down";
+    switch (getSubtreeToggleAction(payload)) {
+        case "expand-first-level":
+            return "single-down";
+        case "expand-all":
+            return payload.hasOnlyLeafResults ? "single-down" : "double-down";
+        case "collapse-to-first-level":
+            return "double-up";
+        case "collapse-all":
+            return "single-up";
     }
-    return "double-up";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/web-commons",
-  "version": "3.20.1",
+  "version": "3.21.0",
   "description": "Collection of utilities used across the web Allure reports",
   "keywords": [
     "allure",
@@ -22,27 +22,30 @@
     "build": "run clean && tsc --project ./tsconfig.json",
     "clean": "rimraf ./dist",
     "test": "vitest run",
+    "test:unit": "yarn test",
     "lint": "oxlint --import-plugin src test features stories",
     "lint:fix": "oxlint --import-plugin --fix src test features stories"
   },
   "dependencies": {
-    "@allurereport/aql": "3.20.1",
-    "@allurereport/charts-api": "3.20.1",
-    "@allurereport/core-api": "3.20.1",
-    "@allurereport/plugin-api": "3.20.1",
+    "@allurereport/aql": "3.21.0",
+    "@allurereport/charts-api": "3.21.0",
+    "@allurereport/core-api": "3.21.0",
+    "@allurereport/plugin-api": "3.21.0",
     "@preact/signals": "^2.6.1",
     "@preact/signals-core": "^1.12.2",
     "ansi-to-html": "^0.7.2",
     "d3-interpolate": "^3.0.1",
     "d3-scale": "^4.0.2",
     "d3-shape": "^3.2.0",
-    "dompurify": "^3.4.0",
+    "dompurify": "3.4.16",
     "nanoid": "^5.1.16"
   },
   "devDependencies": {
+    "@allurereport/test-config": "3.21.0",
     "@types/d3-interpolate": "^3.0.4",
     "@types/d3-scale": "^4.0.9",
     "@types/d3-shape": "^3.1.8",
+    "@vitest/coverage-istanbul": "^4.1.0",
     "@vitest/runner": "^2",
     "allure-js-commons": "^3",
     "allure-vitest": "^3",