diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-29 12:09:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-29 12:09:45 +0300 |
commit | 946b1e2fe93357d596f37d3978cf682b8b837925 (patch) | |
tree | 5ba8070fbeac96435b4b3c9c3b00127277408f17 /app/assets/javascripts/sidebar | |
parent | 47702dd42fdf551289927f9fed67b73e803bde2d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/sidebar')
10 files changed, 26 insertions, 26 deletions
diff --git a/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue b/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue index 18b26c7d8bd..15fd365b4da 100644 --- a/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue +++ b/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue @@ -1,6 +1,6 @@ <script> import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests'; -import createFlash from '~/flash'; +import { createAlert } from '~/flash'; import { __ } from '~/locale'; import eventHub from '~/sidebar/event_hub'; import Store from '~/sidebar/stores/sidebar_store'; @@ -113,7 +113,7 @@ export default { }) .catch(() => { this.loading = false; - return createFlash({ + return createAlert({ message: __('Error occurred when saving assignees'), }); }); diff --git a/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees_widget.vue b/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees_widget.vue index 26fda2a823c..395dcf73693 100644 --- a/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees_widget.vue +++ b/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees_widget.vue @@ -1,7 +1,7 @@ <script> import { GlDropdownItem } from '@gitlab/ui'; import Vue from 'vue'; -import createFlash from '~/flash'; +import { createAlert } from '~/flash'; import { IssuableType } from '~/issues/constants'; import { __, n__ } from '~/locale'; import SidebarAssigneesRealtime from '~/sidebar/components/assignees/assignees_realtime.vue'; @@ -111,7 +111,7 @@ export default { } }, error() { - createFlash({ message: __('An error occurred while fetching participants.') }); + createAlert({ message: __('An error occurred while fetching participants.') }); }, }, }, @@ -191,7 +191,7 @@ export default { return data; }) .catch(() => { - createFlash({ message: __('An error occurred while updating assignees.') }); + createAlert({ message: __('An error occurred while updating assignees.') }); }) .finally(() => { this.isSettingAssignees = false; @@ -220,7 +220,7 @@ export default { this.$refs.userSelect.showDropdown(); }, showError() { - createFlash({ message: __('An error occurred while fetching participants.') }); + createAlert({ message: __('An error occurred while fetching participants.') }); }, setDirtyState() { this.isDirty = true; diff --git a/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue b/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue index c44ce8b0057..3532b75b6e7 100644 --- a/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue +++ b/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue @@ -1,6 +1,6 @@ <script> import { GlSprintf, GlButton } from '@gitlab/ui'; -import createFlash from '~/flash'; +import { createAlert } from '~/flash'; import { IssuableType } from '~/issues/constants'; import { __, sprintf } from '~/locale'; import { confidentialityQueries } from '~/sidebar/constants'; @@ -92,7 +92,7 @@ export default { }, }) => { if (errors.length) { - createFlash({ + createAlert({ message: errors[0], }); } else { @@ -101,7 +101,7 @@ export default { }, ) .catch(() => { - createFlash({ + createAlert({ message: sprintf( __('Something went wrong while setting %{issuableType} confidentiality.'), { diff --git a/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_widget.vue b/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_widget.vue index f234c5ea3c9..f3bd58c11d4 100644 --- a/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_widget.vue +++ b/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_widget.vue @@ -1,7 +1,7 @@ <script> import produce from 'immer'; import Vue from 'vue'; -import createFlash from '~/flash'; +import { createAlert } from '~/flash'; import { __, sprintf } from '~/locale'; import SidebarEditableItem from '~/sidebar/components/sidebar_editable_item.vue'; import { confidentialityQueries, Tracking } from '~/sidebar/constants'; @@ -72,7 +72,7 @@ export default { this.$emit('confidentialityUpdated', data.workspace?.issuable?.confidential); }, error() { - createFlash({ + createAlert({ message: sprintf( __('Something went wrong while setting %{issuableType} confidentiality.'), { diff --git a/app/assets/javascripts/sidebar/components/crm_contacts/crm_contacts.vue b/app/assets/javascripts/sidebar/components/crm_contacts/crm_contacts.vue index 67f36f65b5d..81090bfa062 100644 --- a/app/assets/javascripts/sidebar/components/crm_contacts/crm_contacts.vue +++ b/app/assets/javascripts/sidebar/components/crm_contacts/crm_contacts.vue @@ -1,7 +1,7 @@ <script> import { GlIcon, GlLink, GlPopover, GlTooltipDirective } from '@gitlab/ui'; import { __, n__, sprintf } from '~/locale'; -import createFlash from '~/flash'; +import { createAlert } from '~/flash'; import { convertToGraphQLId, getIdFromGraphQLId } from '~/graphql_shared/utils'; import { TYPE_ISSUE } from '~/graphql_shared/constants'; import getIssueCrmContactsQuery from './queries/get_issue_crm_contacts.query.graphql'; @@ -41,7 +41,7 @@ export default { return data?.issue?.customerRelationsContacts?.nodes; }, error(error) { - createFlash({ + createAlert({ message: __('Something went wrong trying to load issue contacts.'), error, captureError: true, diff --git a/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue b/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue index ef99d540c86..98468583992 100644 --- a/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue +++ b/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue @@ -1,6 +1,6 @@ <script> import { GlIcon, GlDatepicker, GlTooltipDirective, GlLink, GlPopover } from '@gitlab/ui'; -import createFlash from '~/flash'; +import { createAlert } from '~/flash'; import { IssuableType } from '~/issues/constants'; import { dateInWords, formatDate, parsePikadayDate } from '~/lib/utils/datetime_utility'; import { __, sprintf } from '~/locale'; @@ -92,7 +92,7 @@ export default { this.$emit(`${this.dateType}Updated`, data.workspace?.issuable?.[this.dateType]); }, error() { - createFlash({ + createAlert({ message: sprintf( __('Something went wrong while setting %{issuableType} %{dateType} date.'), { @@ -205,7 +205,7 @@ export default { }, }) => { if (errors.length) { - createFlash({ + createAlert({ message: errors[0], }); } else { @@ -214,7 +214,7 @@ export default { }, ) .catch(() => { - createFlash({ + createAlert({ message: sprintf( __('Something went wrong while setting %{issuableType} %{dateType} date.'), { diff --git a/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue b/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue index 8145506f32c..df03af346c0 100644 --- a/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue +++ b/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue @@ -2,7 +2,7 @@ import { GlButton } from '@gitlab/ui'; import $ from 'jquery'; import { mapActions } from 'vuex'; -import createFlash from '~/flash'; +import { createAlert } from '~/flash'; import { __, sprintf } from '~/locale'; import eventHub from '../../event_hub'; @@ -52,7 +52,7 @@ export default { const flashMessage = __( 'Something went wrong trying to change the locked state of this %{issuableDisplayName}', ); - createFlash({ + createAlert({ message: sprintf(flashMessage, { issuableDisplayName: this.issuableDisplayName }), }); }) diff --git a/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue b/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue index 286bd50f6dd..d32d8a7b044 100644 --- a/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue +++ b/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue @@ -3,7 +3,7 @@ import { GlIcon, GlTooltipDirective, GlOutsideDirective as Outside } from '@gitl import { mapGetters, mapActions } from 'vuex'; import { __, sprintf } from '~/locale'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import createFlash from '~/flash'; +import { createAlert } from '~/flash'; import eventHub from '~/sidebar/event_hub'; import toast from '~/vue_shared/plugins/global_toast'; import EditForm from './edit_form.vue'; @@ -95,7 +95,7 @@ export default { const flashMessage = __( 'Something went wrong trying to change the locked state of this %{issuableDisplayName}', ); - createFlash({ + createAlert({ message: sprintf(flashMessage, { issuableDisplayName: this.issuableDisplayName }), }); }) diff --git a/app/assets/javascripts/sidebar/components/reviewers/sidebar_reviewers.vue b/app/assets/javascripts/sidebar/components/reviewers/sidebar_reviewers.vue index b0d820ddd15..e34c51bc11f 100644 --- a/app/assets/javascripts/sidebar/components/reviewers/sidebar_reviewers.vue +++ b/app/assets/javascripts/sidebar/components/reviewers/sidebar_reviewers.vue @@ -3,7 +3,7 @@ // It will soon be overhauled in Issue https://gitlab.com/gitlab-org/gitlab/-/issues/233736 import Vue from 'vue'; import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests'; -import createFlash from '~/flash'; +import { createAlert } from '~/flash'; import { __ } from '~/locale'; import eventHub from '~/sidebar/event_hub'; import Store from '~/sidebar/stores/sidebar_store'; @@ -64,7 +64,7 @@ export default { this.initialLoading = false; }, error() { - createFlash({ message: __('An error occurred while fetching reviewers.') }); + createAlert({ message: __('An error occurred while fetching reviewers.') }); }, }, }, @@ -120,7 +120,7 @@ export default { }) .catch(() => { this.loading = false; - return createFlash({ + return createAlert({ message: __('Error occurred when saving reviewers'), }); }); diff --git a/app/assets/javascripts/sidebar/components/severity/sidebar_severity.vue b/app/assets/javascripts/sidebar/components/severity/sidebar_severity.vue index a562df4ecd6..f02e0c783e1 100644 --- a/app/assets/javascripts/sidebar/components/severity/sidebar_severity.vue +++ b/app/assets/javascripts/sidebar/components/severity/sidebar_severity.vue @@ -7,7 +7,7 @@ import { GlSprintf, GlButton, } from '@gitlab/ui'; -import createFlash from '~/flash'; +import { createAlert } from '~/flash'; import { INCIDENT_SEVERITY, ISSUABLE_TYPES, I18N } from './constants'; import updateIssuableSeverity from './graphql/mutations/update_issuable_severity.mutation.graphql'; import SeverityToken from './severity.vue'; @@ -123,7 +123,7 @@ export default { this.severity = severity; }) .catch(() => - createFlash({ + createAlert({ message: `${this.$options.i18n.UPDATE_SEVERITY_ERROR} ${this.$options.i18n.TRY_AGAIN}`, }), ) |