Merge branch 'master' into 13903-edit-collection-popup

[arvados.git] / 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 f688d41dac6c9d4e49433ea1b1d1334ae9a7e161..8908fff7083edc1d261239d057128a3bb60b2010 100644 (file)
--- a/src/store/favorite-panel/favorite-panel-middleware-service.ts
+++ b/src/store/favorite-panel/favorite-panel-middleware-service.ts
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { DataExplorerMiddlewareService } from "../data-explorer/data-explorer-middleware-service";
-import { columns, FavoritePanelFilter, FavoritePanelColumnNames } from "../../views/favorite-panel/favorite-panel";
+import { FavoritePanelFilter, FavoritePanelColumnNames } from "../../views/favorite-panel/favorite-panel";
 import { RootState } from "../store";
 import { DataColumns } from "../../components/data-table/data-table";
 import { FavoritePanelItem, resourceToDataItem } from "../../views/favorite-panel/favorite-panel-item";
@@ -14,21 +14,19 @@ import { FilterBuilder } from "../../common/api/filter-builder";
 import { LinkResource } from "../../models/link";
 import { checkPresenceInFavorites } from "../favorites/favorites-actions";
 import { favoritePanelActions } from "./favorite-panel-action";
+import { Dispatch, MiddlewareAPI } from "redux";
 
 export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareService {
     constructor(id: string) {
         super(id);
     }
 
-    getColumns() {
-        return columns;
-    }
-
-    requestItems() {
-        const state = this.api.getState() as RootState;
-        const dataExplorer = this.getDataExplorer();
+    requestItems(api: MiddlewareAPI<Dispatch, RootState>) {
+        const dataExplorer = api.getState().dataExplorer[this.getId()];
         const columns = dataExplorer.columns as DataColumns<FavoritePanelItem, FavoritePanelFilter>;
-        const sortColumn = dataExplorer.columns.find(({ sortDirection }) => Boolean(sortDirection && sortDirection !== "none"));
+        const sortColumn = dataExplorer.columns.find(
+            ({ sortDirection }) => sortDirection !== undefined && sortDirection !== "none"
+        );
         const typeFilters = getColumnFilters(columns, FavoritePanelColumnNames.TYPE);
         const order = FavoriteOrderBuilder.create();
         if (typeFilters.length > 0) {
@@ -47,16 +45,16 @@ export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareServic
                         .addILike("name", dataExplorer.searchValue)
                 })
                 .then(response => {
-                    this.api.dispatch(favoritePanelActions.SET_ITEMS({
+                    api.dispatch(favoritePanelActions.SET_ITEMS({
                         items: response.items.map(resourceToDataItem),
                         itemsAvailable: response.itemsAvailable,
                         page: Math.floor(response.offset / response.limit),
                         rowsPerPage: response.limit
                     }));
-                    this.api.dispatch<any>(checkPresenceInFavorites(response.items.map(item => item.uuid)));
+                    api.dispatch<any>(checkPresenceInFavorites(response.items.map(item => item.uuid)));
                 });
         } else {
-            this.api.dispatch(favoritePanelActions.SET_ITEMS({
+            api.dispatch(favoritePanelActions.SET_ITEMS({
                 items: [],
                 itemsAvailable: 0,
                 page: 0,