use different approach for setting version

Author: shamanec

.github/workflows/main.yml

@@ -27,8 +27,7 @@ jobs:
         env:
           CI: false
         run: |
-          cd hub/gads-ui && npm install && npm run build --verbose
-          echo "{\"version\": \"${{ github.ref_name }}\"}" > hub/gads-ui/build/version.json
+          cd hub/gads-ui && npm install && REACT_APP_VERSION=${{ github.ref_name }} npm run build --verbose
 
       - name: Build binaries
         run: |

common/models/config.go

@@ -37,5 +37,4 @@ type HubConfig struct {
 	SeleniumGridInstance string `json:"selenium_grid_instance"`
 	OSTempDir            string `json:"-"`
 	UIFilesTempDir       string `json:"-"`
-	CurrentVersion       string `json:"-"`
 }

hub/gads-ui/.env

@@ -50,7 +50,7 @@ export default function Login() {
             })
     }
 
-    let gadsVersion = localStorage.getItem('gadsVersion')
+    let gadsVersion = localStorage.getItem('gadsVersion') || 'unknown'
 
     return (
         <div className="top-wrapper">

hub/gads-ui/.env.production

@@ -4,7 +4,6 @@ import { NavLink } from 'react-router-dom'
 import { Auth } from '../../contexts/Auth'
 import Button from '@mui/material/Button'
 import { api } from '../../services/api.js'
-import versionData from "../../version.json";
 
 export default function NavBar() {
     const {userName} = useContext(Auth)
@@ -19,7 +18,7 @@ export default function NavBar() {
         }
     }
 
-    let appVersion = localStorage.getItem('gadsVersion')
+    let appVersion = localStorage.getItem('gadsVersion') || 'unknown'
 
     return (
         <div
@@ -47,11 +46,23 @@ export default function NavBar() {
                     />
                 )}
             </nav>
-            <div>V: {appVersion}</div>
+            <div
+                style={{
+                    backgroundColor: '#2f3b26'
+                }}
+            >
+                <div
+                    style={{
+                        fontWeight: 'bold',
+                        color: '#829476',
+                        padding: '5px',
+                    }}
+                >{appVersion.startsWith('v') ? appVersion : "DEV"}</div>
+            </div>
             <div
                 className="social-buttons-wrapper"
             >
-                <p style={{ fontWeight: "bold"}}>Welcome, {userName}</p>
+                <p style={{fontWeight: "bold"}}>Welcome, {userName}</p>
                 <KoFiButton></KoFiButton>
                 <GithubButton></GithubButton>
                 <DiscordButton></DiscordButton>

hub/gads-ui/src/components/Login/Login.js

@@ -57,7 +57,6 @@ func StartHub(flags *pflag.FlagSet, appVersion string) {
 		MongoDB:        mongoDB,
 		OSTempDir:      osTempDir,
 		UIFilesTempDir: uiFilesTempDir,
-		CurrentVersion: appVersion,
 	}
 
 	devices.ConfigData = &config

hub/gads-ui/src/components/TopNavigationBar/TopNavigationBar.js

@@ -21,7 +21,7 @@ func main() {
 		Use:   "hub",
 		Short: "Run a hub component",
 		Run: func(cmd *cobra.Command, args []string) {
-			hub.StartHub(cmd.Flags(), AppVersion)
+			hub.StartHub(cmd.Flags())
 		},
 	}
 	hubCmd.Flags().String("ui-files-dir", "", "Directory where the UI static files will be unpacked and served from."+