X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/d6d85de50096eb0053d58c5022fd4e949c830929..4d73bcbaa792da5854f4d266dd7be32fc99e3289:/src/views-components/side-panel-tree/side-panel-tree.tsx?ds=sidebyside 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 6445515c..dd5005c3 100644 --- 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 { 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 { openSidePanelContextMenu } from '~/store/context-menu/context-menu-actions'; +import { noop } from 'lodash'; export interface SidePanelTreeProps { onItemActivation: (id: string) => void; + sidePanelProgress?: boolean; } -type SidePanelTreeActionProps = Pick; +type SidePanelTreeActionProps = Pick, 'onContextMenu' | 'toggleItemActive' | 'toggleItemOpen' | 'toggleItemSelection'>; const mapDispatchToProps = (dispatch: Dispatch, props: SidePanelTreeProps): SidePanelTreeActionProps => ({ - toggleItemActive: (nodeId) => { - dispatch(activateSidePanelTreeItem(nodeId)); - props.onItemActivation(nodeId); + onContextMenu: (event, { id }) => { + dispatch(openSidePanelContextMenu(event, id)); }, - toggleItemOpen: (nodeId) => { - dispatch(toggleSidePanelTreeItemCollapse(nodeId)); - } + toggleItemActive: (_, { id }) => { + dispatch(activateSidePanelTreeItem(id)); + props.onItemActivation(id); + }, + toggleItemOpen: (_, { id }) => { + dispatch(toggleSidePanelTreeItemCollapse(id)); + }, + toggleItemSelection: noop, }); export const SidePanelTree = connect(undefined, mapDispatchToProps)( @@ -38,7 +44,9 @@ const renderSidePanelItem = (item: TreeItem) => 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) => typeof item.data === 'string' @@ -51,8 +59,6 @@ const getSidePanelIcon = (category: string) => { return FavoriteIcon; case SidePanelTreeCategory.PROJECTS: return ProjectsIcon; - case SidePanelTreeCategory.RECENT_OPEN: - return RecentIcon; case SidePanelTreeCategory.SHARED_WITH_ME: return ShareMeIcon; case SidePanelTreeCategory.TRASH: