Improve projects/groups list js codedashboard-filter-search-keep-params

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

3 files changed, 14 insertions, 10 deletions

diff --git a/app/assets/javascripts/filterable_list.js b/app/assets/javascripts/filterable_list.js
index f498c3ea973..47a40e28461 100644
--- a/app/assets/javascripts/filterable_list.js
+++ b/app/assets/javascripts/filterable_list.js
@@ -7,8 +7,6 @@ export default class FilterableList {
     this.filterForm = form;
     this.listFilterElement = filter;
     this.listHolderElement = holder;
-
-    this.initSearch();
   }
 
   initSearch() {
diff --git a/app/assets/javascripts/groups_list.js b/app/assets/javascripts/groups_list.js
index 49b29affaa5..56a8cbf6d03 100644
--- a/app/assets/javascripts/groups_list.js
+++ b/app/assets/javascripts/groups_list.js
@@ -6,10 +6,13 @@ import FilterableList from './filterable_list';
  */
 export default class GroupsList {
   constructor() {
-    var form = document.querySelector('form#group-filter-form');
-    var filter = document.querySelector('.js-groups-list-filter');
-    var holder = document.querySelector('.js-groups-list-holder');
+    const form = document.querySelector('form#group-filter-form');
+    const filter = document.querySelector('.js-groups-list-filter');
+    const holder = document.querySelector('.js-groups-list-holder');
 
-    new FilterableList(form, filter, holder);
+    if (form && filter && holder) {
+      const list = new FilterableList(form, filter, holder);
+      list.initSearch();
+    }
   }
 }
diff --git a/app/assets/javascripts/projects_list.js b/app/assets/javascripts/projects_list.js
index 383c2815457..c67d59d2be5 100644
--- a/app/assets/javascripts/projects_list.js
+++ b/app/assets/javascripts/projects_list.js
@@ -6,10 +6,13 @@ import FilterableList from './filterable_list';
  */
 export default class ProjectsList {
   constructor() {
-    var form = document.querySelector('form#project-filter-form');
-    var filter = document.querySelector('.js-projects-list-filter');
-    var holder = document.querySelector('.js-projects-list-holder');
+    const form = document.querySelector('form#project-filter-form');
+    const filter = document.querySelector('.js-projects-list-filter');
+    const holder = document.querySelector('.js-projects-list-holder');
 
-    new FilterableList(form, filter, holder);
+    if (form && filter && holder) {
+      const list = new FilterableList(form, filter, holder);
+      list.initSearch();
+    }
   }
 }