20603: Trash shows all items, not just those owned by user

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/src/services/groups-service/groups-service.ts b/src/services/groups-service/groups-service.ts
index fc6033002dccea2532e27dfe361eaa354747f860..b9f47df0dbb97e01e7f020c84ebf2eb1139c4339 100644 (file)
--- a/src/services/groups-service/groups-service.ts
+++ b/src/services/groups-service/groups-service.ts
@@ -60,7 +60,7 @@ export class GroupsService<
                 }))
                 : undefined
         };
-        const pathUrl = uuid ? `/${uuid}/contents` : '/contents';
+        const pathUrl = (uuid !== '') ? `/${uuid}/contents` : '/contents';
         const cfg: AxiosRequestConfig = {
             params: CommonResourceService.mapKeys(snakeCase)(params),
         };

diff --git a/src/store/trash-panel/trash-panel-middleware-service.ts b/src/store/trash-panel/trash-panel-middleware-service.ts
index bed3e62859b73c52bae07259599e2066afe8ef1f..e63365103319c709de6a7405e594409662e1148b 100644 (file)
--- a/src/store/trash-panel/trash-panel-middleware-service.ts
+++ b/src/store/trash-panel/trash-panel-middleware-service.ts
@@ -56,7 +56,7 @@ export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService {
         try {
             api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
             const listResults = await this.services.groupsService
-                .contents(userUuid, {
+                .contents('', {
                     ...dataExplorerToListParams(dataExplorer),
                     order: getOrder(dataExplorer),
                     filters,