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/06/10 15:32:24 UTC
[airavata-django-portal] 02/08: AIRAVATA-3057 Canceling file
selection
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 7b386aa933b390e25d0dcf6c4fc605dd99dc62a6
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Jun 10 09:31:49 2019 -0400
AIRAVATA-3057 Canceling file selection
---
.../js/components/experiment/input-editors/FileInputEditor.vue | 7 +++++--
.../js/components/storage/UserStorageFileSelectionContainer.vue | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/input-editors/FileInputEditor.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/input-editors/FileInputEditor.vue
index 01b1d7e..7c9dc0f 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/input-editors/FileInputEditor.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/input-editors/FileInputEditor.vue
@@ -29,8 +29,7 @@
</b-link>
</div>
<div v-if="isSelectingFile">
- <!-- TODO: handle @cancel -->
- <user-storage-file-selection-container @file-selected="fileSelected"/>
+ <user-storage-file-selection-container @file-selected="fileSelected" @cancel="cancelFileSelection"/>
</div>
<div class="d-flex" v-if="!isSelectingFile && !isDataProductURI">
<!-- TODO: fix layout -->
@@ -131,6 +130,10 @@ export default {
this.isSelectingFile = false;
this.loadDataProduct(dataProductURI);
this.valueChanged();
+ },
+ cancelFileSelection() {
+ this.isSelectingFile = false;
+ this.unselect();
}
}
};
diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/storage/UserStorageFileSelectionContainer.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/storage/UserStorageFileSelectionContainer.vue
index 51588aa..3f5696e 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/storage/UserStorageFileSelectionContainer.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/storage/UserStorageFileSelectionContainer.vue
@@ -9,7 +9,7 @@
:download-in-new-window="true"
/>
<!-- TODO: push this right? -->
- <b-link class="card-link">Cancel</b-link>
+ <b-link class="card-link" @click="$emit('cancel')">Cancel</b-link>
</b-card>
</template>