21225: Rename project panel middleware to data middleware and separate data explorer

[arvados.git] / services / workbench2 / src / store / favorite-panel / favorite-panel-middleware-service.ts

diff --git a/services/workbench2/src/store/favorite-panel/favorite-panel-middleware-service.ts b/services/workbench2/src/store/favorite-panel/favorite-panel-middleware-service.ts
index 0229834c3bc148ee6c48e64fdca945e11716b80c..f61ec392409287c64d228859099be8af9a79883b 100644 (file)
--- a/services/workbench2/src/store/favorite-panel/favorite-panel-middleware-service.ts
+++ b/services/workbench2/src/store/favorite-panel/favorite-panel-middleware-service.ts
@@ -16,7 +16,7 @@ import { resourcesActions } from "store/resources/resources-actions";
 import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
 import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions';
 import { getDataExplorer } from "store/data-explorer/data-explorer-reducer";
-import { loadMissingProcessesInformation } from "store/project-panel/project-panel-middleware-service";
+import { loadMissingProcessesInformation } from "store/project-panel/project-panel-data-middleware-service";
 import { getDataExplorerColumnFilters } from 'store/data-explorer/data-explorer-middleware-service';
 import { serializeSimpleObjectTypeFilters } from '../resource-type-filters/resource-type-filters';
 import { ResourceKind } from "models/resource";
@@ -77,7 +77,6 @@ export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareServic
                     response.items.push(it);
                 });
 
-                api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
                 api.dispatch(resourcesActions.SET_RESOURCES(response.items));
                 await api.dispatch<any>(loadMissingProcessesInformation(response.items));
                 api.dispatch(favoritePanelActions.SET_ITEMS({
@@ -87,8 +86,8 @@ export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareServic
                     rowsPerPage: response.limit
                 }));
                 api.dispatch<any>(updateFavorites(response.items.map((item: any) => item.uuid)));
-            } catch (e) {
                 api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
+            } catch (e) {
                 api.dispatch(favoritePanelActions.SET_ITEMS({
                     items: [],
                     itemsAvailable: 0,
@@ -96,6 +95,7 @@ export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareServic
                     rowsPerPage: dataExplorer.rowsPerPage
                 }));
                 api.dispatch(couldNotFetchFavoritesContents());
+                api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
             }
         }
     }