From: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
Date: Thu, 27 Sep 2018 14:37:45 +0000 (+0200)
Subject: Merge workflows view
X-Git-Tag: 1.3.0~72^2~23
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/a9ba50241080a83734e8aea0f230cc3fc3f3b7ca

Merge workflows view

Feature #13863

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

a9ba50241080a83734e8aea0f230cc3fc3f3b7ca
diff --cc package.json
index a15f4174,64ea1d1a..1b196f1b
--- a/package.json
+++ b/package.json
@@@ -13,11 -12,10 +13,11 @@@
      "@types/shell-quote": "1.6.0",
      "axios": "0.18.0",
      "classnames": "2.2.6",
 +    "js-yaml": "3.12.0",
      "lodash": "4.17.10",
-     "react": "16.4.2",
+     "react": "16.5.2",
      "react-copy-to-clipboard": "5.0.1",
-     "react-dom": "16.4.2",
+     "react-dom": "16.5.2",
      "react-dropzone": "5.0.1",
      "react-redux": "5.0.7",
      "react-router": "4.3.1",
diff --cc src/index.tsx
index 542ce6cd,d0154b66..d64798bc
--- a/src/index.tsx
+++ b/src/index.tsx
@@@ -38,9 -38,8 +38,10 @@@ import { addRouteChangeHandlers } from 
  import { setCurrentTokenDialogApiHost } from '~/store/current-token-dialog/current-token-dialog-actions';
  import { processResourceActionSet } from '~/views-components/context-menu/action-sets/process-resource-action-set';
  import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions';
+ import { setUuidPrefix } from '~/store/workflow-panel/workflow-panel-actions';
  import { trashedCollectionActionSet } from '~/views-components/context-menu/action-sets/trashed-collection-action-set';
 +import { ContainerRequestState } from '~/models/container-request';
 +import { MountKind } from './models/mount-types';
  
  const getBuildNumber = () => "BN-" + (process.env.REACT_APP_BUILD_NUMBER || "dev");
  const getGitCommit = () => "GIT-" + (process.env.REACT_APP_GIT_COMMIT || "latest").substr(0, 7);