Merge pull request #717 from arbulu89/hotfix/set-table-filters-properly

Set table filters properly when the page is reloaded in a new tab
trento-project · Jan 19, 2022 · 1e539fc · 1e539fc
2 parents 71a01b1 + 58139c8
commit 1e539fc
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 30 deletions.
diff --git a/web/clusters.go b/web/clusters.go
@@ -57,6 +57,12 @@ func NewClusterListHandler(clustersService services.ClustersService) gin.Handler
 			return
 		}
 
+		filterClusterNames, err := clustersService.GetAllClusterNames()
+		if err != nil {
+			_ = c.Error(err)
+			return
+		}
+
 		filterClusterTypes, err := clustersService.GetAllClusterTypes()
 		if err != nil {
 			_ = c.Error(err)
@@ -88,6 +94,7 @@ func NewClusterListHandler(clustersService services.ClustersService) gin.Handler
 		c.HTML(http.StatusOK, "clusters.html.tmpl", gin.H{
 			"ClustersTable":      clusterList,
 			"AppliedFilters":     query,
+			"filterClusterNames": filterClusterNames,
 			"FilterClusterTypes": filterClusterTypes,
 			"FilterSIDs":         filterSIDs,
 			"FilterTags":         filterTags,

diff --git a/web/clusters_test.go b/web/clusters_test.go
@@ -322,6 +322,10 @@ func TestClustersListHandler(t *testing.T) {
 	mockClusterService := new(services.MockClustersService)
 	mockClusterService.On("GetAll", mock.Anything, mock.Anything).Return(clustersList, nil)
 	mockClusterService.On("GetCount").Return(4, nil)
+	mockClusterService.On("GetAllClusterNames", mock.Anything).Return(
+		[]string{"hana_cluster", "other_cluster", "netweaver_cluster"},
+		nil,
+	)
 	mockClusterService.On("GetAllClusterTypes", mock.Anything).Return(
 		[]string{models.ClusterTypeHANAScaleUp, models.ClusterTypeUnknown},
 		nil,

diff --git a/web/services/clusters.go b/web/services/clusters.go
@@ -19,6 +19,7 @@ type ClustersService interface {
 	GetAll(*ClustersFilter, *Page) (models.ClusterList, error)
 	GetByID(string) (*models.Cluster, error)
 	GetCount() (int, error)
+	GetAllClusterNames() ([]string, error)
 	GetAllClusterTypes() ([]string, error)
 	GetAllSIDs() ([]string, error)
 	GetAllTags() ([]string, error)
@@ -134,6 +135,21 @@ func (s *clustersService) GetCount() (int, error) {
 	return int(count), err
 }
 
+func (s *clustersService) GetAllClusterNames() ([]string, error) {
+	var clusterNames []string
+
+	err := s.db.Model(&entities.Cluster{}).
+		Distinct().
+		Pluck("name", &clusterNames).
+		Error
+
+	if err != nil {
+		return nil, err
+	}
+
+	return clusterNames, nil
+}
+
 func (s *clustersService) GetAllClusterTypes() ([]string, error) {
 	var clusterTypes []string
 

diff --git a/web/services/clusters_mock.go b/web/services/clusters_mock.go
diff --git a/web/services/clusters_test.go b/web/services/clusters_test.go
@@ -238,6 +238,11 @@ func (suite *ClustersServiceTestSuite) TestClustersService_GetClustersCount() {
 	suite.Equal(3, count)
 }
 
+func (suite *ClustersServiceTestSuite) TestClustersService_GetAllClusterNames() {
+	clusterNames, _ := suite.clustersService.GetAllClusterNames()
+	suite.ElementsMatch([]string{"cluster1", "cluster2", "cluster3"}, clusterNames)
+}
+
 func (suite *ClustersServiceTestSuite) TestClustersService_GetAllClusterTypes() {
 	clusterTypes, _ := suite.clustersService.GetAllClusterTypes()
 	suite.ElementsMatch(

diff --git 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 }}
+{{- end }}
diff --git a/web/templates/clusters.html.tmpl b/web/templates/clusters.html.tmpl
@@ -20,31 +20,26 @@
     <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 }}
-                {{- if .Name }}
-                    <option value="{{ .Name }}">{{ .Name }}</option>
-                {{- end }}
+            {{- range .filterClusterNames }}
+                <option value="{{ . }}">{{ . }}</option>
             {{- 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 }}

diff --git a/web/templates/hosts.html.tmpl b/web/templates/hosts.html.tmpl
@@ -22,17 +22,14 @@
         <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>

diff --git a/web/templates/sap_systems.html.tmpl b/web/templates/sap_systems.html.tmpl
@@ -19,16 +19,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="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>