19504: Remove breadcrumb type style/color handling

Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen@curii.com>

diff --git a/src/common/custom-theme.ts b/src/common/custom-theme.ts
index 23fc1fb8353a5324e13da6f38bf18e80ea4991f4..67a514b10ca8de49577d457983a717da1b87ff4d 100644 (file)
--- a/src/common/custom-theme.ts
+++ b/src/common/custom-theme.ts
@@ -5,10 +5,8 @@
 import { createMuiTheme } from '@material-ui/core/styles';
 import { ThemeOptions, Theme } from '@material-ui/core/styles/createMuiTheme';
 import blue from '@material-ui/core/colors/blue';
-import cyan from '@material-ui/core/colors/cyan';
 import grey from '@material-ui/core/colors/grey';
 import green from '@material-ui/core/colors/green';
-import lightGreen from '@material-ui/core/colors/lightGreen';
 import yellow from '@material-ui/core/colors/yellow';
 import red from '@material-ui/core/colors/red';
 import teal from '@material-ui/core/colors/teal';
@@ -24,10 +22,6 @@ export interface ArvadosTheme extends Theme {
 }
 
 interface Colors {
-    cyan100: string;
-    cyan200: string;
-    lightGreen300: string;
-    lightGreen400: string;
     green700: string;
     yellow100: string;
     yellow700: string;
@@ -54,10 +48,6 @@ export const themeOptions: ArvadosThemeOptions = {
     },
     customs: {
         colors: {
-            lightGreen300: lightGreen["300"],
-            lightGreen400: lightGreen["400"],
-            cyan100: cyan["100"],
-            cyan200: cyan["200"],
             green700: green["700"],
             yellow100: yellow["100"],
             yellow700: yellow["700"],

diff --git a/src/components/breadcrumbs/breadcrumbs.tsx b/src/components/breadcrumbs/breadcrumbs.tsx
index 38c2a394b9b71f8226cf30027e844bb3950e88a1..7c28fe3299289878291eff70ec6b5860119e0064 100644 (file)
--- a/src/components/breadcrumbs/breadcrumbs.tsx
+++ b/src/components/breadcrumbs/breadcrumbs.tsx
@@ -12,8 +12,6 @@ import grey from '@material-ui/core/colors/grey';
 import { ResourcesState } from 'store/resources/resources';
 import classNames from 'classnames';
 import { ArvadosTheme } from 'common/custom-theme';
-import { extractUuidKind, ResourceKind } from 'models/resource';
-import { ClassNameMap } from '@material-ui/core/styles/withStyles';
 
 export interface Breadcrumb {
     label: string;
@@ -21,35 +19,21 @@ export interface Breadcrumb {
     uuid: string;
 }
 
-type CssRules = "item" | "defaultItem" | "processItem" | "collectionItem" | "parentItem" | "currentItem" | "label" | "icon" | "frozenIcon";
+type CssRules = "item" | "label" | "icon" | "frozenIcon";
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     item: {
         borderRadius: '16px',
-    },
-    defaultItem: {
         backgroundColor: theme.customs.colors.grey300,
+        '&.parentItem': {
+            backgroundColor: `${theme.customs.colors.grey300}99`,
+        },
         '&:hover': {
             backgroundColor: theme.customs.colors.grey400,
-        }
-    },
-    processItem: {
-        backgroundColor: theme.customs.colors.lightGreen300,
-        '&:hover': {
-            backgroundColor: theme.customs.colors.lightGreen400,
-        }
-    },
-    collectionItem: {
-        backgroundColor: theme.customs.colors.cyan100,
-        '&:hover': {
-            backgroundColor: theme.customs.colors.cyan200,
-        }
-    },
-    parentItem: {
-        opacity: 0.75
-    },
-    currentItem: {
-        opacity: 1
+        },
+        '&.parentItem:hover': {
+            backgroundColor: `${theme.customs.colors.grey400}99`,
+        },
     },
     label: {
         textTransform: "none",
@@ -75,17 +59,6 @@ export interface BreadcrumbsProps {
     onContextMenu: (event: React.MouseEvent<HTMLElement>, breadcrumb: Breadcrumb) => void;
 }
 
-const getBreadcrumbClass = (item: Breadcrumb, classes: ClassNameMap<CssRules>): string => {
-    switch (extractUuidKind(item.uuid)) {
-        case ResourceKind.PROCESS:
-            return classes.processItem;
-        case ResourceKind.COLLECTION:
-            return classes.collectionItem;
-        default:
-            return classes.defaultItem;
-    }
-};
-
 export const Breadcrumbs = withStyles(styles)(
     ({ classes, onClick, onContextMenu, items, resources }: BreadcrumbsProps & WithStyles<CssRules>) =>
     <Grid container data-cy='breadcrumbs' alignItems="center" wrap="nowrap">
@@ -106,9 +79,8 @@ export const Breadcrumbs = withStyles(styles)(
                                     ? 'breadcrumb-last'
                                     : false}
                             className={classNames(
-                                isLastItem ? classes.currentItem : classes.parentItem,
-                                classes.item,
-                                getBreadcrumbClass(item, classes)
+                                isLastItem ? null : 'parentItem',
+                                classes.item
                             )}
                             onClick={() => onClick(item)}
                             onContextMenu={event => onContextMenu(event, item)}>
@@ -124,7 +96,7 @@ export const Breadcrumbs = withStyles(styles)(
                             }
                         </Button>
                     </Tooltip>
-                    {!isLastItem && <ChevronRightIcon color="inherit" className={classes.parentItem} />}
+                    {!isLastItem && <ChevronRightIcon color="inherit" className={'parentItem'} />}
                 </React.Fragment>
             );
         })