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 2019/12/05 19:56:55 UTC

[airavata-django-portal] branch develop updated (0370a9a -> 6b07e76)

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

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


    from 0370a9a  AIRAVATA-3067 Apply most recently used resource profile, comput resource
     add 85d0da0  AIRAVATA-3279 Check if user has READ access to project
     add 93e4908  fix lint error
     add 46d5600  script to run npm commands in docker container
     add e851d92  multi-stage docker image build: build JS, then Django container
     add 9af3b52  AIRAVATA-3230 Rename to standard Dockerfile
     add 156e6fb  AIRAVATA-3230 Updating README, docs
     add a1bf683  AIRAVATA-3230 Removing npm.py script, no longer needed
     add 914673f  AIRAVATA-3230 Adding running from Docker instructions to README
     add 92fbeab  docs: adding virtual env activation instructions
     add d3ae4ca  Adding futurewater theme
     add 4c169f1  Adding images for futurewater theme
     add 2279434  commiting updates to futurewater theme
     add a466105  commiting updates futurewater theme
     add b6770e0  AIRAVATA-3281 Use mime-type when loading output files
     new 53bd781  AIRAVATA-3268 Add overrideFilename for URI type inputs
     new 66cb438  Fix focusApplicationInputKey
     new 6b07e76  Vuejs warning fixes

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .dockerignore                                      |     7 +
 Dockerfile                                         |    91 +
 README.md                                          |    39 +-
 airavata/model/application/io/ttypes.py            |    16 +-
 airavata/model/sharing/ttypes.py                   |    15 +-
 .../service/profile/user/cpi/UserProfileService.py |     8 +
 build_js.sh                                        |    14 +-
 django_airavata/apps/admin/README.md               |     8 +-
 django_airavata/apps/admin/package.json            |     8 +-
 .../applications/ApplicationInputFieldEditor.vue   |    17 +-
 .../applications/ApplicationInterfaceEditor.vue    |     7 +-
 .../src/components/applications/JSONEditor.vue     |     1 -
 django_airavata/apps/admin/yarn.lock               |  8865 ++++++++++++++++
 .../js/models/ApplicationInterfaceDefinition.js    |    14 +-
 .../js/models/InputDataObjectType.js               |     3 +-
 .../js/models/OutputDataObjectType.js              |    55 +-
 django_airavata/apps/api/views.py                  |    23 +-
 django_airavata/apps/api/yarn.lock                 |  6461 ++++++++++++
 django_airavata/apps/dataparsers/package.json      |     4 +-
 django_airavata/apps/dataparsers/yarn.lock         |  8791 ++++++++++++++++
 django_airavata/apps/groups/package.json           |     4 +-
 django_airavata/apps/groups/yarn.lock              |  8791 ++++++++++++++++
 .../django-airavata-workspace-plugin-api/yarn.lock |  8437 +++++++++++++++
 django_airavata/apps/workspace/package.json        |     6 +-
 .../output-displays/DefaultOutputDisplay.vue       |    17 +-
 django_airavata/apps/workspace/yarn.lock           | 10403 +++++++++++++++++++
 ...ture_Water_Gateway_Overview_V1.3.max-140x43.png |   Bin 0 -> 5486 bytes
 ...ure_Water_Gateway_Overview_V1.3.max-165x165.png |   Bin 0 -> 11923 bytes
 ...ure_Water_Gateway_Overview_V1.3.max-800x600.png |   Bin 0 -> 120059 bytes
 ...Future_Water_Gateway_Overview_V1.3.original.png |   Bin 0 -> 274830 bytes
 ...uture_Water_Gateway_Overview_V1.3.width-800.png |   Bin 0 -> 120059 bytes
 ...r_Gateway_Overview_V1.3_1vnzuHA.max-165x165.png |   Bin 0 -> 11923 bytes
 ...r_Gateway_Overview_V1.3_1vnzuHA.max-800x600.png |   Bin 0 -> 120059 bytes
 ...ater_Gateway_Overview_V1.3_1vnzuHA.original.png |   Bin 0 -> 274830 bytes
 ...ter_Gateway_Overview_V1.3_1vnzuHA.width-800.png |   Bin 0 -> 120059 bytes
 ...g => futurewaterbanner_I1p7r10.max-165x165.jpg} |   Bin
 ....jpg => futurewaterbanner_I1p7r10.original.jpg} |   Bin
 ...g => futurewaterbanner_RCUyACd.max-165x165.jpg} |   Bin
 ....jpg => futurewaterbanner_RCUyACd.original.jpg} |   Bin
 ...g => futurewaterbanner_kVxcSHE.max-165x165.jpg} |   Bin
 ....jpg => futurewaterbanner_kVxcSHE.original.jpg} |   Bin
 ...g => futurewaterbanner_uHwUuwk.max-165x165.jpg} |   Bin
 ....jpg => futurewaterbanner_uHwUuwk.original.jpg} |   Bin
 ...l.png => trident-large_itLdOgS.max-165x165.png} |   Bin
 ...inal.png => trident-large_itLdOgS.original.png} |   Bin
 .../common/js/components/DataProductViewer.vue     |    16 +-
 django_airavata/static/common/package.json         |     2 +-
 django_airavata/static/common/yarn.lock            |  9196 ++++++++++++++++
 .../fixtures/{csbglsu.json => futurewater.json}    |   491 +-
 django_airavata/wagtailapps/base/wagtail_hooks.py  |     3 +-
 docs/dev/developing_frontend.md                    |    62 +-
 docs/dev/new_django_app.md                         |     5 +-
 docs/dev/wagtail_export.md                         |    43 +-
 lint_js.sh                                         |    14 +-
 scripts/start-server.sh                            |     5 +
 test_js.sh                                         |     4 +-
 56 files changed, 61786 insertions(+), 160 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 Dockerfile
 create mode 100644 django_airavata/apps/admin/yarn.lock
 create mode 100644 django_airavata/apps/api/yarn.lock
 create mode 100644 django_airavata/apps/dataparsers/yarn.lock
 create mode 100644 django_airavata/apps/groups/yarn.lock
 create mode 100644 django_airavata/apps/workspace/django-airavata-workspace-plugin-api/yarn.lock
 create mode 100644 django_airavata/apps/workspace/yarn.lock
 create mode 100644 django_airavata/media/images/Future_Water_Gateway_Overview_V1.3.max-140x43.png
 create mode 100644 django_airavata/media/images/Future_Water_Gateway_Overview_V1.3.max-165x165.png
 create mode 100644 django_airavata/media/images/Future_Water_Gateway_Overview_V1.3.max-800x600.png
 create mode 100644 django_airavata/media/images/Future_Water_Gateway_Overview_V1.3.original.png
 create mode 100644 django_airavata/media/images/Future_Water_Gateway_Overview_V1.3.width-800.png
 create mode 100644 django_airavata/media/images/Future_Water_Gateway_Overview_V1.3_1vnzuHA.max-165x165.png
 create mode 100644 django_airavata/media/images/Future_Water_Gateway_Overview_V1.3_1vnzuHA.max-800x600.png
 create mode 100644 django_airavata/media/images/Future_Water_Gateway_Overview_V1.3_1vnzuHA.original.png
 create mode 100644 django_airavata/media/images/Future_Water_Gateway_Overview_V1.3_1vnzuHA.width-800.png
 copy django_airavata/media/images/{futurewaterbanner.max-165x165.jpg => futurewaterbanner_I1p7r10.max-165x165.jpg} (100%)
 copy django_airavata/media/images/{futurewaterbanner.original.jpg => futurewaterbanner_I1p7r10.original.jpg} (100%)
 copy django_airavata/media/images/{futurewaterbanner.max-165x165.jpg => futurewaterbanner_RCUyACd.max-165x165.jpg} (100%)
 copy django_airavata/media/images/{futurewaterbanner.original.jpg => futurewaterbanner_RCUyACd.original.jpg} (100%)
 copy django_airavata/media/images/{futurewaterbanner.max-165x165.jpg => futurewaterbanner_kVxcSHE.max-165x165.jpg} (100%)
 copy django_airavata/media/images/{futurewaterbanner.original.jpg => futurewaterbanner_kVxcSHE.original.jpg} (100%)
 copy django_airavata/media/images/{futurewaterbanner.max-165x165.jpg => futurewaterbanner_uHwUuwk.max-165x165.jpg} (100%)
 copy django_airavata/media/images/{futurewaterbanner.original.jpg => futurewaterbanner_uHwUuwk.original.jpg} (100%)
 copy django_airavata/media/images/{trident-large_EnFLTsO.original.png => trident-large_itLdOgS.max-165x165.png} (100%)
 copy django_airavata/media/images/{trident-large_EnFLTsO.original.png => trident-large_itLdOgS.original.png} (100%)
 create mode 100644 django_airavata/static/common/yarn.lock
 copy django_airavata/wagtailapps/base/fixtures/{csbglsu.json => futurewater.json} (81%)
 create mode 100755 scripts/start-server.sh


