X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/264be0e4b5adc7bf81181505c446d83628f84bfb..ae946826d1670cb786688e859bc1f3257150ae75:/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 0e35d93f..983b309a 100644 --- 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 @@ -2,25 +2,29 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { ServiceRepository } from '~/services/services'; +import { ServiceRepository } from 'services/services'; import { MiddlewareAPI, Dispatch } from 'redux'; -import { DataExplorerMiddlewareService } from '~/store/data-explorer/data-explorer-middleware-service'; -import { RootState } from '~/store/store'; -import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions'; -import { getDataExplorer } from '~/store/data-explorer/data-explorer-reducer'; -import { resourcesActions } from '~/store/resources/resources-actions'; -import { FilterBuilder } from '~/services/api/filter-builder'; -import { SortDirection } from '~/components/data-table/data-column'; -import { OrderDirection, OrderBuilder } from '~/services/api/order-builder'; -import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer"; -import { FavoritePanelColumnNames } from '~/views/favorite-panel/favorite-panel'; -import { GroupContentsResource, GroupContentsResourcePrefix } from '~/services/groups-service/groups-service'; -import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions'; +import { DataExplorerMiddlewareService } from 'store/data-explorer/data-explorer-middleware-service'; +import { RootState } from 'store/store'; +import { getUserUuid } from "common/getuser"; +import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions'; +import { getDataExplorer } from 'store/data-explorer/data-explorer-reducer'; +import { resourcesActions } from 'store/resources/resources-actions'; +import { FilterBuilder } from 'services/api/filter-builder'; +import { SortDirection } from 'components/data-table/data-column'; +import { OrderDirection, OrderBuilder } from 'services/api/order-builder'; +import { getSortColumn } from "store/data-explorer/data-explorer-reducer"; +import { FavoritePanelColumnNames } from 'views/favorite-panel/favorite-panel'; +import { GroupContentsResource, GroupContentsResourcePrefix } from 'services/groups-service/groups-service'; +import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions'; import { collectionsContentAddressActions } from './collections-content-address-panel-actions'; -import { navigateTo } from '~/store/navigation/navigation-action'; -import { updateFavorites } from '~/store/favorites/favorites-actions'; -import { updatePublicFavorites } from '~/store/public-favorites/public-favorites-actions'; +import { navigateTo } from 'store/navigation/navigation-action'; +import { updateFavorites } from 'store/favorites/favorites-actions'; +import { updatePublicFavorites } from 'store/public-favorites/public-favorites-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) { @@ -46,16 +50,55 @@ export class CollectionsWithSameContentAddressMiddlewareService extends DataExpl } try { api.dispatch(progressIndicatorActions.START_WORKING(this.getId())); - const userUuid = api.getState().auth.user!.uuid; + const userUuid = getUserUuid(api.getState()); const pathname = api.getState().router.location!.pathname; const contentAddress = pathname.split('/')[2]; const response = await this.services.collectionService.list({ limit: dataExplorer.rowsPerPage, offset: dataExplorer.page * dataExplorer.rowsPerPage, filters: new FilterBuilder() - .addEqual('portableDataHash', contentAddress) + .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) { + return it.ownerUuid; + } else { + return ''; + } + } + ); + const groupUuids = response.items.map(it => { + if (extractUuidKind(it.ownerUuid) === ResourceKind.GROUP) { + return it.ownerUuid; + } else { + return ''; + } + }); + const responseUsers = await this.services.userService.list({ + filters: new FilterBuilder() + .addIn('uuid', userUuids) + .getFilters(), + count: "none" + }); + const responseGroups = await this.services.groupsService.list({ + filters: new FilterBuilder() + .addIn('uuid', groupUuids) + .getFilters(), + count: "none" + }); + responseUsers.items.forEach(it => { + api.dispatch(ownerNameActions.SET_OWNER_NAME({ + name: it.uuid === userUuid + ? 'User: Me' + : `User: ${getUserDisplayName(it)}`, + uuid: it.uuid + })); + }); + responseGroups.items.forEach(it => { + api.dispatch(ownerNameActions.SET_OWNER_NAME({ name: `Project: ${it.name}`, uuid: it.uuid })); }); api.dispatch(setBreadcrumbs([{ label: 'Projects', uuid: userUuid }])); api.dispatch(updateFavorites(response.items.map(item => item.uuid))); @@ -97,4 +140,4 @@ const couldNotFetchCollections = () => snackbarActions.OPEN_SNACKBAR({ message: 'Could not fetch collection with this content address.', kind: SnackbarKind.ERROR - }); \ No newline at end of file + });