Skip to content
Snippets Groups Projects

Add a user overage modal

Merged Diana Zubova requested to merge dz/348486-add-second-modal into master
All threads resolved!
Compare and Show latest version
12 files
+ 363
341
Compare changes
  • Side-by-side
  • Inline
Files
12
@@ -19,7 +19,7 @@ import ExperimentTracking from '~/experimentation/experiment_tracking';
import { sanitize } from '~/lib/dompurify';
import { BV_SHOW_MODAL } from '~/lib/utils/constants';
import { getParameterValues } from '~/lib/utils/url_utility';
import { sprintf, __ } from '~/locale';
import { sprintf } from '~/locale';
import {
GROUP_FILTERS,
USERS_FILTER_ALL,
@@ -28,6 +28,8 @@ import {
LEARN_GITLAB,
OVERAGE_MODAL_LINK,
OVERAGE_MODAL_TITLE,
OVERAGE_MODAL_BUTTON_LABEL,
OVERAGE_MODAL_LINK_TEXT,
overageModalInfoText,
overageModalInfoWarning,
} from '../constants';
@@ -120,7 +122,7 @@ export default {
subscriptionSeats: {
type: Number,
required: false,
default: 0,
default: 10, // TODO: pass data from backend https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78287
},
},
data() {
@@ -230,13 +232,12 @@ export default {
},
modalInfo() {
const infoText = this.$options.i18n.infoText(this.subscriptionSeats);
const infoWarningCountable = this.$options.i18n.infoWarning(this.totalUserCount);
const infoWarning = sprintf(infoWarningCountable, {
groupName: this.name,
quantity: this.totalUserCount,
});
const infoWarning = this.$options.i18n.infoWarning(this.totalUserCount, this.name);
return [infoText, infoWarning].join(' ');
return `${infoText} ${infoWarning}`;
},
modalTitleLabel() {
return this.showOverageModal ? this.$options.i18n.overageModalTitle : this.modalTitle;
},
},
mounted() {
@@ -426,8 +427,8 @@ export default {
infoWarning: overageModalInfoWarning,
overageModalTitle: OVERAGE_MODAL_TITLE,
url: OVERAGE_MODAL_LINK,
buttonLabel: __('Back'),
linkText: __('Learn more.'),
buttonLabel: OVERAGE_MODAL_BUTTON_LABEL,
linkText: OVERAGE_MODAL_LINK_TEXT,
},
membersTokenSelectLabelId: 'invite-members-input',
};
@@ -439,7 +440,7 @@ export default {
size="sm"
data-qa-selector="invite_members_modal_content"
data-testid="invite-members-modal"
:title="showOverageModal ? $options.i18n.overageModalTitle : modalTitle"
:title="modalTitleLabel"
:header-close-label="$options.labels.headerCloseLabel"
@hidden="resetFields"
@close="resetFields"
Loading