Removes EE differences from environmnet_item
Creares a mixin & moves the EE template differences into CE
This commit is contained in:
parent
a89df58527
commit
90dc0928ea
4 changed files with 32 additions and 1 deletions
|
@ -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: {
|
||||
|
@ -467,9 +468,18 @@ export default {
|
|||
<div v-if="!model.isFolder" class="table-mobile-header" role="rowheader">
|
||||
{{ s__('Environments|Environment') }}
|
||||
</div>
|
||||
|
||||
<span v-if="shouldRenderDeployBoard" class="deploy-board-icon" @click="toggleDeployBoard">
|
||||
<icon :name="deployIconName" />
|
||||
</span>
|
||||
|
||||
<span v-if="!model.isFolder" class="environment-name table-mobile-content">
|
||||
<a class="qa-environment-link" :href="environmentPath"> {{ model.name }} </a>
|
||||
<span v-if="isProtected" class="badge badge-success">
|
||||
{{ s__('Environments|protected') }}
|
||||
</span>
|
||||
</span>
|
||||
|
||||
<span v-else class="folder-name" role="button" @click="onClickFolder">
|
||||
<icon :name="folderIconName" class="folder-icon" />
|
||||
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
export default {
|
||||
computed: {
|
||||
deployIconName() {
|
||||
return '';
|
||||
},
|
||||
shouldRenderDeployBoard() {
|
||||
return false;
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
toggleDeployBoard() {},
|
||||
},
|
||||
};
|
5
changelogs/unreleased/10029-env-item.yml
Normal file
5
changelogs/unreleased/10029-env-item.yml
Normal file
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Removes EE differences for environment_item.vue
|
||||
merge_request:
|
||||
author:
|
||||
type: other
|
|
@ -3196,6 +3196,9 @@ msgstr ""
|
|||
msgid "Environments|You don't have any environments right now"
|
||||
msgstr ""
|
||||
|
||||
msgid "Environments|protected"
|
||||
msgstr ""
|
||||
|
||||
msgid "Epic"
|
||||
msgstr ""
|
||||
|
||||
|
|
Loading…
Reference in a new issue