added version display in the settings component

main.js

@@ -66,14 +66,15 @@ function createUpdaterWindow() {
   if (updaterWindow === null) {
     updaterWindow = new BrowserWindow({
       icon: path.join(resources, '96x96.png'),
-      width: 800,
-      height: 800,
+      width: 400,
+      height: 200,
       resizable: false,
       show: false,
       title: 'Updater',
     })
 
-    updaterWindow.toggleDevTools()
+    // updaterWindow.toggleDevTools()
+
   }
 
   // win.setMenuBarVisibility(false)

src/components/Settings.tsx

@@ -4,7 +4,7 @@ import React, { Component } from 'react'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 
 import { MainSessionState, Token, SessionSettings } from '../store/session/types'
-import { getCSRFToken } from '../store/session/thunks'
+import { getCSRFToken, getApiVersion } from '../store/session/thunks'
 import { updateMainSession } from '../store/session/actions'
 import { connect } from 'react-redux'
 import { AppState } from '../store/'
@@ -24,19 +24,27 @@ interface DefaultState {
   jobManagerUrl: string
   s2d2Url: string
   s2d2Verified: boolean
+  tileViewerVersion: string
+  s2d2Version: string
   jobManagerVerified: boolean
+  version: string
 }
 
-const defaultState = {
+declare var VERSION: string
+
 
+const defaultState = {
+  tileViewerVersion: VERSION,
 }
 
+
 class Settings extends Component<AppProps, AppState & DefaultState> {
   constructor (props: AppProps) {
     super(props)
     console.log('settings constructor running')
 
     this.state = {
+      ...defaultState,
       ...this.state,
       jobManagerUrl: props.settings.jobManagerUrl,
       s2d2Url: props.settings.s2d2Url,
@@ -80,6 +88,8 @@ class Settings extends Component<AppProps, AppState & DefaultState> {
       console.log('check CSRF result')
       console.log(result)
 
+      const apiversion = await getApiVersion(this.state.s2d2Url)
+
       const session = { ...this.props.session }
       console.log(session)
 
@@ -90,7 +100,8 @@ class Settings extends Component<AppProps, AppState & DefaultState> {
         this.props.updateMainSession(session)
 
         this.setState({
-          s2d2Verified: true
+          s2d2Verified: true,
+          s2d2Version: JSON.parse(apiversion).version
         })
       } else {
         session.csrfTokens.s2d2.key = ""
@@ -129,6 +140,7 @@ class Settings extends Component<AppProps, AppState & DefaultState> {
           if (this.state.s2d2Verified) {
             return (<div className='verified flexItem2'>
               <FontAwesomeIcon icon={'check'} />
+              <span>{'   API version:' + this.state.s2d2Version}</span>
             </div>)
           } else {
             return (<div className='notVerified flexItem2'>
@@ -173,6 +185,7 @@ class Settings extends Component<AppProps, AppState & DefaultState> {
           <div className='main'>
             <div className='settings'>
               <h1>Settings</h1> <br />
+              <h5>{this.state.tileViewerVersion}</h5>
               <label htmlFor='job_url'>Job Manager API Url</label> <br />
               <div className='settingsEntry'>
                 <input id='job_url' className='job_url' size={50} type='text' value={this.state.jobManagerUrl} onChange={this.updatejobManagerUrl} />

src/store/session/thunks.ts

@@ -57,3 +57,25 @@ export async function getCSRFToken(apiRootUrl: string): Promise<string> {
 
   return result
 }
+
+export async function getApiVersion(apiRootUrl: string): Promise<string> {
+  const headers = new Headers()
+
+  const result = await fetch(`${apiRootUrl}/version/`, {
+    method: 'GET',
+    mode: 'cors',
+    cache: 'default',
+    headers,
+  })
+    .then(response => response.json())
+    .then(response => {
+      console.log('Success:', JSON.stringify(response))
+      return JSON.stringify(response)
+    })
+    .catch(err => {
+      console.log('Something blew up while verifying the API')
+      return ''
+    })
+
+  return result
+}

webpack.build.config.js

@@ -81,6 +81,9 @@ module.exports = {
       'process.env.NODE_ENV': JSON.stringify('production'),
     }),
     new MinifyPlugin(),
+    new webpack.DefinePlugin({
+      VERSION: JSON.stringify(require("./package.json").version)
+    }),
   ],
   stats: {
     colors: true,

webpack.dev.config.js

@@ -81,6 +81,9 @@ module.exports = {
     new MiniCssExtractPlugin({
       filename: 'css/[name].bundle.css',
     }),
+    new webpack.DefinePlugin({
+      VERSION: JSON.stringify(require("./package.json").version)
+    }),
   ],
   devtool: 'inline-source-map',
   devServer: {