From 7e3fd2f63e098569355689d1f31868cca50b3fcd Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Thu, 16 Nov 2017 20:03:44 -0500
Subject: [PATCH] added app and db versions to about dialog in settings

---
 public/javascripts/dialogs/settings.js | 10 +++++++---
 routes/api/settings.js                 | 13 +++++++++++--
 services/build.js                      |  2 +-
 set-build.sh                           |  2 +-
 views/index.ejs                        | 10 ++++++++++
 5 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/public/javascripts/dialogs/settings.js b/public/javascripts/dialogs/settings.js
index 0fb2bc4b8..482a0d39f 100644
--- a/public/javascripts/dialogs/settings.js
+++ b/public/javascripts/dialogs/settings.js
@@ -152,13 +152,17 @@ settings.addModule((function () {
 })());
 
 settings.addModule((function () {
+    const appVersionEl = $("#app-version");
+    const dbVersionEl = $("#db-version");
     const buildDateEl = $("#build-date");
     const buildRevisionEl = $("#build-revision");
 
     function settingsLoaded(settings) {
-        buildDateEl.html(settings['buildDate']);
-        buildRevisionEl.html(settings['buildRevision']);
-        buildRevisionEl.attr('href', 'https://github.com/zadam/trilium/commit/' + settings['buildRevision']);
+        appVersionEl.html(settings.app_version);
+        dbVersionEl.html(settings.db_version);
+        buildDateEl.html(settings.build_date);
+        buildRevisionEl.html(settings.build_revision);
+        buildRevisionEl.attr('href', 'https://github.com/zadam/trilium/commit/' + settings.build_revision);
     }
 
     return {
diff --git a/routes/api/settings.js b/routes/api/settings.js
index 57c22587c..db40e3f7d 100644
--- a/routes/api/settings.js
+++ b/routes/api/settings.js
@@ -8,14 +8,23 @@ const audit_category = require('../../services/audit_category');
 const auth = require('../../services/auth');
 const utils = require('../../services/utils');
 const build = require('../../services/build');
+const packageJson = require('../../package');
+const migration = require('../../services/migration');
 
 // options allowed to be updated directly in settings dialog
 const ALLOWED_OPTIONS = ['protected_session_timeout', 'history_snapshot_time_interval'];
 
+function addExtraSettings(settings) {
+    Object.assign(settings, build);
+
+    settings['app_version'] = packageJson.version;
+    settings['db_version'] = migration.APP_DB_VERSION;
+}
+
 router.get('/all', auth.checkApiAuth, async (req, res, next) => {
     const settings = await sql.getMap("SELECT opt_name, opt_value FROM options");
 
-    Object.assign(settings, build);
+    addExtraSettings(settings);
 
     res.send(settings);
 });
@@ -24,7 +33,7 @@ router.get('/', auth.checkApiAuth, async (req, res, next) => {
     const settings = await sql.getMap("SELECT opt_name, opt_value FROM options WHERE opt_name IN ("
         + ALLOWED_OPTIONS.map(x => '?').join(",") + ")", ALLOWED_OPTIONS);
 
-    Object.assign(settings, build);
+    addExtraSettings(settings);
 
     res.send(settings);
 });
diff --git a/services/build.js b/services/build.js
index a5d8a060f..b1b6aa35b 100644
--- a/services/build.js
+++ b/services/build.js
@@ -1 +1 @@
-module.exports = { buildDate:"2017-11-16T19:29:52-05:00", buildRevision: "c371ffb5974d8dccaec76c78dfa91dd54fcc624e" };
+module.exports = { build_date:"2017-11-16T19:29:52-05:00", build_revision: "c371ffb5974d8dccaec76c78dfa91dd54fcc624e" };
diff --git a/set-build.sh b/set-build.sh
index 3f59e790b..bee63ef4d 100755
--- a/set-build.sh
+++ b/set-build.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-echo 'module.exports = { buildDate:"'`date --iso-8601=seconds`'", buildRevision: "'`git log -1 --format="%H"`'" };' > services/build.js
\ No newline at end of file
+echo 'module.exports = { build_date:"'`date --iso-8601=seconds`'", build_revision: "'`git log -1 --format="%H"`'" };' > services/build.js
\ No newline at end of file
diff --git a/views/index.ejs b/views/index.ejs
index e95670c60..1f1a2f8ca 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -202,6 +202,16 @@
         </div>
         <div id="about">
           <table class="table">
+            <tr>
+              <th>App version:</th>
+              <td id="app-version"></td>
+            </tr>
+
+            <tr>
+              <th>DB version:</th>
+              <td id="db-version"></td>
+            </tr>
+
             <tr>
               <th>Build date:</th>
               <td id="build-date"></td>