diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue index 74c68998da55d1fa1fdd03b5ab3e62c07d215930..a092bdfbc6ce2ba9180db0230723df9c48fa94b0 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'; @@ -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); - }, }, }; @@ -475,7 +469,7 @@ export default { {{ s__('Environments|Environment') }} - + @@ -485,6 +479,7 @@ export default { {{ s__('Environments|protected') }} + 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 0000000000000000000000000000000000000000..2dfed36ec99df2bdf1d732aa424a50c70a2291cb --- /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 0000000000000000000000000000000000000000..f4e742d3e17399fa0d160c9933fcadf64b0055e7 --- /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 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 0000000000000000000000000000000000000000..694e5740d9e900a735fe681ab8fd69b1c86f3977 --- /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); + }, + }, +};