1 files changed, 12 insertions, 6 deletions
diff --git a/app/assets/javascripts/runner/components/search_tokens/tag_token.vue b/app/assets/javascripts/runner/components/search_tokens/tag_token.vue
index 59230bb809e..6e7c41885f8 100644
--- a/app/assets/javascripts/runner/components/search_tokens/tag_token.vue
+++ b/app/assets/javascripts/runner/components/search_tokens/tag_token.vue
@@ -7,6 +7,12 @@ import { s__ } from '~/locale';
 import BaseToken from '~/vue_shared/components/filtered_search_bar/tokens/base_token.vue';
 import { RUNNER_TAG_BG_CLASS } from '../../constants';
 
+// TODO This should be implemented via a GraphQL API
+// The API should
+// 1) scope to the rights of the user
+// 2) stay up to date to the removal of old tags
+// 3) consider the scope of search, like searching within the tags of a group
+// See: https://gitlab.com/gitlab-org/gitlab/-/issues/333796
 export const TAG_SUGGESTIONS_PATH = '/admin/runners/tag_list.json';
 
 export default {
@@ -29,12 +35,6 @@ export default {
   },
   methods: {
     getTagsOptions(search) {
-      // TODO This should be implemented via a GraphQL API
-      // The API should
-      // 1) scope to the rights of the user
-      // 2) stay up to date to the removal of old tags
-      // 3) consider the scope of search, like searching within the tags of a group
-      // See: https://gitlab.com/gitlab-org/gitlab/-/issues/333796
       return axios
         .get(TAG_SUGGESTIONS_PATH, {
           params: {
@@ -46,6 +46,12 @@ export default {
         });
     },
     async fetchTags(searchTerm) {
+      // Note: Suggestions should only be enabled for admin users
+      if (this.config.suggestionsDisabled) {
+        this.tags = [];
+        return;
+      }
+
       this.loading = true;
       try {
         this.tags = await this.getTagsOptions(searchTerm);