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/23 22:19:47 UTC

[airavata-django-portal] branch develop updated (53ccaa0 -> 7e330f7)

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 53ccaa0  Merge branch 'AIRAVATA-3285--Interactive-output-view-providers' into develop
     add 738ad5d  AIRAVATA-3324 Add AutocompleteInputEditor
     add 7499431  AIRAVATA-3324 Improve UI for canceling selection
     add 812fdd7  AIRAVATA-3324 Debounce search queries
     add f1ef162  AIRAVATA-3324 Handle loading exact value and 404 error case
     add a9b69c3  AIRAVATA-3324 Adding documentation
     add 779cad5  Merge branch 'AIRAVATA-3324-custom-input-editor-autocomplete-input-editor'
     new 3c28e42  AIRAVATA-3340 Fix issue with queue default overwriting saved values
     new 7e330f7  Merge branch 'AIRAVATA-3340' 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:
 django_airavata/apps/workspace/package.json        |   1 +
 .../components/experiment/QueueSettingsEditor.vue  |  12 +-
 .../input-editors/AutocompleteInputEditor.vue      | 151 ++++++++++++
 .../input-editors/InputEditorContainer.vue         |   4 +-
 .../common/js/components/AutocompleteTextInput.vue |   9 +-
 docs/admin/app_inputs.md                           | 268 +++++++++++++++++++++
 docs/images/app-input-metadata.png                 | Bin 0 -> 244374 bytes
 mkdocs.yml                                         |   1 +
 8 files changed, 440 insertions(+), 6 deletions(-)
 create mode 100644 django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/input-editors/AutocompleteInputEditor.vue
 create mode 100644 docs/admin/app_inputs.md
 create mode 100644 docs/images/app-input-metadata.png


[airavata-django-portal] 01/02: AIRAVATA-3340 Fix issue with queue default overwriting saved values

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 3c28e4297063b633c5f80cad66bc9cfdc0c23e5c
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Jun 23 18:17:42 2020 -0400

    AIRAVATA-3340 Fix issue with queue default overwriting saved values
---
 .../js/components/experiment/QueueSettingsEditor.vue         | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue
index e50a3f0..b5527d7 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue
@@ -377,12 +377,18 @@ export default {
       this.loadAppDeploymentQueues().then(() => this.setDefaultQueue());
     },
     // If the default queue changes, re-set queue defaults
-    defaultQueue() {
-      this.setDefaultQueue();
+    defaultQueue(value, oldValue) {
+      // Only set defaultQueue if it changes from a non-null value to some
+      // different non-null value (initially it is null when data is loading)
+      if (oldValue && value !== oldValue) {
+        this.setDefaultQueue();
+      }
     },
     // If batch queue resource policy for the default queue changes, re-set queue defaults
     defaultQueueBatchQueueResourcePolicy(newValue, oldValue) {
-      if (newValue !== oldValue) {
+      // Only set defaultQueue if it changes from a non-null value to some
+      // different non-null value (initially it is null when data is loading)
+      if (oldValue && newValue !== oldValue) {
         this.setDefaultQueue();
       }
     }


[airavata-django-portal] 02/02: Merge branch 'AIRAVATA-3340' 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 7e330f79edf7054342412746592bad3667bc06b0
Merge: 53ccaa0 3c28e42
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Jun 23 18:17:59 2020 -0400

    Merge branch 'AIRAVATA-3340' into develop

 django_airavata/apps/workspace/package.json        |   1 +
 .../components/experiment/QueueSettingsEditor.vue  |  12 +-
 .../input-editors/AutocompleteInputEditor.vue      | 151 ++++++++++++
 .../input-editors/InputEditorContainer.vue         |   4 +-
 .../common/js/components/AutocompleteTextInput.vue |   9 +-
 docs/admin/app_inputs.md                           | 268 +++++++++++++++++++++
 docs/images/app-input-metadata.png                 | Bin 0 -> 244374 bytes
 mkdocs.yml                                         |   1 +
 8 files changed, 440 insertions(+), 6 deletions(-)

diff --cc mkdocs.yml
index 6bf42ea,74cecb1..fdde766
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@@ -11,12 -11,12 +11,13 @@@ nav
      - Developing the Frontend: dev/developing_frontend.md
      - Developing the Backend: dev/developing_backend.md
      - Developing a Wagtail Export (theme): dev/wagtail_export.md
 +  - Customization Guide:
 +    - Gateways 2019 Tutorial: tutorial/gateways2019_tutorial.md
 +    - Adding a Custom Django App: dev/custom_django_app.md
 +    - Adding a Custom Output View Provider: dev/custom_output_view_provider.md
    - Administrator Guide:
+     - Application Input Customization: admin/app_inputs.md
      - Tusd Installation: admin/tusd.md
 -  - Tutorials:
 -    - Gateways 2019: tutorial/gateways2019_tutorial.md
  
  theme: readthedocs