[ARVADOS-WORKBENCH2] updated: 1.2.0-270-gf5c0cb1
Git user
git at public.curoverse.com
Tue Sep 4 06:23:43 EDT 2018
Summary of changes:
src/common/formatters.ts | 11 +-
.../data-explorer/data-explorer.test.tsx | 1 +
src/components/data-explorer/data-explorer.tsx | 5 +-
src/components/icon/icon.tsx | 2 +
src/index.tsx | 2 +
src/models/collection.ts | 9 +-
src/models/group.ts | 9 +-
src/models/project.ts | 2 +-
src/models/resource.ts | 9 +-
src/models/test-utils.ts | 4 +-
src/routes/routes.ts | 17 +-
.../ancestors-service/ancestors-service.ts | 6 +-
.../api/filter-builder.test.ts | 0
src/{common => services}/api/filter-builder.ts | 0
src/{common => services}/api/order-builder.test.ts | 0
src/{common => services}/api/order-builder.ts | 2 +-
src/{common => services}/api/url-builder.ts | 0
.../collection-files-service.ts | 2 +-
.../collection-service/collection-service.ts | 5 +-
.../common-resource-service.test.ts | 2 +-
.../common-service}/common-resource-service.ts | 2 +-
.../common-service/trashable-resource-service.ts | 32 ++++
.../container-request-service.ts | 2 +-
.../container-service/container-service.ts | 2 +-
.../favorite-service/favorite-service.test.ts | 4 +-
src/services/favorite-service/favorite-service.ts | 4 +-
src/services/groups-service/groups-service.test.ts | 2 +-
src/services/groups-service/groups-service.ts | 10 +-
src/services/keep-service/keep-service.ts | 2 +-
src/services/link-service/link-service.ts | 2 +-
src/services/log-service/log-service.ts | 2 +-
.../project-service/project-service.test.ts | 2 +-
src/services/project-service/project-service.ts | 4 +-
src/services/tag-service/tag-service.ts | 4 +-
src/services/user-service/user-service.ts | 4 +-
.../collection-panel-files-actions.ts | 2 +-
src/store/collections/collection-copy-actions.ts | 4 +-
src/store/collections/collection-create-actions.ts | 2 +-
src/store/collections/collection-move-actions.ts | 2 +-
.../collections/collection-partial-copy-actions.ts | 4 +-
src/store/collections/collection-update-actions.ts | 10 +-
src/store/context-menu/context-menu-actions.ts | 48 +++--
src/store/context-menu/context-menu-reducer.ts | 9 +-
.../data-explorer-middleware-service.ts | 4 +-
.../favorite-panel-middleware-service.ts | 4 +-
src/store/navigation/navigation-action.ts | 2 +
.../process-logs-panel-actions.ts | 6 +-
src/store/processes/processes-actions.ts | 2 +-
.../project-panel-middleware-service.ts | 6 +-
src/store/projects/project-create-actions.ts | 2 +-
src/store/projects/project-move-actions.ts | 2 +-
src/store/projects/project-update-actions.ts | 6 +-
.../side-panel-tree/side-panel-tree-actions.ts | 2 +-
src/store/side-panel/side-panel-action.ts | 6 +-
src/store/store.ts | 8 +-
src/store/trash-panel/trash-panel-action.ts | 11 ++
.../trash-panel/trash-panel-middleware-service.ts | 84 +++++++++
src/store/trash/trash-actions.ts | 66 +++++++
src/store/workbench/workbench-actions.ts | 13 +-
.../collection-panel-files.ts | 20 ++-
.../action-sets/collection-action-set.ts | 8 +
.../action-sets/collection-resource-action-set.ts | 8 +
.../context-menu/action-sets/project-action-set.ts | 8 +
.../context-menu/action-sets/trash-action-set.ts | 16 ++
.../{favorite-action.tsx => trash-action.tsx} | 19 +-
.../context-menu/context-menu-action-set.ts | 2 +-
src/views-components/context-menu/context-menu.tsx | 6 +-
src/views-components/data-explorer/renderers.tsx | 30 +++-
.../project-tree-picker/project-tree-picker.tsx | 2 +-
src/views/collection-panel/collection-panel.tsx | 10 +-
src/views/favorite-panel/favorite-panel.tsx | 29 ++-
src/views/project-panel/project-panel.tsx | 21 ++-
src/views/trash-panel/trash-panel.tsx | 199 +++++++++++++++++++++
src/views/workbench/workbench.tsx | 3 +
src/websocket/websocket-service.ts | 2 +-
src/websocket/websocket.ts | 6 +-
76 files changed, 688 insertions(+), 172 deletions(-)
rename src/{common => services}/api/filter-builder.test.ts (100%)
rename src/{common => services}/api/filter-builder.ts (100%)
rename src/{common => services}/api/order-builder.test.ts (100%)
rename src/{common => services}/api/order-builder.ts (94%)
rename src/{common => services}/api/url-builder.ts (100%)
rename src/{common/api => services/common-service}/common-resource-service.test.ts (98%)
rename src/{common/api => services/common-service}/common-resource-service.ts (98%)
create mode 100644 src/services/common-service/trashable-resource-service.ts
create mode 100644 src/store/trash-panel/trash-panel-action.ts
create mode 100644 src/store/trash-panel/trash-panel-middleware-service.ts
create mode 100644 src/store/trash/trash-actions.ts
create mode 100644 src/views-components/context-menu/action-sets/trash-action-set.ts
copy src/views-components/context-menu/actions/{favorite-action.tsx => trash-action.tsx} (50%)
create mode 100644 src/views/trash-panel/trash-panel.tsx
via f5c0cb11102a006cda59711f29458b7569b9a21f (commit)
via c276ce4c8dd3cf27ad6d17eca9af473f353fda55 (commit)
via e53e6f1efe7b156934514b51fd5f956262f6f9af (commit)
via 88ce683068f65862b3b5e753e55989902be5f1a9 (commit)
via ec00e13345fd6731287124ee776e0e4892c1cf13 (commit)
via 59ee572e791985a36bdd2015c9b494145109e8ed (commit)
via 7792c5200c3144fcc75e102f2aeaf4862252ec8e (commit)
via 46f597da5c34d80250cc7efd87d2ce087528ed5f (commit)
via 3eeb63ce55c9156f96f933a0cff5eab3dab86392 (commit)
via 9cb78f72cfe7da0fd3e04609f13d5f930a76a2f1 (commit)
via 1baec2d74e64375ce1b410f6a66fc8c8c9848307 (commit)
via 25691034b44b9323cae96c8db002826880ccfd7e (commit)
via f63f3a5360ae6381d4b332bf86ef52b4e22107fb (commit)
via f1065fb7260dd562ea2e826e9cbc508d7932ecca (commit)
via efe0283919eb18e60ad876eaf6edef03c6cf04b3 (commit)
from 5cc899fc13465c57f16adf69a593a4354e6e0eb3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit f5c0cb11102a006cda59711f29458b7569b9a21f
Merge: 5cc899f c276ce4
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Tue Sep 4 12:23:31 2018 +0200
merge master
Feature #13860
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --cc src/routes/routes.ts
index 30040e6,05a8ab0..ac02dbc
--- 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 63396fb,01aca59..9b4f42b
--- 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' &&
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list