Merge workflows view
authorMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Thu, 27 Sep 2018 14:37:45 +0000 (16:37 +0200)
committerMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Thu, 27 Sep 2018 14:37:45 +0000 (16:37 +0200)
Feature #13863

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

1  2 
package.json
src/index.tsx
yarn.lock

diff --cc package.json
index a15f41743127a331eee63b154ff0ca23d2c8f369,64ea1d1a4dcef19aad3f4072b5295c4b4f01b2e0..1b196f1b994bd56be35c9a86f366506e8c91207f
      "@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 542ce6cd8dd8201d8db2f1cf2af9ca47c80fb094,d0154b663e0a9150419edbf437ac1b1eb729405d..d64798bca541bfc3996df94fdea8c37c81ec09d0
@@@ -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);
diff --cc yarn.lock
Simple merge