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/08/18 21:36:11 UTC

[airavata-django-portal] branch develop updated (19dd2baf -> 835cefff)

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 19dd2baf AIRAVATA-3648 Show last modified time in user storage views
     add 23bb679b Updating the doc due to the code changes
     add df089fc7 Merge pull request #105 from lahirujayathilake/master
     add 9752c39d Updating mkdocs and pinning Jinja2 to fix readthedocs build
     add a11ff2ee Fixing readthedocs build; pinning importlib-metadata for better Py 3.7 compat
     add cf3c5867 Dropping Jinja2 to 3.0 for Py3.6 compat
     add 5fac9dfb Merge branch 'staging'
     new 71f02dbc AIRAVATA-3637 Add support for URI and URI_COLLECTION input types in experiment editor web component
     new 835cefff Merge branch 'AIRAVATA-3637' into develop

The 2 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:
 .../js/web-components/ExperimentEditor.vue         | 25 +++++++++++++++-
 docs/dev/new_django_app.md                         | 35 ++++++++++++----------
 requirements-dev.txt                               | 14 +++++----
 3 files changed, 51 insertions(+), 23 deletions(-)


[airavata-django-portal] 02/02: Merge branch 'AIRAVATA-3637' into develop

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 835cefff91ad2af1c50dd25dfcdf208755bf69ec
Merge: 19dd2baf 71f02dbc
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Aug 18 17:36:01 2022 -0400

    Merge branch 'AIRAVATA-3637' into develop

 .../js/web-components/ExperimentEditor.vue         | 25 +++++++++++++++-
 docs/dev/new_django_app.md                         | 35 ++++++++++++----------
 requirements-dev.txt                               | 14 +++++----
 3 files changed, 51 insertions(+), 23 deletions(-)


[airavata-django-portal] 01/02: AIRAVATA-3637 Add support for URI and URI_COLLECTION input types in experiment editor web component

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 71f02dbc9037effc02e5fd15d853817fe4cc8856
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Aug 18 17:35:12 2022 -0400

    AIRAVATA-3637 Add support for URI and URI_COLLECTION input types in experiment editor web component
---
 .../js/web-components/ExperimentEditor.vue         | 25 +++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/web-components/ExperimentEditor.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/web-components/ExperimentEditor.vue
index e20e3e4f..c45d9f17 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/web-components/ExperimentEditor.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/web-components/ExperimentEditor.vue
@@ -84,8 +84,31 @@ export default {
           textInput.setAttribute("name", input.name);
           slot.appendChild(textInput);
           this.$refs[input.name][0].append(slot);
+        } else if (input.type.name === "URI") {
+          slot.textContent = `${input.name} `;
+          const fileInputEditor = document.createElement(
+            "adpf-file-input-editor"
+          );
+          fileInputEditor.setAttribute(
+            "value",
+            input.value !== null ? input.value : ""
+          );
+          fileInputEditor.setAttribute("name", input.name);
+          slot.appendChild(fileInputEditor);
+          this.$refs[input.name][0].append(slot);
+        } else if (input.type.name === "URI_COLLECTION") {
+          slot.textContent = `${input.name} `;
+          const multiFileInputEditor = document.createElement(
+            "adpf-multi-file-input-editor"
+          );
+          multiFileInputEditor.setAttribute(
+            "value",
+            input.value !== null ? input.value : ""
+          );
+          multiFileInputEditor.setAttribute("name", input.name);
+          slot.appendChild(multiFileInputEditor);
+          this.$refs[input.name][0].append(slot);
         }
-        // TODO: add support for other input types
       }
       // this.injectPropsIntoSlottedInputs();