This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch airavata-3016 in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit eddcb002826e7d3194aaef827888ad679c3834dc Author: Marcus Christie <[email protected]> AuthorDate: Mon May 27 17:41:30 2019 -0400 AIRAVATA-3032 Hide tmp input file upload dir in viewer --- django_airavata/apps/api/data_products_helper.py | 13 ++++++++----- django_airavata/apps/api/serializers.py | 2 ++ .../js/models/UserStorageDirectory.js | 8 +++++++- .../components/storage/UserStoragePathViewer.vue | 22 ++++++++++++---------- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/django_airavata/apps/api/data_products_helper.py b/django_airavata/apps/api/data_products_helper.py index 08ce7e0..759cae3 100644 --- a/django_airavata/apps/api/data_products_helper.py +++ b/django_airavata/apps/api/data_products_helper.py @@ -114,10 +114,12 @@ def listdir(request, path): created_time = datastore.get_created_time( request.user.username, dpath) size = datastore.size(request.user.username, dpath) - directories_data.append({'name': d, - 'path': dpath, - 'created_time': created_time, - 'size': size}) + directories_data.append({ + 'name': d, + 'path': dpath, + 'created_time': created_time, + 'size': size, + 'hidden': dpath == TMP_INPUT_FILE_UPLOAD_DIR}) files_data = [] for f in files: user_rel_path = os.path.join(path, f) @@ -130,7 +132,8 @@ def listdir(request, path): 'path': user_rel_path, 'data-product-uri': data_product_uri, 'created_time': created_time, - 'size': size}) + 'size': size, + 'hidden': False}) return directories_data, files_data else: raise ObjectDoesNotExist("User storage path does not exist") diff --git a/django_airavata/apps/api/serializers.py b/django_airavata/apps/api/serializers.py index 91a5d6b..e4141f1 100644 --- a/django_airavata/apps/api/serializers.py +++ b/django_airavata/apps/api/serializers.py @@ -760,6 +760,7 @@ class UserStorageFileSerializer(serializers.Serializer): dataProductURI = serializers.CharField(source='data-product-uri') createdTime = serializers.DateTimeField(source='created_time') size = serializers.IntegerField() + hidden = serializers.BooleanField() def get_downloadURL(self, file): """Getter for downloadURL field.""" @@ -775,6 +776,7 @@ class UserStorageDirectorySerializer(serializers.Serializer): path = serializers.CharField() createdTime = serializers.DateTimeField(source='created_time') size = serializers.IntegerField() + hidden = serializers.BooleanField() url = FullyEncodedHyperlinkedIdentityField( view_name='django_airavata_api:user-storage-items', lookup_field='path', diff --git a/django_airavata/apps/api/static/django_airavata_api/js/models/UserStorageDirectory.js b/django_airavata/apps/api/static/django_airavata_api/js/models/UserStorageDirectory.js index 83faa77..ef631a5 100644 --- a/django_airavata/apps/api/static/django_airavata_api/js/models/UserStorageDirectory.js +++ b/django_airavata/apps/api/static/django_airavata_api/js/models/UserStorageDirectory.js @@ -1,6 +1,12 @@ import BaseModel from "./BaseModel"; -const FIELDS = ["name", "path", { name: "createdTime", type: "date" }, "size"]; +const FIELDS = [ + "name", + "path", + { name: "createdTime", type: "date" }, + "size", + "hidden" +]; export default class UserStorageDirectory extends BaseModel { constructor(data = {}) { diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/storage/UserStoragePathViewer.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/storage/UserStoragePathViewer.vue index a2286f2..7b6826a 100644 --- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/storage/UserStoragePathViewer.vue +++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/storage/UserStoragePathViewer.vue @@ -82,16 +82,18 @@ export default { }, items() { if (this.userStoragePath) { - const dirs = this.userStoragePath.directories.map(d => { - return { - name: d.name, - path: d.path, - type: "dir", - createdTime: d.createdTime, - createdTimestamp: d.createdTime.getTime(), // for sorting - size: d.size - }; - }); + const dirs = this.userStoragePath.directories + .filter(d => !d.hidden) + .map(d => { + return { + name: d.name, + path: d.path, + type: "dir", + createdTime: d.createdTime, + createdTimestamp: d.createdTime.getTime(), // for sorting + size: d.size + }; + }); const files = this.userStoragePath.files.map(f => { return { name: f.name,
