Merge pull request #182 from spectre-team/fixup/update-worker-version

Update worker version & bugfixes
spectre-team · Apr 5, 2018 · 7b87fa9 · 7b87fa9
2 parents e67891e + b75a9f9
commit 7b87fa9
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,9 @@ services:
 - docker
 env:
   global:
-  - VERSION=5.0.1
+  - MAJOR=5
+  - MINOR=0
+  - FIXUP=2
   - secure: o3WvEAFaEw3wQpAljJG9/NrLSMkV81aLl23BwkoYXdd4gGNuwv6CZV7Hy42FMPrDgy2IpngehiKMDr/OqaNDXrnWGuYpppgprqGfX1oRPSPF8Mgu+REdRdbsIZ4+Va8E81G9WGM3bTeUzLT6i8++gBKIsIBC2/UgHYW9Rpl0wsqIAZfYQshuOzrGJA2G8RH7p3UakVWx60wYCiSdCsqTJzFmgS/48siAMA2H3k5FYgDiKCH9XkFI3746b4Ew14eJiSmK2sT4DmFYjhS5MvoTZpiVNtBcr4rE7Ir7DHJZkR2gf4mu+/CG+78XNHu5AEP2iYyWH13xWgsOotl18iimWYkXJ9PkKdydoi0Lw9rTC3r69B1IdjE0IcakB+OkLaqtEClGRT6e0t0Likg9INlg/GwOx+ik9ZBruU4q4Izo4cbh+k8xGSRJLjKtUgowJ9msUwLP5zy+aP5Dxk7U/hXSiNh8C+kZuL8BfZZGrW+T0P1MGC2j5LeVzhmhwKlX3ARxlpSXa/1yBzQ3u1H/22EmZkF9NRIf+Fs+6n1oFkQXRh8z71Aqnb/hWEDYuWKd2vUryrHQnrh2vQPhumQ4yPlhGM2l9mOaQFT4Ko4gxkerAOvBSPO4KyX72exrS5GZ96pU8a2gqaazXpvjBTmfy10IZRNXh1Ld/VUOqzI+cU8XR2I=
   - secure: ltoQKSge89qnXHc4FIc1oRM8KCbu4zJPrHiMF46LE8ur/P+lIHkiGURfWYa56OGrNyKSx1/ITFqqiCLSfaHZ7BSKYrjQi1pnyIjhFMPBOlKZykSKAAi254miX6fgCSlis7/FgLyobALFpxrQ1kaSFuJxlwEz1XU6eryeOguXHVU82OZGUrq+xm39f0UPGCcsjamF1R0hyHfLs+U+336CQFuziMj43TSi8O71G7ArGQutY6hoKr+ZIgTFg87DFXgVeZeJOv1DaA4N7t61vY1LIkBiS99GjUVtaViVR7pHjIobqLJv8YyCq8yiyJRhJwDfbriaQOxWvfHW9z3ks2A3lGNbmmwZPstugHgOCrtLkfdvK0RpQf6tkVVSwoMqR707HeILG3579Z1o2GGLNYQUc5kbjLswlqNfejXAr8O2h0iomuZ8XqCCOQ/YD5eKWoG9MU+3vRbxw91Q+ccY1ImeeekZVHjqsvDHR7R35Ta/kjz2g/C/BpnTrwLMShV+4Zc7s5HCALM0xIIoSMUctbl+RUidP14fsDoq84KqrGu/IN8+qIo/pDC8BTFHjhpg9Rw9XWzEAzLY5WIj3k07jVYWjiS2/uAHmyv7E5+hCwwjzEteFtUMOcx1mFJnvZlPD7dRAaJn6U/1Dfr/Yyf/BDUtq+5ILTJv+q9jWNivQ20yCeo=
   matrix:
@@ -33,17 +35,34 @@ script:
 after_success:
 - |
   if [ $CONFIGURATION = "prod" ]; then
-      docker build -t spectreteam/spectre:latest -t spectreteam/spectre:beta -t spectreteam/spectre:$VERSION -t spectreteam/spectre:$VERSION-beta -t spectreteam/spectre:$VERSION-alpha .
+      docker build -t spectreteam/spectre:latest \
+                   -t spectreteam/spectre:beta \
+                   -t spectreteam/spectre:$MAJOR.$MINOR.$FIXUP \
+                   -t spectreteam/spectre:$MAJOR.$MINOR.$FIXUP-beta \
+                   -t spectreteam/spectre:$MAJOR.$MINOR.$FIXUP-alpha \
+                   -t spectreteam/spectre:$MAJOR.$MINOR \
+                   -t spectreteam/spectre:$MAJOR.$MINOR-beta \
+                   -t spectreteam/spectre:$MAJOR.$MINOR-alpha \
+                   -t spectreteam/spectre:$MAJOR \
+                   -t spectreteam/spectre:$MAJOR-beta \
+                   -t spectreteam/spectre:$MAJOR-alpha \
+                   .
       docker images
       if [ $TRAVIS_PULL_REQUEST = "false" ]; then
           if [ $TRAVIS_BRANCH = "master" ]; then
               docker push spectreteam/spectre:latest
