render workspace service list like services + toggle

4 files changed, 76 insertions, 7 deletions

diff --git a/src/components/ui/ServiceIcon.js b/src/components/ui/ServiceIcon.js
new file mode 100644
index 000000000..0b9155a4e
--- /dev/null
+++ b/src/components/ui/ServiceIcon.js
@@ -0,0 +1,67 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import injectSheet from 'react-jss';
+import classnames from 'classnames';
+
+import ServiceModel from '../../models/Service';
+
+const styles = theme => ({
+  root: {
+    height: 'auto',
+  },
+  icon: {
+    width: theme.serviceIcon.width,
+  },
+  isCustomIcon: {
+    width: theme.serviceIcon.isCustom.width,
+    border: theme.serviceIcon.isCustom.border,
+    borderRadius: theme.serviceIcon.isCustom.borderRadius,
+  },
+  isDisabled: {
+    filter: 'grayscale(100%)',
+    opacity: '.5',
+  },
+});
+
+@injectSheet(styles) @observer
+class ServiceIcon extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    service: PropTypes.instanceOf(ServiceModel).isRequired,
+    className: PropTypes.string,
+  };
+
+  static defaultProps = {
+    className: '',
+  };
+
+  render() {
+    const {
+      classes,
+      className,
+      service,
+    } = this.props;
+
+    return (
+      <div
+        className={classnames([
+          classes.root,
+          className,
+        ])}
+      >
+        <img
+          src={service.icon}
+          className={classnames([
+            classes.icon,
+            service.isEnabled ? null : classes.isDisabled,
+            service.hasCustomIcon ? classes.isCustomIcon : null,
+          ])}
+          alt=""
+        />
+      </div>
+    );
+  }
+}
+
+export default ServiceIcon;
diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js
index e4bf44248..bba4485ff 100644
--- a/src/features/workspaces/components/EditWorkspaceForm.js
+++ b/src/features/workspaces/components/EditWorkspaceForm.js
@@ -10,7 +10,7 @@ import Workspace from '../models/Workspace';
 import Service from '../../../models/Service';
 import Form from '../../../lib/Form';
 import { required } from '../../../helpers/validation-helpers';
-import ServiceListItem from './ServiceListItem';
+import WorkspaceServiceListItem from './WorkspaceServiceListItem';
 import Request from '../../../stores/lib/Request';
 import { gaEvent } from '../../../lib/analytics';
 import { GA_CATEGORY_WORKSPACES } from '../index';
@@ -151,7 +151,7 @@ class EditWorkspaceForm extends Component {
           <h2>{intl.formatMessage(messages.servicesInWorkspaceHeadline)}</h2>
           <div className={classes.serviceList}>
             {services.map(s => (
-              <ServiceListItem
+              <WorkspaceServiceListItem
                 key={s.id}
                 service={s}
                 isInWorkspace={workspaceServices.includes(s.id)}
diff --git a/src/features/workspaces/components/WorkspaceItem.js b/src/features/workspaces/components/WorkspaceItem.js
index a950a981a..cc4b1a3ba 100644
--- a/src/features/workspaces/components/WorkspaceItem.js
+++ b/src/features/workspaces/components/WorkspaceItem.js
@@ -8,10 +8,10 @@ import Workspace from '../models/Workspace';
 
 const styles = theme => ({
   row: {
-    height: 57,
-    borderBottom: `1px solid ${theme.workspaceSettings.listItemBorderColor}`,
+    height: theme.workspaces.settings.listItems.height,
+    borderBottom: `1px solid ${theme.workspaces.settings.listItems.borderColor}`,
     '&:hover': {
-      background: theme.workspaceSettings.listItemHoverBgColor,
+      background: theme.workspaces.settings.listItems.hoverBgColor,
     },
   },
   columnName: {},
diff --git a/src/features/workspaces/components/ServiceListItem.js b/src/features/workspaces/components/WorkspaceServiceListItem.js
index 146cc5a36..7b516d056 100644
--- a/src/features/workspaces/components/ServiceListItem.js
+++ b/src/features/workspaces/components/WorkspaceServiceListItem.js
@@ -5,10 +5,11 @@ import injectSheet from 'react-jss';
 import { Toggle } from '@meetfranz/forms';
 
 import Service from '../../../models/Service';
+import ServiceIcon from '../../../components/ui/ServiceIcon';
 
-const styles = () => ({
+const styles = theme => ({
   service: {
-    height: 'auto',
+    height: theme.workspaceSettings.listItemHeight,
     display: 'flex',
   },
   name: {
@@ -35,6 +36,7 @@ class ServiceListItem extends Component {
 
     return (
       <div className={classes.service}>
+        <ServiceIcon service={service} />
         <Toggle
           checked={isInWorkspace}
           onChange={onToggle}