diff --git a/docs/_config.yml b/docs/_config.yml deleted file mode 100644 index f6c8a3c20..000000000 --- a/docs/_config.yml +++ /dev/null @@ -1,7 +0,0 @@ -markdown: kramdown -theme: jekyll-theme-slate -name: PHAT - -kramdown: - input: GFM - hard_wrap: false \ No newline at end of file diff --git a/docs/allReleases.md b/docs/allReleases.md deleted file mode 100644 index 5c95ea8d5..000000000 --- a/docs/allReleases.md +++ /dev/null @@ -1,3 +0,0 @@ ---- -title: All Releases ---- diff --git a/docs/docs/betaChangeLog.md b/docs/docs/betaChangeLog.md deleted file mode 100644 index 18ac73abd..000000000 --- a/docs/docs/betaChangeLog.md +++ /dev/null @@ -1 +0,0 @@ -* Fixes element hovering in QC window \ No newline at end of file diff --git a/docs/docs/latest/home.md b/docs/docs/latest/home.md deleted file mode 100644 index b496c745e..000000000 --- a/docs/docs/latest/home.md +++ /dev/null @@ -1,16 +0,0 @@ -[Home](https://chgibb.github.io/PHAT/) - -The Pathogen Host Analysis Tool (PHAT) is an application for processing and analyzing next-generation sequencing (NGS) data as it relates to relationships between pathogen and host organisms. PHAT provides quality control (QC) reporting on sequence files, alignment of sequence files against reference files, alignment viewing and Excel and comma separated values (CSV) output. - -PHAT is under development in the Zehbe Lab (http://zehbelab.weebly.com/) at the Thunder Bay Regional Health Research Institute (TBRHRI) and Lakehead University (LU) under the supervison of Dr. Ingeborg Zehbe. This work is supported by a Natural Sciences and Engineering Research Council of Canada (NSERC) Discovery grant to Dr. Ingeborg Zehbe (#RGPIN-2015-03855) and a NSERC Alexander Graham Bell Canada Graduate Scholarship-Doctoral (CGS-D) to Robert Jackson (#454402-2014). - -Project Supervisor/Principal Investigator: Dr. Ingeborg Zehbe, LU/TBRHRI Research Chair & Senior Scientist -Project Lead/Biologist: Robert Jackson, PhD Biotech Candidate -Project Lead/Software Developer: Chris Gibb, HBSc Comp Sci Student -Team Member: Mitchell Pynn -Team Member: Shane Liu -Team Member: Jeremy Braun - -# Documentation for $TAGNAME$ -## Contents -1. [How to Get PHAT](https://chgibb.github.io/PHAT/docs/latest/howToGetPHAT) \ No newline at end of file diff --git a/docs/docs/latest/howToGetPHAT.md b/docs/docs/latest/howToGetPHAT.md deleted file mode 100644 index c54d6b1c6..000000000 --- a/docs/docs/latest/howToGetPHAT.md +++ /dev/null @@ -1,37 +0,0 @@ -[Home](https://chgibb.github.io/PHAT/) - -#### For $TAGNAME$ -[Contents](https://chgibb.github.io/PHAT/docs/latest/home) - -PHAT is available for both Ubuntu Linux (64-bit) and Windows (64-bit) in installed and portable (not installed) editions. - -# Installing PHAT -## Windows -Downloading and running ```phat-win32-x64-setup.exe``` will install PHAT onto your PC. - -## Ubuntu Linux -Downloading and running ```phat_x.x.x_amd64.deb``` will install PHAT onto your Ubuntu Linux computer. -If the installer does not successfully install using the Ubuntu Software Centre, you will need to navigate to where you downloaded the installer and run -```sudo dpkg -i phat_x.x.x.amd64.deb``` -The ```.deb``` build of PHAT is more than likely compatible with any distribution which supports Debian packages. At the time of writing, we do not have access to the infrastructure to test and guarantee the functionality/correctness of ```.deb``` builds of PHAT on distributions other than Ubuntu. Please file an [issue](https://github.com/chgibb/PHAT/issues) and let us know about your experience using ```.deb``` builds of PHAT on other distributions and help us make them better. - -## RHEL, Fedora, CentOS (experimental, not officially supported) -PHAT is available as an ```.rpm``` package for ```RPM``` based distributions. At the time of writing, we do not have access to the infrastructure to test and guarantee the functionality/correctness of these packages. Please file an [issue](https://github.com/chgibb/PHAT/issues) and let us know about your experience using ```.rpm``` builds of PHAT and help us make them better. - - -# Portable PHAT -For users who are not administrators on their computers or who wish to use PHAT on a USB device(not recommended for performance reasons, PHAT is considerably slower when run on a USB), portable editions are available. -## Windows -```phat-win32-x64-portable.zip``` - -## Linux -```phat-linux-x64-portable.tar.gz``` -Though the Linux portable edition of PHAT is built on an Ubuntu Linux machine, it should be compatible with other Linux distributions. If this is not the case or you would like to see your favourite Linux distribution supported, please let us know by filing an [issue](https://github.com/chgibb/PHAT/issues). - -# Getting PHAT Updates -PHAT's release cycle is relatively fast. If you have installed PHAT for Windows, or are using a portable edition for either Windows or Linux, PHAT will automatically check for updates and prompt you to download and install them as they become available. If you are using the installed (Debian package) edition of PHAT for Ubuntu Linux, PHAT will check for updates but will not download and install them. You will need to manually download and install the latest Debian package. - -# About PHAT Updates and Releases -PHAT updates are powered by Github releases. Each time PHAT is run, it will contact github.com and get the list of repository tags. It will look through the list of tags until it finds a tag version greater than it's current version. If successful, the update in the form of ```phat-plat-x64-update.tar.gz``` will be downloaded and unpacked overtop of itself. These are special packages built specifically to be used as updates. They will not function correctly if downloaded and ran by themselves. - -[Contents](https://chgibb.github.io/PHAT/docs/latest/home) \ No newline at end of file diff --git a/docs/docs/stableChangeLog.md b/docs/docs/stableChangeLog.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/docs/index.md b/docs/index.md deleted file mode 100644 index 6a653d7c9..000000000 --- a/docs/index.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -title: Home ---- - -### Latest Stable - -### Latest Beta - -#### [Release History](https://chgibb.github.io/PHAT/allReleases) - -The Pathogen Host Analysis Tool (PHAT) is an application for processing and analyzing next-generation sequencing (NGS) data as it relates to relationships between pathogen and host organisms. PHAT provides quality control (QC) reporting on sequence files, alignment of sequence files against reference files, alignment viewing and Excel and comma separated values (CSV) output. - -PHAT is under development in the Zehbe Lab (http://zehbelab.weebly.com/) at the Thunder Bay Regional Health Research Institute (TBRHRI) and Lakehead University (LU) under the supervison of Dr. Ingeborg Zehbe. This work is supported by a Natural Sciences and Engineering Research Council of Canada (NSERC) Discovery grant to Dr. Ingeborg Zehbe (#RGPIN-2015-03855) and a NSERC Alexander Graham Bell Canada Graduate Scholarship-Doctoral (CGS-D) to Robert Jackson (#454402-2014). - -**Project Supervisor/Principal Investigator:** Dr. Ingeborg Zehbe, LU/TBRHRI Research Chair & Senior Scientist -**Project Lead/Biologist:** Robert Jackson, PhD Biotech Candidate -**Project Lead/Software Developer:** Chris Gibb, HBSc Comp Sci Student -**Team Member:** Mitchell Pynn -**Team Member:** Shane Liu -**Team Member:** Jeremy Braun diff --git a/package-lock.json b/package-lock.json index 75cbc9963..6295ff633 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "phat", - "version": "0.0.50-beta.2", + "version": "0.0.50-beta.3", "lockfileVersion": 1, "dependencies": { "@claviska/jquery-minicolors": { diff --git a/package.json b/package.json index 4e7470cc3..2c433bdeb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "phat", - "version": "0.0.50-beta.4", + "version": "0.0.51-beta.1", "description": "Pathogen Host Analysis Tool", "main": "main.js", "scripts": { diff --git a/releaseTemplate.md b/releaseTemplate.md deleted file mode 100644 index 38cc72361..000000000 --- a/releaseTemplate.md +++ /dev/null @@ -1,11 +0,0 @@ -# PHAT $TAGNAME$ -[Documentation](https://chgibb.github.io/PHAT/docs/releases/$TAGNAME$/home) -* [Windows Installer](https://github.com/chgibb/PHAT/releases/download/$TAGNAME$/phat-win32-x64-setup.exe) -* [Ubuntu Linux Debian Package](https://github.com/chgibb/PHAT/releases/download/$TAGNAME$/phat_$DEBTAGNAME$_amd64.deb) -* [Windows Portable](https://github.com/chgibb/PHAT/releases/download/$TAGNAME$/phat-win32-x64-portable.zip) -* [Linux Portable](https://github.com/chgibb/PHAT/releases/download/$TAGNAME$/phat-linux-x64-portable.tar.gz) -#### Experimental -* [Red Hat Package Manager](https://github.com/chgibb/PHAT/releases/download/$TAGNAME$/phat-$TAGNAME$.x86_64.rpm) - -### Changelog -$CHANGELOG$ \ No newline at end of file diff --git a/scripts/appendToAllReleases.js b/scripts/appendToAllReleases.js deleted file mode 100644 index 216246c36..000000000 --- a/scripts/appendToAllReleases.js +++ /dev/null @@ -1,6 +0,0 @@ -const fs = require("fs"); - -module.exports = function appendToAllReleases(tag_name,branch) -{ - fs.appendFileSync(`docs/allReleases.md`,`${new Date}: [PHAT@${tag_name}](https://chgibb.github.io/PHAT/releases/${tag_name}/index) cut from ${branch} ${"\n"}`); -} \ No newline at end of file diff --git a/scripts/cutRelease.js b/scripts/cutRelease.js deleted file mode 100644 index 280230d39..000000000 --- a/scripts/cutRelease.js +++ /dev/null @@ -1,20 +0,0 @@ -const GitHubAPI = require("github-api"); -module.exports = async function cutRelease(user,repo,token,tag_name,branch) -{ - return new Promise((resolve,reject) => { - const ghapi = new GitHubAPI({token : token}); - ghapi.getRepo(user,repo).createRelease({ - tag_name : tag_name, - target_commitish : branch, - name : tag_name, - body : "", - draft : false, - prerelease : true - }).then(() => { - console.log(`Cut ${user}/${repo}@${tag_name} from ${branch}`); - resolve(); - }).catch((err) => { - reject(err); - }) - }); -} \ No newline at end of file diff --git a/scripts/deploy.js b/scripts/deploy.js deleted file mode 100644 index 2487cb138..000000000 --- a/scripts/deploy.js +++ /dev/null @@ -1,19 +0,0 @@ -const generateDownloadTemplate = require("./generateDownloadTemplate"); -const cutRelease = require("./cutRelease"); -const generateReleaseDocsFromLatest = require("./generateReleaseDocsFromLatest"); -const appendToAllReleases = require("./appendToAllReleases"); - -let args = process.argv.slice(2); -const token = args[0]; -const tag_name = args[1]; -const type = args[2]; - -(async function(){ - await generateReleaseDocsFromLatest(tag_name); - await generateDownloadTemplate(type,tag_name); - await appendToAllReleases(tag_name,type); - await cutRelease("chgibb","PHAT",args[0],args[1],type); - -})().catch((err) => { - console.log(err); -}); \ No newline at end of file diff --git a/scripts/generateDownloadTemplate.js b/scripts/generateDownloadTemplate.js deleted file mode 100644 index 6ed438df7..000000000 --- a/scripts/generateDownloadTemplate.js +++ /dev/null @@ -1,26 +0,0 @@ -const fs = require("fs"); - -module.exports = async function generateDownloadTemplate(type,tag_name) -{ - return new Promise((resolve,reject) => { - let releaseTemplate = fs.readFileSync("releaseTemplate.md").toString(); - - //The deb build replaces the hyphen in the beta tag with a full stop - //All other builds are fine - let debTagName = tag_name.replace("-","."); - - //Patch all occurences of $TAGNAME$ and $DEBTAGNAME$ with the current version being deployed - releaseTemplate = releaseTemplate.replace(/\$TAGNAME\$/g,tag_name); - releaseTemplate = releaseTemplate.replace(/\$DEBTAGNAME\$/g,debTagName); - - //Patch $CHANGELOG$ with this branch's changelog - let changeLog = fs.readFileSync(`docs/docs/${type}ChangeLog.md`).toString(); - releaseTemplate = releaseTemplate.replace(/\$CHANGELOG\$/g,changeLog); - console.log(releaseTemplate); - - fs.mkdirSync(`docs/releases/${tag_name}`); - fs.writeFileSync(`docs/releases/${tag_name}/index.md`,releaseTemplate); - - resolve(); - }); -} diff --git a/scripts/generateReleaseDocsFromLatest.js b/scripts/generateReleaseDocsFromLatest.js deleted file mode 100644 index f57caeb30..000000000 --- a/scripts/generateReleaseDocsFromLatest.js +++ /dev/null @@ -1,24 +0,0 @@ -const fs = require("fs"); - -const walk = require("walk"); - -module.exports = async function generateReleaseDocsFromLatest(tag_name) -{ - return new Promise((resolve,reject) => { - let walker = walk.walk(`docs/docs/latest`,{}); - fs.mkdirSync(`docs/docs/releases/${tag_name}`); - - //Patch all doc links to point from latest to the version of this deployment - //Also patch occurences of $TAGNAME$ with this version - walker.on("file",function(root,fileStats,next){ - let file = fs.readFileSync(`${root}/${fileStats.name}`).toString(); - file = file.replace(/\/latest\//g,`/releases/${tag_name}/`); - file = file.replace(/\$TAGNAME\$/g,`${tag_name}`); - fs.writeFileSync(`docs/docs/releases/${tag_name}/${fileStats.name}`,file); - next(); - }); - walker.on("end",function(){ - resolve(); - }); - }); -} \ No newline at end of file diff --git a/src/guiTests/req/projectSelection/openFirstProject.ts b/src/guiTests/req/projectSelection/openFirstProject.ts index 99434677e..c14b9e71e 100644 --- a/src/guiTests/req/projectSelection/openFirstProject.ts +++ b/src/guiTests/req/projectSelection/openFirstProject.ts @@ -18,7 +18,9 @@ export async function openFirstProject() : Promise } } `); - resolve(); + setTimeout(function(){ + resolve(); + },5000); },5000); }); } \ No newline at end of file diff --git a/src/req/renderer/inputRenderer/inputBrowseDialog.ts b/src/req/renderer/inputRenderer/inputBrowseDialog.ts index 2af5d07b8..56fa940e4 100644 --- a/src/req/renderer/inputRenderer/inputBrowseDialog.ts +++ b/src/req/renderer/inputRenderer/inputBrowseDialog.ts @@ -10,10 +10,15 @@ let fastqExtensions = [ "fastq", "fq" ]; + let fastaExtensions = [ "fasta", - "fa" -] + "fas", + "fa", + "seq", + "fsa", + "fna" +]; export function inputBrowseDialog() : void { @@ -71,6 +76,5 @@ export function inputBrowseDialog() : void } } } - ); } \ No newline at end of file