X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4ea2ff188ec745966387ce8bbe14880bfeede863..24e864bc823b27ac27c39e9e5879987924330007:/src/store/trash-panel/trash-panel-middleware-service.ts diff --git a/src/store/trash-panel/trash-panel-middleware-service.ts b/src/store/trash-panel/trash-panel-middleware-service.ts index f52421a1d6..f5173fc98c 100644 --- a/src/store/trash-panel/trash-panel-middleware-service.ts +++ b/src/store/trash-panel/trash-panel-middleware-service.ts @@ -15,17 +15,17 @@ import { trashPanelActions } from "./trash-panel-action"; import { Dispatch, MiddlewareAPI } from "redux"; import { OrderBuilder, OrderDirection } from "~/services/api/order-builder"; import { GroupContentsResourcePrefix } from "~/services/groups-service/groups-service"; -import { TrashPanelColumnNames, TrashPanelFilter } from "~/views/trash-panel/trash-panel"; import { ProjectResource } from "~/models/project"; import { ProjectPanelColumnNames } from "~/views/project-panel/project-panel"; import { updateFavorites } from "~/store/favorites/favorites-actions"; +import { updatePublicFavorites } from '~/store/public-favorites/public-favorites-actions'; import { snackbarActions, SnackbarKind } from "~/store/snackbar/snackbar-actions"; import { updateResources } from "~/store/resources/resources-actions"; import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions"; import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer"; import { serializeResourceTypeFilters } from '~/store//resource-type-filters/resource-type-filters'; import { getDataExplorerColumnFilters } from '~/store/data-explorer/data-explorer-middleware-service'; -import { joinFilters } from '../../services/api/filter-builder'; +import { joinFilters } from '~/services/api/filter-builder'; export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService { constructor(private services: ServiceRepository, id: string) { @@ -41,7 +41,7 @@ export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService { const otherFilters = new FilterBuilder() .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.COLLECTION) - .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.PROCESS) + // .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.PROCESS) .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.PROJECT) .addEqual("is_trashed", true) .getFilters(); @@ -84,6 +84,7 @@ export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService { items })); api.dispatch(updateFavorites(items)); + api.dispatch(updatePublicFavorites(items)); api.dispatch(updateResources(listResults.items)); } catch (e) { api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));