-              docker push spectreteam/spectre:$VERSION
+              docker push spectreteam/spectre:$MAJOR.$MINOR.$FIXUP
+              docker push spectreteam/spectre:$MAJOR.$MINOR
+              docker push spectreteam/spectre:$MAJOR
           elif [ $TRAVIS_BRANCH = "develop" ]; then
               docker push spectreteam/spectre:beta
-              docker push spectreteam/spectre:$VERSION-beta
+              docker push spectreteam/spectre:$MAJOR.$MINOR.$FIXUP-beta
+              docker push spectreteam/spectre:$MAJOR.$MINOR-beta
+              docker push spectreteam/spectre:$MAJOR-beta
           fi
-          docker push spectreteam/spectre:$VERSION-alpha
+          docker push spectreteam/spectre:$MAJOR.$MINOR.$FIXUP-alpha
+          docker push spectreteam/spectre:$MAJOR.$MINOR-alpha
+          docker push spectreteam/spectre:$MAJOR-alpha
       fi
   fi
 notifications:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
 
     client:
         restart: always
-        image: spectreteam/spectre:5.0.1
+        image: spectreteam/spectre:5
         ports:
             - "80:80"
         depends_on:
@@ -48,7 +48,7 @@ services:
             - celery:/var/lib/postgresql/data
 
     analysis-api:
-        image: spectreteam/spectre-analysis:1.0.0
+        image: spectreteam/spectre-analysis:1
         ports:
           - "2003:80"
         depends_on:
@@ -59,7 +59,7 @@ services:
           - data:/data
 
     celery-flower:
-        image: spectreteam/spectre-analysis:1.0.0
+        image: spectreteam/spectre-analysis:1
         command: celery -A spectre_analyses flower --loglevel=info --port=80 --address=0.0.0.0
         depends_on:
           - rabbitmq
@@ -68,7 +68,7 @@ services:
           - "2004:80"
 
     divik-worker:
-        image: spectreteam/divik-worker:1.0.0
+        image: spectreteam/divik-worker:1
         depends_on:
           - rabbitmq
           - postgresql

diff --git a/src/app/aspect-view/aspect-view/aspect-view.component.css b/src/app/aspect-view/aspect-view/aspect-view.component.css
@@ -0,0 +1,6 @@
+mat-expansion-panel {
+    margin: 30px;
+    margin-left: auto;
+    margin-right: auto;
+    max-width: 800px;
+}
diff --git a/src/app/aspect-view/aspect-view/aspect-view.component.html b/src/app/aspect-view/aspect-view/aspect-view.component.html
@@ -13,9 +13,9 @@
     (onSubmit)="submit($event)">
   </app-generic-form>
 
-  <app-visualization-view *ngIf="data !== undefined"
+  <app-visualization-view *ngIf="result !== undefined"
     [type]="description.output_type"
-    [data]="data">
+    [data]="result">
   </app-visualization-view>
 
 </mat-expansion-panel>
diff --git a/src/app/finished-analysis-view/finished-analysis-view/finished-analysis-view.component.css b/src/app/finished-analysis-view/finished-analysis-view/finished-analysis-view.component.css
@@ -0,0 +1,6 @@
+mat-card {
+    margin: 30px;
+    margin-left: auto;
+    margin-right: auto;
+    max-width: 800px;
+}
diff --git a/src/app/new-analysis-view/new-analysis-view/new-analysis-view.component.ts b/src/app/new-analysis-view/new-analysis-view/new-analysis-view.component.ts
@@ -34,6 +34,7 @@ export class NewAnalysisViewComponent implements OnInit {
   private algorithm: string;
   private layoutUrl: string;
   private schemaUrl: string;
+  private snackBarConfig = {duration: 3000};
 
   constructor(
     private scheduler: AnalysisSchedulerService,
@@ -52,9 +53,13 @@ export class NewAnalysisViewComponent implements OnInit {
   }
 
   submit(algorithmParameters: any): void {
-    this.scheduler.enqueue(this.algorithm, algorithmParameters).subscribe(
-      response => this.snackBar.open('Analysis scheduled successfully'),
-      error => this.snackBar.open('Error scheduling your analysis'));
+    this.scheduler.enqueue(this.algorithm, algorithmParameters).subscribe({
+      next: response => this.notify('Analysis scheduled successfully'),
+      error: message => this.notify('Error scheduling your analysis')});
+  }
+
+  private notify(message): void {
+    this.snackBar.open(message, '', this.snackBarConfig);
   }
 
 }