From 6f48379abdd444ed69e030b25e47174b39129a5d Mon Sep 17 00:00:00 2001 From: Michal Klobukowski Date: Mon, 26 Nov 2018 10:39:48 +0100 Subject: [PATCH] Restore type filters to favorit-middleware-service Feature #14258 Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski --- .../favorite-panel-middleware-service.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/store/favorite-panel/favorite-panel-middleware-service.ts b/src/store/favorite-panel/favorite-panel-middleware-service.ts index 0d75ad1f..87f49f34 100644 --- a/src/store/favorite-panel/favorite-panel-middleware-service.ts +++ b/src/store/favorite-panel/favorite-panel-middleware-service.ts @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { DataExplorerMiddlewareService } from "../data-explorer/data-explorer-middleware-service"; -import { FavoritePanelColumnNames, FavoritePanelFilter } 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"; @@ -21,6 +21,8 @@ import { progressIndicatorActions } from '~/store/progress-indicator/progress-in 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'; export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareService { constructor(private services: ServiceRepository, id: string) { @@ -34,7 +36,8 @@ export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareServic } else { const columns = dataExplorer.columns as DataColumns; const sortColumn = getSortColumn(dataExplorer); - const typeFilters = this.getColumnFilters(columns, FavoritePanelColumnNames.TYPE); + const typeFilters = serializeSimpleObjectTypeFilters(getDataExplorerColumnFilters(columns, FavoritePanelColumnNames.TYPE)); + const linkOrder = new OrderBuilder(); const contentOrder = new OrderBuilder(); @@ -59,10 +62,10 @@ export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareServic linkOrder: linkOrder.getOrder(), contentOrder: contentOrder.getOrder(), filters: new FilterBuilder() - // TODO: update filters - // .addIsA("headUuid", typeFilters.map(filter => filter.type)) .addILike("name", dataExplorer.searchValue) - .getFilters() + .addIsA("headUuid", typeFilters) + .getFilters(), + }); api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId())); api.dispatch(resourcesActions.SET_RESOURCES(response.items)); -- 2.30.2