Commit dcc10797 authored by Paul Slaughter's avatar Paul Slaughter

Merge branch '212320-mixin-container' into 'master'

Moved container_mixin out of ee folder

See merge request gitlab-org/gitlab!30061
parents a60753c0 93965a24
<script> <script>
import { GlLoadingIcon } from '@gitlab/ui'; import { GlLoadingIcon } from '@gitlab/ui';
import containerMixin from 'ee_else_ce/environments/mixins/container_mixin';
import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue';
import EnvironmentTable from '../components/environments_table.vue'; import EnvironmentTable from '../components/environments_table.vue';
...@@ -10,8 +9,12 @@ export default { ...@@ -10,8 +9,12 @@ export default {
TablePagination, TablePagination,
GlLoadingIcon, GlLoadingIcon,
}, },
mixins: [containerMixin],
props: { props: {
canaryDeploymentFeatureId: {
type: String,
required: false,
default: null,
},
isLoading: { isLoading: {
type: Boolean, type: Boolean,
required: true, required: true,
...@@ -28,6 +31,31 @@ export default { ...@@ -28,6 +31,31 @@ export default {
type: Boolean, type: Boolean,
required: true, required: true,
}, },
deployBoardsHelpPath: {
type: String,
required: false,
default: '',
},
helpCanaryDeploymentsPath: {
type: String,
required: false,
default: '',
},
lockPromotionSvgPath: {
type: String,
required: false,
default: '',
},
showCanaryDeploymentCallout: {
type: Boolean,
required: false,
default: false,
},
userCalloutsPath: {
type: String,
required: false,
default: '',
},
}, },
methods: { methods: {
onChangePage(page) { onChangePage(page) {
......
export default {
props: {
canaryDeploymentFeatureId: {
type: String,
required: false,
default: null,
},
showCanaryDeploymentCallout: {
type: Boolean,
required: false,
default: false,
},
userCalloutsPath: {
type: String,
required: false,
default: null,
},
lockPromotionSvgPath: {
type: String,
required: false,
default: null,
},
helpCanaryDeploymentsPath: {
type: String,
required: false,
default: null,
},
deployBoardsHelpPath: {
type: String,
required: false,
default: '',
},
},
};
export default {
props: {
canaryDeploymentFeatureId: {
type: String,
required: true,
},
showCanaryDeploymentCallout: {
type: Boolean,
required: true,
},
userCalloutsPath: {
type: String,
required: true,
},
lockPromotionSvgPath: {
type: String,
required: true,
},
helpCanaryDeploymentsPath: {
type: String,
required: true,
},
deployBoardsHelpPath: {
type: String,
required: false,
default: '',
},
},
};
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