Merge branch 'ee-10029-env-item' into 'master'

EE: Removes EE differences from environment_item

Closes #10029

See merge request gitlab-org/gitlab-ee!9936

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';
@@ -34,10 +35,10 @@ export default {
     TerminalButtonComponent,
     MonitoringButtonComponent,
   },
-
   directives: {
     GlTooltip: GlTooltipDirective,
   },
+  mixins: [environmentItemMixin],
 
   props: {
     model: {
@@ -440,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>
@@ -475,7 +469,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 +479,7 @@ export default {
           {{ s__('Environments|protected') }}
         </span>
       </span>
+
       <span v-else class="folder-name" role="button" @click="onClickFolder">
         <icon :name="folderIconName" class="folder-icon" />
 

app/assets/javascripts/environments/mixins/environment_item_mixin.js

+export default {
+  computed: {
+    deployIconName() {
+      return '';
+    },
+    shouldRenderDeployBoard() {
+      return false;
+    },
+  },
+  methods: {
+    toggleDeployBoard() {},
+  },
+};

changelogs/unreleased/10029-env-item.yml

+---
+title: Removes EE differences for environment_item.vue
+merge_request:
+author:
+type: other

ee/app/assets/javascripts/environments/mixins/environment_item_mixin.js

+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);
+    },
+  },
+};