edit page titles, fix nodeList continuous parameter changes

ClusterCockpit · Jan 13, 2025 · 5c2c493 · 5c2c493
1 parent 2c383eb
commit 5c2c493
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/internal/routerConfig/routes.go b/internal/routerConfig/routes.go
@@ -42,9 +42,9 @@ var routes []Route = []Route{
 	{"/monitoring/projects/", "monitoring/list.tmpl", "Projects - ClusterCockpit", true, func(i InfoType, r *http.Request) InfoType { i["listType"] = "PROJECT"; return i }},
 	{"/monitoring/tags/", "monitoring/taglist.tmpl", "Tags - ClusterCockpit", false, setupTaglistRoute},
 	{"/monitoring/user/{id}", "monitoring/user.tmpl", "User <ID> - ClusterCockpit", true, setupUserRoute},
-	{"/monitoring/systems/{cluster}", "monitoring/systems.tmpl", "Cluster <ID> Overview - ClusterCockpit", false, setupClusterOverviewRoute},
-	{"/monitoring/systems/list/{cluster}", "monitoring/systems.tmpl", "Cluster <ID> List - ClusterCockpit", false, setupClusterListRoute},
-	{"/monitoring/systems/list/{cluster}/{subcluster}", "monitoring/systems.tmpl", "Cluster <ID> List - ClusterCockpit", false, setupClusterListRoute},
+	{"/monitoring/systems/{cluster}", "monitoring/systems.tmpl", "Cluster <ID> Node Overview - ClusterCockpit", false, setupClusterOverviewRoute},
+	{"/monitoring/systems/list/{cluster}", "monitoring/systems.tmpl", "Cluster <ID> Node List - ClusterCockpit", false, setupClusterListRoute},
+	{"/monitoring/systems/list/{cluster}/{subcluster}", "monitoring/systems.tmpl", "Cluster <ID> <SID> Node List - ClusterCockpit", false, setupClusterListRoute},
 	{"/monitoring/node/{cluster}/{hostname}", "monitoring/node.tmpl", "Node <ID> - ClusterCockpit", false, setupNodeRoute},
 	{"/monitoring/analysis/{cluster}", "monitoring/analysis.tmpl", "Analysis - ClusterCockpit", true, setupAnalysisRoute},
 	{"/monitoring/status/{cluster}", "monitoring/status.tmpl", "Status of <ID> - ClusterCockpit", false, setupClusterStatusRoute},
@@ -143,6 +143,7 @@ func setupClusterListRoute(i InfoType, r *http.Request) InfoType {
 	vars := mux.Vars(r)
 	i["id"] = vars["cluster"]
 	i["cluster"] = vars["cluster"]
+	i["sid"] = vars["subcluster"]
 	i["subCluster"] = vars["subcluster"]
 	i["displayType"] = "LIST"
 
@@ -374,6 +375,9 @@ func SetupRoutes(router *mux.Router, buildInfo web.Build) {
 			infos := route.Setup(map[string]interface{}{}, r)
 			if id, ok := infos["id"]; ok {
 				title = strings.Replace(route.Title, "<ID>", id.(string), 1)
+				if sid, ok := infos["sid"]; ok { // 2nd ID element
+					title = strings.Replace(title, "<SID>", sid.(string), 1)
+				}
 			}
 
 			// Get User -> What if NIL?

diff --git a/web/frontend/src/systems/NodeList.svelte b/web/frontend/src/systems/NodeList.svelte
@@ -161,8 +161,8 @@
     }
   }
 
-  $: if (!usePaging && selectedMetrics) {
-    // Continous Scroll: Reset list and paging if sleectedMetrics change: Existing entries will not match new metric selection
+  $: if (!usePaging && (selectedMetrics || selectedResolution || hostnameFilter || from || to)) {
+    // Continous Scroll: Reset list and paging if parameters change: Existing entries will not match new selections
     nodes = [];
     paging = { itemsPerPage, page: 1 };
   }
@@ -202,7 +202,7 @@
             </Col>
           </Row>
         {:else}
-          {#each nodes as nodeData (nodeData.host)}
+          {#each nodes as nodeData}
             <NodeListRow {nodeData} {cluster} {selectedMetrics}/>
           {:else}
             <tr>