From: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
Date: Mon, 17 Dec 2018 16:10:26 +0000 (+0100)
Subject: Merge branch 'master' into 13540-add-possibility-to-open-files-in-third-party-apps
X-Git-Tag: 1.4.0~71^2~17^2
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/ec33904efe960ec3e3bddb668d892463171e50bd?hp=-c

Merge branch 'master' into 13540-add-possibility-to-open-files-in-third-party-apps

refs #13540

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

ec33904efe960ec3e3bddb668d892463171e50bd
diff --combined src/index.tsx
index 55d0b482,508fa7c3..7cd4ae9a
--- a/src/index.tsx
+++ b/src/index.tsx
@@@ -56,8 -56,9 +56,10 @@@ import { virtualMachineActionSet } fro
  import { userActionSet } from '~/views-components/context-menu/action-sets/user-action-set';
  import { computeNodeActionSet } from '~/views-components/context-menu/action-sets/compute-node-action-set';
  import { apiClientAuthorizationActionSet } from '~/views-components/context-menu/action-sets/api-client-authorization-action-set';
+ import { groupActionSet } from '~/views-components/context-menu/action-sets/group-action-set';
+ import { groupMemberActionSet } from '~/views-components/context-menu/action-sets/group-member-action-set';
  import { linkActionSet } from '~/views-components/context-menu/action-sets/link-action-set';
 +import { loadFileViewersConfig } from '~/store/file-viewers/file-viewers-actions';
  
  console.log(`Starting arvados [${getBuildInfo()}]`);
  
@@@ -82,6 -83,8 +84,8 @@@ addMenuActionSet(ContextMenuKind.USER, 
  addMenuActionSet(ContextMenuKind.LINK, linkActionSet);
  addMenuActionSet(ContextMenuKind.NODE, computeNodeActionSet);
  addMenuActionSet(ContextMenuKind.API_CLIENT_AUTHORIZATION, apiClientAuthorizationActionSet);
+ addMenuActionSet(ContextMenuKind.GROUPS, groupActionSet);
+ addMenuActionSet(ContextMenuKind.GROUP_MEMBER, groupMemberActionSet);
  
  fetchConfig()
      .then(({ config, apiHost }) => {
@@@ -103,7 -106,6 +107,7 @@@
          store.dispatch(setCurrentTokenDialogApiHost(apiHost));
          store.dispatch(setUuidPrefix(config.uuidPrefix));
          store.dispatch(loadVocabulary);
 +        store.dispatch(loadFileViewersConfig);
  
          const TokenComponent = (props: any) => <ApiToken authService={services.authService} {...props} />;
          const MainPanelComponent = (props: any) => <MainPanel {...props} />;