sosy-lab · EshaanAgg · Jun 12, 2024 · Jun 12, 2024 · Jun 12, 2024 · Jun 12, 2024
diff --git a/benchexec/tablegenerator/react-table/build/main.min.js b/benchexec/tablegenerator/react-table/build/main.min.js
diff --git a/benchexec/tablegenerator/react-table/build/vendors.min.js b/benchexec/tablegenerator/react-table/build/vendors.min.js
diff --git a/benchexec/tablegenerator/react-table/package-lock.json b/benchexec/tablegenerator/react-table/package-lock.json
diff --git a/benchexec/tablegenerator/react-table/package.json b/benchexec/tablegenerator/react-table/package.json
@@ -21,7 +21,7 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-modal": "^3.15.1",
-    "react-router-dom": "^5.3.3",
+    "react-router-dom": "^6.4.0",
     "react-table": "^7.8.0",
     "react-table-sticky": "^1.1.3",
     "react-vis": "^1.11.7",
@@ -78,6 +78,7 @@
     ]
   },
   "devDependencies": {
+    "@types/react-router-dom": "^5.3.3",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.6",
     "eslint-config-prettier": "^8.5.0",

diff --git a/benchexec/tablegenerator/react-table/public/index.html b/benchexec/tablegenerator/react-table/public/index.html
@@ -12,7 +12,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>React App</title>
+    <title>BenchExec</title>
     <style>
         #msg-container {
             text-align: center;

diff --git a/benchexec/tablegenerator/react-table/src/App.js b/benchexec/tablegenerator/react-table/src/App.js
@@ -6,31 +6,39 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import "./App.scss";
-import React, { Component } from "react";
+import React from "react";
 import Overview from "./components/Overview";
 
 if (process.env.NODE_ENV !== "production") {
-  // load example data for development
+  // Load example data for development
   window.data = require("@data");
   window.data.version = "(development build)";
 }
 
-class App extends Component {
-  render() {
-    return (
-      <div className="App">
-        <main>
-          <Overview
-            data={window.data}
-            renderPlotsFlexible={true}
-            onStatsReady={this.props.onStatsReady}
-          />
-          {/* imports the component Overview with all subcomponents.
-              The renderPlotsFlexible prop should always be true in development and production, but will be set to false in the tests to make them work.*/}
-        </main>
-      </div>
-    );
+const App = (props) => {
+  // If we visit this page without a hash, like www.domain.com/ or www.domain.com/subpage, we
+  // append a hash to the URL to ensure that the page is loaded correctly. This is necessary
+  // to ensure correct routing in the app.
+  if (window.location.hash === "") {
+    window.location.hash = "#/";
   }
-}
+
+  return (
+    <div className="App">
+      <main>
+        <Overview
+          data={window.data}
+          renderPlotsFlexible={true}
+          onStatsReady={props.onStatsReady}
+        />
+        {/*
+         * Imports the component Overview with all subcomponents.
+         * The renderPlotsFlexible prop should always be true in development and production,
+         * but will be set to false in the tests to make them work.
+         */}
+      </main>
+    </div>
+  );
+};
 
 export default App;
diff --git a/benchexec/tablegenerator/react-table/src/components/FilterBox/FilterCard.js b/benchexec/tablegenerator/react-table/src/components/FilterBox/FilterCard.js
@@ -90,6 +90,7 @@ export default class FilterCard extends React.PureComponent {
     if (!this.props.filter) {
       return;
     }
+
     if (
       !prevProps.filter ||
       prevProps.filter.values !== this.props.filter.values

diff --git a/benchexec/tablegenerator/react-table/src/components/FilterBox/FilterContainer.js b/benchexec/tablegenerator/react-table/src/components/FilterBox/FilterContainer.js
@@ -22,7 +22,12 @@ export default class FilterContainer extends React.PureComponent {
       };
     }
     this.props.resetFilterHook(() => this.resetAllFilters());
-    this.state = { filters, toolName, addingFilter: false, numCards: 0 };
+    this.state = {
+      filters,
+      toolName,
+      addingFilter: false,
+      numCards: 0,
+    };
   }
 
   getActiveFilters() {
@@ -42,6 +47,7 @@ export default class FilterContainer extends React.PureComponent {
 
   addFilter(idx) {
     const { filters: newFilterState, numCards } = this.state;
+
     const newFilter = { filtering: true, numCards, touched: 0 };
     if (newFilterState[idx].type === "status") {
       newFilter.values = [
@@ -80,12 +86,16 @@ export default class FilterContainer extends React.PureComponent {
     const newFilterState = this.state.filters;
     newFilterState[idx].filtering = false;
     newFilterState[idx].values = [];
-    this.setState({ filters: [...newFilterState] });
+    this.setState({
+      filters: [...newFilterState],
+    });
     this.props.updateFilters({ title, values: [] }, idx);
   }
 
-  componentDidUpdate({ currentFilters: prevFilters }) {
+  componentDidUpdate(prevProps, prevState) {
+    const prevFilters = prevProps.currentFilters;
     const { currentFilters } = this.props;
+
     if (!equals(prevFilters, currentFilters)) {
       // update set filters
       let { filters } = this.state;
-Original file line number
+Diff line change
@@ Expand Up / @@ -90,6 +90,7 @@ export default class FilterCard extends React.PureComponent { @@
         if (!this.props.filter) {
           return;
         }
         if (
           !prevProps.filter ||
           prevProps.filter.values !== this.props.filter.values
@@ Expand Down @@