X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/1bbdd9c70d0099e0bf46b3c1ac55e423e3406314..33c03ae3c79936cc1a69129f07fba33fe2d28fd8:/src/store/favorite-panel/favorite-panel-middleware-service.ts diff --git a/src/store/favorite-panel/favorite-panel-middleware-service.ts b/src/store/favorite-panel/favorite-panel-middleware-service.ts index 87f49f34..c9a06fe6 100644 --- a/src/store/favorite-panel/favorite-panel-middleware-service.ts +++ b/src/store/favorite-panel/favorite-panel-middleware-service.ts @@ -5,6 +5,7 @@ import { DataExplorerMiddlewareService } from "~/store/data-explorer/data-explorer-middleware-service"; import { FavoritePanelColumnNames } from "~/views/favorite-panel/favorite-panel"; import { RootState } from "../store"; +import { getUserUuid } from "~/common/getuser"; import { DataColumns } from "~/components/data-table/data-table"; import { ServiceRepository } from "~/services/services"; import { SortDirection } from "~/components/data-table/data-column"; @@ -23,6 +24,8 @@ import { loadMissingProcessesInformation } from "~/store/project-panel/project-p import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer"; import { getDataExplorerColumnFilters } from '~/store/data-explorer/data-explorer-middleware-service'; import { serializeSimpleObjectTypeFilters } from '../resource-type-filters/resource-type-filters'; +import { ResourceKind } from "~/models/resource"; +import { LinkClass } from "~/models/link"; export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareService { constructor(private services: ServiceRepository, id: string) { @@ -55,28 +58,55 @@ export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareServic } try { api.dispatch(progressIndicatorActions.START_WORKING(this.getId())); - const response = await this.services.favoriteService - .list(this.services.authService.getUuid()!, { - limit: dataExplorer.rowsPerPage, - offset: dataExplorer.page * dataExplorer.rowsPerPage, - linkOrder: linkOrder.getOrder(), - contentOrder: contentOrder.getOrder(), - filters: new FilterBuilder() - .addILike("name", dataExplorer.searchValue) - .addIsA("headUuid", typeFilters) - .getFilters(), + const responseLinks = await this.services.linkService.list({ + filters: new FilterBuilder() + .addEqual("link_class", LinkClass.STAR) + .addEqual('tail_uuid', getUserUuid(api.getState())) + .addEqual('tail_kind', ResourceKind.USER) + .getFilters() + }).then(results => results); + const uuids = responseLinks.items.map(it => it.headUuid); + const groupItems: any = await this.services.groupsService.list({ + filters: new FilterBuilder() + .addIn("uuid", uuids) + .addILike("name", dataExplorer.searchValue) + .addIsA("uuid", typeFilters) + .getFilters() + }); + const collectionItems: any = await this.services.collectionService.list({ + filters: new FilterBuilder() + .addIn("uuid", uuids) + .addILike("name", dataExplorer.searchValue) + .addIsA("uuid", typeFilters) + .getFilters() + }); + const processItems: any = await this.services.containerRequestService.list({ + filters: new FilterBuilder() + .addIn("uuid", uuids) + .addILike("name", dataExplorer.searchValue) + .addIsA("uuid", typeFilters) + .getFilters() + }); + const response = groupItems; + collectionItems.items.map((it: any) => { + response.itemsAvailable++; + response.items.push(it); + }); + processItems.items.map((it: any) => { + response.itemsAvailable++; + response.items.push(it); + }); - }); api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId())); api.dispatch(resourcesActions.SET_RESOURCES(response.items)); await api.dispatch(loadMissingProcessesInformation(response.items)); api.dispatch(favoritePanelActions.SET_ITEMS({ - items: response.items.map(resource => resource.uuid), + items: response.items.map((resource: any) => resource.uuid), itemsAvailable: response.itemsAvailable, page: Math.floor(response.offset / response.limit), rowsPerPage: response.limit })); - api.dispatch(updateFavorites(response.items.map(item => item.uuid))); + api.dispatch(updateFavorites(response.items.map((item: any) => item.uuid))); } catch (e) { api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId())); api.dispatch(favoritePanelActions.SET_ITEMS({ @@ -93,7 +123,8 @@ export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareServic const favoritesPanelDataExplorerIsNotSet = () => snackbarActions.OPEN_SNACKBAR({ - message: 'Favorites panel is not ready.' + message: 'Favorites panel is not ready.', + kind: SnackbarKind.ERROR }); const couldNotFetchFavoritesContents = () =>