Make use of a new Icon component in ContextMenu

Feature #13805

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

diff --git a/src/components/context-menu/context-menu.tsx b/src/components/context-menu/context-menu.tsx
index 49b65927a0715f6a790a04272f8b0e1a44226080..a7b83bcfacc1710174fb2fabbfcebe5069ca7588 100644 (file)
--- a/src/components/context-menu/context-menu.tsx
+++ b/src/components/context-menu/context-menu.tsx
@@ -4,10 +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";
 
 export interface ContextMenuItem {
     name: string;
-    icon: string;
+    icon: IconTypes;
 }
 
 export type ContextMenuItemGroup = ContextMenuItem[];
@@ -38,7 +39,7 @@ export default class ContextMenu extends React.PureComponent<ContextMenuProps> {
                                 key={actionIndex}
                                 onClick={() => onItemClick(item)}>
                                 <ListItemIcon>
-                                    <i className={item.icon} />
+                                    <IconBase icon={item.icon} />
                                 </ListItemIcon>
                                 <ListItemText>
                                     {item.name}

diff --git a/src/views-components/context-menu/project-item-set.ts b/src/views-components/context-menu/project-item-set.ts
index 583bbaaad7fb07766ef55cc8cf8b8381c7fb1961..e205339f1d49ddb333d405229b9221a63749e56c 100644 (file)
--- a/src/views-components/context-menu/project-item-set.ts
+++ b/src/views-components/context-menu/project-item-set.ts
@@ -5,6 +5,7 @@
 import { ContextMenuItemGroup } from "../../components/context-menu/context-menu";
 import { ContextMenuItemSet } from "./context-menu-item-set";
 import actions from "../../store/project/project-action";
+import { IconTypes } from "../../components/icon/icon";
 
 export const projectItemSet: ContextMenuItemSet = {
     getItems: () => items,
@@ -16,28 +17,9 @@ export const projectItemSet: ContextMenuItemSet = {
 };
 
 const items: ContextMenuItemGroup[] = [[{
-    icon: "fas fa-plus fa-fw",
+    icon: IconTypes.FOLDER,
     name: "New project"
 }, {
-    icon: "fas fa-users fa-fw",
+    icon: IconTypes.ANNOUNCEMENT,
     name: "Share"
-}, {
-    icon: "fas fa-sign-out-alt fa-fw",
-    name: "Move to"
-}, {
-    icon: "fas fa-star fa-fw",
-    name: "Add to favourite"
-}, {
-    icon: "fas fa-edit fa-fw",
-    name: "Rename"
-}, {
-    icon: "fas fa-copy fa-fw",
-    name: "Make a copy"
-}, {
-    icon: "fas fa-download fa-fw",
-    name: "Download"
-}], [{
-    icon: "fas fa-trash-alt fa-fw",
-    name: "Remove"
-}
-]];
\ No newline at end of file
+}]];
\ No newline at end of file

diff --git a/src/views-components/context-menu/root-project-item-set.ts b/src/views-components/context-menu/root-project-item-set.ts
index ae760f0fe9a27d011ee4ff33ac3e275dc22db97b..5106881806400f1b4bcd641f183bf033f42799ac 100644 (file)
--- a/src/views-components/context-menu/root-project-item-set.ts
+++ b/src/views-components/context-menu/root-project-item-set.ts
@@ -5,6 +5,7 @@
 import { ContextMenuItemGroup } from "../../components/context-menu/context-menu";
 import { ContextMenuItemSet } from "./context-menu-item-set";
 import actions from "../../store/project/project-action";
+import { IconTypes } from "../../components/icon/icon";
 
 export const rootProjectItemSet: ContextMenuItemSet = {
     getItems: () => items,
@@ -16,6 +17,6 @@ export const rootProjectItemSet: ContextMenuItemSet = {
 };
 
 const items: ContextMenuItemGroup[] = [[{
-    icon: "fas fa-plus fa-fw",
+    icon: IconTypes.FOLDER,
     name: "New project"
 }]];
\ No newline at end of file