17782: Fixes almost all tests (4 left) mostly by fixing namespace-type imports.
[arvados-workbench2.git] / src / components / subprocess-filter / subprocess-filter.tsx
index f13668582bec95b1a8125efa35736e5849b31c9d..1722de8f17231e9d6ad6723e09e466695900e86f 100644 (file)
@@ -2,20 +2,18 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import * as React from 'react';
+import React from 'react';
 import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
-import { ArvadosTheme } from '~/common/custom-theme';
-import { Grid, Typography, Switch } from '@material-ui/core';
+import { ArvadosTheme } from 'common/custom-theme';
+import { Typography, Switch } from '@material-ui/core';
 
-type CssRules = 'grid' | 'label' | 'value' | 'switch';
+type CssRules = 'container' | 'label' | 'value';
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
-    grid: {
+    container: {
         display: 'flex',
-        height: '20px',
-        paddingTop: '0px!important',
-        paddingBottom: '0px!important',
-        marginBottom: theme.spacing.unit
+        alignItems: 'center',
+        height: '20px'
     },
     label: {
         width: '86px',
@@ -25,12 +23,6 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     value: {
         width: '24px',
         paddingLeft: theme.spacing.unit,
-    },
-    switch: {
-        height: '20px',
-        '& span:first-child': {
-            height: '18px'
-        }
     }
 });
 
@@ -46,14 +38,14 @@ type SubprocessFilterProps = SubprocessFilterDataProps & WithStyles<CssRules>;
 
 export const SubprocessFilter = withStyles(styles)(
     ({ classes, label, value, key, checked, onToggle }: SubprocessFilterProps) =>
-        <Grid item className={classes.grid} md={12} lg={6} >
+        <div className={classes.container} >
             <Typography component="span" className={classes.label}>{label}:</Typography>
             <Typography component="span" className={classes.value}>{value}</Typography>
-            {onToggle && <Switch classes={{ root: classes.switch }}
+            {onToggle && <Switch
                 checked={checked}
                 onChange={onToggle}
                 value={key}
                 color="primary" />
             }
-        </Grid>
+        </div>
 );
\ No newline at end of file