[airavata-django-portal] 03/03: Vuejs warning fixes

Posted by ma...@apache.org.
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 6b07e7639a6f55158e989185ced105e111283cd5
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Dec 5 14:51:35 2019 -0500

    Vuejs warning fixes
---
 .../src/components/applications/ApplicationInputFieldEditor.vue         | 2 +-
 .../django_airavata_admin/src/components/applications/JSONEditor.vue    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationInputFieldEditor.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationInputFieldEditor.vue
index 0213f4b..1d50b2d 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationInputFieldEditor.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationInputFieldEditor.vue
@@ -11,7 +11,7 @@
         <span class="sr-only">Delete</span>
       </b-link>
     </div>
-    <b-collapse :visible="!collapse">
+    <b-collapse :id="id+'-collapse'" :visible="!collapse">
       <b-form-group label="Name" :label-for="id+'-name'">
         <b-form-input :id="id+'-name'" type="text" v-model="data.name" ref="nameInput" required :disabled="readonly"></b-form-input>
       </b-form-group>
diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/JSONEditor.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/JSONEditor.vue
index 54f8941..88b240c 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/JSONEditor.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/JSONEditor.vue
@@ -8,7 +8,6 @@ export default {
   props: {
     value: {
       type: Object,
-      required: true
     },
     id: String,
     rows: Number,


[airavata-django-portal] 02/03: Fix focusApplicationInputKey

Posted by ma...@apache.org.
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 66cb438b2d0fdb808fd64636f5fde573388bffaa
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Dec 5 14:48:44 2019 -0500

    Fix focusApplicationInputKey
---
 .../src/components/applications/ApplicationInterfaceEditor.vue     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationInterfaceEditor.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationInterfaceEditor.vue
index 99faa51..ad6e17a 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationInterfaceEditor.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationInterfaceEditor.vue
@@ -91,7 +91,7 @@ export default {
   },
   data() {
     return {
-      focusApplicationInputIndex: null,
+      focusApplicationInputKey: null,
       focusApplicationOutputKey: null,
       dragOptions: {
         handle: ".drag-handle"
@@ -113,8 +113,9 @@ export default {
       Object.assign(input, newValue);
     },
     addApplicationInput() {
-      this.data.applicationInputs.push(new models.InputDataObjectType());
-      this.focusApplicationInputIndex = this.data.applicationInputs.length - 1;
+      const appInput = new models.InputDataObjectType();
+      this.data.applicationInputs.push(appInput);
+      this.focusApplicationInputKey = appInput.key;
     },
     deleteInput(input) {
       const inputIndex = this.data.applicationInputs.findIndex(


[airavata-django-portal] 01/03: AIRAVATA-3268 Add overrideFilename for URI type inputs

Posted by ma...@apache.org.
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 53bd78197c18f4f218146c2934dc162ab3ac670d
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Dec 5 14:42:46 2019 -0500

    AIRAVATA-3268 Add overrideFilename for URI type inputs
---
 airavata/model/application/io/ttypes.py                  | 16 +++++++++++++++-
 airavata/model/sharing/ttypes.py                         | 15 ++++++++++++++-
 airavata/service/profile/user/cpi/UserProfileService.py  |  8 ++++++++
 .../applications/ApplicationInputFieldEditor.vue         | 15 ++++++++++++---
 .../django_airavata_api/js/models/InputDataObjectType.js |  3 ++-
 5 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/airavata/model/application/io/ttypes.py b/airavata/model/application/io/ttypes.py
index 8c9017a..17f1760 100644
--- a/airavata/model/application/io/ttypes.py
+++ b/airavata/model/application/io/ttypes.py
@@ -74,6 +74,8 @@ class InputDataObjectType(object):
     metaData:
       Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
 
+    overrideFilename:
+      Rename input file to given value when staging to compute resource.
 
     Attributes:
      - name
@@ -89,6 +91,7 @@ class InputDataObjectType(object):
      - dataStaged
      - storageResourceId
      - isReadOnly
+     - overrideFilename
     """
 
     thrift_spec = (
@@ -106,9 +109,10 @@ class InputDataObjectType(object):
         (11, TType.BOOL, 'dataStaged', None, None, ),  # 11
         (12, TType.STRING, 'storageResourceId', 'UTF8', None, ),  # 12
         (13, TType.BOOL, 'isReadOnly', None, None, ),  # 13
+        (14, TType.STRING, 'overrideFilename', 'UTF8', None, ),  # 14
     )
 
-    def __init__(self, name=None, value=None, type=None, applicationArgument=None, standardInput=None, userFriendlyDescription=None, metaData=None, inputOrder=None, isRequired=None, requiredToAddedToCommandLine=None, dataStaged=None, storageResourceId=None, isReadOnly=None,):
+    def __init__(self, name=None, value=None, type=None, applicationArgument=None, standardInput=None, userFriendlyDescription=None, metaData=None, inputOrder=None, isRequired=None, requiredToAddedToCommandLine=None, dataStaged=None, storageResourceId=None, isReadOnly=None, overrideFilename=None,):
         self.name = name
         self.value = value
         self.type = type
@@ -122,6 +126,7 @@ class InputDataObjectType(object):
         self.dataStaged = dataStaged
         self.storageResourceId = storageResourceId
         self.isReadOnly = isReadOnly
+        self.overrideFilename = overrideFilename
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -197,6 +202,11 @@ class InputDataObjectType(object):
                     self.isReadOnly = iprot.readBool()
                 else:
                     iprot.skip(ftype)
+            elif fid == 14:
+                if ftype == TType.STRING:
+                    self.overrideFilename = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -259,6 +269,10 @@ class InputDataObjectType(object):
             oprot.writeFieldBegin('isReadOnly', TType.BOOL, 13)
             oprot.writeBool(self.isReadOnly)
             oprot.writeFieldEnd()
+        if self.overrideFilename is not None:
+            oprot.writeFieldBegin('overrideFilename', TType.STRING, 14)
+            oprot.writeString(self.overrideFilename.encode('utf-8') if sys.version_info[0] == 2 else self.overrideFilename)
+            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
diff --git a/airavata/model/sharing/ttypes.py b/airavata/model/sharing/ttypes.py
index 1f2f0e9..661367f 100644
--- a/airavata/model/sharing/ttypes.py
+++ b/airavata/model/sharing/ttypes.py
@@ -190,6 +190,7 @@ class Domain(object):
     <li>description : A short description for the domain</li>
     <li>createdTime : Will be set by the system</li>
     <li>updatedTime : Will be set by the system</li>
+    <li>initialUserGroupId : New users will automatically be added to this group</li>
 
 
     Attributes:
@@ -198,6 +199,7 @@ class Domain(object):
      - description
      - createdTime
      - updatedTime
+     - initialUserGroupId
     """
 
     thrift_spec = (
@@ -207,14 +209,16 @@ class Domain(object):
         (3, TType.STRING, 'description', 'UTF8', None, ),  # 3
         (4, TType.I64, 'createdTime', None, None, ),  # 4
         (5, TType.I64, 'updatedTime', None, None, ),  # 5
+        (6, TType.STRING, 'initialUserGroupId', 'UTF8', None, ),  # 6
     )
 
-    def __init__(self, domainId=thrift_spec[1][4], name=None, description=None, createdTime=None, updatedTime=None,):
+    def __init__(self, domainId=thrift_spec[1][4], name=None, description=None, createdTime=None, updatedTime=None, initialUserGroupId=None,):
         self.domainId = domainId
         self.name = name
         self.description = description
         self.createdTime = createdTime
         self.updatedTime = updatedTime
+        self.initialUserGroupId = initialUserGroupId
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -250,6 +254,11 @@ class Domain(object):
                     self.updatedTime = iprot.readI64()
                 else:
                     iprot.skip(ftype)
+            elif fid == 6:
+                if ftype == TType.STRING:
+                    self.initialUserGroupId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -280,6 +289,10 @@ class Domain(object):
             oprot.writeFieldBegin('updatedTime', TType.I64, 5)
             oprot.writeI64(self.updatedTime)
             oprot.writeFieldEnd()
+        if self.initialUserGroupId is not None:
+            oprot.writeFieldBegin('initialUserGroupId', TType.STRING, 6)
+            oprot.writeString(self.initialUserGroupId.encode('utf-8') if sys.version_info[0] == 2 else self.initialUserGroupId)
+            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
diff --git a/airavata/service/profile/user/cpi/UserProfileService.py b/airavata/service/profile/user/cpi/UserProfileService.py
index ca8b8b0..98f33fb 100644
--- a/airavata/service/profile/user/cpi/UserProfileService.py
+++ b/airavata/service/profile/user/cpi/UserProfileService.py
@@ -31,6 +31,10 @@ class Iface(airavata.base.api.BaseAPI.Iface):
 
     def addUserProfile(self, authzToken, userProfile):
         """
+        This method is deprecated and will be removed in future versions of Airavata. Please use
+        the initializeUserProfile method which fetches the information about the user profile from
+        IAM service - @Deprecated
+
         Parameters:
          - authzToken
          - userProfile
@@ -154,6 +158,10 @@ class Client(airavata.base.api.BaseAPI.Client, Iface):
 
     def addUserProfile(self, authzToken, userProfile):
         """
+        This method is deprecated and will be removed in future versions of Airavata. Please use
+        the initializeUserProfile method which fetches the information about the user profile from
+        IAM service - @Deprecated
+
         Parameters:
          - authzToken
          - userProfile
diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationInputFieldEditor.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationInputFieldEditor.vue
index 2f6f472..0213f4b 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationInputFieldEditor.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationInputFieldEditor.vue
@@ -15,12 +15,15 @@
       <b-form-group label="Name" :label-for="id+'-name'">
         <b-form-input :id="id+'-name'" type="text" v-model="data.name" ref="nameInput" required :disabled="readonly"></b-form-input>
       </b-form-group>
-      <b-form-group label="Initial Value" :label-for="id+'-value'">
-        <b-form-input :id="id+'-value'" type="text" v-model="data.value" :disabled="readonly"></b-form-input>
-      </b-form-group>
       <b-form-group label="Type" :label-for="id+'-type'">
         <b-form-select :id="id+'-type'" v-model="data.type" :options="inputTypeOptions" :disabled="readonly" />
       </b-form-group>
+      <b-form-group label="Initial Value" :label-for="id+'-value'" v-if="showValueField">
+        <b-form-input :id="id+'-value'" type="text" v-model="data.value" :disabled="readonly"></b-form-input>
+      </b-form-group>
+      <b-form-group label="Override Filename" :label-for="id+'-value'" v-if="showOverrideFilenameField">
+        <b-form-input :id="id+'-override-filename'" type="text" v-model="data.overrideFilename" :disabled="readonly"></b-form-input>
+      </b-form-group>
       <b-form-group label="Application Argument" :label-for="id+'-argument'">
         <b-form-input :id="id+'-argument'" type="text" v-model="data.applicationArgument" :disabled="readonly"></b-form-input>
       </b-form-group>
@@ -102,6 +105,12 @@ export default {
     },
     id() {
       return "id-" + this.data.key;
+    },
+    showValueField() {
+      return this.data.type.isSimpleValueType
+    },
+    showOverrideFilenameField() {
+      return this.data.type === models.DataType.URI;
     }
   },
   methods: {
diff --git a/django_airavata/apps/api/static/django_airavata_api/js/models/InputDataObjectType.js b/django_airavata/apps/api/static/django_airavata_api/js/models/InputDataObjectType.js
index f3a25fb..9149d2e 100644
--- a/django_airavata/apps/api/static/django_airavata_api/js/models/InputDataObjectType.js
+++ b/django_airavata/apps/api/static/django_airavata_api/js/models/InputDataObjectType.js
@@ -41,7 +41,8 @@ const FIELDS = [
     name: "isReadOnly",
     type: "boolean",
     default: false
-  }
+  },
+  "overrideFilename"
 ];
 
 const IS_REQUIRED_DEFAULT = "This field is required.";