projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
virtual-machines-panel-init
[arvados-workbench2.git]
/
src
/
views-components
/
side-panel-tree
/
side-panel-tree.tsx
diff --git
a/src/views-components/side-panel-tree/side-panel-tree.tsx
b/src/views-components/side-panel-tree/side-panel-tree.tsx
index 6445515cf2428a5724e40c9dfabf4e264e88d92c..dd5005c35557f1fdf769450fd79f2337a70f522b 100644
(file)
--- a/
src/views-components/side-panel-tree/side-panel-tree.tsx
+++ b/
src/views-components/side-panel-tree/side-panel-tree.tsx
@@
-10,23
+10,29
@@
import { TreeItem } from "~/components/tree/tree";
import { ProjectResource } from "~/models/project";
import { ListItemTextIcon } from "~/components/list-item-text-icon/list-item-text-icon";
import { ProjectIcon, FavoriteIcon, ProjectsIcon, ShareMeIcon, TrashIcon } from '~/components/icon/icon';
import { ProjectResource } from "~/models/project";
import { ListItemTextIcon } from "~/components/list-item-text-icon/list-item-text-icon";
import { ProjectIcon, FavoriteIcon, ProjectsIcon, ShareMeIcon, TrashIcon } from '~/components/icon/icon';
-import {
RecentIcon,
WorkflowIcon } from '~/components/icon/icon';
+import { WorkflowIcon } from '~/components/icon/icon';
import { activateSidePanelTreeItem, toggleSidePanelTreeItemCollapse, SIDE_PANEL_TREE, SidePanelTreeCategory } from '~/store/side-panel-tree/side-panel-tree-actions';
import { activateSidePanelTreeItem, toggleSidePanelTreeItemCollapse, SIDE_PANEL_TREE, SidePanelTreeCategory } from '~/store/side-panel-tree/side-panel-tree-actions';
-
+import { openSidePanelContextMenu } from '~/store/context-menu/context-menu-actions';
+import { noop } from 'lodash';
export interface SidePanelTreeProps {
onItemActivation: (id: string) => void;
export interface SidePanelTreeProps {
onItemActivation: (id: string) => void;
+ sidePanelProgress?: boolean;
}
}
-type SidePanelTreeActionProps = Pick<TreePickerProps
, 'toggleItemActive' | 'toggleItemOpe
n'>;
+type SidePanelTreeActionProps = Pick<TreePickerProps
<ProjectResource | string>, 'onContextMenu' | 'toggleItemActive' | 'toggleItemOpen' | 'toggleItemSelectio
n'>;
const mapDispatchToProps = (dispatch: Dispatch, props: SidePanelTreeProps): SidePanelTreeActionProps => ({
const mapDispatchToProps = (dispatch: Dispatch, props: SidePanelTreeProps): SidePanelTreeActionProps => ({
- toggleItemActive: (nodeId) => {
- dispatch<any>(activateSidePanelTreeItem(nodeId));
- props.onItemActivation(nodeId);
+ onContextMenu: (event, { id }) => {
+ dispatch<any>(openSidePanelContextMenu(event, id));
},
},
- toggleItemOpen: (nodeId) => {
- dispatch<any>(toggleSidePanelTreeItemCollapse(nodeId));
- }
+ toggleItemActive: (_, { id }) => {
+ dispatch<any>(activateSidePanelTreeItem(id));
+ props.onItemActivation(id);
+ },
+ toggleItemOpen: (_, { id }) => {
+ dispatch<any>(toggleSidePanelTreeItemCollapse(id));
+ },
+ toggleItemSelection: noop,
});
export const SidePanelTree = connect(undefined, mapDispatchToProps)(
});
export const SidePanelTree = connect(undefined, mapDispatchToProps)(
@@
-38,7
+44,9
@@
const renderSidePanelItem = (item: TreeItem<ProjectResource>) =>
icon={getProjectPickerIcon(item)}
name={typeof item.data === 'string' ? item.data : item.data.name}
isActive={item.active}
icon={getProjectPickerIcon(item)}
name={typeof item.data === 'string' ? item.data : item.data.name}
isActive={item.active}
- hasMargin={true} />;
+ hasMargin={true}
+ iconSize={1.25}
+ />;
const getProjectPickerIcon = (item: TreeItem<ProjectResource | string>) =>
typeof item.data === 'string'
const getProjectPickerIcon = (item: TreeItem<ProjectResource | string>) =>
typeof item.data === 'string'
@@
-51,8
+59,6
@@
const getSidePanelIcon = (category: string) => {
return FavoriteIcon;
case SidePanelTreeCategory.PROJECTS:
return ProjectsIcon;
return FavoriteIcon;
case SidePanelTreeCategory.PROJECTS:
return ProjectsIcon;
- case SidePanelTreeCategory.RECENT_OPEN:
- return RecentIcon;
case SidePanelTreeCategory.SHARED_WITH_ME:
return ShareMeIcon;
case SidePanelTreeCategory.TRASH:
case SidePanelTreeCategory.SHARED_WITH_ME:
return ShareMeIcon;
case SidePanelTreeCategory.TRASH: