diff --git a/package.json b/package.json index ada8423ed..32d978942 100644 --- a/package.json +++ b/package.json @@ -20,9 +20,9 @@ "build:aot": "npm run build:aot:prod", "build:aot:dev": "cross-env BUILD_AOT=1 npm run build:dev", "build:dev": "npm run clean:dist && npm run webpack -- --config config/webpack.dev.js --progress --profile", - "build:docker:app": "docker-compose -f ./docker-compose-app.yml up -d --build", - "build:docker:mongo": "docker-compose -f ./docker-compose.yml up -d --build", - "build:docker": "npm run build:docker:mongo && npm run build:docker:app", + "build:docker:app": "docker-compose -f ./docker-compose-app.yml up", + "build:docker:mongo": "docker-compose -f ./docker-compose.yml up -d", + "build:docker": "npm run build:docker:mongo -- --build && npm run build:docker:app -- --build", "build:prod": "npm run clean:dist && npm run webpack -- --config config/webpack.prod.js --progress --profile --bail", "build:server:dev": "npm run clean:server && npm run webpack:server -- --config config/webpack.server.js --progress --profile --bail", "build:server:docker": "npm run clean:server && cross-env NODE_ENV=production Docker=true npm run webpack:server -- --config config/webpack.server.js --progress --profile --bail", @@ -40,7 +40,7 @@ "clean:server": "npm run rimraf dist/server.js", "clean:install": "npm set progress=false && npm install", "clean": "npm cache clean --force && npm run rimraf -- node_modules doc coverage dist compiled dll", - "docker": "docker-compose up", + "docker": "npm run build:docker:mongo && npm run build:docker:app", "docs": "npm run typedoc -- --options typedoc.json --exclude '**/*.spec.ts' ./src/", "docs:compodoc": "compodoc -p tsconfig.json", "docs:compodoc:serve": "compodoc -p tsconfig.json -s", diff --git a/src/app/genes/gene-details/gene-network/gene-network.component.ts b/src/app/genes/gene-details/gene-network/gene-network.component.ts index f3dd4959c..057acbb89 100644 --- a/src/app/genes/gene-details/gene-network/gene-network.component.ts +++ b/src/app/genes/gene-details/gene-network/gene-network.component.ts @@ -2,12 +2,10 @@ import { Component, OnInit, Input, ViewEncapsulation } from '@angular/core'; import { Location } from '@angular/common'; import { Router, ActivatedRoute } from '@angular/router'; -import { Gene, GeneNetwork, GeneLink, GeneNode } from '../../../models'; +import { Gene, GeneNetwork, GeneNode } from '../../../models'; import { GeneService, DataService } from '../../../core/services'; -import { Observable } from 'rxjs/Observable'; - @Component({ selector: 'gene-network', templateUrl: './gene-network.component.html', diff --git a/src/app/genes/gene-details/gene-rnaseq-de/gene-rnaseq-de.component.ts b/src/app/genes/gene-details/gene-rnaseq-de/gene-rnaseq-de.component.ts index 3eeb0b990..7aa5c2b83 100644 --- a/src/app/genes/gene-details/gene-rnaseq-de/gene-rnaseq-de.component.ts +++ b/src/app/genes/gene-details/gene-rnaseq-de/gene-rnaseq-de.component.ts @@ -71,6 +71,7 @@ export class GeneRNASeqDEComponent implements OnInit { ]); } else { this.loadChartData().then((status) => { + console.log(this.geneService.getTissues()); this.geneService.getTissues().forEach((t) => { this.tissues.push({label: t.toUpperCase(), value: t}); }); diff --git a/src/server/routes/api.ts b/src/server/routes/api.ts index a234e7c48..2f22ae4f3 100644 --- a/src/server/routes/api.ts +++ b/src/server/routes/api.ts @@ -93,10 +93,8 @@ Genes.aggregate( } ] ).allowDiskUse(true).exec().then((genes) => { - console.log(genes.length); // All the genes, ordered by hgnc_symbol allGenes = genes.slice(); - console.log(allGenes.length); // Unique genes, ordered by hgnc_symbol const seen = {}; genesById = genes.slice().filter((g) => { @@ -255,11 +253,9 @@ router.get('/genelist/:id', function(req, res, next) { // Return an empty array in case no id was passed or no params if (!req.params || !req.params.id) { res.json({ items: [] }); } GenesLinks.find({geneA_ensembl_gene_id: req.params.id}).exec((err, links) => { - console.log(links); const arr = links.slice().map((slink) => { return slink.toJSON()['geneB_ensembl_gene_id']; }); - console.log(arr); GenesLinks.find({ geneA_ensembl_gene_id: { $in: arr } }) .where('geneB_ensembl_gene_id') .in(arr)