Update filters in views so that the code can be compiled, leave TODO markers to guide...

[arvados-workbench2.git] / 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 90838b207a559292ac538fbe62a02571233cbd30..e6cee25ef559b54233bfb8889dfe7708982fe0e3 100644 (file)
--- a/src/store/trash-panel/trash-panel-middleware-service.ts
+++ b/src/store/trash-panel/trash-panel-middleware-service.ts
@@ -22,6 +22,7 @@ import { updateFavorites } from "~/store/favorites/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";
 
 export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService {
     constructor(private services: ServiceRepository, id: string) {
@@ -30,8 +31,8 @@ export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService {
 
     async requestItems(api: MiddlewareAPI<Dispatch, RootState>) {
         const dataExplorer = api.getState().dataExplorer[this.getId()];
-        const columns = dataExplorer.columns as DataColumns<string, TrashPanelFilter>;
-        const sortColumn = dataExplorer.columns.find(c => c.sortDirection !== SortDirection.NONE);
+        const columns = dataExplorer.columns as DataColumns<string>;
+        const sortColumn = getSortColumn(dataExplorer);
         const typeFilters = this.getColumnFilters(columns, TrashPanelColumnNames.TYPE);
 
         const order = new OrderBuilder<ProjectResource>();
@@ -55,7 +56,8 @@ export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService {
                     ...dataExplorerToListParams(dataExplorer),
                     order: order.getOrder(),
                     filters: new FilterBuilder()
-                        .addIsA("uuid", typeFilters.map(f => f.type))
+                        // TODO: update filters
+                        // .addIsA("uuid", typeFilters.map(f => f.type))
                         .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.COLLECTION)
                         .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.PROJECT)
                         .addEqual("is_trashed", true)