[ARVADOS-WORKBENCH2] updated: 1.1.4-322-gea80145

[Git user]

Summary of changes:
 src/components/context-menu/context-menu.test.tsx                 | 8 ++++----
 src/components/context-menu/context-menu.tsx                      | 8 ++++----
 .../context-menu/action-sets/project-action-set.ts                | 6 +++---
 .../context-menu/action-sets/root-project-action-set.ts           | 4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

       via  ea80145c5d632a647cf583cf0ebbf2a866d85549 (commit)
       via  9b390921232a4a3d1279d59da96f00dabeba1150 (commit)
      from  ff25c5d64dd7ba92f121726a31c56f50d4655d2a (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 ea80145c5d632a647cf583cf0ebbf2a866d85549
Merge: ff25c5d 9b39092
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Tue Jul 17 13:50:08 2018 +0200

    Merge branch '13834-update-icons-in-context-menu'
    
    refs #13834
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>


commit 9b390921232a4a3d1279d59da96f00dabeba1150
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Tue Jul 17 13:49:33 2018 +0200

    Update icons in context menu
    
    Feature #13834
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/components/context-menu/context-menu.test.tsx b/src/components/context-menu/context-menu.test.tsx
index 86011a3..95a219f 100644
--- a/src/components/context-menu/context-menu.test.tsx
+++ b/src/components/context-menu/context-menu.test.tsx
@@ -7,19 +7,19 @@ import { mount, configure, shallow } from "enzyme";
 import * as Adapter from "enzyme-adapter-react-16";
 import ContextMenu from "./context-menu";
 import { ListItem } from "@material-ui/core";
-import { IconTypes } from "../icon/icon";
+import { ShareIcon } from "../icon/icon";
 
 configure({ adapter: new Adapter() });
 
 describe("<ContextMenu />", () => {
     const items = [[{
-        icon: IconTypes.ANNOUNCEMENT,
+        icon: ShareIcon,
         name: "Action 1.1"
     }, {
-        icon: IconTypes.ANNOUNCEMENT,
+        icon: ShareIcon,
         name: "Action 1.2"
     },], [{
-        icon: IconTypes.ANNOUNCEMENT,
+        icon: ShareIcon,
         name: "Action 2.1"
     }]];
 
diff --git a/src/components/context-menu/context-menu.tsx b/src/components/context-menu/context-menu.tsx
index a7b83bc..ccdc01b 100644
--- a/src/components/context-menu/context-menu.tsx
+++ b/src/components/context-menu/context-menu.tsx
@@ -4,11 +4,11 @@
 import * as React from "react";
 import { Popover, List, ListItem, ListItemIcon, ListItemText, Divider } from "@material-ui/core";
 import { DefaultTransformOrigin } from "../popover/helpers";
-import IconBase, { IconTypes } from "../icon/icon";
+import { IconType } from "../icon/icon";
 
 export interface ContextMenuItem {
     name: string;
-    icon: IconTypes;
+    icon: IconType;
 }
 
 export type ContextMenuItemGroup = ContextMenuItem[];
@@ -22,7 +22,7 @@ export interface ContextMenuProps {
 
 export default class ContextMenu extends React.PureComponent<ContextMenuProps> {
     render() {
-        const { anchorEl, items, onClose, onItemClick } = this.props;
+        const { anchorEl, items, onClose, onItemClick} = this.props;
         return <Popover
             anchorEl={anchorEl}
             open={!!anchorEl}
@@ -39,7 +39,7 @@ export default class ContextMenu extends React.PureComponent<ContextMenuProps> {
                                 key={actionIndex}
                                 onClick={() => onItemClick(item)}>
                                 <ListItemIcon>
-                                    <IconBase icon={item.icon} />
+                                    <item.icon/>
                                 </ListItemIcon>
                                 <ListItemText>
                                     {item.name}
diff --git a/src/views-components/context-menu/action-sets/project-action-set.ts b/src/views-components/context-menu/action-sets/project-action-set.ts
index 9a1b1d5..61ff9fe 100644
--- a/src/views-components/context-menu/action-sets/project-action-set.ts
+++ b/src/views-components/context-menu/action-sets/project-action-set.ts
@@ -4,16 +4,16 @@
 
 import { ContextMenuActionSet } from "../context-menu-action-set";
 import actions from "../../../store/project/project-action";
-import { IconTypes } from "../../../components/icon/icon";
+import { ShareIcon, NewProjectIcon  } from "../../../components/icon/icon";
 
 export const projectActionSet: ContextMenuActionSet = [[{
-    icon: IconTypes.FOLDER,
+    icon: NewProjectIcon,
     name: "New project",
     execute: (dispatch, resource) => {
         dispatch(actions.OPEN_PROJECT_CREATOR({ ownerUuid: resource.uuid }));
     }
 }, {
-    icon: IconTypes.ANNOUNCEMENT,
+    icon: ShareIcon,
     name: "Share",
     execute: () => { return; }
 }]];
\ No newline at end of file
diff --git 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
index 53642d0..afb428a 100644
--- 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
@@ -4,10 +4,10 @@
 
 import { ContextMenuActionSet } from "../context-menu-action-set";
 import actions from "../../../store/project/project-action";
-import { IconTypes } from "../../../components/icon/icon";
+import { NewProjectIcon } from "../../../components/icon/icon";
 
 export const rootProjectActionSet: ContextMenuActionSet =  [[{
-    icon: IconTypes.FOLDER,
+    icon: NewProjectIcon,
     name: "New project",
     execute: (dispatch, resource) => {
         dispatch(actions.OPEN_PROJECT_CREATOR({ ownerUuid: resource.uuid }));

-----------------------------------------------------------------------


hooks/post-receive
--