[ARVADOS-WORKBENCH2] updated: 1.1.4-672-gdffffdf
Git user
git at public.curoverse.com
Mon Aug 20 06:44:38 EDT 2018
Summary of changes:
src/common/custom-theme.ts | 6 ++++
.../details-attribute/details-attribute.tsx | 10 ++++--
.../list-item-text-icon/list-item-text-icon.tsx | 2 +-
.../details-panel/collection-details.tsx | 2 +-
.../details-panel/details-panel.tsx | 9 +++--
.../details-panel/process-details.tsx | 2 +-
.../details-panel/project-details.tsx | 2 +-
.../project-tree-picker/project-tree-picker.tsx | 38 +++++++++++-----------
src/views/collection-panel/collection-panel.tsx | 31 +++++++++++-------
9 files changed, 61 insertions(+), 41 deletions(-)
via dffffdfbf3e0bce8a7cd4d6755d71d8084615b33 (commit)
via 900081d75c21b924f4da42a94c1ca4ef7084a3df (commit)
via 53022b7d9f1cad38d709f92e70b86f44cd436c18 (commit)
via 33608c44bf33ab330ad1267ab8d56c08634673b5 (commit)
via 31df208339af5e30665455e193cdbde90dabaf1d (commit)
via 01e4b29eb65a760650476a8f5f059413130921f4 (commit)
via 07d646d908bcbd2b3de9ad22c02a93b65d04af2a (commit)
via 5ca3e3c15a9741bd2e4dcaada9e7e0edc22306df (commit)
from 1bd016d1f30c72353e5e3b086dd9778b74efb516 (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 dffffdfbf3e0bce8a7cd4d6755d71d8084615b33
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Mon Aug 20 12:44:27 2018 +0200
treepickerkind for treepickerid
Feature #13902
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/views-components/project-tree-picker/project-tree-picker.tsx b/src/views-components/project-tree-picker/project-tree-picker.tsx
index a2b5acc..30acf2a 100644
--- a/src/views-components/project-tree-picker/project-tree-picker.tsx
+++ b/src/views-components/project-tree-picker/project-tree-picker.tsx
@@ -36,9 +36,9 @@ const mapDispatchToProps = (dispatch: Dispatch, props: { onChange: (projectUuid:
const toggleItemOpen = (nodeId: string, status: TreeItemStatus, pickerId: string) =>
(dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
if (status === TreeItemStatus.INITIAL) {
- if (pickerId === TreePickerKind.PROJECTS) {
+ if (pickerId === TreePickerId.PROJECTS) {
dispatch<any>(loadProjectTreePickerProjects(nodeId));
- } else if (pickerId === TreePickerKind.FAVORITES) {
+ } else if (pickerId === TreePickerId.FAVORITES) {
dispatch<any>(loadFavoriteTreePickerProjects(nodeId === services.authService.getUuid() ? '' : nodeId));
} else {
// TODO: load sharedWithMe
@@ -49,10 +49,10 @@ const toggleItemOpen = (nodeId: string, status: TreeItemStatus, pickerId: string
};
const getNotSelectedTreePickerKind = (pickerId: string) => {
- return [TreePickerKind.PROJECTS, TreePickerKind.FAVORITES, TreePickerKind.SHARED_WITH_ME].filter(nodeId => nodeId !== pickerId);
+ return [TreePickerId.PROJECTS, TreePickerId.FAVORITES, TreePickerId.SHARED_WITH_ME].filter(nodeId => nodeId !== pickerId);
};
-export enum TreePickerKind {
+export enum TreePickerId {
PROJECTS = 'Projects',
SHARED_WITH_ME = 'Shared with me',
FAVORITES = 'Favorites'
@@ -64,9 +64,9 @@ export const ProjectTreePicker = connect(undefined, mapDispatchToProps)((props:
Select a project
</Typography>
<div style={{ flexGrow: 1, overflow: 'auto' }}>
- <TreePicker {...props} render={renderTreeItem} pickerId={TreePickerKind.PROJECTS} />
- <TreePicker {...props} render={renderTreeItem} pickerId={TreePickerKind.SHARED_WITH_ME} />
- <TreePicker {...props} render={renderTreeItem} pickerId={TreePickerKind.FAVORITES} />
+ <TreePicker {...props} render={renderTreeItem} pickerId={TreePickerId.PROJECTS} />
+ <TreePicker {...props} render={renderTreeItem} pickerId={TreePickerId.SHARED_WITH_ME} />
+ <TreePicker {...props} render={renderTreeItem} pickerId={TreePickerId.FAVORITES} />
</div>
</div>);
@@ -74,7 +74,7 @@ export const ProjectTreePicker = connect(undefined, mapDispatchToProps)((props:
// TODO: move action creator to store directory
export const loadProjectTreePickerProjects = (nodeId: string) =>
async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ nodeId, pickerId: TreePickerKind.PROJECTS }));
+ dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ nodeId, pickerId: TreePickerId.PROJECTS }));
const ownerUuid = nodeId.length === 0 ? services.authService.getUuid() || '' : nodeId;
@@ -84,7 +84,7 @@ export const loadProjectTreePickerProjects = (nodeId: string) =>
const { items } = await services.projectService.list({ filters });
- dispatch<any>(receiveTreePickerData(nodeId, items, TreePickerKind.PROJECTS));
+ dispatch<any>(receiveTreePickerData(nodeId, items, TreePickerId.PROJECTS));
};
export const loadFavoriteTreePickerProjects = (nodeId: string) =>
@@ -92,30 +92,30 @@ export const loadFavoriteTreePickerProjects = (nodeId: string) =>
const parentId = services.authService.getUuid() || '';
if (nodeId === '') {
- dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ nodeId: parentId, pickerId: TreePickerKind.FAVORITES }));
+ dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ nodeId: parentId, pickerId: TreePickerId.FAVORITES }));
const { items } = await services.favoriteService.list(parentId);
- dispatch<any>(receiveTreePickerData(parentId, items as ProjectResource[], TreePickerKind.FAVORITES));
+ dispatch<any>(receiveTreePickerData(parentId, items as ProjectResource[], TreePickerId.FAVORITES));
} else {
- dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ nodeId, pickerId: TreePickerKind.FAVORITES }));
+ dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ nodeId, pickerId: TreePickerId.FAVORITES }));
const filters = new FilterBuilder()
.addEqual('ownerUuid', nodeId)
.getFilters();
const { items } = await services.projectService.list({ filters });
- dispatch<any>(receiveTreePickerData(nodeId, items, TreePickerKind.FAVORITES));
+ dispatch<any>(receiveTreePickerData(nodeId, items, TreePickerId.FAVORITES));
}
};
const getProjectPickerIcon = (item: TreeItem<ProjectResource>) => {
switch (item.data.name) {
- case TreePickerKind.FAVORITES:
+ case TreePickerId.FAVORITES:
return FavoriteIcon;
- case TreePickerKind.PROJECTS:
+ case TreePickerId.PROJECTS:
return ProjectsIcon;
- case TreePickerKind.SHARED_WITH_ME:
+ case TreePickerId.SHARED_WITH_ME:
return ShareMeIcon;
default:
return ProjectIcon;
@@ -151,15 +151,15 @@ export const initPickerProjectTree = () => (dispatch: Dispatch, getState: () =>
};
const getPickerTreeProjects = (uuid: string = '') => {
- return getProjectsPickerTree(uuid, TreePickerKind.PROJECTS);
+ return getProjectsPickerTree(uuid, TreePickerId.PROJECTS);
};
const getSharedWithMeProjectsPickerTree = (uuid: string = '') => {
- return getProjectsPickerTree(uuid, TreePickerKind.SHARED_WITH_ME);
+ return getProjectsPickerTree(uuid, TreePickerId.SHARED_WITH_ME);
};
const getFavoritesProjectsPickerTree = (uuid: string = '') => {
- return getProjectsPickerTree(uuid, TreePickerKind.FAVORITES);
+ return getProjectsPickerTree(uuid, TreePickerId.FAVORITES);
};
const getProjectsPickerTree = (uuid: string, kind: string) => {
commit 900081d75c21b924f4da42a94c1ca4ef7084a3df
Merge: 1bd016d 53022b7
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Mon Aug 20 12:33:14 2018 +0200
Merge branch 'master' into 13902-ui-move-to-popup
refs #13902
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list