[airavata-django-portal] branch master updated: AIRAVATA-2832 Experiment latest status

[machristie]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git


The following commit(s) were added to refs/heads/master by this push:
     new b22d5b4  AIRAVATA-2832 Experiment latest status
b22d5b4 is described below

commit b22d5b4fca53c95be17e39c963eeeba5980b3d7f
Author: Marcus Christie <machr...@iu.edu>
AuthorDate: Tue Jun 19 10:48:34 2018 -0400

    AIRAVATA-2832 Experiment latest status
---
 .../static/django_airavata_api/js/models/Experiment.js  | 17 +++++++++++------
 .../django_airavata_api/js/models/FullExperiment.js     |  3 +--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git 
a/django_airavata/apps/api/static/django_airavata_api/js/models/Experiment.js 
b/django_airavata/apps/api/static/django_airavata_api/js/models/Experiment.js
index d45637e..a7f8304 100644
--- 
a/django_airavata/apps/api/static/django_airavata_api/js/models/Experiment.js
+++ 
b/django_airavata/apps/api/static/django_airavata_api/js/models/Experiment.js
@@ -87,10 +87,16 @@ export default class Experiment extends BaseModel {
         return validationResults;
     }
 
+    get latestStatus() {
+        if (this.experimentStatus && this.experimentStatus.length > 0) {
+            return this.experimentStatus[this.experimentStatus.length - 1];
+        } else {
+            return null;
+        }
+    }
+
     get isProgressing() {
-        return this.experimentStatus
-            && this.experimentStatus.length > 0
-            && this.experimentStatus[0].state.isProgressing;
+        return this.latestStatus && this.latestStatus.isProgressing;
     }
 
     get hasLaunched() {
@@ -101,9 +107,8 @@ export default class Experiment extends BaseModel {
                                    ExperimentState.CANCELED,
                                    ExperimentState.FAILED,
                                    ExperimentState.COMPLETED];
-        return this.experimentStatus
-            && this.experimentStatus.length > 0
-            && hasLaunchedStates.indexOf(this.experimentStatus[0].state) >= 0;
+        return this.latestStatus
+            && hasLaunchedStates.indexOf(this.latestStatus.state) >= 0;
     }
 
     populateInputsOutputsFromApplicationInterface(applicationInterface) {
diff --git 
a/django_airavata/apps/api/static/django_airavata_api/js/models/FullExperiment.js
 
b/django_airavata/apps/api/static/django_airavata_api/js/models/FullExperiment.js
index b7bac6a..62b8700 100644
--- 
a/django_airavata/apps/api/static/django_airavata_api/js/models/FullExperiment.js
+++ 
b/django_airavata/apps/api/static/django_airavata_api/js/models/FullExperiment.js
@@ -60,8 +60,7 @@ export default class FullExperiment extends BaseModel {
     }
 
     get experimentStatus() {
-        return this.experiment.experimentStatus && 
this.experiment.experimentStatus.length > 0
-            ? this.experiment.experimentStatus[0] : null;
+        return this.experiment.latestStatus;
     }
 
     get experimentStatusName() {