X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/bbcdcd7b7582b43ca4853e436df383ff9dda465a..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 a68d13bd..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,29 +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 { 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 { 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'; +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) { @@ -59,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) { @@ -88,7 +89,7 @@ export class CollectionsWithSameContentAddressMiddlewareService extends DataExpl .getFilters(), count: "none" }); - responseUsers.items.map(it => { + responseUsers.items.forEach(it => { api.dispatch(ownerNameActions.SET_OWNER_NAME({ name: it.uuid === userUuid ? 'User: Me' @@ -96,7 +97,7 @@ export class CollectionsWithSameContentAddressMiddlewareService extends DataExpl uuid: it.uuid })); }); - responseGroups.items.map(it => { + responseGroups.items.forEach(it => { api.dispatch(ownerNameActions.SET_OWNER_NAME({ name: `Project: ${it.name}`, uuid: it.uuid })); }); api.dispatch(setBreadcrumbs([{ label: 'Projects', uuid: userUuid }]));