Dismiss the need of from backend

thewca · Sep 9, 2020 · 85bc9af · 85bc9af
1 parent 6674fca
commit 85bc9af
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/tnoodle-ui/src/components/VersionInfo.jsx b/tnoodle-ui/src/components/VersionInfo.jsx
@@ -38,10 +38,14 @@ const VersionInfo = connect(
             fetchRunningVersion()
                 .then((response) => response.json())
                 .then((version) => {
-                    let { runningVersion, signedBuild } = version;
+                    let { projectName, projectVersion, signedBuild } = version;
                     this.setState({
                         ...this.state,
-                        runningVersion,
+                        // Running version is based on projectName and projectVersion
+                        runningVersion:
+                            projectVersion != null && projectVersion != null
+                                ? `${projectName}-${projectVersion}`
+                                : "",
                         officialBuild: signedBuild,
                     });
                 })

diff --git a/tnoodle-ui/src/components/VersionInfo.test.js b/tnoodle-ui/src/components/VersionInfo.test.js
@@ -28,7 +28,6 @@ afterEach(() => {
 it("Current version is the correct one", async () => {
     // Define mock objects
     const version = {
-        runningVersion: "TNoodle-WCA-2",
         projectName: "TNoodle-WCA",
         projectVersion: "2",
         signedBuild: true,
@@ -79,7 +78,6 @@ it("Current version is the correct one", async () => {
 
 it("Current version is allowed, but it's not the latest one", async () => {
     const version = {
-        runningVersion: "TNoodle-WCA-2",
         projectName: "TNoodle-WCA",
         projectVersion: "2",
         signedBuild: true,
@@ -137,7 +135,6 @@ it("Current version is allowed, but it's not the latest one", async () => {
 
 it("Not official version alert", async () => {
     const version = {
-        runningVersion: "TNoodle-WCA-3",
         projectName: "TNoodle-WCA",
         projectVersion: "3",
         signedBuild: false, // This should trigger an alert, even with currentVersion == runningVersion
@@ -192,7 +189,6 @@ it("Not official version alert", async () => {
 
 it("Not allowed TNoodle version, despite it's official", async () => {
     const version = {
-        runningVersion: "TNoodle-WCA-1",
         projectName: "TNoodle-WCA",
         projectVersion: "1",
         signedBuild: true,