Make NamespaceSelect change URL when filteringwinh-admin-projects-namespace-filter

2 files changed, 17 insertions, 11 deletions

diff --git a/app/assets/javascripts/namespace_select.js b/app/assets/javascripts/namespace_select.js
index 69e83d784bf..1d496c64e53 100644
--- a/app/assets/javascripts/namespace_select.js
+++ b/app/assets/javascripts/namespace_select.js
@@ -1,16 +1,13 @@
 /* eslint-disable func-names, space-before-function-paren, no-var, comma-dangle, object-shorthand, no-else-return, prefer-template, quotes, prefer-arrow-callback, max-len */
 import Api from './api';
+import './lib/utils/url_utility';
 
 export default class NamespaceSelect {
   constructor(opts) {
     const isFilter = opts.dropdown.dataset.isFilter === 'true';
-    var fieldName;
-    this.dropdown = $(opts.dropdown);
-    fieldName = 'namespace_id';
-    if (this.dropdown.attr('data-field-name')) {
-      fieldName = this.dropdown.data('fieldName');
-    }
-    this.dropdown.glDropdown({
+    const fieldName = opts.dropdown.dataset.fieldName || 'namespace_id';
+
+    $(opts.dropdown).glDropdown({
       filterable: true,
       selectable: true,
       filterRemote: true,
@@ -27,9 +24,8 @@ export default class NamespaceSelect {
       },
       data: function(term, dataCallback) {
         return Api.namespaces(term, function(namespaces) {
-          var anyNamespace;
           if (isFilter) {
-            anyNamespace = {
+            const anyNamespace = {
               text: 'Any namespace',
               id: null
             };
@@ -48,8 +44,13 @@ export default class NamespaceSelect {
       },
       renderRow: this.renderRow,
       clicked(options) {
-        const { e } = options;
-        return e.preventDefault();
+        if (!isFilter) {
+          const { e } = options;
+          e.preventDefault();
+        }
+      },
+      url(namespace) {
+        return gl.utils.mergeUrlParams({ [fieldName]: namespace.id }, window.location.href);
       },
     });
   }
diff --git a/changelogs/unreleased/winh-admin-projects-namespace-filter.yml b/changelogs/unreleased/winh-admin-projects-namespace-filter.yml
new file mode 100644
index 00000000000..7e906f446b0
--- /dev/null
+++ b/changelogs/unreleased/winh-admin-projects-namespace-filter.yml
@@ -0,0 +1,5 @@
+---
+title: Make NamespaceSelect change URL when filtering
+merge_request: 14888
+author:
+type: fixed