hide trash folder for Community Data and published projects (#1093)

Co-authored-by: Jake Rosenberg <[email protected]>
DesignSafe-CI · Sep 13, 2023 · 2817aa8 · 2817aa8
1 parent a03e1df
commit 2817aa8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...e/static/scripts/data-depot/components/data-depot-listing/data-depot-listing.component.js b/...e/static/scripts/data-depot/components/data-depot-listing/data-depot-listing.component.js
@@ -224,6 +224,7 @@ class FilesListingCtrl {
  this.FileOperationService = FileOperationService;
  this.PublicationService = PublicationService;
  this.handleScroll = this.handleScroll.bind(this);
+ this.filterTrash = this.filterTrash.bind(this);
  }
 
  $onInit() {
@@ -236,6 +237,12 @@ class FilesListingCtrl {
  }
  }
 
+ filterTrash(f) {
+ // Don't display the trash folder in Community listings.
+ return !(['designsafe.storage.community', 'designsafe.storage.published'].includes(this.listing.params.system) 
+ && f.name.toLowerCase() === '.trash')
+ }
+
  browse($event, file) {
  $event.preventDefault();
  $event.stopPropagation();

diff --git a/...nsafe/static/scripts/data-depot/components/data-depot-listing/files-listing.template.html b/...nsafe/static/scripts/data-depot/components/data-depot-listing/files-listing.template.html
@@ -26,7 +26,7 @@
  </thead>
  <tbody>
  <tr
- data-ng-repeat="item in $ctrl.listing.listing"
+ data-ng-repeat="item in $ctrl.listing.listing.filter($ctrl.filterTrash)"
  ng-class="{highlight: item.selected}"
  >
  <td class="unselectable">