release v2.3.1 RC

phnmnl · May 24, 2018 · 097cdab · 097cdab
2 parents 330c579 + 4f6935c
commit 097cdab
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng2-phenomenal-portal",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "license": "MIT",
   "angular-cli": {},
   "scripts": {
@@ -46,7 +46,7 @@
     "@angular/cdk": "^2.0.0-beta.12",
     "@angular/cli": "^1.7.3",
     "@angular/compiler-cli": "^4.0.0",
-    "@compodoc/compodoc": "^1.0.1",
+    "@compodoc/compodoc": "1.1.2",
     "@types/jasmine": "2.5.38",
     "@types/node": "^6.0.60",
     "codelyzer": "~2.0.0",

diff --git a/src/app/log-monitor/log-monitor.component.ts b/src/app/log-monitor/log-monitor.component.ts
@@ -38,10 +38,10 @@ export class LogMonitorComponent implements OnInit {
         this.deployment = data;
         this.deployerManager.getDeploymentLogs(reference).subscribe(
           (logs) => {
+            this.deployment["logs"] = logs;
             let blob = new Blob([this.deployment["logs"]], {type: 'text/plain'});
             let url = window.URL.createObjectURL(blob);
             this.downloadLogsUri = this.sanitizer.bypassSecurityTrustUrl(url);
-            this.deployment["logs"] = logs;
           }, (error) => {
             console.error(error);
           });

diff --git a/src/index.html b/src/index.html
@@ -10,7 +10,20 @@
   <!-- Temporary fix for favicon-->
   <link rel="icon" type="image/x-icon" href="favicon.ico">
 
-  <script   src="https://code.jquery.com/jquery-3.1.0.min.js"   integrity="sha256-cCueBR6CsyA4/9szpPfrX3s49M9vUU5BgtiJj06wt/s="   crossorigin="anonymous"></script>
+  <!--<script>-->
+    <!--var localFrameworkVersion = 'other';-->
+    <!--var newDataProtectionNotificationBanner = document.createElement('script');-->
+    <!--newDataProtectionNotificationBanner.src = 'https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/js/ebi-global-includes/script/5_ebiFrameworkNotificationBanner.js?legacyRequest='+localFrameworkVersion;-->
+    <!--document.head.appendChild(newDataProtectionNotificationBanner);-->
+    <!--newDataProtectionNotificationBanner.onload = function() {-->
+      <!--ebiFrameworkRunDataProtectionBanner(); // invoke the banner-->
+    <!--};-->
+  <!--</script>-->
+
+  <script src="https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/js/ebi-global-includes/script/5_ebiFrameworkNotificationBanner.js?legacyRequest=other">
+  </script>
+
+  <script src="https://code.jquery.com/jquery-3.1.0.min.js"   integrity="sha256-cCueBR6CsyA4/9szpPfrX3s49M9vUU5BgtiJj06wt/s="   crossorigin="anonymous"></script>
   <script>
     (function(w,d,s,g,js,fs){
       g=w.gapi||(w.gapi={});g.analytics={q:[],ready:function(f){this.q.push(f);}};
@@ -19,9 +32,13 @@
       fs.parentNode.insertBefore(js,fs);js.onload=function(){g.load('analytics');};
     }(window,document,'script'));
   </script>
-
 </head>
-<body>
+
+<body onpageshow="ebiFrameworkRunDataProtectionBanner()">
+  <div id="data-protection-message-configuration"
+       data-message='This website requires cookies, and the limited processing of your personal data in order to function. <br>By using the site you are agreeing to this as outlined in our <a class="nav_link" target="_blank" href="https://www.ebi.ac.uk/data-protection/privacy-notice/phenomenal-vre-portal" class="white-color"><b>Privacy Notice<b></a>.'
+       data-service-id="phenomenal-vre-portal" data-data-protection-version="0.1">
+  </div>
   <ph-root>
     <div class="loader">Loading...</div>
   </ph-root>

diff --git a/src/styles.css b/src/styles.css
@@ -169,6 +169,10 @@ input:focus {
   min-height: 120px;
 }
 
+.data-protection-banner{
+  padding: 20px 40px !important;
+}
+
 @-webkit-keyframes load8 {
   0% {
     -webkit-transform: rotate(0deg);