From e3f72c738b72708eaea354509a44941fd8892e27 Mon Sep 17 00:00:00 2001
From: arbulu89 <xarbulu@suse.com>
Date: Tue, 18 Jan 2022 14:24:06 +0100
Subject: [PATCH] Select properly the filter elements when page reload

---
 web/templates/blocks/health_filter.html.tmpl |  4 ++--
 web/templates/clusters.html.tmpl             | 17 +++++++----------
 web/templates/hosts.html.tmpl                | 15 ++++++---------
 web/templates/sap_systems.html.tmpl          | 13 +++++--------
 4 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/web/templates/blocks/health_filter.html.tmpl b/web/templates/blocks/health_filter.html.tmpl
index 3de5fc1ee..79329655f 100644
--- a/web/templates/blocks/health_filter.html.tmpl
+++ b/web/templates/blocks/health_filter.html.tmpl
@@ -1,8 +1,8 @@
 {{ define "health_filter" }}
-    <select name="health" id="health" class="selectpicker" multiple data-selected-text-format="count > 3"
+    <select name="health" class="selectpicker" multiple data-selected-text-format="count > 3"
             data-act/healions-box="true" title="Health status...">
     <option data-content="<span class='badge badge-success'>Passing</span>" value="passing">Passing</option>
     <option data-content="<span class='badge badge-warning'>Warning</span>" value="warning">Warning</option>
     <option data-content="<span class='badge badge-danger'>Critical</span>" value="critical">Critical</option>
     </select>
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/web/templates/clusters.html.tmpl b/web/templates/clusters.html.tmpl
index 8cc114a37..ef491f1f2 100644
--- a/web/templates/clusters.html.tmpl
+++ b/web/templates/clusters.html.tmpl
@@ -20,16 +20,13 @@
     <div class="horizontal-container">
         <script>
           $(document).ready(function () {
-              {{- range $Key, $Value := .AppliedFilters }}
-            $("#{{ $Key }}").selectpicker("val", {{ $Value }});
-              {{- end }}
-            $('#clean').click(function () {
-              $('.selectpicker').selectpicker("deselectAll")
-            });
+            {{- range $Key, $Value := .AppliedFilters }}
+            $("[name='{{ $Key }}']").selectpicker("val", {{ $Value }});
+            {{- end }}
           });
         </script>
         {{ template "health_filter" }}
-        <select name="name" id="name_filter" class="selectpicker" multiple
+        <select name="name" class="selectpicker" multiple
                 data-selected-text-format="count > 3" data-actions-box="true" data-live-search="true"
                 title="Cluster name">
             {{- range .ClustersTable }}
@@ -38,20 +35,20 @@
                 {{- end }}
             {{- end}}
         </select>
-        <select name="sids" id="sid_filter" class="selectpicker" multiple
+        <select name="sids" class="selectpicker" multiple
                 data-selected-text-format="count > 3" data-actions-box="true" data-live-search="true" title="SID">
             {{- range .FilterSIDs }}
                 <option value="{{ . }}">{{ . }}</option>
             {{- end }}
         </select>
-        <select name="cluster_type" id="cluster_type_filter" class="selectpicker" multiple
+        <select name="cluster_type" class="selectpicker" multiple
                 data-selected-text-format="count > 3" data-actions-box="true" data-live-search="true"
                 title="Cluster type">
             {{- range .FilterClusterTypes }}
                 <option value="{{ . }}">{{ . }}</option>
             {{- end}}
         </select>
-        <select name="tags" id="tags_filter" class="selectpicker" multiple
+        <select name="tags" class="selectpicker" multiple
                 data-selected-text-format="count > 3" data-actions-box="true" data-live-search="true"
                 title="Tags">
             {{- range .FilterTags }}
diff --git a/web/templates/hosts.html.tmpl b/web/templates/hosts.html.tmpl
index f3bbf8b1a..1be339b8a 100644
--- a/web/templates/hosts.html.tmpl
+++ b/web/templates/hosts.html.tmpl
@@ -22,23 +22,20 @@
         <div class="horizontal-container">
             <script>
               $(document).ready(function () {
-                  {{- range $Key, $Value := .AppliedFilters }}
-                $("#{{ $Key }}").selectpicker("val", {{ $Value }});
-                  {{- end }}
-                $('#clean').click(function () {
-                  $('.selectpicker').selectpicker("deselectAll")
-                });
+                {{- range $Key, $Value := .AppliedFilters }}
+                $("[name='{{ $Key }}']").selectpicker("val", {{ $Value }});
+                {{- end }}
               });
             </script>
             {{ template "health_filter" }}
-            <select name="sids" id="trento-sap-systems" class="selectpicker" multiple
-                    data-selected-text-format="count > 3" data-actions-box="true" data-live-search="true" 
+            <select name="sids" class="selectpicker" multiple
+                    data-selected-text-format="count > 3" data-actions-box="true" data-live-search="true"
                     title="SAP system...">
                 {{- range .FilterSIDs }}
                     <option value="{{ . }}">{{ . }}</option>
                 {{- end }}
             </select>
-            <select name="tags" id="tags_filter" class="selectpicker" multiple
+            <select name="tags" class="selectpicker" multiple
                     data-selected-text-format="count > 3" data-actions-box="true" data-live-search="true"
                     title="Tags...">
                 {{- range .FilterTags }}
diff --git a/web/templates/sap_systems.html.tmpl b/web/templates/sap_systems.html.tmpl
index c7353b8cb..f8547d34a 100644
--- a/web/templates/sap_systems.html.tmpl
+++ b/web/templates/sap_systems.html.tmpl
@@ -19,22 +19,19 @@
     <div class="horizontal-container">
         <script>
           $(document).ready(function () {
-              {{- range $Key, $Value := .AppliedFilters }}
-            $("#{{ $Key }}").selectpicker("val", {{ $Value }});
-              {{- end }}
-            $('#clean').click(function () {
-              $('.selectpicker').selectpicker("deselectAll")
-            });
+            {{- range $Key, $Value := .AppliedFilters }}
+            $("[name='{{ $Key }}']").selectpicker("val", {{ $Value }});
+            {{- end }}
           });
         </script>
         {{/* {{ template "health_filter" }} */}}
-        <select name="sids" id="sids" class="selectpicker" multiple
+        <select name="sids" class="selectpicker" multiple
                 data-selected-text-format="count > 3" data-actions-box="true" data-live-search="true" title="SID">
             {{- range .FilterSIDs }}
                 <option value="{{ . }}">{{ . }}</option>
             {{- end }}
         </select>
-        <select name="tags" id="tags_filter" class="selectpicker" multiple
+        <select name="tags" class="selectpicker" multiple
                 data-selected-text-format="count > 3" data-actions-box="true" data-live-search="true"
                 title="Tags">
             {{- range .FilterTags }}