Use scoped routes for labels and milestones

Update frontend code to use /-/ scope for milestones and labels routes

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

4 files changed, 25 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 be867a3838d..891086b4142 100644
--- a/app/assets/javascripts/filtered_search/available_dropdown_mappings.js
+++ b/app/assets/javascripts/filtered_search/available_dropdown_mappings.js
@@ -8,9 +8,19 @@ import DropdownUtils from './dropdown_utils';
 import { mergeUrlParams } from '../lib/utils/url_utility';
 
 export default class AvailableDropdownMappings {
-  constructor(container, baseEndpoint, groupsOnly, includeAncestorGroups, includeDescendantGroups) {
+  constructor(
+    container,
+    baseEndpoint,
+    labelsEndpoint,
+    milestonesEndpoint,
+    groupsOnly,
+    includeAncestorGroups,
+    includeDescendantGroups,
+  ) {
     this.container = container;
     this.baseEndpoint = baseEndpoint;
+    this.labelsEndpoint = labelsEndpoint;
+    this.milestonesEndpoint = milestonesEndpoint;
     this.groupsOnly = groupsOnly;
     this.includeAncestorGroups = includeAncestorGroups;
     this.includeDescendantGroups = includeDescendantGroups;
@@ -117,11 +127,11 @@ export default class AvailableDropdownMappings {
   }
 
   getMilestoneEndpoint() {
-    return `${this.baseEndpoint}/milestones.json`;
+    return `${this.milestonesEndpoint}.json`;
   }
 
   getLabelsEndpoint() {
-    let endpoint = `${this.baseEndpoint}/labels.json?`;
+    let endpoint = `${this.labelsEndpoint}.json?`;
 
     if (this.groupsOnly) {
       endpoint = `${endpoint}only_group_labels=true&`;
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 cb0a84b490b..1cbfd7f9bb9 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
@@ -9,6 +9,8 @@ import FilteredSearchVisualTokens from './filtered_search_visual_tokens';
 export default class FilteredSearchDropdownManager {
   constructor({
     baseEndpoint = '',
+    labelsEndpoint = '',
+    milestonesEndpoint = '',
     tokenizer,
     page,
     isGroup,
@@ -18,6 +20,8 @@ export default class FilteredSearchDropdownManager {
   }) {
     this.container = FilteredSearchContainer.container;
     this.baseEndpoint = baseEndpoint.replace(/\/$/, '');
+    this.labelsEndpoint = labelsEndpoint.replace(/\/$/, '');
+    this.milestonesEndpoint = milestonesEndpoint.replace(/\/$/, '');
     this.tokenizer = tokenizer;
     this.filteredSearchTokenKeys = filteredSearchTokenKeys || FilteredSearchTokenKeys;
     this.filteredSearchInput = this.container.querySelector('.filtered-search');
@@ -48,6 +52,8 @@ export default class FilteredSearchDropdownManager {
     const availableMappings = new AvailableDropdownMappings(
       this.container,
       this.baseEndpoint,
+      this.labelsEndpoint,
+      this.milestonesEndpoint,
       this.groupsOnly,
       this.includeAncestorGroups,
       this.includeDescendantGroups,
diff --git a/app/assets/javascripts/filtered_search/filtered_search_manager.js b/app/assets/javascripts/filtered_search/filtered_search_manager.js
index 78fbb3696cc..450e0725f2e 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_manager.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_manager.js
@@ -86,6 +86,8 @@ export default class FilteredSearchManager {
       this.tokenizer = FilteredSearchTokenizer;
       this.dropdownManager = new FilteredSearchDropdownManager({
         baseEndpoint: this.filteredSearchInput.getAttribute('data-base-endpoint') || '',
+        labelsEndpoint: this.filteredSearchInput.getAttribute('data-labels-endpoint') || '',
+        milestonesEndpoint: this.filteredSearchInput.getAttribute('data-milestones-endpoint') || '',
         tokenizer: this.tokenizer,
         page: this.page,
         isGroup: this.isGroup,
diff --git a/app/assets/javascripts/filtered_search/visual_token_value.js b/app/assets/javascripts/filtered_search/visual_token_value.js
index 38327472cb3..a54b445fb0a 100644
--- a/app/assets/javascripts/filtered_search/visual_token_value.js
+++ b/app/assets/javascripts/filtered_search/visual_token_value.js
@@ -56,13 +56,13 @@ export default class VisualTokenValue {
   updateLabelTokenColor(tokenValueContainer) {
     const { tokenValue } = this;
     const filteredSearchInput = FilteredSearchContainer.container.querySelector('.filtered-search');
-    const { baseEndpoint } = filteredSearchInput.dataset;
-    const labelsEndpoint = FilteredSearchVisualTokens.getEndpointWithQueryParams(
-      `${baseEndpoint}/labels.json`,
+    const { labelsEndpoint } = filteredSearchInput.dataset;
+    const labelsEndpointWithParams = FilteredSearchVisualTokens.getEndpointWithQueryParams(
+      `${labelsEndpoint}.json`,
       filteredSearchInput.dataset.endpointQueryParams,
     );
 
-    return AjaxCache.retrieve(labelsEndpoint)
+    return AjaxCache.retrieve(labelsEndpointWithParams)
       .then(labels => {
         const matchingLabel = (labels || []).find(
           label => `~${DropdownUtils.getEscapedText(label.title)}` === tokenValue,