From: Daniel Kutyła <daniel.kutyla@contractors.roche.com>
Date: Tue, 29 Mar 2022 15:33:17 +0000 (+0200)
Subject: Merge branch 'fixed-failing-test-in-main' into main
X-Git-Tag: 2.4.0~3
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/079923a5211b0a7a8c234657b6bb804ef52669a3?hp=5e020488f67b5bc919796e0dc8b0b9f3b3ff23b0

Merge branch 'fixed-failing-test-in-main' into main
refs #18834

Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla@contractors.roche.com>
---

diff --git a/src/services/collection-service/collection-service.ts b/src/services/collection-service/collection-service.ts
index a3a7cf8f..0bddc82b 100644
--- a/src/services/collection-service/collection-service.ts
+++ b/src/services/collection-service/collection-service.ts
@@ -40,11 +40,11 @@ export class CollectionService extends TrashableResourceService<CollectionResour
             listArgs.select = select;
         }
 
-        if (session) {
+        if (!session) {
             const lst = await super.list(listArgs, showErrors);
             return lst.items[0];
         } else {
-            return super.get(uuid, showErrors, session);
+            return super.get(uuid, showErrors, select, session);
         }
     }
 
diff --git a/src/views/search-results-panel/search-results-panel-view.tsx b/src/views/search-results-panel/search-results-panel-view.tsx
index 60fdd33e..e281035c 100644
--- a/src/views/search-results-panel/search-results-panel-view.tsx
+++ b/src/views/search-results-panel/search-results-panel-view.tsx
@@ -135,7 +135,7 @@ export const SearchResultsPanelView = withStyles(styles, { withTheme: true })(
 
                         if (sessions.length > 0) {
                             const session = sessions[0];
-                            const { name, ownerUuid } = await (service as any).get(searchUuid, false, session);
+                            const { name, ownerUuid } = await (service as any).get(searchUuid, false, undefined, session);
                             tmpPath.push(name);
                             searchUuid = ownerUuid;
                             itemKind = extractUuidKind(searchUuid);