From: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Date: Tue, 4 Sep 2018 10:23:31 +0000 (+0200)
Subject: merge master
X-Git-Tag: 1.3.0~119^2~4
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/f5c0cb11102a006cda59711f29458b7569b9a21f

merge master

Feature #13860

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
---

f5c0cb11102a006cda59711f29458b7569b9a21f
diff --cc src/routes/routes.ts
index 30040e6d,05a8ab09..ac02dbcf
--- a/src/routes/routes.ts
+++ b/src/routes/routes.ts
@@@ -6,10 -6,10 +6,10 @@@ import { History, Location } from 'hist
  import { RootStore } from '~/store/store';
  import { matchPath } from 'react-router';
  import { ResourceKind, RESOURCE_UUID_PATTERN, extractUuidKind } from '~/models/resource';
- import { getProjectUrl } from '../models/project';
+ import { getProjectUrl } from '~/models/project';
  import { getCollectionUrl } from '~/models/collection';
- import { loadProject, loadFavorites, loadCollection, loadProcessLog } from '~/store/workbench/workbench-actions';
+ import { loadProject, loadFavorites, loadCollection, loadTrash, loadProcessLog } from '~/store/workbench/workbench-actions';
 -import { loadProcess } from '~/store/processes/processes-actions';
 +import { loadProcessPanel } from '~/store/process-panel/process-panel-actions';
  
  export const Routes = {
      ROOT: '/',
@@@ -78,8 -83,10 +83,10 @@@ const handleLocationChange = (store: Ro
          store.dispatch(loadCollection(collectionMatch.params.id));
      } else if (favoriteMatch) {
          store.dispatch(loadFavorites());
+     } else if (trashMatch) {
+         store.dispatch(loadTrash());
      } else if (processMatch) {
 -        store.dispatch(loadProcess(processMatch.params.id));
 +        store.dispatch(loadProcessPanel(processMatch.params.id));
      } else if (processLogMatch) {
          store.dispatch(loadProcessLog(processLogMatch.params.id));
      }
diff --cc src/store/store.ts
index 63396fb9,01aca598..9b4f42b8
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@@ -28,8 -28,9 +28,10 @@@ import { resourcesReducer } from '~/sto
  import { propertiesReducer } from './properties/properties-reducer';
  import { RootState } from './store';
  import { fileUploaderReducer } from './file-uploader/file-uploader-reducer';
+ import { TrashPanelMiddlewareService } from "~/store/trash-panel/trash-panel-middleware-service";
+ import { TRASH_PANEL_ID } from "~/store/trash-panel/trash-panel-action";
  import { processLogsPanelReducer } from './process-logs-panel/process-logs-panel-reducer';
 +import { processPanelReducer } from '~/store/process-panel/process-panel-reducer';
  
  const composeEnhancers =
      (process.env.NODE_ENV === 'development' &&