Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

7 files changed, 38 insertions, 38 deletions

diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/base_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/base_token.vue
index 6a4ff07c999..b0fa3e4c27e 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/base_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/base_token.vue
@@ -9,7 +9,7 @@ import {
 } from '@gitlab/ui';
 import { debounce } from 'lodash';
 
-import { DEBOUNCE_DELAY, FILTER_NONE_ANY, OPERATOR_IS_NOT } from '../constants';
+import { DEBOUNCE_DELAY, FILTERS_NONE_ANY, OPERATOR_NOT } from '../constants';
 import {
   getRecentlyUsedSuggestions,
   setTokenValueToRecentlyUsed,
@@ -100,9 +100,9 @@ export default {
       return this.getActiveTokenValue(this.suggestions, this.value.data);
     },
     availableDefaultSuggestions() {
-      if (this.value.operator === OPERATOR_IS_NOT) {
+      if (this.value.operator === OPERATOR_NOT) {
         return this.defaultSuggestions.filter(
-          (suggestion) => !FILTER_NONE_ANY.includes(suggestion.value),
+          (suggestion) => !FILTERS_NONE_ANY.includes(suggestion.value),
         );
       }
       return this.defaultSuggestions;
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_contact_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_contact_token.vue
index d34cfb922a9..e0fa06c159e 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_contact_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_contact_token.vue
@@ -8,7 +8,7 @@ import { isPositiveInteger } from '~/lib/utils/number_utils';
 import { __ } from '~/locale';
 import searchCrmContactsQuery from '../queries/search_crm_contacts.query.graphql';
 
-import { DEFAULT_NONE_ANY } from '../constants';
+import { OPTIONS_NONE_ANY } from '../constants';
 
 import BaseToken from './base_token.vue';
 
@@ -39,7 +39,7 @@ export default {
   },
   computed: {
     defaultContacts() {
-      return this.config.defaultContacts || DEFAULT_NONE_ANY;
+      return this.config.defaultContacts || OPTIONS_NONE_ANY;
     },
     namespace() {
       return this.config.isProject ? ITEM_TYPE.PROJECT : ITEM_TYPE.GROUP;
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_organization_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_organization_token.vue
index c7c9350ee93..3f030c8698c 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_organization_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/crm_organization_token.vue
@@ -8,7 +8,7 @@ import { isPositiveInteger } from '~/lib/utils/number_utils';
 import { __ } from '~/locale';
 import searchCrmOrganizationsQuery from '../queries/search_crm_organizations.query.graphql';
 
-import { DEFAULT_NONE_ANY } from '../constants';
+import { OPTIONS_NONE_ANY } from '../constants';
 
 import BaseToken from './base_token.vue';
 
@@ -39,7 +39,7 @@ export default {
   },
   computed: {
     defaultOrganizations() {
-      return this.config.defaultOrganizations || DEFAULT_NONE_ANY;
+      return this.config.defaultOrganizations || OPTIONS_NONE_ANY;
     },
     namespace() {
       return this.config.isProject ? ITEM_TYPE.PROJECT : ITEM_TYPE.GROUP;
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/emoji_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/emoji_token.vue
index 929823f7308..74905dc2ae0 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/emoji_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/emoji_token.vue
@@ -3,7 +3,7 @@ import { GlFilteredSearchSuggestion } from '@gitlab/ui';
 import { createAlert } from '~/flash';
 import { __ } from '~/locale';
 import BaseToken from '~/vue_shared/components/filtered_search_bar/tokens/base_token.vue';
-import { DEFAULT_NONE_ANY } from '../constants';
+import { OPTIONS_NONE_ANY } from '../constants';
 import { stripQuotes } from '../filtered_search_utils';
 
 export default {
@@ -33,7 +33,7 @@ export default {
   },
   computed: {
     defaultEmojis() {
-      return this.config.defaultEmojis || DEFAULT_NONE_ANY;
+      return this.config.defaultEmojis || OPTIONS_NONE_ANY;
     },
   },
   methods: {
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue
index bce0c11aafd..71c50ef292a 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue
@@ -5,7 +5,7 @@ import { createAlert } from '~/flash';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { __ } from '~/locale';
 
-import { DEFAULT_NONE_ANY } from '../constants';
+import { OPTIONS_NONE_ANY } from '../constants';
 import { stripQuotes } from '../filtered_search_utils';
 
 import BaseToken from './base_token.vue';
@@ -38,7 +38,7 @@ export default {
   },
   computed: {
     defaultLabels() {
-      return this.config.defaultLabels || DEFAULT_NONE_ANY;
+      return this.config.defaultLabels || OPTIONS_NONE_ANY;
     },
   },
   methods: {
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/release_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/release_token.vue
index 59701b4959e..6d681aab3ca 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/release_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/release_token.vue
@@ -3,7 +3,7 @@ import { GlFilteredSearchSuggestion } from '@gitlab/ui';
 import { createAlert } from '~/flash';
 import { __ } from '~/locale';
 import BaseToken from '~/vue_shared/components/filtered_search_bar/tokens/base_token.vue';
-import { DEFAULT_NONE_ANY } from '../constants';
+import { OPTIONS_NONE_ANY } from '../constants';
 
 export default {
   components: {
@@ -32,7 +32,7 @@ export default {
   },
   computed: {
     defaultReleases() {
-      return this.config.defaultReleases || DEFAULT_NONE_ANY;
+      return this.config.defaultReleases || OPTIONS_NONE_ANY;
     },
   },
   methods: {
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/author_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/user_token.vue
index 7c184a3c391..28e65c1185f 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/author_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/user_token.vue
@@ -4,7 +4,7 @@ import { compact } from 'lodash';
 import { createAlert } from '~/flash';
 import { __ } from '~/locale';
 
-import { DEFAULT_NONE_ANY } from '../constants';
+import { OPTIONS_NONE_ANY } from '../constants';
 
 import BaseToken from './base_token.vue';
 
@@ -30,30 +30,30 @@ export default {
   },
   data() {
     return {
-      authors: this.config.initialAuthors || [],
+      users: this.config.initialUsers || [],
       loading: false,
     };
   },
   computed: {
-    defaultAuthors() {
-      return this.config.defaultAuthors || DEFAULT_NONE_ANY;
+    defaultUsers() {
+      return this.config.defaultUsers || OPTIONS_NONE_ANY;
     },
-    preloadedAuthors() {
-      return this.config.preloadedAuthors || [];
+    preloadedUsers() {
+      return this.config.preloadedUsers || [];
     },
   },
   methods: {
-    getActiveAuthor(authors, data) {
-      return authors.find((author) => author.username.toLowerCase() === data.toLowerCase());
+    getActiveUser(users, data) {
+      return users.find((user) => user.username.toLowerCase() === data.toLowerCase());
     },
-    getAvatarUrl(author) {
-      return author.avatarUrl || author.avatar_url;
+    getAvatarUrl(user) {
+      return user.avatarUrl || user.avatar_url;
     },
-    fetchAuthors(searchTerm) {
+    fetchUsers(searchTerm) {
       this.loading = true;
       const fetchPromise = this.config.fetchPath
-        ? this.config.fetchAuthors(this.config.fetchPath, searchTerm)
-        : this.config.fetchAuthors(searchTerm);
+        ? this.config.fetchUsers(this.config.fetchPath, searchTerm)
+        : this.config.fetchUsers(searchTerm);
 
       fetchPromise
         .then((res) => {
@@ -62,7 +62,7 @@ export default {
           // return response differently
 
           // TODO: rm when completed https://gitlab.com/gitlab-org/gitlab/-/issues/345756
-          this.authors = Array.isArray(res) ? compact(res) : compact(res.data);
+          this.users = Array.isArray(res) ? compact(res) : compact(res.data);
         })
         .catch(() =>
           createAlert({
@@ -83,12 +83,12 @@ export default {
     :value="value"
     :active="active"
     :suggestions-loading="loading"
-    :suggestions="authors"
-    :get-active-token-value="getActiveAuthor"
-    :default-suggestions="defaultAuthors"
-    :preloaded-suggestions="preloadedAuthors"
+    :suggestions="users"
+    :get-active-token-value="getActiveUser"
+    :default-suggestions="defaultUsers"
+    :preloaded-suggestions="preloadedUsers"
     v-bind="$attrs"
-    @fetch-suggestions="fetchAuthors"
+    @fetch-suggestions="fetchUsers"
     v-on="$listeners"
   >
     <template #view="{ viewTokenProps: { inputValue, activeTokenValue } }">
@@ -102,15 +102,15 @@ export default {
     </template>
     <template #suggestions-list="{ suggestions }">
       <gl-filtered-search-suggestion
-        v-for="author in suggestions"
-        :key="author.username"
-        :value="author.username"
+        v-for="user in suggestions"
+        :key="user.username"
+        :value="user.username"
       >
         <div class="gl-display-flex">
-          <gl-avatar :size="32" :src="getAvatarUrl(author)" />
+          <gl-avatar :size="32" :src="getAvatarUrl(user)" />
           <div>
-            <div>{{ author.name }}</div>
-            <div>@{{ author.username }}</div>
+            <div>{{ user.name }}</div>
+            <div>@{{ user.username }}</div>
           </div>
         </div>
       </gl-filtered-search-suggestion>