Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

4 files changed, 36 insertions, 38 deletions

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 87f1ed31a7f..a334f5e4bf7 100644
--- a/app/assets/javascripts/invite_members/components/invite_members_modal.vue
+++ b/app/assets/javascripts/invite_members/components/invite_members_modal.vue
@@ -118,6 +118,7 @@ export default {
       selectedAccessLevel: undefined,
       errorsLimit: 2,
       isErrorsSectionExpanded: false,
+      emptyInvitesError: false,
     };
   },
   computed: {
@@ -133,8 +134,8 @@ export default {
     labelIntroText() {
       return this.$options.labels[this.inviteTo][this.mode].introText;
     },
-    inviteDisabled() {
-      return this.newUsersToInvite.length === 0;
+    isEmptyInvites() {
+      return Boolean(this.newUsersToInvite.length);
     },
     hasInvalidMembers() {
       return !isEmpty(this.invalidMembers);
@@ -219,6 +220,18 @@ export default {
       });
     },
   },
+  watch: {
+    isEmptyInvites: {
+      handler(updatedValue) {
+        // nothing to do if the invites are **still** empty and the emptyInvites were never set from submit
+        if (!updatedValue && !this.emptyInvitesError) {
+          return;
+        }
+
+        this.clearEmptyInviteError();
+      },
+    },
+  },
   mounted() {
     eventHub.$on('openModal', (options) => {
       this.openModal(options);
@@ -260,10 +273,19 @@ export default {
       const tracking = new ExperimentTracking(experimentName);
       tracking.event(eventName);
     },
+    showEmptyInvitesError() {
+      this.invalidFeedbackMessage = this.$options.labels.emptyInvitesErrorText;
+      this.emptyInvitesError = true;
+    },
     sendInvite({ accessLevel, expiresAt }) {
       this.isLoading = true;
       this.clearValidation();
 
+      if (!this.isEmptyInvites) {
+        this.showEmptyInvitesError();
+        return;
+      }
+
       const [usersToInviteByEmail, usersToAddById] = this.partitionNewUsersToInvite();
 
       const apiAddByInvite = this.isProject
@@ -338,6 +360,10 @@ export default {
       this.invalidFeedbackMessage = '';
       this.invalidMembers = {};
     },
+    clearEmptyInviteError() {
+      this.invalidFeedbackMessage = '';
+      this.emptyInvitesError = false;
+    },
     removeToken(token) {
       delete this.invalidMembers[memberName(token)];
       this.invalidMembers = { ...this.invalidMembers };
@@ -360,7 +386,6 @@ export default {
     :label-intro-text="labelIntroText"
     :label-search-field="$options.labels.searchField"
     :form-group-description="formGroupDescription"
-    :submit-disabled="inviteDisabled"
     :invalid-feedback-message="invalidFeedbackMessage"
     :is-loading="isLoading"
     :new-users-to-invite="newUsersToInvite"
diff --git a/app/assets/javascripts/invite_members/components/user_limit_notification.vue b/app/assets/javascripts/invite_members/components/user_limit_notification.vue
index 6c9b1f8e6d0..c3d9d959ef6 100644
--- a/app/assets/javascripts/invite_members/components/user_limit_notification.vue
+++ b/app/assets/javascripts/invite_members/components/user_limit_notification.vue
@@ -8,8 +8,6 @@ import {
   REACHED_LIMIT_MESSAGE,
   REACHED_LIMIT_UPGRADE_SUGGESTION_MESSAGE,
   CLOSE_TO_LIMIT_MESSAGE,
-  CLOSE_TO_LIMIT_MESSAGE_PERSONAL_NAMESPACE,
-  DANGER_ALERT_TITLE_PERSONAL_NAMESPACE,
 } from '../constants';
 
 export default {
@@ -52,13 +50,6 @@ export default {
       });
     },
     dangerAlertTitle() {
-      if (this.usersLimitDataset.userNamespace) {
-        return sprintf(DANGER_ALERT_TITLE_PERSONAL_NAMESPACE, {
-          count: this.freeUsersLimit,
-          members: this.pluralMembers(this.freeUsersLimit),
-        });
-      }
-
       return sprintf(DANGER_ALERT_TITLE, {
         count: this.freeUsersLimit,
         members: this.pluralMembers(this.freeUsersLimit),
@@ -71,20 +62,9 @@ export default {
     title() {
       return this.reachedLimit ? this.dangerAlertTitle : this.warningAlertTitle;
     },
-    reachedLimitMessage() {
-      if (this.usersLimitDataset.userNamespace) {
-        return this.$options.i18n.reachedLimitMessage;
-      }
-
-      return this.$options.i18n.reachedLimitUpgradeSuggestionMessage;
-    },
     message() {
       if (this.reachedLimit) {
-        return this.reachedLimitMessage;
-      }
-
-      if (this.usersLimitDataset.userNamespace) {
-        return this.$options.i18n.closeToLimitMessagePersonalNamespace;
+        return this.$options.i18n.reachedLimitUpgradeSuggestionMessage;
       }
 
       return this.$options.i18n.closeToLimitMessage;
@@ -99,7 +79,6 @@ export default {
     reachedLimitMessage: REACHED_LIMIT_MESSAGE,
     reachedLimitUpgradeSuggestionMessage: REACHED_LIMIT_UPGRADE_SUGGESTION_MESSAGE,
     closeToLimitMessage: CLOSE_TO_LIMIT_MESSAGE,
-    closeToLimitMessagePersonalNamespace: CLOSE_TO_LIMIT_MESSAGE_PERSONAL_NAMESPACE,
   },
 };
 </script>
diff --git a/app/assets/javascripts/invite_members/constants.js b/app/assets/javascripts/invite_members/constants.js
index 1ceb63e2146..f502e1ea369 100644
--- a/app/assets/javascripts/invite_members/constants.js
+++ b/app/assets/javascripts/invite_members/constants.js
@@ -81,6 +81,9 @@ export const MEMBER_ERROR_LIST_TEXT = s__(
 );
 export const COLLAPSED_ERRORS = s__('InviteMembersModal|Show more (%{count})');
 export const EXPANDED_ERRORS = s__('InviteMembersModal|Show less');
+export const EMPTY_INVITES_ERROR_TEXT = s__(
+  'InviteMembersModal|Please select members or type email addresses to invite',
+);
 
 export const MEMBER_MODAL_LABELS = {
   modal: {
@@ -119,6 +122,7 @@ export const MEMBER_MODAL_LABELS = {
   memberErrorListText: MEMBER_ERROR_LIST_TEXT,
   collapsedErrors: COLLAPSED_ERRORS,
   expandedErrors: EXPANDED_ERRORS,
+  emptyInvitesErrorText: EMPTY_INVITES_ERROR_TEXT,
 };
 
 export const GROUP_MODAL_LABELS = {
@@ -146,10 +150,6 @@ export const DANGER_ALERT_TITLE = s__(
   "InviteMembersModal|You've reached your %{count} %{members} limit for %{name}",
 );
 
-export const DANGER_ALERT_TITLE_PERSONAL_NAMESPACE = s__(
-  "InviteMembersModal|You've reached your %{count} %{members} limit for your personal projects",
-);
-
 export const REACHED_LIMIT_MESSAGE = s__(
   'InviteMembersModal|You cannot add more members, but you can remove members who no longer need access.',
 );
@@ -163,6 +163,3 @@ export const REACHED_LIMIT_UPGRADE_SUGGESTION_MESSAGE = REACHED_LIMIT_MESSAGE.co
 export const CLOSE_TO_LIMIT_MESSAGE = s__(
   'InviteMembersModal|To get more members an owner of the group can %{trialLinkStart}start a trial%{trialLinkEnd} or %{upgradeLinkStart}upgrade%{upgradeLinkEnd} to a paid tier.',
 );
-export const CLOSE_TO_LIMIT_MESSAGE_PERSONAL_NAMESPACE = s__(
-  'InviteMembersModal|To make more space, you can remove members who no longer need access.',
-);
diff --git a/app/assets/javascripts/invite_members/init_invite_members_modal.js b/app/assets/javascripts/invite_members/init_invite_members_modal.js
index 6e2c0ecb5bb..a4be3f205a3 100644
--- a/app/assets/javascripts/invite_members/init_invite_members_modal.js
+++ b/app/assets/javascripts/invite_members/init_invite_members_modal.js
@@ -20,8 +20,6 @@ export default (function initInviteMembersModal() {
         return false;
       }
 
-      const usersLimitDataset = JSON.parse(el.dataset.usersLimitDataset || '{}');
-
       inviteMembersModal = new Vue({
         el,
         name: 'InviteMembersModalRoot',
@@ -40,10 +38,9 @@ export default (function initInviteMembersModal() {
               projects: JSON.parse(el.dataset.projects || '[]'),
               usersFilter: el.dataset.usersFilter,
               filterId: parseInt(el.dataset.filterId, 10),
-              usersLimitDataset: convertObjectPropsToCamelCase({
-                ...usersLimitDataset,
-                user_namespace: parseBoolean(usersLimitDataset.user_namespace),
-              }),
+              usersLimitDataset: convertObjectPropsToCamelCase(
+                JSON.parse(el.dataset.usersLimitDataset || '{}'),
+              ),
             },
           }),
       });