Merge pull request #544 from chgibb/beta-staging

540, 459
chgibb · Jul 24, 2017 · 0589d9a · 0589d9a
2 parents 4713b83 + b4145e9
commit 0589d9a
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "phat",
-  "version": "0.0.51-beta.1",
+  "version": "0.0.51-beta.2",
   "description": "Pathogen Host Analysis Tool",
   "main": "main.js",
   "scripts": {

diff --git a/src/guiTests/req/projectSelection/openProjectsView.ts b/src/guiTests/req/projectSelection/openProjectsView.ts
@@ -9,7 +9,9 @@ export async function openProjectsView() : Promise<void>
             projSelection[0].webContents.executeJavaScript(`
                 document.getElementById("openProject").click();
             `);
-            resolve();
+            setTimeout(function(){
+                resolve();
+            },3000);
         },500);
     });
 }
diff --git a/src/main.ts b/src/main.ts
@@ -1,3 +1,5 @@
+console.time("mainStartup");
+
 import {getReadable,getReadableAndWritable} from "./req/getAppPath";
 import {bootStrapCodeCache} from "./req/bootStrapCodeCache";
 
@@ -6,3 +8,4 @@ bootStrapCodeCache(
     "./mainProcess",
     getReadableAndWritable("mainProcess.cdata")
 );
+console.timeEnd("mainStartup");
diff --git a/src/req/getLatestUpdate.ts b/src/req/getLatestUpdate.ts
@@ -1,7 +1,7 @@
 let GitHubAPI = require("github-api");
 const pjson = require("./package.json");
 
-import {versionIsGreaterThan,isBeta} from "./versionIsGreaterThan";
+import {versionIsGreaterThan,isBeta,sepBaseAndBeta} from "./versionIsGreaterThan";
 import {getAppSettings,writeAppSettings} from "./appSettings";
 
 let isRightOS : RegExp;
@@ -43,8 +43,12 @@ export function getLatestUpdate(userName : string,repo : string,token : string)
 
                 if(!greaterThan && updateChannel == "beta")
                 {
-                    //try to check again as though current version was a beta
-                    if(!isBeta(pjson.version) && arg.data[i].tag_name != pjson.version)
+
+                    if(
+                        !isBeta(pjson.version) && 
+                        arg.data[i].tag_name != pjson.version && 
+                        sepBaseAndBeta(pjson.version).base != sepBaseAndBeta(arg.data[i].tag_name).base
+                    )
                     {
                         greaterThan = versionIsGreaterThan(arg.data[i].tag_name,`${pjson.version}-beta.0`);
                     }

diff --git a/src/req/renderer/OutputRenderer/reportView.ts b/src/req/renderer/OutputRenderer/reportView.ts
@@ -64,6 +64,7 @@ export class View extends viewMgr.View
         if(!event.target.id)
             return;
         let masterView = <masterView.View>viewMgr.getViewByName("masterView");
+        let rightPanel = <rightPanel.View>viewMgr.getViewByName("rightPanel",masterView.views);
         for(let i = 0; i != masterView.alignData.length; ++i)
         {
             if(event.target.id == masterView.alignData[i].uuid+"ViewSNPs")
@@ -135,5 +136,11 @@ export class View extends viewMgr.View
                 }
             }
         }
+        if(event.target.id == "goBackToAlignments")
+        {
+            masterView.displayInfo = "AlignmentInfo";
+            viewMgr.render();
+            return;
+        }
     }
 }
diff --git a/src/req/renderer/OutputRenderer/reportView/renderMappedReadsPerContigTable.ts b/src/req/renderer/OutputRenderer/reportView/renderMappedReadsPerContigTable.ts
@@ -1,14 +1,15 @@
 import * as viewMgr from "./../../viewMgr";
 import * as masterView from "./../masterView";
 import * as rightPanel from "./../rightPanel";
-
+import {getReadable} from "./../../../getAppPath";
 export function renderMappedReadsPerContigTable() : string
 {
     let masterView = <masterView.View>viewMgr.getViewByName("masterView");
     let rightPanel = <rightPanel.View>viewMgr.getViewByName("rightPanel",masterView.views);
     if(masterView.displayInfo != "MappedReadsPerContigInfo")
         return "";
     return `
+        <img class="activeHover" id="goBackToAlignments" src="${getReadable("img/GoBack.png")}">
         <table style="width:100%">
             ${(()=>{
                 let res = "";

diff --git a/src/req/renderer/OutputRenderer/reportView/renderSNPPositionsTable.ts b/src/req/renderer/OutputRenderer/reportView/renderSNPPositionsTable.ts
@@ -2,14 +2,15 @@ import * as viewMgr from "./../../viewMgr";
 import * as masterView from "./../masterView";
 import * as rightPanel from "./../rightPanel";
 import {VCF2JSONRow} from "./../../../varScanMPileup2SNPVCF2JSON";
-
+import {getReadable} from "./../../../getAppPath";
 export function renderSNPPositionsTable(rows : Array<VCF2JSONRow>) : string
 {
     let masterView = <masterView.View>viewMgr.getViewByName("masterView");
     let rightPanel = <rightPanel.View>viewMgr.getViewByName("rightPanel",masterView.views);
     if(masterView.displayInfo != "SNPPositions")
         return "";
     return `
+        <img class="activeHover" id="goBackToAlignments" src="${getReadable("img/GoBack.png")}">
         <table style="width:100%">
         ${(()=>{
             let res = "";

diff --git a/src/req/renderer/OutputRenderer/rightPanel.ts b/src/req/renderer/OutputRenderer/rightPanel.ts
@@ -148,11 +148,6 @@ export class View extends viewMgr.View
                         <p style="display:inline-block;">FastQ QC Info</p>
                 </div>
 
-                <div style="display:inline-block;">
-                    <input style="display:inline-block;" id="RefSeqInfo" type="radio" name="selectedInfo" />
-                        <p style="display:inline-block;">Ref Seq Info</p>
-                </div>
-
                 <div style="display:inline-block;">
                     <input style="display:inline-block;" id="AlignmentInfo" type="radio" name="selectedInfo" />
                         <p style="display:inline-block;">Alignment Info</p>

diff --git a/src/req/versionIsGreaterThan.ts b/src/req/versionIsGreaterThan.ts
@@ -21,7 +21,7 @@ export function isBeta(version : string) : boolean
     return false;
 }
 
-function sepBaseAndBeta(version : string) : Version
+export function sepBaseAndBeta(version : string) : Version
 {
     if(isBeta(version))
     {