Merge branch 'master' into 13860-status-for-subprocesses

[arvados-workbench2.git] / src / components / details-attribute / details-attribute.tsx

diff --git a/src/components/details-attribute/details-attribute.tsx b/src/components/details-attribute/details-attribute.tsx
index d3a83918ec8681da74aa6ea3b49a5e9a1b305cf8..dce08986d34d2349e67009f6bfac5db38f39ca04 100644 (file)
--- a/src/components/details-attribute/details-attribute.tsx
+++ b/src/components/details-attribute/details-attribute.tsx
@@ -8,7 +8,7 @@ import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/st
 import { ArvadosTheme } from '~/common/custom-theme';
 import * as classnames from "classnames";
 
-type CssRules = 'attribute' | 'label' | 'value' | 'link';
+type CssRules = 'attribute' | 'label' | 'value' | 'lowercaseValue' | 'link';
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     attribute: {
@@ -17,20 +17,26 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
         marginBottom: theme.spacing.unit
     },
     label: {
+        boxSizing: 'border-box',
         color: theme.palette.grey["500"],
         width: '40%'
     },
     value: {
+        boxSizing: 'border-box',
         width: '60%',
         display: 'flex',
         alignItems: 'flex-start',
         textTransform: 'capitalize'
     },
+    lowercaseValue: {
+        textTransform: 'lowercase'
+    },
     link: {
         width: '60%',
         color: theme.palette.primary.main,
         textDecoration: 'none',
-        overflowWrap: 'break-word'
+        overflowWrap: 'break-word',
+        cursor: 'pointer'
     }
 });
 
@@ -39,20 +45,22 @@ interface DetailsAttributeDataProps {
     classLabel?: string;
     value?: string | number;
     classValue?: string;
+    lowercaseValue?: boolean;
     link?: string;
     children?: React.ReactNode;
 }
 
 type DetailsAttributeProps = DetailsAttributeDataProps & WithStyles<CssRules>;
 
-export const DetailsAttribute = withStyles(styles)(({ label, link, value, children, classes, classLabel, classValue }: DetailsAttributeProps) =>
-    <Typography component="div" className={classes.attribute}>
-        <Typography component="span" className={classnames([classes.label, classLabel])}>{label}</Typography>
-        { link
-            ? <a href={link} className={classes.link} target='_blank'>{value}</a>
-            : <Typography component="span" className={classnames([classes.value, classValue])}>
-                {value}
-                {children}
-            </Typography> }
-    </Typography>
+export const DetailsAttribute = withStyles(styles)(
+    ({ label, link, value, children, classes, classLabel, classValue, lowercaseValue }: DetailsAttributeProps) =>
+        <Typography component="div" className={classes.attribute}>
+            <Typography component="span" className={classnames([classes.label, classLabel])}>{label}</Typography>
+            { link
+                ? <a href={link} className={classes.link} target='_blank'>{value}</a>
+                : <Typography component="span" className={classnames([classes.value, classValue, { [classes.lowercaseValue]: lowercaseValue }])}>
+                    {value}
+                    {children}
+                </Typography> }
+        </Typography>
 );