Remove baseEndpoint from search dropdwon

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

3 files changed, 8 insertions, 7 deletions

diff --git a/app/assets/javascripts/filtered_search/available_dropdown_mappings.js b/app/assets/javascripts/filtered_search/available_dropdown_mappings.js
index 891086b4142..f280f3cd26c 100644
--- a/app/assets/javascripts/filtered_search/available_dropdown_mappings.js
+++ b/app/assets/javascripts/filtered_search/available_dropdown_mappings.js
@@ -10,7 +10,7 @@ import { mergeUrlParams } from '../lib/utils/url_utility';
 export default class AvailableDropdownMappings {
   constructor(
     container,
-    baseEndpoint,
+    runnerTagsEndpoint,
     labelsEndpoint,
     milestonesEndpoint,
     groupsOnly,
@@ -18,7 +18,7 @@ export default class AvailableDropdownMappings {
     includeDescendantGroups,
   ) {
     this.container = container;
-    this.baseEndpoint = baseEndpoint;
+    this.runnerTagsEndpoint = runnerTagsEndpoint;
     this.labelsEndpoint = labelsEndpoint;
     this.milestonesEndpoint = milestonesEndpoint;
     this.groupsOnly = groupsOnly;
@@ -149,7 +149,7 @@ export default class AvailableDropdownMappings {
   }
 
   getRunnerTagsEndpoint() {
-    return `${this.baseEndpoint}/admin/runners/tag_list.json`;
+    return `${this.runnerTagsEndpoint}.json`;
   }
 
   getMergeRequestTargetBranchesEndpoint() {
diff --git a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
index 1cbfd7f9bb9..835d3bf8a53 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
@@ -8,7 +8,7 @@ import FilteredSearchVisualTokens from './filtered_search_visual_tokens';
 
 export default class FilteredSearchDropdownManager {
   constructor({
-    baseEndpoint = '',
+    runnerTagsEndpoint = '',
     labelsEndpoint = '',
     milestonesEndpoint = '',
     tokenizer,
@@ -19,7 +19,7 @@ export default class FilteredSearchDropdownManager {
     filteredSearchTokenKeys,
   }) {
     this.container = FilteredSearchContainer.container;
-    this.baseEndpoint = baseEndpoint.replace(/\/$/, '');
+    this.runnerTagsEndpoint = runnerTagsEndpoint.replace(/\/$/, '');
     this.labelsEndpoint = labelsEndpoint.replace(/\/$/, '');
     this.milestonesEndpoint = milestonesEndpoint.replace(/\/$/, '');
     this.tokenizer = tokenizer;
@@ -51,7 +51,7 @@ export default class FilteredSearchDropdownManager {
     const supportedTokens = this.filteredSearchTokenKeys.getKeys();
     const availableMappings = new AvailableDropdownMappings(
       this.container,
-      this.baseEndpoint,
+      this.runnerTagsEndpoint,
       this.labelsEndpoint,
       this.milestonesEndpoint,
       this.groupsOnly,
diff --git a/app/assets/javascripts/filtered_search/filtered_search_manager.js b/app/assets/javascripts/filtered_search/filtered_search_manager.js
index 450e0725f2e..d1f52b91d9e 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_manager.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_manager.js
@@ -85,7 +85,8 @@ export default class FilteredSearchManager {
     if (this.filteredSearchInput) {
       this.tokenizer = FilteredSearchTokenizer;
       this.dropdownManager = new FilteredSearchDropdownManager({
-        baseEndpoint: this.filteredSearchInput.getAttribute('data-base-endpoint') || '',
+        runnerTagsEndpoint:
+          this.filteredSearchInput.getAttribute('data-runner-tags-endpoint') || '',
         labelsEndpoint: this.filteredSearchInput.getAttribute('data-labels-endpoint') || '',
         milestonesEndpoint: this.filteredSearchInput.getAttribute('data-milestones-endpoint') || '',
         tokenizer: this.tokenizer,