From: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
Date: Thu, 29 Nov 2018 09:42:35 +0000 (+0100)
Subject: Merge branch 'master' into 14393-vocabulary
X-Git-Tag: 1.3.0~5^2^2^2
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/b7de31f185fccd2f9b276c1e89754d288e7facfe?hp=-c

Merge branch 'master' into 14393-vocabulary

refs #14393

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

b7de31f185fccd2f9b276c1e89754d288e7facfe
diff --combined src/index.tsx
index 62db7f0f,ef658857..801a56a1
--- a/src/index.tsx
+++ b/src/index.tsx
@@@ -50,7 -50,6 +50,7 @@@ import HTML5Backend from 'react-dnd-htm
  import { initAdvanceFormProjectsTree } from '~/store/search-bar/search-bar-actions';
  import { repositoryActionSet } from '~/views-components/context-menu/action-sets/repository-action-set';
  import { sshKeyActionSet } from '~/views-components/context-menu/action-sets/ssh-key-action-set';
 +import { loadVocabulary } from '~/store/vocabulary/vocabulary-actions';
  
  console.log(`Starting arvados [${getBuildInfo()}]`);
  
@@@ -89,7 -88,6 +89,7 @@@ fetchConfig(
          store.dispatch(setBuildInfo());
          store.dispatch(setCurrentTokenDialogApiHost(apiHost));
          store.dispatch(setUuidPrefix(config.uuidPrefix));
 +        store.dispatch(loadVocabulary);
  
          const TokenComponent = (props: any) => <ApiToken authService={services.authService} {...props} />;
          const MainPanelComponent = (props: any) => <MainPanel {...props} />;
@@@ -306,3 -304,4 +306,4 @@@ const createSampleProcess = ({ containe
      });
  };
  
+ // force build comment #1
diff --combined src/services/services.ts
index b0d3ba67,f1ef86b8..b24b1d99
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@@ -24,9 -24,9 +24,10 @@@ import { ApiActions } from "~/services/
  import { WorkflowService } from "~/services/workflow-service/workflow-service";
  import { SearchService } from '~/services/search-service/search-service';
  import { PermissionService } from "~/services/permission-service/permission-service";
+ import { VirtualMachinesService } from "~/services/virtual-machines-service/virtual-machines-service";
  import { RepositoriesService } from '~/services/repositories-service/repositories-service';
  import { AuthorizedKeysService } from '~/services/authorized-keys-service/authorized-keys-service';
 +import { VocabularyService } from '~/services/vocabulary-service/vocabulary-service';
  
  export type ServiceRepository = ReturnType<typeof createServices>;
  
@@@ -48,6 -48,7 +49,7 @@@ export const createServices = (config: 
      const projectService = new ProjectService(apiClient, actions);
      const repositoriesService = new RepositoriesService(apiClient, actions);
      const userService = new UserService(apiClient, actions);
+     const virtualMachineService = new VirtualMachinesService(apiClient, actions);
      const workflowService = new WorkflowService(apiClient, actions);
  
      const ancestorsService = new AncestorService(groupsService, userService);
@@@ -57,7 -58,6 +59,7 @@@
      const favoriteService = new FavoriteService(linkService, groupsService);
      const tagService = new TagService(linkService);
      const searchService = new SearchService();
 +    const vocabularyService = new VocabularyService(config.vocabularyUrl);
  
      return {
          ancestorsService,
@@@ -79,9 -79,9 +81,10 @@@
          searchService,
          tagService,
          userService,
+         virtualMachineService,
          webdavClient,
          workflowService,
 +        vocabularyService,
      };
  };