[ARVADOS-WORKBENCH2] updated: 1.1.4-461-g1c7242e
Git user
git at public.curoverse.com
Tue Jul 31 05:07:47 EDT 2018
Summary of changes:
src/common/custom-theme.ts | 28 +++++-
src/components/icon/icon.tsx | 9 +-
src/index.tsx | 2 +
src/models/collection.ts | 4 +
src/models/project.ts | 4 +
.../collection-service.ts} | 6 +-
src/services/services.ts | 4 +-
.../collection-panel/collection-panel-action.ts | 30 ++++++
.../collection-panel/collection-panel-reducer.ts | 21 +++++
.../creator/collection-creator-action.ts | 32 +++++++
.../creator/collection-creator-reducer.test.ts | 45 +++++++++
.../creator/collection-creator-reducer.ts | 39 ++++++++
src/store/context-menu/context-menu-reducer.ts | 1 -
src/store/navigation/navigation-action.ts | 6 +-
src/store/project/project-reducer.test.ts | 13 ++-
src/store/project/project-reducer.ts | 4 +-
src/store/store.ts | 6 ++
.../create-project/create-project-validator.tsx | 2 +
.../action-sets/collection-action-set.ts | 77 +++++++++++++++
.../action-sets/favorite-action-set.ts | 2 +-
.../context-menu/action-sets/project-action-set.ts | 2 +-
.../action-sets/resource-action-set.ts | 2 +-
.../{action-sets => actions}/favorite-action.tsx | 2 +-
src/views-components/context-menu/context-menu.tsx | 1 +
.../create-collection-dialog.tsx | 44 +++++++++
.../create-project-dialog.tsx | 5 +
...ect-create.tsx => dialog-collection-create.tsx} | 31 ++++---
.../dialog-create/dialog-project-create.tsx | 6 +-
src/views/collection-panel/collection-panel.tsx | 103 +++++++++++++++++++++
src/views/project-panel/project-panel.tsx | 13 ++-
src/views/workbench/workbench.tsx | 56 +++++++++--
31 files changed, 543 insertions(+), 57 deletions(-)
copy src/services/{link-service/link-service.ts => collection-service/collection-service.ts} (59%)
create mode 100644 src/store/collection-panel/collection-panel-action.ts
create mode 100644 src/store/collection-panel/collection-panel-reducer.ts
create mode 100644 src/store/collections/creator/collection-creator-action.ts
create mode 100644 src/store/collections/creator/collection-creator-reducer.test.ts
create mode 100644 src/store/collections/creator/collection-creator-reducer.ts
create mode 100644 src/views-components/context-menu/action-sets/collection-action-set.ts
rename src/views-components/context-menu/{action-sets => actions}/favorite-action.tsx (89%)
create mode 100644 src/views-components/create-collection-dialog/create-collection-dialog.tsx
copy src/views-components/dialog-create/{dialog-project-create.tsx => dialog-collection-create.tsx} (80%)
create mode 100644 src/views/collection-panel/collection-panel.tsx
via 1c7242e61e9d71c7a37483ec0583dd0256f8ee7e (commit)
via c384037883732764d73829804aabee0ccfc8aa61 (commit)
via 7bbaab130034613a1191d692c9ce5596a5acd427 (commit)
via b92f9ebb833ad1a868f9cad6e6b1cf9076fe7c9f (commit)
via e4c3defe5d79926d86f49ba83cfe3125261481cb (commit)
via 378c6a3a18cd9849bf4233e130a9ffdf250de35e (commit)
via 7ae86efd9905582df4191910528c3803a68ba81b (commit)
via 83d2d86a40a316eb332b9962f9fac2eae3259cc2 (commit)
via 3ee31ce16470660d90fb870e048c2de9fcde6e47 (commit)
via ccc52fb9e9a880f8b8e9b15b09c2ebd513575bd4 (commit)
via 46460de37ddbc61a296d3a393bce332d856664a6 (commit)
via c01f42311966c4d13413ee34dd6c97d5e5ac8b7f (commit)
from 3402189ee23183fb7b655cd19815950c607b9679 (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 1c7242e61e9d71c7a37483ec0583dd0256f8ee7e
Merge: 3402189 c384037
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Tue Jul 31 11:05:28 2018 +0200
Merge branch 'master'
Feature #13855
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --cc src/index.tsx
index 64ff705,b2c00f9..c950c55
--- a/src/index.tsx
+++ b/src/index.tsx
@@@ -24,15 -24,13 +24,17 @@@ import { rootProjectActionSet } from ".
import { projectActionSet } from "./views-components/context-menu/action-sets/project-action-set";
import { resourceActionSet } from './views-components/context-menu/action-sets/resource-action-set';
import { favoriteActionSet } from "./views-components/context-menu/action-sets/favorite-action-set";
+import { collectionFilesActionSet } from './views-components/context-menu/action-sets/collection-files-action-set';
+import { collectionFilesItemActionSet } from './views-components/context-menu/action-sets/collection-files-item-action-set';
+ import { collectionActionSet } from './views-components/context-menu/action-sets/collection-action-set';
addMenuActionSet(ContextMenuKind.ROOT_PROJECT, rootProjectActionSet);
addMenuActionSet(ContextMenuKind.PROJECT, projectActionSet);
addMenuActionSet(ContextMenuKind.RESOURCE, resourceActionSet);
addMenuActionSet(ContextMenuKind.FAVORITE, favoriteActionSet);
+addMenuActionSet(ContextMenuKind.COLLECTION_FILES, collectionFilesActionSet);
+addMenuActionSet(ContextMenuKind.COLLECTION_FILES_ITEM, collectionFilesItemActionSet);
+ addMenuActionSet(ContextMenuKind.COLLECTION, collectionActionSet);
fetchConfig()
.then(config => {
diff --cc src/store/store.ts
index 33e537c,5c928fc..9d888ef
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@@ -18,8 -18,8 +18,10 @@@ import { favoritePanelMiddleware } fro
import { reducer as formReducer } from 'redux-form';
import { FavoritesState, favoritesReducer } from './favorites/favorites-reducer';
import { snackbarReducer, SnackbarState } from './snackbar/snackbar-reducer';
+import { CollectionPanelFilesState } from './collection-panel/collection-panel-files/collection-panel-files-state';
+import { collectionPanelFilesReducer } from './collection-panel/collection-panel-files/collections-panel-files-reducer';
+ import { CollectionCreatorState, collectionCreationReducer } from './collections/creator/collection-creator-reducer';
+ import { CollectionPanelState, collectionPanelReducer } from './collection-panel/collection-panel-reducer';
const composeEnhancers =
(process.env.NODE_ENV === 'development' &&
diff --cc src/views-components/context-menu/context-menu.tsx
index 20ed669,4ec7029..8b00893
--- a/src/views-components/context-menu/context-menu.tsx
+++ b/src/views-components/context-menu/context-menu.tsx
@@@ -60,6 -60,5 +60,7 @@@ export enum ContextMenuKind
PROJECT = "Project",
RESOURCE = "Resource",
FAVORITE = "Favorite",
+ COLLECTION_FILES = "CollectionFiles",
+ COLLECTION_FILES_ITEM = "CollectionFilesItem",
+ COLLECTION = 'Collection'
}
diff --cc src/views/workbench/workbench.tsx
index 34030f1,160e12f..5a28413
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -36,7 -37,10 +37,11 @@@ import { FavoritePanel, FAVORITE_PANEL_
import { CurrentTokenDialog } from '../../views-components/current-token-dialog/current-token-dialog';
import { dataExplorerActions } from '../../store/data-explorer/data-explorer-action';
import { Snackbar } from '../../views-components/snackbar/snackbar';
+import { CollectionPanelFiles } from '../../views-components/collection-panel-files/collection-panel-files';
+ import { CreateCollectionDialog } from '../../views-components/create-collection-dialog/create-collection-dialog';
+ import { CollectionPanel } from '../collection-panel/collection-panel';
+ import { loadCollection } from '../../store/collection-panel/collection-panel-action';
+ import { getCollectionUrl } from '../../models/collection';
const drawerWidth = 240;
const appBarHeight = 100;
@@@ -213,7 -217,7 +218,8 @@@ export const Workbench = withStyles(sty
<Switch>
<Route path="/projects/:id" render={this.renderProjectPanel} />
<Route path="/favorites" render={this.renderFavoritePanel} />
+ <Route path="/collections/:id" render={this.renderCollectionPanel} />
+ <Route path="/" render={() => <CollectionPanelFiles />} />
</Switch>
</div>
{user && <DetailsPanel />}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list