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

internal/graph/schema.resolvers.go

@@ -243,14 +243,21 @@ func (r *queryResolver) Jobs(ctx context.Context, filter []*model.JobFilter, pag
 
 	if !config.Keys.UiDefaults["job_list_usePaging"].(bool) {
 		hasNextPage := false
-		page.Page += 1
+		// page.Page += 1 		   : Simple, but expensive
+		// Example Page 4 @ 10 IpP : Does item 41 exist?
+		// Minimal Page 41 @ 1 IpP : If len(result) is 1, Page 5 @ 10 IpP exists.
+		nextPage := &model.PageRequest{
+			ItemsPerPage: 1,
+			Page:         ((page.Page * page.ItemsPerPage) + 1),
+		}
 
-		nextJobs, err := r.Repo.QueryJobs(ctx, filter, page, order)
+		nextJobs, err := r.Repo.QueryJobs(ctx, filter, nextPage, order)
 		if err != nil {
 			log.Warn("Error while querying next jobs")
 			return nil, err
 		}
-		if len(nextJobs) > 0 {
+
+		if len(nextJobs) == 1 {
 			hasNextPage = true
 		}
 

internal/repository/query.go

@@ -135,7 +135,7 @@ func BuildWhereClause(filter *model.JobFilter, query sq.SelectBuilder) sq.Select
 		query = buildStringCondition("job.project", filter.Project, query)
 	}
 	if filter.JobName != nil {
-		query = buildStringCondition("job.meta_data", filter.JobName, query)
+		query = buildMetaJsonCondition("jobName", filter.JobName, query)
 	}
 	if filter.Cluster != nil {
 		query = buildStringCondition("job.cluster", filter.Cluster, query)
@@ -235,6 +235,28 @@ func buildStringCondition(field string, cond *model.StringInput, query sq.Select
 	return query
 }
 
+func buildMetaJsonCondition(jsonField string, cond *model.StringInput, query sq.SelectBuilder) sq.SelectBuilder {
+	// Verify and Search Only in Valid Jsons
+	query = query.Where("JSON_VALID(meta_data)")
+	// add "AND" Sql query Block for field match
+	if cond.Eq != nil {
+		return query.Where("JSON_EXTRACT(meta_data, \"$."+jsonField+"\") = ?", *cond.Eq)
+	}
+	if cond.Neq != nil {
+		return query.Where("JSON_EXTRACT(meta_data, \"$."+jsonField+"\") != ?", *cond.Neq)
+	}
+	if cond.StartsWith != nil {
+		return query.Where("JSON_EXTRACT(meta_data, \"$."+jsonField+"\") LIKE ?", fmt.Sprint(*cond.StartsWith, "%"))
+	}
+	if cond.EndsWith != nil {
+		return query.Where("JSON_EXTRACT(meta_data, \"$."+jsonField+"\") LIKE ?", fmt.Sprint("%", *cond.EndsWith))
+	}
+	if cond.Contains != nil {
+		return query.Where("JSON_EXTRACT(meta_data, \"$."+jsonField+"\") LIKE ?", fmt.Sprint("%", *cond.Contains, "%"))
+	}
+	return query
+}
+
 var matchFirstCap = regexp.MustCompile("(.)([A-Z][a-z]+)")
 var matchAllCap = regexp.MustCompile("([a-z0-9])([A-Z])")
 

internal/repository/userConfig.go

@@ -24,9 +24,9 @@ var (
 type UserCfgRepo struct {
 	DB         *sqlx.DB
 	Lookup     *sqlx.Stmt
-	lock       sync.RWMutex
 	uiDefaults map[string]interface{}
 	cache      *lrucache.Cache
+	lock       sync.RWMutex
 }
 
 func GetUserCfgRepo() *UserCfgRepo {
@@ -112,8 +112,8 @@ func (uCfg *UserCfgRepo) GetUIConfig(user *schema.User) (map[string]interface{},
 // configuration.
 func (uCfg *UserCfgRepo) UpdateConfig(
 	key, value string,
-	user *schema.User) error {
+	user *schema.User,
-
+) error {
 	if user == nil {
 		var val interface{}
 		if err := json.Unmarshal([]byte(value), &val); err != nil {

web/frontend/src/Job.root.svelte

@@ -306,9 +306,6 @@
       </Button>
     {/if}
   </Col>
-  <!--     <Col xs="auto">
-        <Zoom timeseriesPlots={plots} />
-    </Col> -->
 </Row>
 <Row>
   <Col>
@@ -341,7 +338,6 @@
             scopes={item.data.map((x) => x.scope)}
             {width}
             isShared={$initq.data.job.exclusive != 1}
-            resources={$initq.data.job.resources}
           />
         {:else}
           <Card body color="warning"
@@ -361,7 +357,7 @@
             <div style="margin: 10px;">
               <Card color="warning">
                 <CardHeader>
-                  <CardTitle>Missing Metrics/Reseources</CardTitle>
+                  <CardTitle>Missing Metrics/Resources</CardTitle>
                 </CardHeader>
                 <CardBody>
                   {#if missingMetrics.length > 0}

web/frontend/src/Metric.svelte

@@ -33,8 +33,17 @@
     error = null;
   let selectedScope = minScope(scopes);
 
+  let statsPattern = /(.*)-stats$/
+  let statsSeries = rawData.map((data) => data?.statisticsSeries ? data.statisticsSeries : null)
+  let selectedScopeIndex
+
   $: availableScopes = scopes;
-  $: selectedScopeIndex = scopes.findIndex((s) => s == selectedScope);
+  $: patternMatches = statsPattern.exec(selectedScope)
+  $: if (!patternMatches) {
+      selectedScopeIndex = scopes.findIndex((s) => s == selectedScope);
+    } else {
+      selectedScopeIndex = scopes.findIndex((s) => s == patternMatches[1]);
+    }
   $: data = rawData[selectedScopeIndex];
   $: series = data?.series.filter(
     (series) => selectedHost == null || series.hostname == selectedHost,
@@ -62,6 +71,7 @@
       if (jm.scope != "node") {
         scopes = [...scopes, jm.scope];
         rawData.push(jm.metric);
+        statsSeries = rawData.map((data) => data?.statisticsSeries ? data.statisticsSeries : null)
         selectedScope = jm.scope;
         selectedScopeIndex = scopes.findIndex((s) => s == jm.scope);
         dispatch("more-loaded", jm);
@@ -79,15 +89,18 @@
       : "") + (metricConfig?.unit?.base ? metricConfig.unit.base : "")})
   </InputGroupText>
   <select class="form-select" bind:value={selectedScope}>
-    {#each availableScopes as scope}
+    {#each availableScopes as scope, index}
       <option value={scope}>{scope}</option>
+      {#if statsSeries[index]}
+        <option value={scope + '-stats'}>stats series ({scope})</option>
+      {/if}
     {/each}
     {#if availableScopes.length == 1 && metricConfig?.scope != "node"}
       <option value={"load-more"}>Load more...</option>
     {/if}
   </select>
   {#if job.resources.length > 1}
-    <select class="form-select" bind:value={selectedHost}>
+    <select class="form-select" bind:value={selectedHost} disabled={patternMatches}>
       <option value={null}>All Hosts</option>
       {#each job.resources as { hostname }}
         <option value={hostname}>{hostname}</option>
@@ -100,7 +113,7 @@
     <Spinner />
   {:else if error != null}
     <Card body color="danger">{error.message}</Card>
-  {:else if series != null}
+  {:else if series != null && !patternMatches}
     <Timeseries
       bind:this={plot}
       {width}
@@ -114,5 +127,21 @@
       {isShared}
       resources={job.resources}
     />
+  {:else if statsSeries[selectedScopeIndex] != null && patternMatches}
+    <Timeseries
+      bind:this={plot}
+      {width}
+      height={300}
+      {cluster}
+      {subCluster}
+      timestep={data.timestep}
+      scope={selectedScope}
+      metric={metricName}
+      {series}
+      {isShared}
+      resources={job.resources}
+      statisticsSeries={statsSeries[selectedScopeIndex]}
+      useStatsSeries={!!statsSeries[selectedScopeIndex]}
+    />
   {/if}
 {/key}

web/frontend/src/MetricSelection.svelte

@@ -24,7 +24,7 @@
   export let configName;
   export let allMetrics = null;
   export let cluster = null;
-  export let showFootprint;
+  export let showFootprint = false;
   export let view = "job";
 
   const clusters = getContext("clusters"),

web/frontend/src/config/PlotSettings.svelte

@@ -275,7 +275,7 @@
   }
 </script>
 
-<Row cols={3} class="p-2 g-2">
+<Row cols={4} class="p-2 g-2">
   <!-- LINE WIDTH -->
   <Col
     ><Card class="h-100">
@@ -422,6 +422,60 @@
       </form>
     </Card></Col
   >
+
+  <!-- PAGING -->
+  <Col
+    ><Card class="h-100">
+      <form
+        id="paging-form"
+        method="post"
+        action="/api/configuration/"
+        class="card-body"
+        on:submit|preventDefault={() =>
+          handleSettingSubmit("#paging-form", "pag")}
+      >
+        <!-- Svelte 'class' directive only on DOMs directly, normal 'class="xxx"' does not work, so style-array it is. -->
+        <CardTitle
+          style="margin-bottom: 1em; display: flex; align-items: center;"
+        >
+          <div>Paging Type</div>
+          {#if displayMessage && message.target == "pag"}<div
+              style="margin-left: auto; font-size: 0.9em;"
+            >
+              <code style="color: {message.color};" out:fade
+                >Update: {message.msg}</code
+              >
+            </div>{/if}
+        </CardTitle>
+        <input type="hidden" name="key" value="job_list_usePaging" />
+        <div class="mb-3">
+          <div>
+            {#if config.job_list_usePaging}
+              <input type="radio" id="true" name="value" value="true" checked />
+            {:else}
+              <input type="radio" id="true" name="value" value="true" />
+            {/if}
+            <label for="true">Paging with selectable count of jobs.</label>
+          </div>
+          <div>
+            {#if config.job_list_usePaging}
+              <input type="radio" id="false" name="value" value="false" />
+            {:else}
+              <input
+                type="radio"
+                id="false"
+                name="value"
+                value="false"
+                checked
+              />
+            {/if}
+            <label for="false">Continuous scroll iteratively adding 10 jobs.</label>
+          </div>
+        </div>
+        <Button color="primary" type="submit">Submit</Button>
+      </form>
+    </Card></Col
+  >
 </Row>
 
 <Row cols={1} class="p-2 g-2">

web/frontend/src/config/admin/ShowUsersRow.svelte

@@ -20,7 +20,7 @@
 <td>{user.name}</td>
 <td>{user.projects}</td>
 <td>{user.email}</td>
-<td><code>{user.roles.join(", ")}</code></td>
+<td><code>{user?.roles ? user.roles.join(", ") : "No Roles"}</code></td>
 <td>
   {#if !jwt}
     <Button color="success" on:click={getUserJwt(user.username)}

web/frontend/src/plots/MetricPlot.svelte

@@ -461,7 +461,7 @@
     },
     scales: {
       x: { time: false },
-      y: maxY ? { range: [0, maxY * 1.1] } : {},
+      y: maxY ? { min: 0, max: (maxY * 1.1) } : {auto: true}, // Add some space to upper render limit
     },
     legend: {
       // Display legend until max 12 Y-dataseries

web/frontend/src/plots/Roofline.svelte

@@ -298,6 +298,24 @@
                 // Reset grid lineWidth
                 u.ctx.lineWidth = 0.15;
               }
+              if (renderTime) {
+                // The Color Scale For Time Information
+                const posX = u.valToPos(0.1, "x", true)
+                const posXLimit = u.valToPos(100, "x", true)
+                const posY = u.valToPos(15000.0, "y", true)
+                u.ctx.fillStyle = 'black'
+                u.ctx.fillText('Start', posX, posY)
+                const start = posX + 10
+                for (let x = start; x < posXLimit; x += 10) {
+                    let c = (x - start) / (posXLimit - start)
+                    u.ctx.fillStyle = getRGB(c)
+                    u.ctx.beginPath()
+                    u.ctx.arc(x, posY, 3, 0, Math.PI * 2, false)
+                    u.ctx.fill()
+                }
+                u.ctx.fillStyle = 'black'
+                u.ctx.fillText('End', posXLimit + 23, posY)
+              }
             },
           ],
         },