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
7 files
+ 194
19
Compare changes
  • Side-by-side
  • Inline
Files
7
@@ -113,9 +113,9 @@ export default {
required: true,
},
subscriptionSeats: {
type: String,
type: Number,
required: false,
default: '',
default: 10,
},
},
data() {
@@ -134,7 +134,7 @@ export default {
isLoading: false,
mode: 'default',
hasOverage: false,
totalUserCount: 1, // TODO: calculate this value
totalUserCount: null,
};
},
computed: {
@@ -284,15 +284,16 @@ export default {
}
},
checkOverage() {
// TODO: add proper check
const triggersOverage = true;
if (triggersOverage) {
// add a more complex check in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78287
// totalUserCount should be calculated there
if (this.enabledOverageCheck) {
this.totalUserCount = 1;
this.hasOverage = true;
} else {
this.sendInvite();
}
},
handleCancel() {
handleBack() {
this.hasOverage = false;
},
trackinviteMembersForTask() {
@@ -438,7 +439,7 @@ export default {
@close="resetFields"
@hide="resetFields"
>
<div :class="{ 'gl-display-none': showOverageModal }">
<div v-show="!showOverageModal">
<div class="gl-display-flex">
<div v-if="isCelebration" class="gl-p-4 gl-font-size-h1">
<gl-emoji data-name="tada" />
@@ -584,7 +585,7 @@ export default {
</gl-alert>
</div>
</div>
<div :class="{ 'gl-display-none': !showOverageModal }">
<div v-if="showOverageModal">
{{ modalInfo }}
<gl-link :href="$options.i18n.url" target="_blank">{{ $options.i18n.linkText }}</gl-link>
</div>
@@ -605,7 +606,7 @@ export default {
</gl-button>
</template>
<template v-else>
<gl-button data-testid="overage-back-button" @click="handleCancel">
<gl-button data-testid="overage-back-button" @click="handleBack">
{{ $options.i18n.buttonLabel }}
</gl-button>
<gl-button
Loading