Merge long going React Migration Branch to master

.gitignore

@@ -0,0 +1 @@
+.idea

new/package.json

@@ -2,51 +2,35 @@
     "name": "new",
     "version": "0.1.0",
     "private": true,
-    "devDependencies": {
-        "@amcharts/amcharts5": "^5.3.7",
-        "babel-jest": "^27.4.2",
-        "babel-preset-react-app": "^10.0.1",
-        "eslint": "^8.3.0",
-        "eslint-config-react-app": "^7.0.1",
-        "identity-obj-proxy": "^3.0.0",
-        "jest": "^27.4.3",
-        "jest-watch-typeahead": "^1.0.0",
-        "parcel": "^2.6.2",
-        "process": "^0.11.10"
-    },
     "dependencies": {
-        "@cubejs-client/core": "^0.31.0",
-        "@devexpress/dx-react-chart-material-ui": "^4.0.3",
-        "@emotion/styled": "^11.10.6",
-        "@mui/icons-material": "^5.11.11",
-        "@mui/material": "^5.11.10",
-        "@mui/x-data-grid": "^5.17.25",
-        "@syncfusion/ej2-react-charts": "^20.4.53",
+        "@emotion/styled": "^11.11.0",
+        "@mui/icons-material": "^5.15.7",
+        "@mui/material": "^5.15.7",
+        "@mui/x-data-grid": "^6.19.3",
         "@testing-library/jest-dom": "^5.16.5",
         "@testing-library/react": "^13.4.0",
         "@testing-library/user-event": "^13.5.0",
         "@types/jest": "^27.5.2",
-        "@types/node": "^22.13.11",
+        "@types/node": "^16.18.3",
         "@types/react": "^18.0.25",
         "@types/react-dom": "^18.0.9",
-        "amcharts": "^3.14.5",
-        "chart.js": "^4.2.1",
-        "i18next": "^22.4.10",
+        "chart.js": "^4.4.1",
+        "i18next": "^23.8.2",
         "react": "^18.2.0",
         "react-chartjs-2": "^5.2.0",
         "react-dom": "^18.2.0",
-        "react-donut-chart": "^1.3.3",
-        "react-i18next": "^12.2.0",
-        "react-scripts": "5.0.1",
+        "react-i18next": "^14.0.1",
+        "react-router-dom": "^6.22.2",
         "typescript": "^4.9.3",
-        "utility-types": "^3.10.0",
-        "web-vitals": "^2.1.4"
+        "web-vitals": "^2.1.4",
+        "nth-check": "^2.1.1"
     },
     "scripts": {
-        "start": "parcel serve src/index.html",
-        "build": "parcel build src/index.html",
-        "test": "tsc && jest",
-        "clean": "rm -rf dist .parcel-cache"
+        "start": "react-scripts start",
+        "build": "react-scripts build",
+        "test": "react-scripts test",
+        "eject": "react-scripts eject",
+        "format": "prettier --write ."
     },
     "prettier": {
         "printWidth": 100,
@@ -85,5 +69,9 @@
             "last 1 firefox version",
             "last 1 safari version"
         ]
+    },
+    "devDependencies": {
+        "react-scripts": "5.0.1",
+        "prettier": "3.2.5"
     }
 }

new/src/App.tsx

@@ -1,30 +1,17 @@
 import "./App.css";
-import ReportModel, { ReportStatistics } from "./reportModel";
+import ReportModel from "./reportModel";
 import * as guaranteedStateScenario from "./sampleData/GuaranteedStateTestScenario.json";
