From 062ff0ba67e478f7ece1d1bb9b64268db5cf47e6 Mon Sep 17 00:00:00 2001
From: johnytiago <joaosao10@gmail.com>
Date: Wed, 9 May 2018 12:25:04 +0100
Subject: [PATCH] feat(instances): status icon cross, cns tags color

---
 .../__tests__/__snapshots__/cns.spec.js.snap  |  8 ++++++
 .../__snapshots__/firewall.spec.js.snap       |  2 ++
 .../__tests__/__snapshots__/tags.spec.js.snap |  3 +++
 .../instance-steps/src/firewall/components.js | 20 +++++++++-----
 packages/instance-steps/src/tags/index.js     |  2 +-
 packages/resource-step/src/status-icon.js     | 26 ++++++++++++++-----
 .../__snapshots__/firewall.spec.js.snap       |  3 +++
 packages/resource-widgets/src/cns/index.js    |  1 +
 packages/ui-toolkit/src/tags/item.js          | 20 +++++++++++---
 9 files changed, 67 insertions(+), 18 deletions(-)

diff --git a/consoles/my-joy-instances/src/containers/instances/__tests__/__snapshots__/cns.spec.js.snap b/consoles/my-joy-instances/src/containers/instances/__tests__/__snapshots__/cns.spec.js.snap
index ccd81d82..2e29a055 100644
--- a/consoles/my-joy-instances/src/containers/instances/__tests__/__snapshots__/cns.spec.js.snap
+++ b/consoles/my-joy-instances/src/containers/instances/__tests__/__snapshots__/cns.spec.js.snap
@@ -4898,6 +4898,7 @@ exports[`renders <Cns mutating /> without throwing 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
+  background: rgba(66,134,244,0.1);
   border: 0.0625rem solid rgb(45,56,132);
 }
 
@@ -5358,6 +5359,7 @@ exports[`renders <Cns mutating /> without throwing 1`] = `
                     >
                       <li
                         className="c39"
+                        fill="rgba(66, 134, 244, 0.1)"
                       >
                         serbice
                       </li>
@@ -5367,6 +5369,7 @@ exports[`renders <Cns mutating /> without throwing 1`] = `
                     >
                       <li
                         className="c39"
+                        fill="rgba(66, 134, 244, 0.1)"
                       >
                         dssasda
                       </li>
@@ -5376,6 +5379,7 @@ exports[`renders <Cns mutating /> without throwing 1`] = `
                     >
                       <li
                         className="c39"
+                        fill="rgba(66, 134, 244, 0.1)"
                       >
                         dsasd
                       </li>
@@ -7477,6 +7481,7 @@ exports[`renders <Cns services /> without throwing 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
+  background: rgba(66,134,244,0.1);
   border: 0.0625rem solid rgb(45,56,132);
 }
 
@@ -7701,6 +7706,7 @@ exports[`renders <Cns services /> without throwing 1`] = `
                     >
                       <li
                         className="c26"
+                        fill="rgba(66, 134, 244, 0.1)"
                       >
                         serbice
                         <svg
@@ -7729,6 +7735,7 @@ exports[`renders <Cns services /> without throwing 1`] = `
                     >
                       <li
                         className="c26"
+                        fill="rgba(66, 134, 244, 0.1)"
                       >
                         dssasda
                         <svg
@@ -7757,6 +7764,7 @@ exports[`renders <Cns services /> without throwing 1`] = `
                     >
                       <li
                         className="c26"
+                        fill="rgba(66, 134, 244, 0.1)"
                       >
                         dsasd
                         <svg
diff --git a/consoles/my-joy-instances/src/containers/instances/__tests__/__snapshots__/firewall.spec.js.snap b/consoles/my-joy-instances/src/containers/instances/__tests__/__snapshots__/firewall.spec.js.snap
index 9610adcc..fd696f1e 100644
--- a/consoles/my-joy-instances/src/containers/instances/__tests__/__snapshots__/firewall.spec.js.snap
+++ b/consoles/my-joy-instances/src/containers/instances/__tests__/__snapshots__/firewall.spec.js.snap
@@ -6299,6 +6299,7 @@ Array [
                                                 >
                                                     <li
                                                         className="c34"
+                                                        fill={null}
                                                         name="wat"
                                                         style={
                                                             Object {
@@ -7893,6 +7894,7 @@ Array [
                                                 >
                                                     <li
                                                         className="c34"
+                                                        fill={null}
                                                         name="wat"
                                                         style={
                                                             Object {
diff --git a/consoles/my-joy-instances/src/containers/instances/__tests__/__snapshots__/tags.spec.js.snap b/consoles/my-joy-instances/src/containers/instances/__tests__/__snapshots__/tags.spec.js.snap
index ec0370a7..230e270a 100644
--- a/consoles/my-joy-instances/src/containers/instances/__tests__/__snapshots__/tags.spec.js.snap
+++ b/consoles/my-joy-instances/src/containers/instances/__tests__/__snapshots__/tags.spec.js.snap
@@ -6288,6 +6288,7 @@ exports[`renders <Tags tags /> without throwing 1`] = `
       >
         <li
           className="c22"
+          fill={null}
           onClick={undefined}
         >
           name1: value1
@@ -6302,6 +6303,7 @@ exports[`renders <Tags tags /> without throwing 1`] = `
       >
         <li
           className="c22"
+          fill={null}
           onClick={undefined}
         >
           name2: value2
@@ -6316,6 +6318,7 @@ exports[`renders <Tags tags /> without throwing 1`] = `
       >
         <li
           className="c22"
+          fill={null}
           onClick={undefined}
         >
           name3: value3
diff --git a/packages/instance-steps/src/firewall/components.js b/packages/instance-steps/src/firewall/components.js
index 83ead5f6..a0f3e8f3 100644
--- a/packages/instance-steps/src/firewall/components.js
+++ b/packages/instance-steps/src/firewall/components.js
@@ -3,21 +3,27 @@ import Flex, { FlexItem } from 'styled-flex-component';
 import { Margin } from 'styled-components-spacing';
 
 import { H3, TickIcon } from 'joyent-ui-toolkit';
-import { StatusIcon } from 'joyent-ui-resource-step';
+import { StatusIcon, ErrorIcon } from 'joyent-ui-resource-step';
 
 export const Preview = ({ enabled }) => (
   <Flex>
     <FlexItem>
       <Margin right={2}>
-        <StatusIcon
-          fill="green"
-          border="greenDark"
-          Icon={() => <TickIcon fill="white" />}
-        />
+        {enabled ? (
+          <StatusIcon
+            fill="green"
+            border="greenDark"
+            Icon={() => <TickIcon fill="white" />}
+          />
+        ) : (
+          <ErrorIcon noLabel inverted />
+        )}
       </Margin>
     </FlexItem>
     <FlexItem>
-      <H3>{enabled ? 'Firewall enabled' : 'Firewall not enabled'}</H3>
+      <H3>
+        {enabled ? 'Firewall rules are enabled' : 'Firewall rules are disabled'}
+      </H3>
     </FlexItem>
   </Flex>
 );
diff --git a/packages/instance-steps/src/tags/index.js b/packages/instance-steps/src/tags/index.js
index 940f22ac..5c6fa458 100644
--- a/packages/instance-steps/src/tags/index.js
+++ b/packages/instance-steps/src/tags/index.js
@@ -39,7 +39,7 @@ const TagList = styled(BaseTagList)`
 
 const Tag = ({ name, value, onRemoveClick }) => (
   <Margin right={1} bottom={1} key={`${name}-${value}`}>
-    <TagItem fill="grey" onRemoveClick={onRemoveClick}>
+    <TagItem iconFill="grey" onRemoveClick={onRemoveClick}>
       {name ? `${name}: ${value}` : value}
     </TagItem>
   </Margin>
diff --git a/packages/resource-step/src/status-icon.js b/packages/resource-step/src/status-icon.js
index a4587af8..bf625122 100644
--- a/packages/resource-step/src/status-icon.js
+++ b/packages/resource-step/src/status-icon.js
@@ -57,10 +57,22 @@ export const Saved = ({ inverted, children }) => {
   );
 };
 
-export const Error = ({ children }) => (
-  <StatusIcon border="redDark" Icon={() => <CloseIcon fill="redDark" />}>
-    <Margin right="1">
-      <Label color="redDark">Error</Label>
-    </Margin>
-  </StatusIcon>
-);
+export const Error = ({ inverted = false, noLabel = false, children }) => {
+  const fill = inverted ? 'red' : 'white';
+  const iconFill = inverted ? 'white' : 'redDark';
+  console.log(inverted, fill, iconFill);
+
+  return (
+    <StatusIcon
+      border="redDark"
+      fill={fill}
+      Icon={() => <CloseIcon fill={iconFill} />}
+    >
+      {noLabel ? null : (
+        <Margin right="1">
+          <Label color="redDark">Error</Label>
+        </Margin>
+      )}
+    </StatusIcon>
+  );
+};
diff --git a/packages/resource-widgets/src/__tests__/__snapshots__/firewall.spec.js.snap b/packages/resource-widgets/src/__tests__/__snapshots__/firewall.spec.js.snap
index 87170d37..c61da9f4 100644
--- a/packages/resource-widgets/src/__tests__/__snapshots__/firewall.spec.js.snap
+++ b/packages/resource-widgets/src/__tests__/__snapshots__/firewall.spec.js.snap
@@ -1279,6 +1279,7 @@ Array [
                                         >
                                             <li
                                                 className="c18"
+                                                fill={null}
                                                 name="wat"
                                                 style={
                                                     Object {
@@ -3377,6 +3378,7 @@ Array [
                                     >
                                         <li
                                             className="c14"
+                                            fill={null}
                                             name="wat"
                                             style={
                                                 Object {
@@ -4799,6 +4801,7 @@ Array [
                                         >
                                             <li
                                                 className="c18"
+                                                fill={null}
                                                 name="wat"
                                                 style={
                                                     Object {
diff --git a/packages/resource-widgets/src/cns/index.js b/packages/resource-widgets/src/cns/index.js
index 4f814960..2cdc6c32 100644
--- a/packages/resource-widgets/src/cns/index.js
+++ b/packages/resource-widgets/src/cns/index.js
@@ -203,6 +203,7 @@ const CnsHostnames = ({
             {services.map(value => (
               <TagItem
                 active
+                fill={'rgba(66, 134, 244, 0.1)'}
                 key={value}
                 onRemoveClick={
                   onRemoveService && (() => onRemoveService(value))
diff --git a/packages/ui-toolkit/src/tags/item.js b/packages/ui-toolkit/src/tags/item.js
index ceaaa178..93d20937 100644
--- a/packages/ui-toolkit/src/tags/item.js
+++ b/packages/ui-toolkit/src/tags/item.js
@@ -32,6 +32,10 @@ const Tag = styled.li`
       background: ${props => props.theme.disabled};
   `};
 
+  ${is('fill')`
+    background: ${props => props.fill};
+  `};
+
   ${is('error')`
       border: ${remcalc(1)} solid ${props => props.theme.red};
   `};
@@ -46,13 +50,23 @@ const Tag = styled.li`
 `;
 
 export default withTheme(
-  ({ theme, children, active, onRemoveClick, fill = null, ...rest }) => (
+  ({
+    theme,
+    children,
+    active,
+    onRemoveClick,
+    fill = null,
+    iconFill = null,
+    ...rest
+  }) => (
     <Container>
-      <Tag active={active} {...rest}>
+      <Tag fill={fill} active={active} {...rest}>
         {children}
         {onRemoveClick ? (
           <CloseIcon
-            fill={fill ? fill : active ? theme.primaryActive : theme.text}
+            fill={
+              iconFill ? iconFill : active ? theme.primaryActive : theme.text
+            }
             disabled
             onClick={onRemoveClick}
           />