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

[arvados.git] / src / store / project-panel / project-panel-middleware-service.ts

diff --git a/src/store/project-panel/project-panel-middleware-service.ts b/src/store/project-panel/project-panel-middleware-service.ts
index 5c828be300a5b95e499efb15c2efceb3d997ac9d..8d3f06a59b3732637a9c2c73997ecbb8f8956151 100644 (file)
--- a/src/store/project-panel/project-panel-middleware-service.ts
+++ b/src/store/project-panel/project-panel-middleware-service.ts
@@ -3,11 +3,10 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { DataExplorerMiddlewareService } from "../data-explorer/data-explorer-middleware-service";
-import { columns, ProjectPanelColumnNames, ProjectPanelFilter } from "../../views/project-panel/project-panel";
-import { getDataExplorer } from "../data-explorer/data-explorer-reducer";
+import { ProjectPanelColumnNames, ProjectPanelFilter } from "../../views/project-panel/project-panel";
 import { RootState } from "../store";
 import { DataColumns } from "../../components/data-table/data-table";
-import { groupsService } from "../../services/services";
+import { ServiceRepository } from "../../services/services";
 import { ProjectPanelItem, resourceToDataItem } from "../../views/project-panel/project-panel-item";
 import { SortDirection } from "../../components/data-table/data-column";
 import { OrderBuilder } from "../../common/api/order-builder";
@@ -16,39 +15,23 @@ import { ProcessResource } from "../../models/process";
 import { GroupContentsResourcePrefix, GroupContentsResource } from "../../services/groups-service/groups-service";
 import { checkPresenceInFavorites } from "../favorites/favorites-actions";
 import { projectPanelActions } from "./project-panel-action";
+import { Dispatch, MiddlewareAPI } from "redux";
 
 export class ProjectPanelMiddlewareService extends DataExplorerMiddlewareService {
-
-    private static instance: ProjectPanelMiddlewareService;
-
-    static getInstance() {
-        return ProjectPanelMiddlewareService.instance
-            ? ProjectPanelMiddlewareService.instance
-            : new ProjectPanelMiddlewareService();
-    }
-
-    private constructor() {
-        super();
-    }
-
-    get Id() {
-        return "projectPanel";
-    }
-
-    get Columns() {
-        return columns;
+    constructor(private services: ServiceRepository, id: string) {
+        super(id);
     }
 
-    requestItems() {
-        const state = this.api.getState() as RootState;
-        const dataExplorer = getDataExplorer(state.dataExplorer, this.Id);
+    requestItems(api: MiddlewareAPI<Dispatch, RootState>) {
+        const state = api.getState();
+        const dataExplorer = state.dataExplorer[this.getId()];
         const columns = dataExplorer.columns as DataColumns<ProjectPanelItem, ProjectPanelFilter>;
         const typeFilters = getColumnFilters(columns, ProjectPanelColumnNames.TYPE);
         const statusFilters = getColumnFilters(columns, ProjectPanelColumnNames.STATUS);
         const sortColumn = dataExplorer.columns.find(({ sortDirection }) => Boolean(sortDirection && sortDirection !== "none"));
         const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC ? SortDirection.ASC : SortDirection.DESC;
         if (typeFilters.length > 0) {
-            groupsService
+            this.services.groupsService
                 .contents(state.projects.currentItemId, {
                     limit: dataExplorer.rowsPerPage,
                     offset: dataExplorer.page * dataExplorer.rowsPerPage,
@@ -68,16 +51,16 @@ export class ProjectPanelMiddlewareService extends DataExplorerMiddlewareService
                         .concat(getSearchFilter(dataExplorer.searchValue))
                 })
                 .then(response => {
-                    this.api.dispatch(projectPanelActions.SET_ITEMS({
+                    api.dispatch(projectPanelActions.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(projectPanelActions.SET_ITEMS({
+            api.dispatch(projectPanelActions.SET_ITEMS({
                 items: [],
                 itemsAvailable: 0,
                 page: 0,
@@ -110,4 +93,4 @@ const getSearchFilter = (searchValue: string) =>
             FilterBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.PROJECT)]
             .reduce((acc, b) =>
                 acc.concat(b.addILike("name", searchValue)), FilterBuilder.create())
-        : FilterBuilder.create();
\ No newline at end of file
+        : FilterBuilder.create();