Merge branch 'dev' of github.com:ClusterCockpit/cc-backend into dev

internal/graph/schema.resolvers.go

@@ -867,7 +867,8 @@ func (r *queryResolver) NodeMetricsList(ctx context.Context, cluster string, sub
 	}
 
 	nodeMetricsListResult := &model.NodesResultList{
-		Items:       nodeMetricsList,
+		Items: nodeMetricsList,
+		// TotalNodes depends on sum of nodes grouped on latest timestamp, see repo/node.go:357
 		TotalNodes:  &countNodes,
 		HasNextPage: &hasNextPage,
 	}

web/frontend/src/Systems.root.svelte

@@ -272,8 +272,8 @@
     <NodeOverview {cluster} {ccconfig} {selectedMetric} {globalMetrics} {from} {to} {hostnameFilter} {hoststateFilter}/>
   {:else}
     <!-- ROW2-2: Node List (Grid Included)-->
-    <NodeList {cluster} {subCluster} {ccconfig} {globalMetrics}
+    <NodeList pendingSelectedMetrics={selectedMetrics} {cluster} {subCluster}
-      pendingSelectedMetrics={selectedMetrics} {selectedResolution} {hostnameFilter} {hoststateFilter} {from} {to} {systemUnits}/>
+       {selectedResolution} {hostnameFilter} {hoststateFilter} {from} {to} {systemUnits}/>
   {/if}
 {/if}
 

web/frontend/src/generic/Filters.svelte

@@ -451,7 +451,7 @@
 
   {#if filters.startTime.range}
     <Info icon="calendar-range" onclick={() => (isStartTimeOpen = true)}>
-      {startTimeSelectOptions.find((stso) => stso.range === filters.startTime.range).rangeLabel }
+      Job Start: {startTimeSelectOptions.find((stso) => stso.range === filters.startTime.range).rangeLabel }
     </Info>
   {/if}
 

web/frontend/src/generic/filters/StartTime.svelte

@@ -14,10 +14,10 @@
 <script module>
   export const startTimeSelectOptions = [
     { range: "", rangeLabel: "No Selection"},
-    { range: "last6h", rangeLabel: "Job Start: Last 6hrs"},
+    { range: "last6h", rangeLabel: "Last 6 hrs"},
-    { range: "last24h", rangeLabel: "Job Start: Last 24hrs"},
+    { range: "last24h", rangeLabel: "Last 24 hrs"},
-    { range: "last7d", rangeLabel: "Job Start: Last 7 days"},
+    { range: "last7d", rangeLabel: "Last 7 days"},
-    { range: "last30d", rangeLabel: "Job Start: Last 30 days"}
+    { range: "last30d", rangeLabel: "Last 30 days"}
   ];
 </script>
 

web/frontend/src/status/dashdetails/StatisticsDash.svelte

@@ -35,6 +35,7 @@
 
   /* Const Init */
   const ccconfig = getContext("cc-config");
+  const globalMetrics = getContext("globalMetrics");
   const client = getContextClient();
 
   /* State Init */
@@ -139,6 +140,7 @@
 
 <HistogramSelection
   {cluster}
+  {globalMetrics}
   bind:isOpen={isHistogramSelectionOpen}
   presetSelectedHistograms={selectedHistograms}
   configName="statusView_selectedHistograms"

web/frontend/src/systems/NodeList.svelte

@@ -4,8 +4,6 @@
   Properties:
   - `cluster String`: The nodes' cluster
   - `subCluster String`: The nodes' subCluster [Default: ""]
-  - `ccconfig Object?`: The ClusterCockpit Config Context [Default: null]
-  - `globalMetrics [Obj]`: Includes the backend supplied availabilities for cluster and subCluster
   - `pendingSelectedMetrics [String]`: The array of selected metrics [Default []]
   - `selectedResolution Number?`: The selected data resolution [Default: 0]
   - `hostnameFilter String?`: The active hostnamefilter [Default: ""]
@@ -16,7 +14,7 @@
 -->
 
 <script>
-  import { untrack } from "svelte";
+  import { untrack,  getContext } from "svelte";
   import { queryStore, gql, getContextClient, mutationStore } from "@urql/svelte";
   import { Row, Col, Card, Table, Spinner } from "@sveltestrap/sveltestrap";
   import { stickyHeader } from "../generic/utils.js";
@@ -27,8 +25,6 @@
   let {
     cluster,
     subCluster = "",
-    ccconfig = null,
-    globalMetrics = null,
     pendingSelectedMetrics = [],
     selectedResolution = 0,
     hostnameFilter = "",
@@ -99,10 +95,15 @@
   let headerPaddingTop = $state(0);
 
   /* Derived */
+  const initialized = $derived(getContext("initialized") || false);
+  const ccconfig = $derived(initialized ? getContext("cc-config") : null);
+  const globalMetrics = $derived(initialized ? getContext("globalMetrics") : null);
+  const usePaging = $derived(ccconfig ? ccconfig.nodeList_usePaging : false);
+
   let selectedMetrics = $derived(pendingSelectedMetrics);
   let itemsPerPage = $derived(usePaging ? (ccconfig?.nodeList_nodesPerPage || 10) : 10);
-  const usePaging = $derived(ccconfig?.nodeList_usePaging || false);
+  let paging = $derived({ itemsPerPage, page });
-  const paging = $derived({ itemsPerPage, page });
+
   const nodesQuery = $derived(queryStore({
     client: client,
     query: nodeListQuery,
@@ -122,7 +123,7 @@
   }));
 
   const matchedNodes = $derived($nodesQuery?.data?.nodeMetricsList?.totalNodes || 0);
-  
+
   /* Effects */
   $effect(() => {
     if (!usePaging) {