Add UI version to footer

getslash · Apr 10, 2019 · 6a03bda · 6a03bda
1 parent 8bf817d
commit 6a03bda
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/scripts/travis_version_fix.py b/scripts/travis_version_fix.py
@@ -10,3 +10,6 @@
 
     with open('flask_app/__version__.py', 'w') as f:
         print(f'__version__ = "{version}"', file=f)
+
+    with open('webapp/app/utils/ui_version.js', 'w') as f:
+        print(f'export default "{version}";', file=f)
diff --git a/webapp/app/application/route.js b/webapp/app/application/route.js
@@ -1,4 +1,5 @@
 import { hash } from "rsvp";
+import UI_VERSION from "../utils/ui_version";
 import { inject as service } from "@ember/service";
 import Route from "@ember/routing/route";
 import ApplicationRouteMixin from "ember-simple-auth/mixins/application-route-mixin";
@@ -55,5 +56,6 @@ export default Route.extend(ApplicationRouteMixin, {
   setupController(controller, model) {
     controller.setProperties(model);
     controller.set("version", model.runtime_config.version);
+    controller.set("ui_version", UI_VERSION);
   },
 });
diff --git a/webapp/app/application/template.hbs b/webapp/app/application/template.hbs
@@ -78,7 +78,7 @@
   <footer class="footer">
     <div class="container text-center">
       <p class="text-muted">
-        Backslash {{version}}
+        Backslash {{version}} (UI {{ui_version}})
       </p>
     </div>
   </footer>

diff --git a/webapp/app/components/query-results/template.hbs b/webapp/app/components/query-results/template.hbs
@@ -1,4 +1,4 @@
-{{results-nav page=(mut page) has_next=meta.has_more num_pages=meta.num_pages page_size=(mut page_size) filter_controller=filter_controller sort=(mut sort) sort_options=sort_options compact_view=(mut compact_view)}}
+{{results-nav page=(mut page) has_next=meta.has_more num_pages=meta.num_pages page_size=(mut page_size) filter_controller=filter_controller sort=(mut sort) sort_options=sort_options compact_view=(mut compact_view) show_settings=true}}
 
 {{#each results as |result|}}
   {{component (concat result.type "-item") item=result show_subjects=show_subjects  session_model=session_model show_user=show_users compact_view=compact_view}}

diff --git a/webapp/app/utils/ui_version.js b/webapp/app/utils/ui_version.js
@@ -0,0 +1 @@
+export default "?.?.?";