Merge branch '17114-side-panel-tree-as-list'

[arvados.git] / src / store / collections-content-address-panel / collections-content-address-middleware-service.ts

diff --git a/src/store/collections-content-address-panel/collections-content-address-middleware-service.ts b/src/store/collections-content-address-panel/collections-content-address-middleware-service.ts
index dc0f2c52c3cb10ef1db17f9d6885fec5683477b8..e18922a75ea0aa8a31c5aedb2f2a2b7be9625ef4 100644 (file)
--- a/src/store/collections-content-address-panel/collections-content-address-middleware-service.ts
+++ b/src/store/collections-content-address-panel/collections-content-address-middleware-service.ts
@@ -24,6 +24,7 @@ import { updatePublicFavorites } from '~/store/public-favorites/public-favorites
 import { setBreadcrumbs } from '../breadcrumbs/breadcrumbs-actions';
 import { ResourceKind, extractUuidKind } from '~/models/resource';
 import { ownerNameActions } from '~/store/owner-name/owner-name-actions';
+import { getUserDisplayName } from '~/models/user';
 
 export class CollectionsWithSameContentAddressMiddlewareService extends DataExplorerMiddlewareService {
     constructor(private services: ServiceRepository, id: string) {
@@ -58,7 +59,8 @@ export class CollectionsWithSameContentAddressMiddlewareService extends DataExpl
                     filters: new FilterBuilder()
                         .addEqual('portable_data_hash', contentAddress)
                         .addILike("name", dataExplorer.searchValue)
-                        .getFilters()
+                        .getFilters(),
+                    includeOldVersions: true
                 });
                 const userUuids = response.items.map(it => {
                     if (extractUuidKind(it.ownerUuid) === ResourceKind.USER) {
@@ -76,21 +78,24 @@ export class CollectionsWithSameContentAddressMiddlewareService extends DataExpl
                     }
                 });
                 const responseUsers = await this.services.userService.list({
-                    limit: dataExplorer.rowsPerPage,
-                    offset: dataExplorer.page * dataExplorer.rowsPerPage,
                     filters: new FilterBuilder()
                         .addIn('uuid', userUuids)
-                        .getFilters()
+                        .getFilters(),
+                    count: "none"
                 });
                 const responseGroups = await this.services.groupsService.list({
-                    limit: dataExplorer.rowsPerPage,
-                    offset: dataExplorer.page * dataExplorer.rowsPerPage,
                     filters: new FilterBuilder()
                         .addIn('uuid', groupUuids)
-                        .getFilters()
+                        .getFilters(),
+                    count: "none"
                 });
                 responseUsers.items.map(it => {
-                    api.dispatch<any>(ownerNameActions.SET_OWNER_NAME({ name: it.uuid === userUuid ? 'User: Me' : `User: ${it.firstName} ${it.lastName}`, uuid: it.uuid }));
+                    api.dispatch<any>(ownerNameActions.SET_OWNER_NAME({
+                        name: it.uuid === userUuid
+                            ? 'User: Me'
+                            : `User: ${getUserDisplayName(it)}`,
+                        uuid: it.uuid
+                    }));
                 });
                 responseGroups.items.map(it => {
                     api.dispatch<any>(ownerNameActions.SET_OWNER_NAME({ name: `Project: ${it.name}`, uuid: it.uuid }));