X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/71b9264c1720e619f8cfcb297a7848ece420c61c..0ea102c171d9c9e3fae5a0fd1e8e1e5e4a25c4d6:/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 9f80b476..f88f7b91 100644 --- a/src/store/favorite-panel/favorite-panel-middleware-service.ts +++ b/src/store/favorite-panel/favorite-panel-middleware-service.ts @@ -2,27 +2,30 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { DataExplorerMiddlewareService } from "~/store/data-explorer/data-explorer-middleware-service"; -import { FavoritePanelColumnNames } from "~/views/favorite-panel/favorite-panel"; +import { DataExplorerMiddlewareService } from "store/data-explorer/data-explorer-middleware-service"; +import { FavoritePanelColumnNames } from "views/favorite-panel/favorite-panel"; import { RootState } from "../store"; -import { DataColumns } from "~/components/data-table/data-table"; -import { ServiceRepository } from "~/services/services"; -import { SortDirection } from "~/components/data-table/data-column"; -import { FilterBuilder } from "~/services/api/filter-builder"; +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"; +import { FilterBuilder } from "services/api/filter-builder"; import { updateFavorites } from "../favorites/favorites-actions"; import { favoritePanelActions } from "./favorite-panel-action"; import { Dispatch, MiddlewareAPI } from "redux"; -import { OrderBuilder, OrderDirection } from "~/services/api/order-builder"; -import { LinkResource } from "~/models/link"; -import { GroupContentsResource, GroupContentsResourcePrefix } from "~/services/groups-service/groups-service"; -import { resourcesActions } from "~/store/resources/resources-actions"; -import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions'; -import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions.ts'; -import { getDataExplorer } from "~/store/data-explorer/data-explorer-reducer"; -import { loadMissingProcessesInformation } from "~/store/project-panel/project-panel-middleware-service"; -import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer"; -import { getDataExplorerColumnFilters } from '~/store/data-explorer/data-explorer-middleware-service'; +import { OrderBuilder, OrderDirection } from "services/api/order-builder"; +import { LinkResource } from "models/link"; +import { GroupContentsResource, GroupContentsResourcePrefix } from "services/groups-service/groups-service"; +import { resourcesActions } from "store/resources/resources-actions"; +import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions'; +import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions'; +import { getDataExplorer } from "store/data-explorer/data-explorer-reducer"; +import { loadMissingProcessesInformation } from "store/project-panel/project-panel-middleware-service"; +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.forEach((it: any) => { + response.itemsAvailable++; + response.items.push(it); + }); + processItems.items.forEach((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({