diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/assets/javascripts/self_monitor | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/assets/javascripts/self_monitor')
4 files changed, 9 insertions, 8 deletions
diff --git a/app/assets/javascripts/self_monitor/components/self_monitor_form.vue b/app/assets/javascripts/self_monitor/components/self_monitor_form.vue index 6776a9ebb22..9b7264e92ce 100644 --- a/app/assets/javascripts/self_monitor/components/self_monitor_form.vue +++ b/app/assets/javascripts/self_monitor/components/self_monitor_form.vue @@ -1,10 +1,11 @@ <script> /* eslint-disable vue/no-v-html */ -import Vue from 'vue'; import { GlFormGroup, GlButton, GlModal, GlToast, GlToggle } from '@gitlab/ui'; +import Vue from 'vue'; import { mapState, mapActions } from 'vuex'; -import { __, s__, sprintf } from '~/locale'; +import { BV_SHOW_MODAL, BV_HIDE_MODAL } from '~/lib/utils/constants'; import { visitUrl, getBaseURL } from '~/lib/utils/url_utility'; +import { __, s__, sprintf } from '~/locale'; Vue.use(GlToast); @@ -98,11 +99,11 @@ export default { 'resetAlert', ]), hideSelfMonitorModal() { - this.$root.$emit('bv::hide::modal', this.modalId); + this.$root.$emit(BV_HIDE_MODAL, this.modalId); this.setSelfMonitor(true); }, showSelfMonitorModal() { - this.$root.$emit('bv::show::modal', this.modalId); + this.$root.$emit(BV_SHOW_MODAL, this.modalId); }, saveChangesSelfMonitorProject() { if (this.projectCreated && !this.projectEnabled) { diff --git a/app/assets/javascripts/self_monitor/index.js b/app/assets/javascripts/self_monitor/index.js index 7db87b4c627..384b73e528e 100644 --- a/app/assets/javascripts/self_monitor/index.js +++ b/app/assets/javascripts/self_monitor/index.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import store from './store'; import SelfMonitorForm from './components/self_monitor_form.vue'; +import store from './store'; export default () => { const el = document.querySelector('.js-self-monitoring-settings'); diff --git a/app/assets/javascripts/self_monitor/store/actions.js b/app/assets/javascripts/self_monitor/store/actions.js index 99731309a62..670ee547b02 100644 --- a/app/assets/javascripts/self_monitor/store/actions.js +++ b/app/assets/javascripts/self_monitor/store/actions.js @@ -1,7 +1,7 @@ -import { __, s__ } from '~/locale'; import axios from '~/lib/utils/axios_utils'; -import statusCodes from '~/lib/utils/http_status'; import { backOff } from '~/lib/utils/common_utils'; +import statusCodes from '~/lib/utils/http_status'; +import { __, s__ } from '~/locale'; import * as types from './mutation_types'; const TWO_MINUTES = 120000; diff --git a/app/assets/javascripts/self_monitor/store/index.js b/app/assets/javascripts/self_monitor/store/index.js index 1144fff759a..187c3bdd803 100644 --- a/app/assets/javascripts/self_monitor/store/index.js +++ b/app/assets/javascripts/self_monitor/store/index.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import Vuex from 'vuex'; -import createState from './state'; import * as actions from './actions'; import mutations from './mutations'; +import createState from './state'; Vue.use(Vuex); |