diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
commit | 419c53ec62de6e97a517abd5fdd4cbde3a942a34 (patch) | |
tree | 1f43a548b46bca8a5fb8fe0c31cef1883d49c5b6 /app/assets/javascripts/invite_members | |
parent | 1da20d9135b3ad9e75e65b028bffc921aaf8deb7 (diff) |
Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42
Diffstat (limited to 'app/assets/javascripts/invite_members')
3 files changed, 13 insertions, 6 deletions
diff --git a/app/assets/javascripts/invite_members/components/invite_groups_modal.vue b/app/assets/javascripts/invite_members/components/invite_groups_modal.vue index 91dbd86418c..4b492e48095 100644 --- a/app/assets/javascripts/invite_members/components/invite_groups_modal.vue +++ b/app/assets/javascripts/invite_members/components/invite_groups_modal.vue @@ -16,7 +16,7 @@ import GroupSelect from './group_select.vue'; import InviteGroupNotification from './invite_group_notification.vue'; export default { - name: 'InviteMembersModal', + name: 'InviteGroupsModal', components: { GroupSelect, InviteModalBase, diff --git a/app/assets/javascripts/invite_members/components/invite_members_modal.vue b/app/assets/javascripts/invite_members/components/invite_members_modal.vue index e9d7acdc913..509efd31dcd 100644 --- a/app/assets/javascripts/invite_members/components/invite_members_modal.vue +++ b/app/assets/javascripts/invite_members/components/invite_members_modal.vue @@ -1,12 +1,14 @@ <script> import { GlAlert, GlButton, GlCollapse, GlIcon } from '@gitlab/ui'; import { partition, isString, uniqueId, isEmpty } from 'lodash'; +import SafeHtml from '~/vue_shared/directives/safe_html'; import InviteModalBase from 'ee_else_ce/invite_members/components/invite_modal_base.vue'; import Api from '~/api'; import Tracking from '~/tracking'; import { BV_SHOW_MODAL, BV_HIDE_MODAL } from '~/lib/utils/constants'; import { n__, sprintf } from '~/locale'; import { memberName, triggerExternalAlert } from 'ee_else_ce/invite_members/utils/member_utils'; +import { captureException } from '~/ci/runner/sentry_utils'; import { USERS_FILTER_ALL, MEMBER_MODAL_LABELS, @@ -37,6 +39,9 @@ export default { ActiveTrialNotification: () => import('ee_component/invite_members/components/active_trial_notification.vue'), }, + directives: { + SafeHtml, + }, mixins: [Tracking.mixin({ category: INVITE_MEMBER_MODAL_TRACKING_CATEGORY })], props: { id: { @@ -262,8 +267,9 @@ export default { } else { this.onInviteSuccess(); } - } catch (e) { - this.showInvalidFeedbackMessage(e); + } catch (error) { + captureException({ error, component: this.$options.name }); + this.showInvalidFeedbackMessage(error); } finally { this.isLoading = false; } @@ -391,7 +397,8 @@ export default { :key="error.member" data-testid="errors-limited-item" > - <strong>{{ error.displayedMemberName }}:</strong> {{ error.message }} + <strong>{{ error.displayedMemberName }}:</strong> + <span v-safe-html="error.message"></span> </li> </ul> <template v-if="shouldErrorsSectionExpand"> @@ -402,7 +409,8 @@ export default { :key="error.member" data-testid="errors-expanded-item" > - <strong>{{ error.displayedMemberName }}:</strong> {{ error.message }} + <strong>{{ error.displayedMemberName }}:</strong> + <span v-safe-html="error.message"></span> </li> </ul> </gl-collapse> diff --git a/app/assets/javascripts/invite_members/components/invite_modal_base.vue b/app/assets/javascripts/invite_members/components/invite_modal_base.vue index 5a891e23faf..18d22395104 100644 --- a/app/assets/javascripts/invite_members/components/invite_modal_base.vue +++ b/app/assets/javascripts/invite_members/components/invite_modal_base.vue @@ -253,7 +253,6 @@ export default { <gl-modal ref="modal" :modal-id="modalId" - data-qa-selector="invite_members_modal_content" data-testid="invite-modal" size="sm" dialog-class="gl-mx-5" |