fix problem with trees caching (via #202)

epszaw · web-flow · commit 53ec50538f39 · 2025-06-02T17:32:47.000+01:00
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/terser-webpack-plugin-npm-5.3.14-e4f2e3cd89-5b7290f7ed.zip b/.yarn/cache/terser-webpack-plugin-npm-5.3.14-e4f2e3cd89-5b7290f7ed.zip
diff --git a/packages/e2e/test/allure-awesome/test/tree.test.ts b/packages/e2e/test/allure-awesome/test/tree.test.ts
@@ -79,7 +79,7 @@ test.describe("commons", () => {
     });
   });
 
-  test("all types of tests are displayed", async () => {
+  test("all types of tests are displayed", async ({ page }) => {
     await expect(treePage.leafLocator).toHaveCount(5);
 
     await expect(treePage.getNthLeafTitleLocator(0)).toHaveText("0 sample passed test");
diff --git a/packages/e2e/test/utils/index.ts b/packages/e2e/test/utils/index.ts
@@ -2,7 +2,7 @@ import { AllureReport, FileSystemReportFiles, type FullConfig } from "@allurerep
 import { md5 } from "@allurereport/plugin-api";
 import AwesomePlugin from "@allurereport/plugin-awesome";
 import { serve } from "@allurereport/static-server";
-import type { Attachment, TestResult } from "allure-js-commons";
+import type { TestResult } from "allure-js-commons";
 import { FileSystemWriter, ReporterRuntime } from "allure-js-commons/sdk/reporter";
 import { mkdtemp, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
diff --git a/packages/plugin-awesome/src/generators.ts b/packages/plugin-awesome/src/generators.ts
@@ -363,14 +363,16 @@ export const generateStaticFiles = async (
     bodyTags.push(createScriptTag(`data:text/javascript;base64,${mainJsContentBuffer.toString("base64")}`));
   }
 
+  const now = Date.now();
   const reportOptions: AwesomeReportOptions = {
     reportName,
     logo,
     theme,
     reportLanguage,
-    createdAt: Date.now(),
+    createdAt: now,
     reportUuid,
     groupBy: groupBy?.length ? groupBy : ["parentSuite", "suite", "subSuite"],
+    cacheKey: now.toString(),
     layout,
     allureVersion,
     sections,
diff --git a/packages/plugin-classic/src/generators.ts b/packages/plugin-classic/src/generators.ts
@@ -313,15 +313,17 @@ export const generateStaticFiles = async (
     bodyTags.push(createScriptTag(`data:text/javascript;base64,${mainJsContentBuffer.toString("base64")}`));
   }
 
+  const now = Date.now();
   const reportOptions: AwesomeReportOptions = {
     reportName,
     logo,
     theme,
     reportLanguage,
-    createdAt: Date.now(),
+    createdAt: now,
     reportUuid,
     groupBy: groupBy?.length ? groupBy : ["parentSuite", "suite", "subSuite"],
     allureVersion,
+    cacheKey: now.toString(),
   };
   const html = compile({
     headTags: headTags.join("\n"),
diff --git a/packages/static-server/test/unit/static.test.ts b/packages/static-server/test/unit/static.test.ts
@@ -37,3 +37,13 @@ it("serves .bin files", async () => {
   expect(res.headers["content-type"]).toBe("application/octet-stream");
   expect(res.data).not.toBeUndefined();
 });
+
+it("serves files with query parameters", async () => {
+  server = await serve({ port, servePath });
+  const res = await axios.get(`http://localhost:${port}/sample?attachment`, {
+    timeout: 100,
+  });
+
+  expect(res.headers["content-type"]).toBe("application/octet-stream");
+  expect(res.data).not.toBeUndefined();
+});
diff --git a/packages/web-awesome/package.json b/packages/web-awesome/package.json
@@ -96,6 +96,7 @@
     "split.js": "^1.6.5",
     "style-loader": "^4.0.0",
     "svg-sprite-loader": "^6.0.11",
+    "terser-webpack-plugin": "^5.3.14",
     "typescript": "^5.6.3",
     "typescript-eslint": "^8.6.0",
     "vitest": "^2.1.8",
diff --git a/packages/web-awesome/src/components/TestResult/TrSteps/TrAttachment.tsx b/packages/web-awesome/src/components/TestResult/TrSteps/TrAttachment.tsx
@@ -1,8 +1,8 @@
 import type { AttachmentTestStepResult } from "@allurereport/core-api";
 import { attachmentType } from "@allurereport/web-commons";
 import { ArrowButton, Attachment, Code, SvgIcon, Text, allureIcons } from "@allurereport/web-components";
-import type { FunctionComponent } from "preact";
 import cx from "clsx";
+import type { FunctionComponent } from "preact";
 import { useState } from "preact/hooks";
 import { TrAttachmentInfo } from "@/components/TestResult/TrSteps/TrAttachmentInfo";
 import * as styles from "@/components/TestResult/TrSteps/styles.scss";
diff --git a/packages/web-awesome/src/locales/de.json b/packages/web-awesome/src/locales/de.json
@@ -155,5 +155,4 @@
       "title": "Testerfolgsrate"
     }
   }
-
 }
diff --git a/packages/web-awesome/src/stores/chart.ts b/packages/web-awesome/src/stores/chart.ts
@@ -18,7 +18,9 @@ export const fetchPieChartData = async (env: string) => {
   };
 
   try {
-    const res = await fetchReportJsonData(env ? `widgets/${env}/pie_chart.json` : "widgets/pie_chart.json");
+    const res = await fetchReportJsonData(env ? `widgets/${env}/pie_chart.json` : "widgets/pie_chart.json", {
+      bustCache: true,
+    });
 
     pieChartStore.value = {
       data: res,
@@ -47,7 +49,7 @@ export const fetchChartsData = async () => {
   };
 
   try {
-    const res = await fetchReportJsonData<ChartsResponse>("widgets/charts.json");
+    const res = await fetchReportJsonData<ChartsResponse>("widgets/charts.json", { bustCache: true });
 
     chartsStore.value = {
       data: createCharts(res),
diff --git a/packages/web-awesome/src/stores/env.ts b/packages/web-awesome/src/stores/env.ts
@@ -32,7 +32,7 @@ export const fetchEnvironments = async () => {
   };
 
   try {
-    const res = await fetchReportJsonData<string[]>("widgets/environments.json");
+    const res = await fetchReportJsonData<string[]>("widgets/environments.json", { bustCache: true });
 
     environmentsStore.value = {
       data: res,
diff --git a/packages/web-awesome/src/stores/envInfo.ts b/packages/web-awesome/src/stores/envInfo.ts
@@ -1,7 +1,7 @@
 import type { EnvironmentItem } from "@allurereport/core-api";
 import { fetchReportJsonData } from "@allurereport/web-commons";
 import { signal } from "@preact/signals";
-import { StoreSignalState } from "@/stores/types";
+import type { StoreSignalState } from "@/stores/types";
 
 export const envInfoStore = signal<StoreSignalState<EnvironmentItem[]>>({
   loading: false,
@@ -17,7 +17,7 @@ export const fetchEnvInfo = async () => {
   };
 
   try {
-    const res = await fetchReportJsonData<EnvironmentItem[]>("widgets/allure_environment.json");
+    const res = await fetchReportJsonData<EnvironmentItem[]>("widgets/allure_environment.json", { bustCache: true });
 
     envInfoStore.value = {
       data: res,
diff --git a/packages/web-awesome/src/stores/stats.ts b/packages/web-awesome/src/stores/stats.ts
@@ -26,7 +26,7 @@ export const fetchReportStats = async () => {
   };
 
   try {
-    const res = await fetchReportJsonData<Statistic>("widgets/statistic.json");
+    const res = await fetchReportJsonData<Statistic>("widgets/statistic.json", { bustCache: true });
 
     reportStatsStore.value = {
       data: res,
@@ -58,7 +58,7 @@ export const fetchEnvStats = async (envs: string[]) => {
 
   try {
     const data = await Promise.all(
-      envsToFetch.map((env) => fetchReportJsonData<AwesomeTree>(`widgets/${env}/statistic.json`)),
+      envsToFetch.map((env) => fetchReportJsonData<AwesomeTree>(`widgets/${env}/statistic.json`, { bustCache: true })),
     );
 
     statsByEnvStore.value = {
diff --git a/packages/web-awesome/src/stores/testResults.ts b/packages/web-awesome/src/stores/testResults.ts
@@ -21,7 +21,9 @@ export const testResultNavStore = signal<StoreSignalState<TrNavStoreState>>({
 
 export const fetchTestResultNav = async (env?: string) => {
   try {
-    const data = await fetchReportJsonData<string[]>(env ? `widgets/${env}/nav.json` : "widgets/nav.json");
+    const data = await fetchReportJsonData<string[]>(env ? `widgets/${env}/nav.json` : "widgets/nav.json", {
+      bustCache: true,
+    });
 
     testResultNavStore.value = {
       data,
@@ -49,7 +51,9 @@ export const fetchTestResult = async (testResultId: string) => {
   };
 
   try {
-    const data = await fetchReportJsonData<AwesomeTestResult>(`data/test-results/${testResultId}.json`);
+    const data = await fetchReportJsonData<AwesomeTestResult>(`data/test-results/${testResultId}.json`, {
+      bustCache: true,
+    });
 
     testResultStore.value = {
       data: { ...testResultStore.value.data, [testResultId]: data },
diff --git a/packages/web-awesome/src/stores/tree.ts b/packages/web-awesome/src/stores/tree.ts
@@ -164,7 +164,7 @@ export const fetchEnvTreesData = async (envs: string[]) => {
 
   try {
     const data = await Promise.all(
-      envsToFetch.map((env) => fetchReportJsonData<AwesomeTree>(`widgets/${env}/tree.json`)),
+      envsToFetch.map((env) => fetchReportJsonData<AwesomeTree>(`widgets/${env}/tree.json`, { bustCache: true })),
     );
 
     const previous = treeStore.value.data;
diff --git a/packages/web-awesome/src/stores/variables.ts b/packages/web-awesome/src/stores/variables.ts
@@ -18,7 +18,9 @@ export const fetchVariables = async (env: string = "default") => {
   };
 
   try {
-    const res = await fetchReportJsonData<string[]>(env ? `widgets/${env}/variables.json` : "widgets/variables.json");
+    const res = await fetchReportJsonData<string[]>(env ? `widgets/${env}/variables.json` : "widgets/variables.json", {
+      bustCache: true,
+    });
 
     variables.value = {
       data: {
diff --git a/packages/web-awesome/types.d.ts b/packages/web-awesome/types.d.ts
@@ -24,6 +24,7 @@ export type AwesomeReportOptions = {
   layout?: Layout;
   defaultSection?: string;
   sections?: string[];
+  cacheKey: string;
 };
 
 export type AwesomeFixtureResult = Omit<
diff --git a/packages/web-awesome/webpack.config.js b/packages/web-awesome/webpack.config.js
@@ -7,6 +7,7 @@ import SpriteLoaderPlugin from "svg-sprite-loader/plugin.js";
 import webpack from "webpack";
 import { WebpackManifestPlugin } from "webpack-manifest-plugin";
 import ForkTsCheckerPlugin from "fork-ts-checker-webpack-plugin";
+import TerserPlugin from "terser-webpack-plugin";
 
 const { SINGLE_FILE_MODE } = env;
 const baseDir = dirname(fileURLToPath(import.meta.url));
@@ -21,6 +22,19 @@ export default (env, argv) => {
       assetModuleFilename: devMode ? `[name].[ext]` : `[name]-[hash:8].[ext]`,
     },
     devtool: devMode ? "inline-source-map" : false,
+    optimization: {
+      minimize: !devMode,
+      minimizer: [
+        new TerserPlugin({
+          terserOptions: {
+            compress: {
+              drop_console: false,
+              drop_debugger: false,
+            },
+          },
+        }),
+      ],
+    },
     module: {
       rules: [
         {
diff --git a/packages/web-classic/src/stores/behaviors.ts b/packages/web-classic/src/stores/behaviors.ts
@@ -110,7 +110,7 @@ export const fetchBehaviorsData = async () => {
   };
 
   try {
-    const res = await fetchReportJsonData<AwesomeTree>("widgets/behaviors.json");
+    const res = await fetchReportJsonData<AwesomeTree>("widgets/behaviors.json", { bustCache: true });
 
     behaviorsStore.value = {
       data: res,
diff --git a/packages/web-classic/src/stores/categories.ts b/packages/web-classic/src/stores/categories.ts
@@ -110,7 +110,7 @@ export const fetchCategoriesData = async () => {
   };
 
   try {
-    const res = await fetchReportJsonData<AwesomeTree>("widgets/categories.json");
+    const res = await fetchReportJsonData<AwesomeTree>("widgets/categories.json", { bustCache: true });
 
     categoriesStore.value = {
       data: res,
diff --git a/packages/web-classic/src/stores/chart.ts b/packages/web-classic/src/stores/chart.ts
@@ -16,7 +16,7 @@ export const fetchPieChartData = async () => {
   };
 
   try {
-    const res = await fetchReportJsonData("widgets/allure_pie_chart.json");
+    const res = await fetchReportJsonData("widgets/allure_pie_chart.json", { bustCache: true });
 
     pieChartStore.value = {
       data: res,
diff --git a/packages/web-classic/src/stores/envInfo.ts b/packages/web-classic/src/stores/envInfo.ts
@@ -17,7 +17,7 @@ export const fetchEnvInfo = async () => {
   };
 
   try {
-    const res = await fetchReportJsonData<EnvironmentItem[]>("widgets/allure_environment.json");
+    const res = await fetchReportJsonData<EnvironmentItem[]>("widgets/allure_environment.json", { bustCache: true });
 
     envInfoStore.value = {
       data: res,
diff --git a/packages/web-classic/src/stores/packages.ts b/packages/web-classic/src/stores/packages.ts
@@ -110,7 +110,7 @@ export const fetchPackagesData = async () => {
   };
 
   try {
-    const res = await fetchReportJsonData<AwesomeTree>("widgets/packages.json");
+    const res = await fetchReportJsonData<AwesomeTree>("widgets/packages.json", { bustCache: true });
 
     packagesStore.value = {
       data: res,
diff --git a/packages/web-classic/src/stores/stats.ts b/packages/web-classic/src/stores/stats.ts
@@ -19,7 +19,7 @@ export const fetchStats = async () => {
   };
 
   try {
-    const res = await fetchReportJsonData<Statistic>("widgets/allure_statistic.json");
+    const res = await fetchReportJsonData<Statistic>("widgets/allure_statistic.json", { bustCache: true });
 
     statsStore.value = {
       data: res,
diff --git a/packages/web-classic/src/stores/testResults.ts b/packages/web-classic/src/stores/testResults.ts
@@ -21,7 +21,7 @@ export const testResultNavStore = signal<StoreSignalState<TestResultNavStoreStat
 
 export const fetchTestResultNav = async () => {
   try {
-    const data = await fetchReportJsonData<string[]>("widgets/nav.json");
+    const data = await fetchReportJsonData<string[]>("widgets/nav.json", { bustCache: true });
 
     testResultNavStore.value = {
       data,
diff --git a/packages/web-classic/src/stores/tree.ts b/packages/web-classic/src/stores/tree.ts
@@ -110,7 +110,7 @@ export const fetchTreeData = async () => {
   };
 
   try {
-    const res = await fetchReportJsonData<AwesomeTree>("widgets/tree.json");
+    const res = await fetchReportJsonData<AwesomeTree>("widgets/tree.json", { bustCache: true });
 
     treeStore.value = {
       data: res,
diff --git a/packages/web-classic/src/stores/trend.ts b/packages/web-classic/src/stores/trend.ts
@@ -158,7 +158,7 @@ export const fetchTrendData = async () => {
   };
 
   try {
-    const res = await fetchReportJsonData<TrendResponse>("widgets/history-trend.json");
+    const res = await fetchReportJsonData<TrendResponse>("widgets/history-trend.json", { bustCache: true });
 
     trendStore.value = {
       data: {
diff --git a/packages/web-commons/src/charts/getStatusTrendData.ts b/packages/web-commons/src/charts/getStatusTrendData.ts
@@ -1,14 +1,12 @@
-import type { HistoryDataPoint, Statistic} from "@allurereport/core-api";
+import type { HistoryDataPoint, Statistic } from "@allurereport/core-api";
 import { statusesList } from "@allurereport/core-api";
-import type {
-  StatusTrendChartData,
-  TrendChartOptions} from "../charts.js";
+import type { StatusTrendChartData, TrendChartOptions } from "../charts.js";
 import {
   createEmptySeries,
   createEmptyStats,
   getTrendDataGeneric,
   mergeTrendDataGeneric,
-  normalizeStatistic
+  normalizeStatistic,
 } from "../charts.js";
 
 export const getStatusTrendData = (
diff --git a/packages/web-commons/src/data.ts b/packages/web-commons/src/data.ts
diff --git a/packages/web-dashboard/src/stores/dashboard.ts b/packages/web-dashboard/src/stores/dashboard.ts
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -155,5 +155,4 @@`
`155`	`155`	`"title": "Testerfolgsrate"`
`156`	`156`	`}`
`157`	`157`	`}`
`158`		`-`
`159`	`158`	`}`