From 4779060c44aaa97f25a33e0f5f330a9f9333b911 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Fri, 8 Mar 2019 14:26:04 +0000
Subject: [PATCH 1/2] Removes EE differences from environmnet_item

Creares a mixin & moves the EE template
differences into CE
---
 .../environments/components/environment_item.vue    |  6 ++++--
 .../environments/mixins/environment_item_mixin.js   | 13 +++++++++++++
 changelogs/unreleased/10029-env-item.yml            |  5 +++++
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/javascripts/environments/mixins/environment_item_mixin.js
 create mode 100644 changelogs/unreleased/10029-env-item.yml

diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue
index 74c68998da55d1..d2f8f8701c370c 100644
--- a/app/assets/javascripts/environments/components/environment_item.vue
+++ b/app/assets/javascripts/environments/components/environment_item.vue
@@ -14,6 +14,7 @@ import CommitComponent from '../../vue_shared/components/commit.vue';
 import eventHub from '../event_hub';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { CLUSTER_TYPE } from '~/clusters/constants';
+import environmentItemMixin from 'ee_else_ce/environments/mixins/environment_item_mixin';
 
 /**
  * Environment Item Component
@@ -34,7 +35,7 @@ export default {
     TerminalButtonComponent,
     MonitoringButtonComponent,
   },
-
+  mixins: [environmentItemMixin],
   directives: {
     GlTooltip: GlTooltipDirective,
   },
@@ -475,7 +476,7 @@ export default {
         {{ s__('Environments|Environment') }}
       </div>
 
-      <span v-if="model.hasDeployBoard" class="deploy-board-icon" @click="toggleDeployBoard">
+      <span v-if="shouldRenderDeployBoard" class="deploy-board-icon" @click="toggleDeployBoard">
         <icon :name="deployIconName" />
       </span>
 
@@ -485,6 +486,7 @@ export default {
           {{ s__('Environments|protected') }}
         </span>
       </span>
+
       <span v-else class="folder-name" role="button" @click="onClickFolder">
         <icon :name="folderIconName" class="folder-icon" />
 
diff --git a/app/assets/javascripts/environments/mixins/environment_item_mixin.js b/app/assets/javascripts/environments/mixins/environment_item_mixin.js
new file mode 100644
index 00000000000000..2dfed36ec99df2
--- /dev/null
+++ b/app/assets/javascripts/environments/mixins/environment_item_mixin.js
@@ -0,0 +1,13 @@
+export default {
+  computed: {
+    deployIconName() {
+      return '';
+    },
+    shouldRenderDeployBoard() {
+      return false;
+    },
+  },
+  methods: {
+    toggleDeployBoard() {},
+  },
+};
diff --git a/changelogs/unreleased/10029-env-item.yml b/changelogs/unreleased/10029-env-item.yml
new file mode 100644
index 00000000000000..f4e742d3e17399
--- /dev/null
+++ b/changelogs/unreleased/10029-env-item.yml
@@ -0,0 +1,5 @@
+---
+title: Removes EE differences for environment_item.vue
+merge_request:
+author:
+type: other
-- 
GitLab


From 3648978245835d473cc2cbbca9ac8efee05768d5 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Fri, 8 Mar 2019 16:17:00 +0000
Subject: [PATCH 2/2] Creates EE mixin

---
 .../components/environment_item.vue             | 11 ++---------
 .../mixins/environment_item_mixin.js            | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 ee/app/assets/javascripts/environments/mixins/environment_item_mixin.js

diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue
index d2f8f8701c370c..a092bdfbc6ce2b 100644
--- a/app/assets/javascripts/environments/components/environment_item.vue
+++ b/app/assets/javascripts/environments/components/environment_item.vue
@@ -4,6 +4,7 @@ import _ from 'underscore';
 import { GlTooltipDirective } from '@gitlab/ui';
 import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
 import Icon from '~/vue_shared/components/icon.vue';
+import environmentItemMixin from 'ee_else_ce/environments/mixins/environment_item_mixin';
 import ActionsComponent from './environment_actions.vue';
 import ExternalUrlComponent from './environment_external_url.vue';
 import StopComponent from './environment_stop.vue';
@@ -14,7 +15,6 @@ import CommitComponent from '../../vue_shared/components/commit.vue';
 import eventHub from '../event_hub';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { CLUSTER_TYPE } from '~/clusters/constants';
-import environmentItemMixin from 'ee_else_ce/environments/mixins/environment_item_mixin';
 
 /**
  * Environment Item Component
@@ -35,10 +35,10 @@ export default {
     TerminalButtonComponent,
     MonitoringButtonComponent,
   },
-  mixins: [environmentItemMixin],
   directives: {
     GlTooltip: GlTooltipDirective,
   },
+  mixins: [environmentItemMixin],
 
   props: {
     model: {
@@ -441,19 +441,12 @@ export default {
     folderIconName() {
       return this.model.isOpen ? 'chevron-down' : 'chevron-right';
     },
-
-    deployIconName() {
-      return this.model.isDeployBoardVisible ? 'chevron-down' : 'chevron-right';
-    },
   },
 
   methods: {
     onClickFolder() {
       eventHub.$emit('toggleFolder', this.model);
     },
-    toggleDeployBoard() {
-      eventHub.$emit('toggleDeployBoard', this.model);
-    },
   },
 };
 </script>
diff --git a/ee/app/assets/javascripts/environments/mixins/environment_item_mixin.js b/ee/app/assets/javascripts/environments/mixins/environment_item_mixin.js
new file mode 100644
index 00000000000000..694e5740d9e900
--- /dev/null
+++ b/ee/app/assets/javascripts/environments/mixins/environment_item_mixin.js
@@ -0,0 +1,17 @@
+import eventHub from '~/environments/event_hub';
+
+export default {
+  computed: {
+    deployIconName() {
+      return this.model.isDeployBoardVisible ? 'chevron-down' : 'chevron-right';
+    },
+    shouldRenderDeployBoard() {
+      return this.model.hasDeployBoard;
+    },
+  },
+  methods: {
+    toggleDeployBoard() {
+      eventHub.$emit('toggleDeployBoard', this.model);
+    },
+  },
+};
-- 
GitLab