projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14990: added 404 page with wildcard route
[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 57d09bf4be1c90f552a1f9c592b84ba5e5bdf8c9..72da1d2e0144927395175ad4739f227b9cb02071 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 { 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) {
export class CollectionsWithSameContentAddressMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
@@
-56,7
+57,7
@@
export class CollectionsWithSameContentAddressMiddlewareService extends DataExpl
limit: dataExplorer.rowsPerPage,
offset: dataExplorer.page * dataExplorer.rowsPerPage,
filters: new FilterBuilder()
limit: dataExplorer.rowsPerPage,
offset: dataExplorer.page * dataExplorer.rowsPerPage,
filters: new FilterBuilder()
- .addEqual('portable
DataH
ash', contentAddress)
+ .addEqual('portable
_data_h
ash', contentAddress)
.addILike("name", dataExplorer.searchValue)
.getFilters()
});
.addILike("name", dataExplorer.searchValue)
.getFilters()
});
@@
-90,7
+91,11
@@
export class CollectionsWithSameContentAddressMiddlewareService extends DataExpl
.getFilters()
});
responseUsers.items.map(it => {
.getFilters()
});
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 }));
});
responseGroups.items.map(it => {
api.dispatch<any>(ownerNameActions.SET_OWNER_NAME({ name: `Project: ${it.name}`, uuid: it.uuid }));