airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dimuthu...@apache.org
Subject [airavata-django-portal] branch master updated: Adding parser app to build
Date Tue, 15 Jan 2019 21:54:43 GMT
This is an automated email from the ASF dual-hosted git repository.

dimuthuupe 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 e0a1333  Adding parser app to build
e0a1333 is described below

commit e0a1333b34fa37a08b07075a33c49124f9a55133
Author: Dimuthu Wannipurage <dimuthu.upeksha2@gmail.com>
AuthorDate: Tue Jan 15 16:54:34 2019 -0500

    Adding parser app to build
---
 build_js.sh                                                |  1 +
 .../js/parser-components/ParserEditor.vue                  | 14 ++++----------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/build_js.sh b/build_js.sh
index beda6d3..98ac49d 100755
--- a/build_js.sh
+++ b/build_js.sh
@@ -9,6 +9,7 @@ echo -e "Running production JS builds"
 (cd $SCRIPT_DIR/django_airavata/apps/groups && npm install && npm run build)
|| exit 1
 (cd $SCRIPT_DIR/django_airavata/apps/workspace/django-airavata-workspace-plugin-api &&
npm install && npm run build) || exit 1
 (cd $SCRIPT_DIR/django_airavata/apps/workspace && npm install && npm run
build) || exit 1
+(cd $SCRIPT_DIR/django_airavata/apps/dataparsers && npm install && npm run
build) || exit 1
 
 echo -e "All builds finished successfully!"
 
diff --git a/django_airavata/apps/dataparsers/static/django_airavata_dataparsers/js/parser-components/ParserEditor.vue
b/django_airavata/apps/dataparsers/static/django_airavata_dataparsers/js/parser-components/ParserEditor.vue
index eced810..d4da2a4 100644
--- a/django_airavata/apps/dataparsers/static/django_airavata_dataparsers/js/parser-components/ParserEditor.vue
+++ b/django_airavata/apps/dataparsers/static/django_airavata_dataparsers/js/parser-components/ParserEditor.vue
@@ -115,11 +115,8 @@ export default {
         },
         {
           label: "Type",
-          key: "type"
-        },
-        {
-          label: "Action",
-          key: "action"
+          key: "type",
+          formatter: value => value.name
         }
       ],
       parserOutputFields: [
@@ -133,11 +130,8 @@ export default {
         },
         {
           label: "Type",
-          key: "type"
-        },
-        {
-          label: "Action",
-          key: "action"
+          key: "type",
+          formatter: value => value.name
         }
       ]
     };


Mime
View raw message