Commit 7af9b6ae authored by Sarah GP's avatar Sarah GP

Remove feature flag refs in Vue

parent 867839bb
...@@ -58,12 +58,6 @@ export default { ...@@ -58,12 +58,6 @@ export default {
required: true, required: true,
}, },
shouldShowAutoStopDate: {
type: Boolean,
required: false,
default: false,
},
tableData: { tableData: {
type: Object, type: Object,
required: true, required: true,
...@@ -639,7 +633,7 @@ export default { ...@@ -639,7 +633,7 @@ export default {
</div> </div>
<div <div
v-if="!isFolder && shouldShowAutoStopDate" v-if="!isFolder"
class="table-section" class="table-section"
:class="tableData.autoStop.spacing" :class="tableData.autoStop.spacing"
role="gridcell" role="gridcell"
...@@ -663,7 +657,7 @@ export default { ...@@ -663,7 +657,7 @@ export default {
> >
<div class="btn-group table-action-buttons" role="group"> <div class="btn-group table-action-buttons" role="group">
<pin-component <pin-component
v-if="canShowAutoStopDate && shouldShowAutoStopDate" v-if="canShowAutoStopDate"
:auto-stop-url="autoStopUrl" :auto-stop-url="autoStopUrl"
/> />
......
...@@ -6,7 +6,6 @@ import { GlLoadingIcon } from '@gitlab/ui'; ...@@ -6,7 +6,6 @@ import { GlLoadingIcon } from '@gitlab/ui';
import { flow, reverse, sortBy } from 'lodash/fp'; import { flow, reverse, sortBy } from 'lodash/fp';
import environmentTableMixin from 'ee_else_ce/environments/mixins/environments_table_mixin'; import environmentTableMixin from 'ee_else_ce/environments/mixins/environments_table_mixin';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import EnvironmentItem from './environment_item.vue'; import EnvironmentItem from './environment_item.vue';
export default { export default {
...@@ -17,7 +16,7 @@ export default { ...@@ -17,7 +16,7 @@ export default {
CanaryDeploymentCallout: () => CanaryDeploymentCallout: () =>
import('ee_component/environments/components/canary_deployment_callout.vue'), import('ee_component/environments/components/canary_deployment_callout.vue'),
}, },
mixins: [environmentTableMixin, glFeatureFlagsMixin()], mixins: [environmentTableMixin],
props: { props: {
environments: { environments: {
type: Array, type: Array,
...@@ -43,9 +42,6 @@ export default { ...@@ -43,9 +42,6 @@ export default {
: env, : env,
); );
}, },
shouldShowAutoStopDate() {
return this.glFeatures.autoStopEnvironments;
},
tableData() { tableData() {
return { return {
// percent spacing for cols, should add up to 100 // percent spacing for cols, should add up to 100
...@@ -74,7 +70,7 @@ export default { ...@@ -74,7 +70,7 @@ export default {
spacing: 'section-5', spacing: 'section-5',
}, },
actions: { actions: {
spacing: this.shouldShowAutoStopDate ? 'section-25' : 'section-30', spacing: 'section-25',
}, },
}; };
}, },
...@@ -132,7 +128,6 @@ export default { ...@@ -132,7 +128,6 @@ export default {
{{ tableData.date.title }} {{ tableData.date.title }}
</div> </div>
<div <div
v-if="shouldShowAutoStopDate"
class="table-section" class="table-section"
:class="tableData.autoStop.spacing" :class="tableData.autoStop.spacing"
role="columnheader" role="columnheader"
...@@ -146,7 +141,6 @@ export default { ...@@ -146,7 +141,6 @@ export default {
:key="`environment-item-${i}`" :key="`environment-item-${i}`"
:model="model" :model="model"
:can-read-environment="canReadEnvironment" :can-read-environment="canReadEnvironment"
:should-show-auto-stop-date="shouldShowAutoStopDate"
:table-data="tableData" :table-data="tableData"
/> />
...@@ -180,7 +174,6 @@ export default { ...@@ -180,7 +174,6 @@ export default {
:model="children" :model="children"
:can-read-environment="canReadEnvironment" :can-read-environment="canReadEnvironment"
:table-data="tableData" :table-data="tableData"
:should-show-auto-stop-date="shouldShowAutoStopDate"
/> />
<div :key="`sub-div-${i}`"> <div :key="`sub-div-${i}`">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment