Merge pull request #1578 from jplag/report-viewer/min-version

Set minimum report viewer version to 4.2.0
jplag · Feb 20, 2024 · b32ecd6 · b32ecd6
2 parents 0388a2a + e8e1e02
commit b32ecd6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/report-viewer/src/model/factories/OverviewFactory.ts b/report-viewer/src/model/factories/OverviewFactory.ts
@@ -271,7 +271,7 @@ export class OverviewFactory extends BaseFactory {
         "The result's version(" +
         jsonVersion.toString() +
         ') is older than the minimal support version of the report viewer(' +
-        reportViewerVersion.toString() +
+        minimalVersion.toString() +
         '). ' +
         'Can not read the report.'
       )

diff --git a/report-viewer/src/router/index.ts b/report-viewer/src/router/index.ts
@@ -62,7 +62,7 @@ function redirectOnError(
   router.push({
     name: 'ErrorView',
     params: {
-      message: prefix + error.message,
+      message: prefix + (error.message ?? error),
       to: redirectRoute,
       routerInfo: redirectRouteTitle
     }

diff --git a/report-viewer/src/version.json b/report-viewer/src/version.json
@@ -1,12 +1,12 @@
 {
   "report_viewer_version": {
-    "major": 0,
+    "major": 5,
     "minor": 0,
     "patch": 0
   },
   "minimal_report_version": {
     "major": 4,
-    "minor": 0,
+    "minor": 2,
     "patch": 0
   }
 }
diff --git a/report-viewer/tests/unit/model/factories/ValidNewOverview.json b/report-viewer/tests/unit/model/factories/ValidNewOverview.json
@@ -1,5 +1,5 @@
 {
-  "jplag_version": { "major": 4, "minor": 0, "patch": 0 },
+  "jplag_version": { "major": 5, "minor": 0, "patch": 0 },
   "submission_folder_path": ["files"],
   "base_code_folder_path": "",
   "language": "Javac based AST plugin",