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 2020/06/16 14:22:01 UTC

[airavata-django-portal] 01/02: AIRAVATA-3285 Add support for specifying a label and help text

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

machristie pushed a commit to branch AIRAVATA-3285--Interactive-output-view-providers
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git

commit ccfddae351c1bf096a7876b7c9f317a8641fe683
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Jun 16 09:58:23 2020 -0400

    AIRAVATA-3285 Add support for specifying a label and help text
---
 .../interactive-parameters/InteractiveParametersPanel.vue          | 7 ++++---
 django_airavata/static/common/js/components/ValidatedForm.vue      | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/interactive-parameters/InteractiveParametersPanel.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/interactive-parameters/InteractiveParametersPanel.vue
index 6ad640d..3b0ca25 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/interactive-parameters/InteractiveParametersPanel.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/interactive-parameters/InteractiveParametersPanel.vue
@@ -33,8 +33,9 @@ export default {
       return this.localParameters.map(p => {
         return {
           key: p.name,
-          label: p.name,
-          item: p
+          label: p.label || p.name,
+          item: p,
+          description: p.help
         };
       });
     },
@@ -45,7 +46,7 @@ export default {
   data() {
     return {
       localParameters: this.parametersCopy()
-    }
+    };
   },
   methods: {
     updated(param, value) {
diff --git a/django_airavata/static/common/js/components/ValidatedForm.vue b/django_airavata/static/common/js/components/ValidatedForm.vue
index a9d7608..f126ec9 100644
--- a/django_airavata/static/common/js/components/ValidatedForm.vue
+++ b/django_airavata/static/common/js/components/ValidatedForm.vue
@@ -6,6 +6,7 @@
         :key="item.key"
         :valid="isValid(item.key)"
         :feedback-messages="getFeedbackMessages(item.key)"
+        :description="item.description"
       >
         <slot
           :item="item.item"