[ARVADOS-WORKBENCH2] updated: 1.2.0-170-gb979b48
Git user
git at public.curoverse.com
Mon Aug 27 08:09:51 EDT 2018
Summary of changes:
.../data-explorer/data-explorer.test.tsx | 23 +++-
src/components/form-dialog/form-dialog.tsx | 3 +-
src/components/move-to-dialog/move-to-dialog.tsx | 48 -------
src/components/project-copy/project-copy.tsx | 58 ---------
src/store/collections/collection-copy-actions.ts | 51 ++++++++
src/store/collections/collection-create-actions.ts | 55 ++++++++
.../collection-move-actions.ts} | 16 +--
src/store/collections/collection-update-actions.ts | 58 +++++++++
src/store/collections/collections-reducer.ts | 6 -
.../creator/collection-creator-action.ts | 34 -----
.../creator/collection-creator-reducer.test.ts | 33 -----
.../creator/collection-creator-reducer.ts | 30 -----
.../updater/collection-updater-action.ts | 43 -------
.../updater/collection-updater-reducer.ts | 29 -----
src/store/project/project-action.ts | 47 +------
src/store/project/project-reducer.test.ts | 35 +----
src/store/project/project-reducer.ts | 43 +------
src/store/projects/project-create-actions.ts | 56 ++++++++
.../project-move-actions.ts} | 20 +--
src/store/projects/project-update-actions.ts | 57 ++++++++
src/validators/validators.tsx | 2 +-
.../collection-partial-copy-dialog.tsx | 4 +-
.../action-sets/collection-action-set.ts | 10 +-
.../action-sets/collection-resource-action-set.ts | 10 +-
.../context-menu/action-sets/project-action-set.ts | 18 +--
.../action-sets/root-project-action-set.ts | 14 +-
.../create-collection-dialog.tsx | 44 -------
.../create-project-dialog.tsx | 44 -------
.../dialog-copy/dialog-collection-copy.tsx | 34 +++++
.../dialog-create/dialog-collection-create.tsx | 143 +++++----------------
.../dialog-create/dialog-project-create.tsx | 110 +++-------------
.../dialog-forms/copy-collection-dialog.ts | 19 +++
.../dialog-forms/create-collection-dialog.ts | 22 ++++
.../dialog-forms/create-project-dialog.ts | 19 +++
.../move-collection-dialog.ts | 10 +-
.../move-project-dialog.ts | 12 +-
.../dialog-forms/update-collection-dialog.ts | 19 +++
.../dialog-forms/update-project-dialog.ts | 19 +++
.../dialog-move/dialog-move-to.tsx | 26 ++++
.../dialog-update/dialog-collection-update.tsx | 120 +++--------------
.../dialog-update/dialog-project-update.tsx | 116 +++--------------
.../collection-form-fields.tsx} | 2 +-
.../form-fields/project-form-fields.tsx | 22 ++++
.../move-to-dialog/move-to-dialog.tsx | 40 ------
.../project-copy-dialog/project-copy-dialog.tsx | 29 -----
.../project-tree-picker/project-tree-picker.tsx | 14 ++
.../update-collection-dialog..tsx | 44 -------
.../update-project-dialog.tsx | 42 ------
src/views/project-panel/project-panel.tsx | 11 +-
src/views/workbench/workbench.tsx | 16 +--
50 files changed, 662 insertions(+), 1118 deletions(-)
delete mode 100644 src/components/move-to-dialog/move-to-dialog.tsx
delete mode 100644 src/components/project-copy/project-copy.tsx
create mode 100644 src/store/collections/collection-copy-actions.ts
create mode 100644 src/store/collections/collection-create-actions.ts
rename src/store/{move-collection-dialog/move-collection-dialog.ts => collections/collection-move-actions.ts} (72%)
create mode 100644 src/store/collections/collection-update-actions.ts
delete mode 100644 src/store/collections/creator/collection-creator-action.ts
delete mode 100644 src/store/collections/creator/collection-creator-reducer.test.ts
delete mode 100644 src/store/collections/creator/collection-creator-reducer.ts
delete mode 100644 src/store/collections/updater/collection-updater-action.ts
delete mode 100644 src/store/collections/updater/collection-updater-reducer.ts
create mode 100644 src/store/projects/project-create-actions.ts
rename src/store/{move-project-dialog/move-project-dialog.ts => projects/project-move-actions.ts} (71%)
create mode 100644 src/store/projects/project-update-actions.ts
delete mode 100644 src/views-components/create-collection-dialog/create-collection-dialog.tsx
delete mode 100644 src/views-components/create-project-dialog/create-project-dialog.tsx
create mode 100644 src/views-components/dialog-copy/dialog-collection-copy.tsx
create mode 100644 src/views-components/dialog-forms/copy-collection-dialog.ts
create mode 100644 src/views-components/dialog-forms/create-collection-dialog.ts
create mode 100644 src/views-components/dialog-forms/create-project-dialog.ts
rename src/views-components/{move-collection-dialog => dialog-forms}/move-collection-dialog.ts (63%)
rename src/views-components/{move-project-dialog => dialog-forms}/move-project-dialog.ts (59%)
create mode 100644 src/views-components/dialog-forms/update-collection-dialog.ts
create mode 100644 src/views-components/dialog-forms/update-project-dialog.ts
create mode 100644 src/views-components/dialog-move/dialog-move-to.tsx
rename src/views-components/{form-dialog/collection-form-dialog.tsx => form-fields/collection-form-fields.tsx} (93%)
create mode 100644 src/views-components/form-fields/project-form-fields.tsx
delete mode 100644 src/views-components/move-to-dialog/move-to-dialog.tsx
delete mode 100644 src/views-components/project-copy-dialog/project-copy-dialog.tsx
delete mode 100644 src/views-components/update-collection-dialog/update-collection-dialog..tsx
delete mode 100644 src/views-components/update-project-dialog/update-project-dialog.tsx
via b979b48045c915f0ea95bb95d591f8ac306ddf06 (commit)
via 5627bf1a83323d2b0364cb069564998eb8c6ca7a (commit)
via bef6136ae8f4e6d2ebae630940018a99946e6bda (commit)
via cdcdc08b57f7ae779d0b3f043bd255897579498d (commit)
via fb6814e06cc846481043152b0d2ba5c88cc61f96 (commit)
via 9bf2393f07c8a89eaf510a1e6ea3a8432303fcd6 (commit)
via 1f0d4a9c57515816112baa3cb45bf97bec490737 (commit)
via d5e325adeee527001a70193bca5db4a02e726295 (commit)
via 7b2c1a2e5b38246b9360fb062e66997ebfa888ea (commit)
via 1bda4645781ebb80f6d0db901f857abff088d749 (commit)
via 49e31d482873af1328b934bf8f07d8e1d00ce5b6 (commit)
via d842372e4f45ee06315e511529e65ae1d3f319a0 (commit)
via f0bdbd499c57a4a8f5db6a68411bfa8deb7ee291 (commit)
via a31e7b9a5c86f10239d93e327b792e0b1f8646b3 (commit)
via 4beec12398b40d518e0e7c2671cea99c580433f7 (commit)
via 71794c06557ccae7e54644ad23296aafde748d51 (commit)
via 47eb02af0c2c7bc4f0f852400308033c72322af8 (commit)
via 0cdeff59eefbd738d3bd87e2e666915b1e715715 (commit)
via 2e9f1d88035d8ce2bf88b2881e8a3736fae7139b (commit)
via f4ed762732e8f5d2f7c4c08d5efbe92d4bce7f16 (commit)
via cad9f25fc5e75f6e4f09fe90abd42d0cd10eb492 (commit)
via f8a43920a3a9808e4aad77a73c5966b800e34882 (commit)
via 9bad01c91c6c67d5067419ab709129ff1d1e6b18 (commit)
via 067999ebaee9a0decd80d3251afa5b8c102e7907 (commit)
via e1405a5108ab48429606c9460595dad6bd2d82c0 (commit)
via 135c3ebbca47d6a7a9fc63939e892fc63eebb891 (commit)
via 4f0ce2a7fd797146981f8338c4f52bddf2705702 (commit)
via b478a2dc99c373634dffd5a1110f0fa3a53866ef (commit)
via 13810782091128f6cf5b346243be77f5c1776d2c (commit)
via fe297524c4e7f0e7e43a5b946ec492edf12e2f67 (commit)
via 0e9bf3f713937af55e9b8677ca8c87eeddeae4da (commit)
from 4157d0e93444cd1d2a631e7826f8cd831863b58a (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 b979b48045c915f0ea95bb95d591f8ac306ddf06
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Mon Aug 27 14:09:34 2018 +0200
Merge branch 'master'
Feature #14102
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/store/collections/collection-update-actions.ts b/src/store/collections/collection-update-actions.ts
index 27c3bfc..2aa30d9 100644
--- a/src/store/collections/collection-update-actions.ts
+++ b/src/store/collections/collection-update-actions.ts
@@ -6,7 +6,7 @@ import { Dispatch } from "redux";
import { initialize, startSubmit, stopSubmit } from 'redux-form';
import { RootState } from "~/store/store";
import { collectionPanelActions } from "~/store/collection-panel/collection-panel-action";
-import { updateDetails } from "~/store/details-panel/details-panel-action";
+import { loadDetailsPanel } from "~/store/details-panel/details-panel-action";
import { dialogActions } from "~/store/dialog/dialog-actions";
import { dataExplorerActions } from "~/store/data-explorer/data-explorer-action";
import { snackbarActions } from "~/store/snackbar/snackbar-actions";
@@ -46,7 +46,7 @@ export const updateCollection = (collection: Partial<CollectionResource>) =>
try {
const updatedCollection = await services.collectionService.update(uuid, collection);
dispatch(collectionPanelActions.LOAD_COLLECTION_SUCCESS({ item: updatedCollection as CollectionResource }));
- dispatch<any>(updateDetails(updatedCollection));
+ dispatch<any>(loadDetailsPanel(updatedCollection.uuid));
dispatch(dataExplorerActions.REQUEST_ITEMS({ id: PROJECT_PANEL_ID }));
dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_UPDATE_FORM_NAME }));
} catch(e) {
diff --git a/src/store/collections/creator/collection-creator-action.ts b/src/store/collections/creator/collection-creator-action.ts
deleted file mode 100644
index 8c42f2d..0000000
--- a/src/store/collections/creator/collection-creator-action.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: AGPL-3.0
-
-import { unionize, ofType, UnionOf } from "~/common/unionize";
-import { Dispatch } from "redux";
-
-import { RootState } from "../../store";
-import { CollectionResource } from '~/models/collection';
-import { ServiceRepository } from "~/services/services";
-import { uploadCollectionFiles } from '../uploader/collection-uploader-actions';
-import { reset } from "redux-form";
-
-export const collectionCreateActions = unionize({
- OPEN_COLLECTION_CREATOR: ofType<{ ownerUuid: string }>(),
- CLOSE_COLLECTION_CREATOR: ofType<{}>(),
- CREATE_COLLECTION: ofType<{}>(),
- CREATE_COLLECTION_SUCCESS: ofType<{}>(),
-});
-
-export type CollectionCreateAction = UnionOf<typeof collectionCreateActions>;
-
-export const createCollection = (collection: Partial<CollectionResource>, files: File[]) =>
- async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- const { ownerUuid } = getState().collections.creator;
- const collectiontData = { ownerUuid, ...collection };
- dispatch(collectionCreateActions.CREATE_COLLECTION(collectiontData));
- const newCollection = await services.collectionService.create(collectiontData);
- await dispatch<any>(uploadCollectionFiles(newCollection.uuid));
- dispatch(collectionCreateActions.CREATE_COLLECTION_SUCCESS(collection));
- dispatch(reset('collectionCreateDialog'));
- return newCollection;
- };
-
diff --git a/src/store/collections/updater/collection-updater-action.ts b/src/store/collections/updater/collection-updater-action.ts
deleted file mode 100644
index 1ca1a83..0000000
--- a/src/store/collections/updater/collection-updater-action.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: AGPL-3.0
-
-import { Dispatch } from "redux";
-import { unionize, ofType, UnionOf } from '~/common/unionize';
-import { RootState } from "../../store";
-import { ServiceRepository } from "~/services/services";
-import { CollectionResource } from '~/models/collection';
-import { initialize } from 'redux-form';
-import { collectionPanelActions } from "../../collection-panel/collection-panel-action";
-import { ContextMenuResource } from "../../context-menu/context-menu-reducer";
-import { resourcesActions } from "~/store/resources/resources-actions";
-
-export const collectionUpdaterActions = unionize({
- OPEN_COLLECTION_UPDATER: ofType<{ uuid: string }>(),
- CLOSE_COLLECTION_UPDATER: ofType<{}>(),
- UPDATE_COLLECTION_SUCCESS: ofType<{}>(),
-});
-
-export const COLLECTION_FORM_NAME = 'collectionEditDialog';
-
-export const openUpdater = (item: ContextMenuResource) =>
- (dispatch: Dispatch, getState: () => RootState) => {
- if (item) {
- dispatch(collectionUpdaterActions.OPEN_COLLECTION_UPDATER({ uuid: item.uuid }));
- dispatch(initialize(COLLECTION_FORM_NAME, { name: item.name, description: item.description }));
- }
- };
-
-export const updateCollection = (collection: Partial<CollectionResource>) =>
- (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- const { uuid } = getState().collections.updater;
- return services.collectionService
- .update(uuid, collection)
- .then(collection => {
- dispatch(collectionPanelActions.LOAD_COLLECTION_SUCCESS({ item: collection as CollectionResource }));
- dispatch(collectionUpdaterActions.UPDATE_COLLECTION_SUCCESS());
- dispatch(resourcesActions.SET_RESOURCES([collection]));
- });
- };
-
-export type CollectionUpdaterAction = UnionOf<typeof collectionUpdaterActions>;
diff --git a/src/store/projects/project-update-actions.ts b/src/store/projects/project-update-actions.ts
index e674d29..dac931e 100644
--- a/src/store/projects/project-update-actions.ts
+++ b/src/store/projects/project-update-actions.ts
@@ -5,7 +5,7 @@
import { Dispatch } from "redux";
import { initialize, startSubmit, stopSubmit } from 'redux-form';
import { RootState } from "~/store/store";
-import { updateDetails } from "~/store/details-panel/details-panel-action";
+import { loadDetailsPanel } from "~/store/details-panel/details-panel-action";
import { dialogActions } from "~/store/dialog/dialog-actions";
import { snackbarActions } from "~/store/snackbar/snackbar-actions";
import { ContextMenuResource } from '~/store/context-menu/context-menu-reducer';
@@ -46,7 +46,7 @@ export const updateProject = (project: Partial<ProjectResource>) =>
const updatedProject = await services.projectService.update(uuid, project);
dispatch(projectPanelActions.REQUEST_ITEMS());
dispatch<any>(getProjectList(updatedProject.ownerUuid));
- dispatch<any>(updateDetails(updatedProject));
+ dispatch<any>(loadDetailsPanel(updatedProject.uuid));
dispatch(dialogActions.CLOSE_DIALOG({ id: PROJECT_UPDATE_FORM_NAME }));
} catch (e) {
const error = getCommonResourceServiceError(e);
diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx
index f9dcc39..01c2602 100644
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -24,13 +24,11 @@ import { ContextMenuKind } from '~/views-components/context-menu/context-menu';
import { contextMenuActions } from '~/store/context-menu/context-menu-actions';
import { CollectionResource } from '~/models/collection';
import { ProjectResource } from '~/models/project';
-import { openProjectCreator } from '~/store/project/project-action';
-import { reset } from 'redux-form';
-import { COLLECTION_CREATE_DIALOG } from '~/views-components/dialog-create/dialog-collection-create';
-import { collectionCreateActions } from '~/store/collections/creator/collection-creator-action';
import { navigateTo } from '~/store/navigation/navigation-action';
import { getProperty } from '~/store/properties/properties';
import { PROJECT_PANEL_CURRENT_UUID } from '~/store/project-panel/project-panel-action';
+import { openCollectionCreateDialog } from '../../store/collections/collection-create-actions';
+import { openProjectCreateDialog } from '~/store/projects/project-create-actions';
type CssRules = 'root' | "toolbar" | "button";
@@ -192,12 +190,11 @@ export const ProjectPanel = withStyles(styles)(
}
handleNewProjectClick = () => {
- this.props.dispatch<any>(openProjectCreator(this.props.currentItemId));
+ this.props.dispatch<any>(openProjectCreateDialog(this.props.currentItemId));
}
handleNewCollectionClick = () => {
- this.props.dispatch(reset(COLLECTION_CREATE_DIALOG));
- this.props.dispatch(collectionCreateActions.OPEN_COLLECTION_CREATOR({ ownerUuid: this.props.currentItemId }));
+ this.props.dispatch<any>(openCollectionCreateDialog(this.props.currentItemId));
}
handleContextMenu = (event: React.MouseEvent<HTMLElement>, resourceUuid: string) => {
commit 5627bf1a83323d2b0364cb069564998eb8c6ca7a
Merge: 4157d0e bef6136
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Mon Aug 27 14:09:16 2018 +0200
Merge branch 'master'
Feature #14102
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --cc src/store/project/project-action.ts
index 53e09cc,ff66a9c..4f03ae1
--- a/src/store/project/project-action.ts
+++ b/src/store/project/project-action.ts
@@@ -7,31 -7,22 +7,20 @@@ import { ProjectResource } from "~/mode
import { Dispatch } from "redux";
import { FilterBuilder } from "~/common/api/filter-builder";
import { RootState } from "../store";
-import { checkPresenceInFavorites } from "../favorites/favorites-actions";
+import { updateFavorites } from "../favorites/favorites-actions";
import { ServiceRepository } from "~/services/services";
- import { projectPanelActions } from "~/store/project-panel/project-panel-action";
- import { resourcesActions } from "~/store/resources/resources-actions";
- import { reset } from 'redux-form';
++import { resourcesActions } from '~/store/resources/resources-actions';
export const projectActions = unionize({
- OPEN_PROJECT_CREATOR: ofType<{ ownerUuid: string }>(),
- CLOSE_PROJECT_CREATOR: ofType<{}>(),
- CREATE_PROJECT: ofType<Partial<ProjectResource>>(),
- CREATE_PROJECT_SUCCESS: ofType<ProjectResource>(),
- OPEN_PROJECT_UPDATER: ofType<{ uuid: string }>(),
- CLOSE_PROJECT_UPDATER: ofType<{}>(),
- UPDATE_PROJECT_SUCCESS: ofType<ProjectResource>(),
REMOVE_PROJECT: ofType<string>(),
PROJECTS_REQUEST: ofType<string>(),
PROJECTS_SUCCESS: ofType<{ projects: ProjectResource[], parentItemId?: string }>(),
TOGGLE_PROJECT_TREE_ITEM_OPEN: ofType<string>(),
TOGGLE_PROJECT_TREE_ITEM_ACTIVE: ofType<string>(),
RESET_PROJECT_TREE_ACTIVITY: ofType<string>()
-}, {
- tag: 'type',
- value: 'payload'
});
- export const PROJECT_FORM_NAME = 'projectEditDialog';
-
- export const getProjectList = (parentUuid: string = '') =>
+ export const getProjectList = (parentUuid: string = '') =>
(dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
dispatch(projectActions.PROJECTS_REQUEST(parentUuid));
return services.projectService.list({
@@@ -40,7 -31,7 +29,8 @@@
.getFilters()
}).then(({ items: projects }) => {
dispatch(projectActions.PROJECTS_SUCCESS({ projects, parentItemId: parentUuid }));
- dispatch<any>(checkPresenceInFavorites(projects.map(project => project.uuid)));
+ dispatch<any>(updateFavorites(projects.map(project => project.uuid)));
++ dispatch<any>(resourcesActions.SET_RESOURCES(projects));
return projects;
});
};
diff --cc src/views-components/context-menu/action-sets/project-action-set.ts
index 7f83fb2,bc5d739..af10aed
--- a/src/views-components/context-menu/action-sets/project-action-set.ts
+++ b/src/views-components/context-menu/action-sets/project-action-set.ts
@@@ -2,21 -2,25 +2,22 @@@
//
// SPDX-License-Identifier: AGPL-3.0
- import { initialize } from "redux-form";
-import { reset, initialize } from "redux-form";
-
import { ContextMenuActionSet } from "../context-menu-action-set";
- import { projectActions, PROJECT_FORM_NAME, openProjectCreator } from '~/store/project/project-action';
import { NewProjectIcon, RenameIcon, CopyIcon, MoveToIcon } from "~/components/icon/icon";
import { ToggleFavoriteAction } from "../actions/favorite-action";
import { toggleFavorite } from "~/store/favorites/favorites-actions";
import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
- import { openMoveProjectDialog } from '~/store/move-project-dialog/move-project-dialog';
- import { openProjectCopyDialog } from "~/views-components/project-copy-dialog/project-copy-dialog";
+ import { openMoveProjectDialog } from '~/store/projects/project-move-actions';
-import { PROJECT_CREATE_FORM_NAME, openProjectCreateDialog } from '~/store/projects/project-create-actions';
++import { openProjectCreateDialog } from '~/store/projects/project-create-actions';
+ import { openProjectUpdateDialog } from '~/store/projects/project-update-actions';
export const projectActionSet: ContextMenuActionSet = [[
{
icon: NewProjectIcon,
name: "New project",
- execute: (dispatch, resource) => dispatch<any>(openProjectCreator(resource.uuid))
+ execute: (dispatch, resource) => {
- dispatch(reset(PROJECT_CREATE_FORM_NAME));
+ dispatch<any>(openProjectCreateDialog(resource.uuid));
+ }
},
{
icon: RenameIcon,
diff --cc src/views-components/context-menu/action-sets/root-project-action-set.ts
index eb4a9a3,2c71abc..386c516
--- a/src/views-components/context-menu/action-sets/root-project-action-set.ts
+++ b/src/views-components/context-menu/action-sets/root-project-action-set.ts
@@@ -2,26 -2,29 +2,24 @@@
//
// SPDX-License-Identifier: AGPL-3.0
--import { reset } from "redux-form";
--
import { ContextMenuActionSet } from "../context-menu-action-set";
- import { openProjectCreator } from "~/store/project/project-action";
- import { collectionCreateActions } from "~/store/collections/creator/collection-creator-action";
- import { COLLECTION_CREATE_DIALOG } from "../../dialog-create/dialog-collection-create";
-import { projectActions } from "~/store/project/project-action";
-import { COLLECTION_CREATE_FORM_NAME, openCollectionCreateDialog } from '~/store/collections/collection-create-actions';
++import { openCollectionCreateDialog } from '~/store/collections/collection-create-actions';
import { NewProjectIcon, CollectionIcon } from "~/components/icon/icon";
-import { PROJECT_CREATE_FORM_NAME, openProjectCreateDialog } from '~/store/projects/project-create-actions';
++import { openProjectCreateDialog } from '~/store/projects/project-create-actions';
export const rootProjectActionSet: ContextMenuActionSet = [[
{
icon: NewProjectIcon,
name: "New project",
- execute: (dispatch, resource) => dispatch<any>(openProjectCreator(resource.uuid))
+ execute: (dispatch, resource) => {
- dispatch(reset(PROJECT_CREATE_FORM_NAME));
+ dispatch<any>(openProjectCreateDialog(resource.uuid));
+ }
},
{
icon: CollectionIcon,
name: "New Collection",
execute: (dispatch, resource) => {
- dispatch(reset(COLLECTION_CREATE_DIALOG));
- dispatch(collectionCreateActions.OPEN_COLLECTION_CREATOR({ ownerUuid: resource.uuid }));
- dispatch(reset(COLLECTION_CREATE_FORM_NAME));
+ dispatch<any>(openCollectionCreateDialog(resource.uuid));
}
}
]];
diff --cc src/views-components/project-tree-picker/project-tree-picker.tsx
index 51220e6,92c5451..3859180
--- a/src/views-components/project-tree-picker/project-tree-picker.tsx
+++ b/src/views-components/project-tree-picker/project-tree-picker.tsx
@@@ -16,11 -16,11 +16,12 @@@ import { createTreePickerNode } from "~
import { RootState } from "~/store/store";
import { ServiceRepository } from "~/services/services";
import { FilterBuilder } from "~/common/api/filter-builder";
+ import { WrappedFieldProps } from 'redux-form';
-type ProjectTreePickerProps = Pick<TreePickerProps, 'toggleItemActive' | 'toggleItemOpen'>;
+type ProjectTreePickerProps = Pick<TreePickerProps, 'onContextMenu' | 'toggleItemActive' | 'toggleItemOpen'>;
const mapDispatchToProps = (dispatch: Dispatch, props: { onChange: (projectUuid: string) => void }): ProjectTreePickerProps => ({
+ onContextMenu: () => { return; },
toggleItemActive: (nodeId, status, pickerId) => {
getNotSelectedTreePickerKind(pickerId)
.forEach(pickerId => dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_SELECT({ nodeId: '', pickerId })));
diff --cc src/views/workbench/workbench.tsx
index 00d6c7c,973788b..37c247e
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -10,40 -11,55 +10,40 @@@ import { login, logout } from "~/store/
import { User } from "~/models/user";
import { RootState } from "~/store/store";
import { MainAppBar, MainAppBarActionProps, MainAppBarMenuItem } from '~/views-components/main-app-bar/main-app-bar';
-import { Breadcrumb } from '~/components/breadcrumbs/breadcrumbs';
import { push } from 'react-router-redux';
-import { reset } from 'redux-form';
-import { ProjectTree } from '~/views-components/project-tree/project-tree';
import { TreeItem } from "~/components/tree/tree";
-import { getTreePath } from '~/store/project/project-reducer';
-import { sidePanelActions } from '~/store/side-panel/side-panel-action';
-import { SidePanel, SidePanelItem } from '~/components/side-panel/side-panel';
-import { ItemMode, setProjectItem } from "~/store/navigation/navigation-action";
-import { projectActions } from "~/store/project/project-action";
+import { ProjectPanel } from "~/views/project-panel/project-panel";
import { DetailsPanel } from '~/views-components/details-panel/details-panel';
import { ArvadosTheme } from '~/common/custom-theme';
- import { CreateProjectDialog } from "~/views-components/create-project-dialog/create-project-dialog";
-
-import { detailsPanelActions, loadDetails } from "~/store/details-panel/details-panel-action";
-import { contextMenuActions } from "~/store/context-menu/context-menu-actions";
+import { detailsPanelActions } from "~/store/details-panel/details-panel-action";
import { ProjectResource } from '~/models/project';
-import { ResourceKind } from '~/models/resource';
-import { ContextMenu, ContextMenuKind } from "~/views-components/context-menu/context-menu";
+import { ContextMenu } from "~/views-components/context-menu/context-menu";
import { FavoritePanel } from "../favorite-panel/favorite-panel";
import { CurrentTokenDialog } from '~/views-components/current-token-dialog/current-token-dialog';
import { Snackbar } from '~/views-components/snackbar/snackbar';
- import { CreateCollectionDialog } from '~/views-components/create-collection-dialog/create-collection-dialog';
-import { favoritePanelActions } from '~/store/favorite-panel/favorite-panel-action';
import { CollectionPanel } from '../collection-panel/collection-panel';
- import { UpdateCollectionDialog } from '~/views-components/update-collection-dialog/update-collection-dialog.';
- import { UpdateProjectDialog } from '~/views-components/update-project-dialog/update-project-dialog';
-import { loadCollection, loadCollectionTags } from '~/store/collection-panel/collection-panel-action';
-import { getCollectionUrl } from '~/models/collection';
-
-import { PROJECT_CREATE_FORM_NAME, openProjectCreateDialog } from '~/store/projects/project-create-actions';
-import { COLLECTION_CREATE_FORM_NAME, openCollectionCreateDialog } from '~/store/collections/collection-create-actions';
-import { CreateCollectionDialog } from '~/views-components/dialog-forms/create-collection-dialog';
-import { UpdateCollectionDialog } from '~/views-components/dialog-forms/update-collection-dialog';
-import { CreateProjectDialog } from '~/views-components/dialog-forms/create-project-dialog';
-import { UpdateProjectDialog } from '~/views-components/dialog-forms/update-project-dialog';
-
-import { ProjectPanel } from "~/views/project-panel/project-panel";
import { AuthService } from "~/services/auth-service/auth-service";
import { RenameFileDialog } from '~/views-components/rename-file-dialog/rename-file-dialog';
import { FileRemoveDialog } from '~/views-components/file-remove-dialog/file-remove-dialog';
import { MultipleFilesRemoveDialog } from '~/views-components/file-remove-dialog/multiple-files-remove-dialog';
import { DialogCollectionCreateWithSelectedFile } from '~/views-components/create-collection-dialog-with-selected/create-collection-dialog-with-selected';
import { UploadCollectionFilesDialog } from '~/views-components/upload-collection-files-dialog/upload-collection-files-dialog';
- import { ProjectCopyDialog } from '~/views-components/project-copy-dialog/project-copy-dialog';
import { CollectionPartialCopyDialog } from '~/views-components/collection-partial-copy-dialog/collection-partial-copy-dialog';
- import { MoveProjectDialog } from '~/views-components/move-project-dialog/move-project-dialog';
- import { MoveCollectionDialog } from '~/views-components/move-collection-dialog/move-collection-dialog';
+import { SidePanel } from '~/views-components/side-panel/side-panel';
+import { Routes } from '~/routes/routes';
+import { Breadcrumbs } from '~/views-components/breadcrumbs/breadcrumbs';
++import { CreateProjectDialog } from '~/views-components/dialog-forms/create-project-dialog';
++import { CreateCollectionDialog } from '~/views-components/dialog-forms/create-collection-dialog';
++import { CopyCollectionDialog } from '~/views-components/dialog-forms/copy-collection-dialog';
++import { UpdateCollectionDialog } from '~/views-components/dialog-forms/update-collection-dialog';
++import { UpdateProjectDialog } from '~/views-components/dialog-forms/update-project-dialog';
+ import { MoveProjectDialog } from '~/views-components/dialog-forms/move-project-dialog';
+ import { MoveCollectionDialog } from '~/views-components/dialog-forms/move-collection-dialog';
-import { CopyCollectionDialog } from '~/views-components/dialog-forms/copy-collection-dialog';
-const DRAWER_WITDH = 240;
+
const APP_BAR_HEIGHT = 100;
-type CssRules = 'root' | 'appBar' | 'drawerPaper' | 'content' | 'contentWrapper' | 'toolbar';
+type CssRules = 'root' | 'appBar' | 'content' | 'contentWrapper';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
root: {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list