-import { SingleScenarioView } from "./components/Scenarios/SingleScenarioView";
-
-export const statistics: ReportStatistics[] = [
-    {
-        numClasses: 3,
-        numScenarios: 5,
-        numFailedScenarios: 2,
-        numCases: 3,
-        numFailedCases: 3,
-        numSteps: 10,
-        durationInNanos: 12345678910,
-        numPendingScenarios: 0,
-        numSuccessfulScenarios: 3
-    }
-];
+import { ScenarioOverview } from "./components/Scenarios/ScenarioOverview";
 
 const guaranteedStateReport: ReportModel = guaranteedStateScenario as unknown as ReportModel;
 
 function App() {
     return (
         <div className="App" aria-label="App">
-            <SingleScenarioView
+            <ScenarioOverview
+                title={"Mein Titel"}
+                description={"Meine Description"}
                 reportName={guaranteedStateReport.name}
-                scenario={guaranteedStateReport.scenarios[0]}
             />
         </div>
     );

new/src/ReportFilter.test.ts

@@ -0,0 +1,52 @@
+import { repository } from "./repository";
+import { filterByStatus } from "./ReportFilter";
+import { ScenarioStatusFilter } from "./components/ScenarioOverview/ScenarioCollectionHead";
+import { createSampleScenario } from "./components/Scenarios/__test__/scenarioTestData";
+
+describe("Report filter status filter", () => {
+    const fullReport = {
+        tagFile: { tagTypeMap: {}, tags: {} },
+        scenarios: [
+            {
+                className: "com.tngtech.jgiven.junit5.JUnit5ExecutorTest",
+                name: "J Unit 5 Executor",
+                scenarios: [
+                    createSampleScenario({ executionStatus: "SUCCESS" }),
+                    createSampleScenario({ executionStatus: "FAILED" })
+                ]
+            },
+            {
+                className: "com.tngtech.jgiven.tests.TestScenarios",
+                name: "Test Scenarios",
+                scenarios: [createSampleScenario({ executionStatus: "FAILED" })]
+            }
+        ]
+    };
+    test("should filter by status", () => {
+        jest.spyOn(repository, "getReport").mockReturnValue(fullReport);
+
+        expect(filterByStatus(ScenarioStatusFilter.SUCCESS)).toEqual([
+            fullReport.scenarios[0].scenarios[0]
+        ]);
+    });
+
+    test("should ignore undefined status", () => {
+        jest.spyOn(repository, "getReport").mockReturnValue(fullReport);
+
+        expect(filterByStatus(ScenarioStatusFilter.SUCCESS, undefined)).toEqual([
+            fullReport.scenarios[0].scenarios[0]
+        ]);
+    });
+
+    test("should return the full report if no status is provided", () => {
+        jest.spyOn(repository, "getReport").mockReturnValue(fullReport);
+
+        expect(filterByStatus()).toEqual(fullReport.scenarios.flatMap(s => s.scenarios));
+    });
+
+    test("should return the full report if null is provided", () => {
+        jest.spyOn(repository, "getReport").mockReturnValue(fullReport);
+
+        expect(filterByStatus(undefined)).toEqual(fullReport.scenarios.flatMap(s => s.scenarios));
+    });
+});

new/src/ReportFilter.ts

@@ -0,0 +1,35 @@
+import { repository } from "./repository";
+import ReportModel, { ScenarioModel } from "./reportModel";
+import { ScenarioStatusFilter } from "./components/ScenarioOverview/ScenarioCollectionHead";
+
+export function filterByStatus(
+    ...statusParameter: (ScenarioStatusFilter | undefined)[]
+): ScenarioModel[] {
+    const fullReport = repository.getReport();
+    const status = statusParameter
+        .filter(status => status !== undefined)
+        .map(s => s as ScenarioStatusFilter);
+
+    const filteredReports =
+        status.length === 0
+            ? fullReport.scenarios
+            : filterReportByScenarioStatus(fullReport.scenarios, ...status);
+
+    return filteredReports.flatMap(report => report.scenarios);
+}
+
+function filterReportByScenarioStatus(reports: ReportModel[], ...status: ScenarioStatusFilter[]) {
+    const filteredReports = [];
+    for (const report of reports) {
+        const filteredScenarios = report.scenarios.filter(scenario =>
+            (status as string[]).includes(scenario.executionStatus)
+        );
+        if (filteredScenarios.length > 0) {
+            filteredReports.push({
+                ...report,
+                scenarios: filteredScenarios
+            });
+        }
+    }
+    return filteredReports;
+}

new/src/components/ScenarioOverview/DonutChart.tsx

@@ -1,31 +1,43 @@
 import { ReportStatistics } from "../../reportModel";
-import { ArcElement, Chart as ChartJS, Legend, Tooltip } from "chart.js";
+import { ArcElement, BubbleDataPoint, Chart as ChartJS, Legend, Point, Tooltip } from "chart.js";
 import { Doughnut } from "react-chartjs-2";
+import { useRef } from "react";
+import { ChartJSOrUndefined } from "react-chartjs-2/dist/types";
+import { useFilters } from "../../hooks/useFilters";
+import { ScenarioStatusFilter } from "./ScenarioCollectionHead";
 
-export function createReportCircle(props: { statistic: ReportStatistics }) {
+export interface DonutChartProps {
+    statistic: ReportStatistics;
+}
+
+export function DonutChart(props: DonutChartProps) {
+    const successLabel = "Successful:";
+    const failedLabel = "Failed:";
     ChartJS.register(ArcElement, Tooltip, Legend);
 
+    const { statistic } = props;
+
+    const { setUrlSearchParams } = useFilters();
+
+    const chartRef =
+        useRef<
+            ChartJSOrUndefined<
+                "doughnut",
+                (number | [number, number] | Point | BubbleDataPoint | null)[],
+                unknown
+            >
+        >(null);
+
     const width = 240; // set default width to 100 if none is provided via props
     const height = 120; // set default height to 100 if none is provided via props
 
     const data = {
-        labels: ["Successful:", "Failed:"],
+        labels: [successLabel, failedLabel],
         datasets: [
             {
-                data: [props.statistic.numSuccessfulScenarios, props.statistic.numFailedScenarios],
+                data: [statistic.numSuccessfulScenarios, statistic.numFailedScenarios],
                 backgroundColor: ["rgba(60, 179, 113)", "rgba(255, 0, 0)"],
                 borderWidth: 1,
-                onClick: (event: MouseEvent, elements: any[], chart: any) => {
-                    if (elements.length === 0) {
-                        return; // user did not click on a chart element
-                    }
-                    const label = chart.data.labels[elements[0].index];
-                    if (label === "Successful") {
-                        window.location.href = "/successful";
-                    } else if (label === "Failed") {
-                        window.location.href = "/failed";
-                    }
-                },
                 hoverBackgroundColor: ["rgba(60,179,113,0.63)", "rgba(255,20,20,0.63)"]
             }
         ]
@@ -53,5 +65,36 @@ export function createReportCircle(props: { statistic: ReportStatistics }) {
         }
     };
 
-    return <Doughnut data={data} width={width} height={height} options={options} />;
+    const handleClick = (event: React.MouseEvent<HTMLCanvasElement>) => {
+        const chart = chartRef.current;
+        if (chart == null) {
+            return;
+        }
+
+        const clickedElementIndex = chart.getElementsAtEventForMode(
+            event.nativeEvent,
+            "nearest",
+            { intersect: true },
+            false
+        )[0].index;
+
+        const label = chart.data.labels?.at(clickedElementIndex);
+
+        if (label === successLabel) {
+            setUrlSearchParams({ status: ScenarioStatusFilter.SUCCESS });
+        } else if (label === failedLabel) {
+            setUrlSearchParams({ status: ScenarioStatusFilter.FAILED });
+        }
+    };
+
+    return (
+        <Doughnut
+            ref={chartRef}
+            data={data}
+            width={width}
+            height={height}
+            options={options}
+            onClick={handleClick}
+        />
+    );
 }