From: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
Date: Mon, 17 Dec 2018 14:51:40 +0000 (+0100)
Subject: Merge branch 'master'
X-Git-Tag: 1.4.0~71^2~18^2
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/d4b18e45f319eb0885442ab1b64a01683630e38b

Merge branch 'master'

Feature #14505

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
---

d4b18e45f319eb0885442ab1b64a01683630e38b
diff --cc src/store/store.ts
index 3aef8f50,d196e632..14a6ba11
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@@ -48,14 -48,11 +48,15 @@@ import { repositoriesReducer } from '~/
  import { keepServicesReducer } from '~/store/keep-services/keep-services-reducer';
  import { UserMiddlewareService } from '~/store/users/user-panel-middleware-service';
  import { USERS_PANEL_ID } from '~/store/users/users-actions';
- import { computeNodesReducer } from '~/store/compute-nodes/compute-nodes-reducer';
  import { apiClientAuthorizationsReducer } from '~/store/api-client-authorizations/api-client-authorizations-reducer';
 +import { GroupsPanelMiddlewareService } from '~/store/groups-panel/groups-panel-middleware-service';
 +import { GROUPS_PANEL_ID } from '~/store/groups-panel/groups-panel-actions';
 +import { GroupDetailsPanelMiddlewareService } from '~/store/group-details-panel/group-details-panel-middleware-service';
 +import { GROUP_DETAILS_PANEL_ID } from '~/store/group-details-panel/group-details-panel-actions';
  import { LINK_PANEL_ID } from '~/store/link-panel/link-panel-actions';
  import { LinkMiddlewareService } from '~/store/link-panel/link-panel-middleware-service';
+ import { COMPUTE_NODE_PANEL_ID } from '~/store/compute-nodes/compute-nodes-actions';
+ import { ComputeNodeMiddlewareService } from '~/store/compute-nodes/compute-nodes-middleware-service';
  
  const composeEnhancers =
      (process.env.NODE_ENV === 'development' &&
@@@ -110,9 -103,8 +114,10 @@@ export function configureStore(history
          sharedWithMePanelMiddleware,
          workflowPanelMiddleware,
          userPanelMiddleware,
 +        groupsPanelMiddleware,
 +        groupDetailsPanelMiddleware,
-         linkPanelMiddleware
+         linkPanelMiddleware,
 -        computeNodeMiddleware
++        computeNodeMiddleware,
      ];
      const enhancer = composeEnhancers(applyMiddleware(...middlewares));
      return createStore(rootReducer, enhancer);
diff --cc src/store/workbench/workbench-actions.ts
index af2afab2,e42e6c3e..5e9dc285
--- a/src/store/workbench/workbench-actions.ts
+++ b/src/store/workbench/workbench-actions.ts
@@@ -60,14 -60,11 +60,15 @@@ import { loadRepositoriesPanel } from '
  import { loadKeepServicesPanel } from '~/store/keep-services/keep-services-actions';
  import { loadUsersPanel, userBindedActions } from '~/store/users/users-actions';
  import { loadLinkPanel, linkPanelActions } from '~/store/link-panel/link-panel-actions';
+ import { loadComputeNodesPanel, computeNodesActions } from '~/store/compute-nodes/compute-nodes-actions';
  import { linkPanelColumns } from '~/views/link-panel/link-panel-root';
  import { userPanelColumns } from '~/views/user-panel/user-panel';
- import { loadComputeNodesPanel } from '~/store/compute-nodes/compute-nodes-actions';
+ import { computeNodePanelColumns } from '~/views/compute-node-panel/compute-node-panel-root';
  import { loadApiClientAuthorizationsPanel } from '~/store/api-client-authorizations/api-client-authorizations-actions';
 +import * as groupPanelActions from '~/store/groups-panel/groups-panel-actions';
 +import { groupsPanelColumns } from '~/views/groups-panel/groups-panel';
 +import * as groupDetailsPanelActions from '~/store/group-details-panel/group-details-panel-actions';
 +import { groupDetailsPanelColumns } from '~/views/group-details-panel/group-details-panel';
  
  export const WORKBENCH_LOADING_SCREEN = 'workbenchLoadingScreen';
  
@@@ -102,9 -99,8 +103,10 @@@ export const loadWorkbench = () =
                  dispatch(workflowPanelActions.SET_COLUMNS({ columns: workflowPanelColumns }));
                  dispatch(searchResultsPanelActions.SET_COLUMNS({ columns: searchResultsPanelColumns }));
                  dispatch(userBindedActions.SET_COLUMNS({ columns: userPanelColumns }));
 +                dispatch(groupPanelActions.GroupsPanelActions.SET_COLUMNS({ columns: groupsPanelColumns }));
 +                dispatch(groupDetailsPanelActions.GroupDetailsPanelActions.SET_COLUMNS({columns: groupDetailsPanelColumns}));
                  dispatch(linkPanelActions.SET_COLUMNS({ columns: linkPanelColumns }));
+                 dispatch(computeNodesActions.SET_COLUMNS({ columns: computeNodePanelColumns }));
                  dispatch<any>(initSidePanelTree());
                  if (router.location) {
                      const match = matchRootRoute(router.location.pathname);