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

refs #13903

Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki@contractors.roche.com>

diff --cc src/store/store.ts
index 826a25d0256b4e9947fa710bad0df96195e7a428,53a01e2a3a335bdad525a3dc56adefdd062f50f1..73b73f9976682756619341972c2867261018888b
--- 1/src/store/store.ts
--- 2/src/store/store.ts
+++ b/src/store/store.ts
@@@ -17,9 -16,13 +16,13 @@@ import { contextMenuReducer, ContextMen
  import { reducer as formReducer } from 'redux-form';
  import { FavoritesState, favoritesReducer } from './favorites/favorites-reducer';
  import { snackbarReducer, SnackbarState } from './snackbar/snackbar-reducer';
 -import { CollectionCreatorState, collectionCreationReducer } from './collections/creator/collection-creator-reducer';
+ import { dataExplorerMiddleware } from "./data-explorer/data-explorer-middleware";
+ import { FAVORITE_PANEL_ID } from "./favorite-panel/favorite-panel-action";
+ import { PROJECT_PANEL_ID } from "./project-panel/project-panel-action";
+ import { ProjectPanelMiddlewareService } from "./project-panel/project-panel-middleware-service";
+ import { FavoritePanelMiddlewareService } from "./favorite-panel/favorite-panel-middleware-service";
  import { CollectionPanelState, collectionPanelReducer } from './collection-panel/collection-panel-reducer';
 +import { CollectionsState, collectionsReducer } from './collections/collections-reducer';
  
  const composeEnhancers =
      (process.env.NODE_ENV === 'development' &&

diff --cc src/views-components/context-menu/action-sets/collection-action-set.ts
index 9e3ff348245d2704bc4502cbee5425cc3069ab0d,fbb5c864b8a2a608a5b5904229054b50728a9f66..566f8f12e41c85cef26b7b945544b8c050811996
--- 1/src/views-components/context-menu/action-sets/collection-action-set.ts
--- 2/src/views-components/context-menu/action-sets/collection-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-action-set.ts
@@@ -5,10 -5,9 +5,9 @@@
  import { ContextMenuActionSet } from "../context-menu-action-set";
  import { ToggleFavoriteAction } from "../actions/favorite-action";
  import { toggleFavorite } from "../../../store/favorites/favorites-actions";
--import { dataExplorerActions } from "../../../store/data-explorer/data-explorer-action";
- import { FAVORITE_PANEL_ID } from "../../../views/favorite-panel/favorite-panel";
  import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, ProvenanceGraphIcon, AdvancedIcon, RemoveIcon } from "../../../components/icon/icon";
 +import { openUpdator } from "../../../store/collections/updator/collection-updator-action";
+ import { favoritePanelActions } from "../../../store/favorite-panel/favorite-panel-action";
  
  export const collectionActionSet: ContextMenuActionSet = [[
      {
@@@ -36,7 -35,7 +35,7 @@@
          component: ToggleFavoriteAction,
          execute: (dispatch, resource) => {
              dispatch<any>(toggleFavorite(resource)).then(() => {
-                 dispatch<any>(dataExplorerActions.REQUEST_ITEMS({ id: FAVORITE_PANEL_ID }));
 -                dispatch<any>(favoritePanelActions.REQUEST_ITEMS());
++                dispatch<any>(favoritePanelActions.REQUEST_ITEMS());           
              });
          }
      },

diff --cc src/views/workbench/workbench.tsx
Simple merge