From 90d6b312645a66787151e6340be7027ca62cb160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Ramos?= <mail@sergioramos.me>
Date: Thu, 15 Mar 2018 16:22:15 +0000
Subject: [PATCH] feat(instances): remove not working aff features

---
 .../__snapshots__/affinity.spec.js.snap       |  30 ------
 .../components/create-instance/affinity.js    | 101 +++++++++---------
 .../src/containers/create-instance/index.js   |   3 -
 3 files changed, 48 insertions(+), 86 deletions(-)

diff --git a/packages/my-joy-instances/src/components/create-instance/__tests__/__snapshots__/affinity.spec.js.snap b/packages/my-joy-instances/src/components/create-instance/__tests__/__snapshots__/affinity.spec.js.snap
index 1e074eea..e456b9e8 100644
--- a/packages/my-joy-instances/src/components/create-instance/__tests__/__snapshots__/affinity.spec.js.snap
+++ b/packages/my-joy-instances/src/components/create-instance/__tests__/__snapshots__/affinity.spec.js.snap
@@ -864,26 +864,11 @@ exports[`renders <Rule/> without throwing 1`] = `
             >
               equalling
             </option>
-            <option
-              value="not-equalling"
-            >
-              not equalling
-            </option>
-            <option
-              value="containing"
-            >
-              containing
-            </option>
             <option
               value="starting"
             >
               starting with
             </option>
-            <option
-              value="ending"
-            >
-              ending with
-            </option>
           </select>
         </div>
       </div>
@@ -1726,26 +1711,11 @@ exports[`renders <Rule/> without throwing 2`] = `
             >
               equalling
             </option>
-            <option
-              value="not-equalling"
-            >
-              not equalling
-            </option>
-            <option
-              value="containing"
-            >
-              containing
-            </option>
             <option
               value="starting"
             >
               starting with
             </option>
-            <option
-              value="ending"
-            >
-              ending with
-            </option>
           </select>
         </div>
       </div>
diff --git a/packages/my-joy-instances/src/components/create-instance/affinity.js b/packages/my-joy-instances/src/components/create-instance/affinity.js
index 100e1ab8..1a8173df 100644
--- a/packages/my-joy-instances/src/components/create-instance/affinity.js
+++ b/packages/my-joy-instances/src/components/create-instance/affinity.js
@@ -21,14 +21,45 @@ const Values = touched => (
   <Margin right={1}>
     <Select style={style} touched={touched} width={remcalc(130)} embedded>
       <option value="equalling">equalling</option>
-      <option value="not-equalling">not equalling</option>
-      <option value="containing">containing</option>
       <option value="starting">starting with</option>
-      <option value="ending">ending with</option>
     </Select>
   </Margin>
 );
 
+      // {rule.type === 'tag' ? (
+      //   <Fragment>
+      //     <FormGroup name="name" field={Field}>
+      //       <Input
+      //         style={style}
+      //         onBlur={null}
+      //         type="text"
+      //         placeholder="name"
+      //         small
+      //         embedded
+      //         required
+      //       />
+      //       <FormMeta small absolute />
+      //     </FormGroup>
+      //     <H5 style={style} inline noMargin>
+      //       and value{' '}
+      //     </H5>
+      //     <FormGroup name="pattern" field={Field}>
+      //       {Values(rule.pattern)}
+      //     </FormGroup>
+      //     <FormGroup name="value" field={Field}>
+      //       <Input
+      //         style={style}
+      //         onBlur={null}
+      //         type="text"
+      //         placeholder="value"
+      //         embedded
+      //         required
+      //       />
+      //       <FormMeta small absolute />
+      //     </FormGroup>
+      //   </Fragment>
+      // ) : (
+
 export const Rule = ({ valid, ...rule }) => (
   <Margin bottom={valid ? 4 : 8}>
     <Flex alignCenter wrap>
@@ -75,56 +106,20 @@ export const Rule = ({ valid, ...rule }) => (
           <option value="tag">tag</option>
         </Select>
       </FormGroup>
-      {rule.type === 'tag' ? (
-        <Fragment>
-          <FormGroup name="name" field={Field}>
-            <Input
-              style={style}
-              onBlur={null}
-              type="text"
-              placeholder="name"
-              small
-              embedded
-              required
-            />
-            <FormMeta small absolute />
-          </FormGroup>
-          <H5 style={style} inline noMargin>
-            and value{' '}
-          </H5>
-          <FormGroup name="pattern" field={Field}>
-            {Values(rule.pattern)}
-          </FormGroup>
-          <FormGroup name="value" field={Field}>
-            <Input
-              style={style}
-              onBlur={null}
-              type="text"
-              placeholder="value"
-              embedded
-              required
-            />
-            <FormMeta small absolute />
-          </FormGroup>
-        </Fragment>
-      ) : (
-        <Fragment>
-          <FormGroup name="pattern" field={Field}>
-            {Values(rule.pattern)}
-          </FormGroup>
-          <FormGroup name="value" field={Field}>
-            <Input
-              onBlur={null}
-              style={style}
-              type="text"
-              placeholder="Example instance name: nginx"
-              embedded
-              required
-            />
-            <FormMeta absolute />
-          </FormGroup>
-        </Fragment>
-      )}
+      <FormGroup name="pattern" field={Field}>
+        {Values(rule.pattern)}
+      </FormGroup>
+      <FormGroup name="value" field={Field}>
+        <Input
+          onBlur={null}
+          style={style}
+          type="text"
+          placeholder="Example instance name: nginx"
+          embedded
+          required
+        />
+        <FormMeta absolute />
+      </FormGroup>
     </Flex>
   </Margin>
 );
diff --git a/packages/my-joy-instances/src/containers/create-instance/index.js b/packages/my-joy-instances/src/containers/create-instance/index.js
index ca94405a..212c5fd3 100644
--- a/packages/my-joy-instances/src/containers/create-instance/index.js
+++ b/packages/my-joy-instances/src/containers/create-instance/index.js
@@ -281,10 +281,7 @@ export default compose(
 
       const patterns = {
         equalling: value => value,
-        'not-equalling': value => `/^!${value}$/`,
-        containing: value => `/${value}/`,
         starting: value => `/^${value}/`,
-        ending: value => `/${value}$/`
       };
 
       const _name = identity === 'name' ? 'instance' : name;