feat(api): add warning for wrong version

displays a warning if api version is wrong Closes #251
NCI-GDC · Feb 6, 2015 · 9585248 · 9585248
1 parent 3ebab0d
commit 9585248
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/app/config.js b/app/config.js
@@ -4,6 +4,6 @@ angular.module("ngApp.config", [])
     "version": "__VERSION__",
     "commitLink": "https://github.com/NCI-GDC/portal-ui/commit/__COMMIT__",
     "commitHash": "__COMMIT__",
-    "api": "__API__",
+    "api": "__API__", "supportedAPI":"1",
     "tag":"https://github.com/NCI-GDC/portal-ui/releases/tag/__VERSION__"
   });
diff --git a/app/index.html b/app/index.html
@@ -39,6 +39,11 @@
 </head>
 
 <body>
+<div class="alert alert-warning m-margin-bottom-0" ng-if="config.apiIsMismatched">
+  <a onclick="window.location.reload()">
+    A newer version of this software is available. Click here to refresh the page. <i class="fa fa-lg fa-refresh"></i>
+  </a>
+</div>
 <div id="notification"></div>
 <a href="#skip" tabindex="1" class="skip-to-content" data-translate>Skip to Main Content</a>
 
@@ -97,6 +102,7 @@
 
   <div id="skip" class="gdc-body" data-ui-view role="main" tabindex="0"></div>
 
+
   <!-- NCI Footer -->
   <footer id="footer">
     <div class="container" role="contentinfo">

diff --git a/app/scripts/app.ts b/app/scripts/app.ts
@@ -9,6 +9,7 @@ declare module ngApp {
     apiCommitHash: string;
     apiCommitLink: string;
     apiTag: string;
+    supportedAPI: string;
   }
 
   export interface IRootScope extends ng.IScope {
@@ -43,6 +44,8 @@ function appRun(gettextCatalog: any, Restangular: restangular.IProvider,
                 $rootScope: IRootScope, config: IGDCConfig, notify: INotifyService) {
   gettextCatalog.debug = true;
 
+  //debugger;
+
   $rootScope.config = config;
   Restangular.setErrorInterceptor((response) => {
     CoreService.xhrDone();
@@ -61,10 +64,15 @@ function appRun(gettextCatalog: any, Restangular: restangular.IProvider,
   });
 
   Restangular.all('status').get('').then(function(data){
-    config.apiVersion = data['version'];
+
+    config.apiVersion = data['tag'];
     config.apiCommitHash = data['commit'];
     config.apiTag = "https://github.com/NCI-GDC/gdcapi/releases/tag/" + config.apiVersion;
     config.apiCommitLink ="https://github.com/NCI-GDC/gdcapi/commit/" + config.apiCommitHash;
+
+    if (+data.version !== +config.supportedAPI) {
+      config.apiIsMismatched = true;
+    };
   });
 
   $rootScope.$on("$stateChangeStart", () => {

diff --git a/app/styles/app.less b/app/styles/app.less
@@ -131,3 +131,6 @@ table .btn {
   color: @link-blue;
 }
 
+.m-margin-bottom-0 {
+  margin-bottom: 0px;
+}