From 295e55552b81386878657ee84488b824f7173f82 Mon Sep 17 00:00:00 2001
From: Jonatan Heyman <jonatan@heyman.info>
Date: Fri, 12 Jan 2024 15:08:53 +0100
Subject: [PATCH] Add version number to settings dialog.

For the web app we also display the git hash.
---
 electron/main/about.js               |  6 ++----
 electron/main/version.js             | 12 ++++++++++++
 electron/preload/index.ts            |  4 ++++
 src/components/settings/Settings.vue | 17 +++++++++++++----
 webapp/bridge.js                     |  4 ++++
 webapp/vite.config.js                |  8 ++++++--
 6 files changed, 41 insertions(+), 10 deletions(-)
 create mode 100644 electron/main/version.js

diff --git a/electron/main/about.js b/electron/main/about.js
index a4cade5..d90c063 100644
--- a/electron/main/about.js
+++ b/electron/main/about.js
@@ -3,6 +3,7 @@ import { app, BrowserWindow, nativeTheme } from 'electron'
 
 import { win } from "./index"
 import CONFIG from "../config"
+import { getVersionString } from './version'
 
 let aboutWindow = null;
 
@@ -33,10 +34,7 @@ export function openAboutWindow() {
             aboutWindow.loadFile(join(process.env.DIST, 'about.html'))
         }
 
-        let versionString = app.getVersion()
-        if (CONFIG.get("settings.allowBetaVersions")) {
-            versionString += " (beta channel)"
-        }
+        let versionString = getVersionString()
 
         // don't show until content is loaded
         aboutWindow.webContents.on("did-finish-load", () => {
diff --git a/electron/main/version.js b/electron/main/version.js
new file mode 100644
index 0000000..fb4e61e
--- /dev/null
+++ b/electron/main/version.js
@@ -0,0 +1,12 @@
+import { app, ipcMain } from "electron"
+import CONFIG from "../config"
+
+export function getVersionString() {
+    let versionString = app.getVersion()
+    if (CONFIG.get("settings.allowBetaVersions")) {
+        versionString += " (beta channel)"
+    }
+    return versionString
+}
+
+ipcMain.handle("getVersion", () => getVersionString())
diff --git a/electron/preload/index.ts b/electron/preload/index.ts
index c6cdda1..64e8262 100644
--- a/electron/preload/index.ts
+++ b/electron/preload/index.ts
@@ -100,6 +100,10 @@ contextBridge.exposeInMainWorld("heynote", {
             ipcRenderer.invoke(UPDATE_CHECK_FOR_UPDATES)
         },
     },
+
+    async getVersion() {
+        return await ipcRenderer.invoke("getVersion")
+    }
 })
 
 
diff --git a/src/components/settings/Settings.vue b/src/components/settings/Settings.vue
index 7395c1a..7869277 100644
--- a/src/components/settings/Settings.vue
+++ b/src/components/settings/Settings.vue
@@ -44,6 +44,7 @@
                 customBufferLocation: !!this.initialSettings.bufferPath,
                 systemFonts: [[defaultFontFamily, defaultFontFamily + " (default)"]],
                 defaultFontSize: defaultFontSize,
+                appVersion: "",
             }
         },
 
@@ -56,6 +57,8 @@
 
             window.addEventListener("keydown", this.onKeyDown);
             this.$refs.keymapSelector.focus()
+
+            this.appVersion = await window.heynote.getVersion()
         },
         beforeUnmount() {
             window.removeEventListener("keydown", this.onKeyDown);
@@ -134,8 +137,7 @@
                             @click="activeTab = 'appearance'"
                         />
                         <TabListItem 
-                            v-if="!isWebApp"
-                            name="Updates" 
+                            :name="isWebApp ? 'Version' : 'Updates'" 
                             tab="updates" 
                             :activeTab="activeTab" 
                             @click="activeTab = 'updates'"
@@ -292,8 +294,15 @@
                         </div>
                     </TabContent>
                     
-                    <TabContent tab="updates" :activeTab="activeTab" v-if="!isWebApp">
+                    <TabContent tab="updates" :activeTab="activeTab">
                         <div class="row">
+                            <div class="entry">
+                                <h2>Current Version</h2>
+                                <b>{{ appVersion }}</b>
+                            </div>
+                        </div>
+
+                        <div class="row" v-if="!isWebApp">
                             <div class="entry">
                                 <h2>Auto Update</h2>
                                 <label>
@@ -306,7 +315,7 @@
                                 </label>
                             </div>
                         </div>
-                        <div class="row">
+                        <div class="row" v-if="!isWebApp">
                             <div class="entry">
                                 <h2>Beta Versions</h2>
                                 <label>
diff --git a/webapp/bridge.js b/webapp/bridge.js
index d08e66f..06ef81b 100644
--- a/webapp/bridge.js
+++ b/webapp/bridge.js
@@ -148,6 +148,10 @@ const Heynote = {
         currencyData = JSON.parse(await response.text())
         return currencyData
     },
+
+    async getVersion() {
+        return __APP_VERSION__ + " (" + __GIT_HASH__ + ")"
+    },
 }
 
 export { Heynote, ipcRenderer}
diff --git a/webapp/vite.config.js b/webapp/vite.config.js
index eba1ff3..7191747 100644
--- a/webapp/vite.config.js
+++ b/webapp/vite.config.js
@@ -2,8 +2,8 @@ import path from 'path'
 
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
-//import { directoryPlugin } from "vite-plugin-list-directory-contents";
 
+import * as child from "child_process";
 
 const middleware = () => {
     return {
@@ -33,7 +33,6 @@ export default defineConfig({
 
     plugins: [
         vue(), 
-        //directoryPlugin({ baseDir: __dirname }),
     ],
 
     css: {
@@ -51,4 +50,9 @@ export default defineConfig({
             '@': path.resolve(__dirname, '..'),
         },
     },
+
+    define: {
+        '__APP_VERSION__': JSON.stringify(process.env.npm_package_version),
+        '__GIT_HASH__': JSON.stringify(child.execSync('git rev-parse --short HEAD').toString().trim()),
+    },
 })