Passes through the correct endpoints

5 files changed, 46 insertions, 6 deletions

diff --git a/app/assets/javascripts/boards/components/modal/filters.js.es6 b/app/assets/javascripts/boards/components/modal/filters.js.es6
index c6c22dd24c9..8f923f65306 100644
--- a/app/assets/javascripts/boards/components/modal/filters.js.es6
+++ b/app/assets/javascripts/boards/components/modal/filters.js.es6
@@ -9,6 +9,14 @@
         type: Number,
         required: true,
       },
+      milestonePath: {
+        type: String,
+        required: true,
+      },
+      labelPath: {
+        type: String,
+        required: true,
+      },
     },
     components: {
       'user-filter': gl.issueBoards.ModalFilterUser,
@@ -30,8 +38,8 @@
           field-name="assignee_id"
           :null-user="true"
           :project-id="projectId"></user-filter>
-        <milestone-filter></milestone-filter>
-        <label-filter></label-filter>
+        <milestone-filter :milestone-path="milestonePath"></milestone-filter>
+        <label-filter :label-path="labelPath"></label-filter>
       </div>
     `,
   });
diff --git a/app/assets/javascripts/boards/components/modal/filters/label.js.es6 b/app/assets/javascripts/boards/components/modal/filters/label.js.es6
index cfea0780983..a95ef90f97f 100644
--- a/app/assets/javascripts/boards/components/modal/filters/label.js.es6
+++ b/app/assets/javascripts/boards/components/modal/filters/label.js.es6
@@ -2,6 +2,12 @@
 /* global LabelSelect */
 (() => {
   gl.issueBoards.ModalLabelFilter = Vue.extend({
+    props: {
+      labelPath: {
+        type: String,
+        required: true,
+      },
+    },
     mounted() {
       new LabelsSelect(this.$refs.dropdown);
     },
@@ -11,9 +17,9 @@
           class="dropdown-menu-toggle js-label-select js-multiselect js-extra-options"
           type="button"
           data-toggle="dropdown"
-          data-labels="/root/test/labels.json"
           data-show-any="true"
           data-show-no="true"
+          :data-labels="labelPath"
           ref="dropdown">
           <span class="dropdown-toggle-text">
             Label
diff --git a/app/assets/javascripts/boards/components/modal/filters/milestone.js.es6 b/app/assets/javascripts/boards/components/modal/filters/milestone.js.es6
index 14c95cb2dae..0511ffe81a7 100644
--- a/app/assets/javascripts/boards/components/modal/filters/milestone.js.es6
+++ b/app/assets/javascripts/boards/components/modal/filters/milestone.js.es6
@@ -2,6 +2,12 @@
 /* global MilestoneSelect */
 (() => {
   gl.issueBoards.ModalFilterMilestone = Vue.extend({
+    props: {
+      milestonePath: {
+        type: String,
+        required: true,
+      },
+    },
     mounted() {
       new MilestoneSelect(null, this.$refs.dropdown);
     },
@@ -14,7 +20,7 @@
           data-show-any="true"
           data-show-upcoming="true"
           data-field-name="milestone_title"
-          :data-milestones="'/root/test/milestones.json'"
+          :data-milestones="milestonePath"
           ref="dropdown">
           <span class="dropdown-toggle-text">
             Milestone
diff --git a/app/assets/javascripts/boards/components/modal/header.js.es6 b/app/assets/javascripts/boards/components/modal/header.js.es6
index cd672e0f1b2..c220c200d9a 100644
--- a/app/assets/javascripts/boards/components/modal/header.js.es6
+++ b/app/assets/javascripts/boards/components/modal/header.js.es6
@@ -11,6 +11,14 @@
         type: Number,
         required: true,
       },
+      milestonePath: {
+        type: String,
+        required: true,
+      },
+      labelPath: {
+        type: String,
+        required: true,
+      },
     },
     data() {
       return ModalStore.store;
@@ -58,7 +66,9 @@
           class="add-issues-search append-bottom-10"
           v-if="showSearch">
           <modal-filters
-            :project-id="projectId">
+            :project-id="projectId"
+            :milestone-path="milestonePath"
+            :label-path="labelPath">
           </modal-filters>
           <input
             placeholder="Search issues..."
diff --git a/app/assets/javascripts/boards/components/modal/index.js.es6 b/app/assets/javascripts/boards/components/modal/index.js.es6
index 49f4c73151e..c0871d74565 100644
--- a/app/assets/javascripts/boards/components/modal/index.js.es6
+++ b/app/assets/javascripts/boards/components/modal/index.js.es6
@@ -29,6 +29,14 @@
         type: Number,
         required: true,
       },
+      milestonePath: {
+        type: String,
+        required: true,
+      },
+      labelPath: {
+        type: String,
+        required: true,
+      },
     },
     data() {
       return ModalStore.store;
@@ -123,7 +131,9 @@
         v-if="showAddIssuesModal">
         <div class="add-issues-container">
           <modal-header
-            :project-id="projectId">
+            :project-id="projectId"
+            :milestone-path="milestonePath"
+            :label-path="labelPath">
           </modal-header>
           <modal-list
             :issue-link-base="issueLinkBase"