diff options
Diffstat (limited to 'app/assets/javascripts/integrations/edit')
7 files changed, 23 insertions, 29 deletions
diff --git a/app/assets/javascripts/integrations/edit/components/active_checkbox.vue b/app/assets/javascripts/integrations/edit/components/active_checkbox.vue index f7d7f4aa010..9804a9e15f6 100644 --- a/app/assets/javascripts/integrations/edit/components/active_checkbox.vue +++ b/app/assets/javascripts/integrations/edit/components/active_checkbox.vue @@ -1,6 +1,7 @@ <script> import { GlFormGroup, GlFormCheckbox } from '@gitlab/ui'; import { mapGetters } from 'vuex'; +import { TOGGLE_INTEGRATION_EVENT } from '~/integrations/constants'; import eventHub from '../event_hub'; export default { @@ -26,7 +27,7 @@ export default { }, methods: { onChange(e) { - eventHub.$emit('toggle', e); + eventHub.$emit(TOGGLE_INTEGRATION_EVENT, e); }, }, }; diff --git a/app/assets/javascripts/integrations/edit/components/dynamic_field.vue b/app/assets/javascripts/integrations/edit/components/dynamic_field.vue index 1fd4083b920..f30298676df 100644 --- a/app/assets/javascripts/integrations/edit/components/dynamic_field.vue +++ b/app/assets/javascripts/integrations/edit/components/dynamic_field.vue @@ -9,6 +9,7 @@ import { } from '@gitlab/ui'; import { capitalize, lowerCase, isEmpty } from 'lodash'; import { mapGetters } from 'vuex'; +import { VALIDATE_INTEGRATION_FORM_EVENT } from '~/integrations/constants'; import eventHub from '../event_hub'; export default { @@ -121,10 +122,10 @@ export default { if (this.isNonEmptyPassword) { this.model = null; } - eventHub.$on('validateForm', this.validateForm); + eventHub.$on(VALIDATE_INTEGRATION_FORM_EVENT, this.validateForm); }, beforeDestroy() { - eventHub.$off('validateForm', this.validateForm); + eventHub.$off(VALIDATE_INTEGRATION_FORM_EVENT, this.validateForm); }, methods: { validateForm() { diff --git a/app/assets/javascripts/integrations/edit/components/integration_form.vue b/app/assets/javascripts/integrations/edit/components/integration_form.vue index 63f007170d0..ba1aeb28616 100644 --- a/app/assets/javascripts/integrations/edit/components/integration_form.vue +++ b/app/assets/javascripts/integrations/edit/components/integration_form.vue @@ -2,7 +2,11 @@ import { GlButton, GlModalDirective, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; import { mapState, mapActions, mapGetters } from 'vuex'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { integrationLevels } from '../constants'; +import { + TEST_INTEGRATION_EVENT, + SAVE_INTEGRATION_EVENT, + integrationLevels, +} from '~/integrations/constants'; import eventHub from '../event_hub'; import ActiveCheckbox from './active_checkbox.vue'; @@ -75,11 +79,11 @@ export default { ]), onSaveClick() { this.setIsSaving(true); - eventHub.$emit('saveIntegration'); + eventHub.$emit(SAVE_INTEGRATION_EVENT); }, onTestClick() { this.setIsTesting(true); - eventHub.$emit('testIntegration'); + eventHub.$emit(TEST_INTEGRATION_EVENT); }, onResetClick() { this.fetchResetIntegration(); diff --git a/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue b/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue index 1242493fb57..0521e1eeea5 100644 --- a/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue +++ b/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue @@ -1,6 +1,10 @@ <script> import { GlFormGroup, GlFormCheckbox, GlFormInput, GlSprintf, GlLink } from '@gitlab/ui'; import { mapGetters } from 'vuex'; +import { + VALIDATE_INTEGRATION_FORM_EVENT, + GET_JIRA_ISSUE_TYPES_EVENT, +} from '~/integrations/constants'; import eventHub from '../event_hub'; import JiraUpgradeCta from './jira_upgrade_cta.vue'; @@ -77,17 +81,17 @@ export default { }, }, created() { - eventHub.$on('validateForm', this.validateForm); + eventHub.$on(VALIDATE_INTEGRATION_FORM_EVENT, this.validateForm); }, beforeDestroy() { - eventHub.$off('validateForm', this.validateForm); + eventHub.$off(VALIDATE_INTEGRATION_FORM_EVENT, this.validateForm); }, methods: { validateForm() { this.validated = true; }, getJiraIssueTypes() { - eventHub.$emit('getJiraIssueTypes'); + eventHub.$emit(GET_JIRA_ISSUE_TYPES_EVENT); }, }, }; diff --git a/app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue b/app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue index 1cc5a185f03..249a3e105b1 100644 --- a/app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue +++ b/app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue @@ -9,6 +9,7 @@ import { } from '@gitlab/ui'; import { mapGetters } from 'vuex'; import { helpPagePath } from '~/helpers/help_page_helper'; +import { VALIDATE_INTEGRATION_FORM_EVENT } from '~/integrations/constants'; import { s__ } from '~/locale'; import eventHub from '../event_hub'; @@ -118,10 +119,10 @@ export default { }, }, created() { - eventHub.$on('validateForm', this.validateForm); + eventHub.$on(VALIDATE_INTEGRATION_FORM_EVENT, this.validateForm); }, beforeDestroy() { - eventHub.$off('validateForm', this.validateForm); + eventHub.$off(VALIDATE_INTEGRATION_FORM_EVENT, this.validateForm); }, methods: { validateForm() { diff --git a/app/assets/javascripts/integrations/edit/components/override_dropdown.vue b/app/assets/javascripts/integrations/edit/components/override_dropdown.vue index 7b3a067b186..63650400bb7 100644 --- a/app/assets/javascripts/integrations/edit/components/override_dropdown.vue +++ b/app/assets/javascripts/integrations/edit/components/override_dropdown.vue @@ -2,7 +2,7 @@ import { GlDropdown, GlDropdownItem, GlLink } from '@gitlab/ui'; import { mapState } from 'vuex'; import { s__ } from '~/locale'; -import { defaultIntegrationLevel, overrideDropdownDescriptions } from '../constants'; +import { defaultIntegrationLevel, overrideDropdownDescriptions } from '~/integrations/constants'; const dropdownOptions = [ { diff --git a/app/assets/javascripts/integrations/edit/constants.js b/app/assets/javascripts/integrations/edit/constants.js deleted file mode 100644 index b74ae209eb7..00000000000 --- a/app/assets/javascripts/integrations/edit/constants.js +++ /dev/null @@ -1,17 +0,0 @@ -import { s__ } from '~/locale'; - -export const integrationLevels = { - GROUP: 'group', - INSTANCE: 'instance', -}; - -export const defaultIntegrationLevel = integrationLevels.INSTANCE; - -export const overrideDropdownDescriptions = { - [integrationLevels.GROUP]: s__( - 'Integrations|Default settings are inherited from the group level.', - ), - [integrationLevels.INSTANCE]: s__( - 'Integrations|Default settings are inherited from the instance level.', - ), -}; |