Merge pull request #255 from OmicsDI/dev

OmicsDI web app v3.1
OmicsDI · Oct 26, 2018 · 59f6217 · 59f6217
2 parents 0527d62 + 85c0a0e
commit 59f6217
Show file tree

Hide file tree

Showing 9 changed files with 169 additions and 131 deletions.
diff --git a/e2e/modules/dataset/dataset.e2e-spec.ts b/e2e/modules/dataset/dataset.e2e-spec.ts
@@ -100,7 +100,7 @@ describe('public dataset page', function() {
         expect<any>(datasetPage.getSimilar_source().getText()).toContain('PAXDB');
 
         datasetPage.clickGetMoreSimilar();
-        expect<any>(datasetPage.getSimilar().count()).toBe(15);
+        expect<any>(datasetPage.getSimilar().count()).toBe(14);
 
 
         expect<any>(datasetPage.getSimilar_title().getText()).toContain('M.musculus - Jejunum, Protein Intensity (Geiger,MCP,2013)');
@@ -109,27 +109,23 @@ describe('public dataset page', function() {
         expect<any>(datasetPage.getSimilar_title().getText()).toContain('M.musculus - Ileum, Protein Intensity (Geiger,MCP,2013)');
         expect<any>(datasetPage.getSimilar_title().getText()).toContain('M.musculus - Spleen, Protein Intensity (Geiger,MCP,2013)');
         expect<any>(datasetPage.getSimilar_title().getText()).toContain('M.musculus - Uterus, Protein Intensity (Geiger,MCP,2013)');
-        expect<any>(datasetPage.getSimilar_title().getText()).toContain('M.musculus - Pancreas, Protein Intensity (Geiger,MCP,2013)');
         expect<any>(datasetPage.getSimilar_title().getText()).toContain('M.musculus - Diaphragm, Protein Intensity (Geiger,MCP,2013)');
         expect<any>(datasetPage.getSimilar_title().getText()).toContain('M.musculus - Cerebellum, Protein Intensity (Geiger,MCP,2013)');
         expect<any>(datasetPage.getSimilar_title().getText()).toContain('M.musculus - Lung, Protein Intensity (Geiger,MCP,2013)');
         expect<any>(datasetPage.getSimilar_title().getText()).toContain('M.musculus - Duodenum, Protein Intensity (Geiger,MCP,2013)');
         expect<any>(datasetPage.getSimilar_title().getText()).toContain('M.musculus - Stomach, Protein Intensity (Geiger,MCP,2013)');
-        expect<any>(datasetPage.getSimilar_title().getText()).toContain('M.musculus - Heart, Protein Intensity (Geiger,MCP,2013)');
 
         expect<any>(datasetPage.getSimilar_id().getText()).toContain('100909');
         expect<any>(datasetPage.getSimilar_id().getText()).toContain('10090488');
         expect<any>(datasetPage.getSimilar_id().getText()).toContain('10090378');
         expect<any>(datasetPage.getSimilar_id().getText()).toContain('10090222');
         expect<any>(datasetPage.getSimilar_id().getText()).toContain('10090364');
         expect<any>(datasetPage.getSimilar_id().getText()).toContain('10090320');
-        expect<any>(datasetPage.getSimilar_id().getText()).toContain('10090319');
         expect<any>(datasetPage.getSimilar_id().getText()).toContain('10090439');
         expect<any>(datasetPage.getSimilar_id().getText()).toContain('10090218');
         expect<any>(datasetPage.getSimilar_id().getText()).toContain('10090339');
         expect<any>(datasetPage.getSimilar_id().getText()).toContain('100906');
         expect<any>(datasetPage.getSimilar_id().getText()).toContain('1009080');
-        expect<any>(datasetPage.getSimilar_id().getText()).toContain('1009072');
     });
 });
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,6 +5,7 @@
   "angular-cli": {},
   "scripts": {
     "ng": "ng",
+    "webdriver-update": "webdriver-manager update",
     "start": "ng serve",
     "test": "ng test",
     "e2e": "ng e2e",

diff --git a/src/app/modules/dataset/components/dataset/dataset.component.html b/src/app/modules/dataset/components/dataset/dataset.component.html
@@ -16,8 +16,8 @@
                         <h3 class="mt-card-title" style="padding: 0; margin: 0 10px; font-weight: 500">Dataset Information</h3>
                     </div>
                     <div class="col-xs-2">
-                        <div *ngIf="datasetChanged" appPieChart class="pull-right" [width]="60" [circleRadius]="45" [dataset]="d"></div>
-                        <div *ngIf="!datasetChanged" appPieChart class="pull-right" [width]="60" [circleRadius]="45" [dataset]="d"></div>
+                        <div *ngIf="datasetChanged" appPieChart class="pull-right" [width]="65" [circleRadius]="52" [dataset]="d"></div>
+                        <div *ngIf="!datasetChanged" appPieChart class="pull-right" [width]="65" [circleRadius]="52" [dataset]="d"></div>
                     </div>
                 </div>
                 <div class="mt-card-body">