You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@airavata.apache.org by ma...@apache.org on 2022/02/17 00:43:37 UTC

[airavata-django-portal] 16/16: Merge branch 'AIRAVATA-3557' into develop

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

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

commit 47cdd73a3fe4123dddf41e056046018d888724a9
Merge: 00ae7ac 48e5557
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Feb 16 19:36:14 2022 -0500

    Merge branch 'AIRAVATA-3557' into develop

 .../applications/ApplicationOutputFieldEditor.vue  |   7 +
 django_airavata/apps/api/serializers.py            |  68 +++++-
 .../js/models/IntermediateOutput.js                |  21 ++
 .../js/models/OutputDataObjectType.js              |   5 +
 .../django_airavata_api/js/models/ProcessState.js  |  12 +-
 .../django_airavata_api/js/models/ProcessStatus.js |   4 +
 .../django_airavata_api/js/service_config.js       |   7 +
 django_airavata/apps/api/views.py                  |  12 ++
 .../js/components/experiment/ExperimentSummary.vue | 136 ++++--------
 .../output-displays/DefaultOutputDisplay.vue       | 167 +++++++++++++-
 .../output-displays/OutputDisplayContainer.vue     | 143 ++++++++++--
 .../js/containers/ViewExperimentContainer.vue      |  52 -----
 .../js/entry-view-experiment.js                    |  37 ++--
 .../django_airavata_workspace/js/store/index.js    |  16 ++
 .../js/store/modules/view-experiment.js            | 240 +++++++++++++++++++++
 requirements.txt                                   |   2 +-
 16 files changed, 730 insertions(+), 199 deletions(-)