add single update gql queries to metric wrapper

api/schema.graphqls

@@ -223,7 +223,7 @@ type Query {
   allocatedNodes(cluster: String!): [Count!]!
 
   job(id: ID!): Job
-  jobMetrics(id: ID!, metrics: [String!], scopes: [MetricScope!]): [JobMetricWithName!]!
+  jobMetrics(id: ID!, metrics: [String!], scopes: [MetricScope!], resolution: Int): [JobMetricWithName!]!
   jobsFootprints(filter: [JobFilter!], metrics: [String!]!): Footprints
 
   jobs(filter: [JobFilter!], page: PageRequest, order: OrderByInput): JobResultList!

internal/api/rest.go

@@ -1110,7 +1110,7 @@ func (api *RestApi) getJobMetrics(rw http.ResponseWriter, r *http.Request) {
 	}
 
 	resolver := graph.GetResolverInstance()
-	data, err := resolver.Query().JobMetrics(r.Context(), id, metrics, scopes)
+	data, err := resolver.Query().JobMetrics(r.Context(), id, metrics, scopes, nil)
 	if err != nil {
 		json.NewEncoder(rw).Encode(Respone{
 			Error: &struct {

internal/graph/generated/generated.go

@@ -246,7 +246,7 @@ type ComplexityRoot struct {
 		Clusters        func(childComplexity int) int
 		GlobalMetrics   func(childComplexity int) int
 		Job             func(childComplexity int, id string) int
-		JobMetrics      func(childComplexity int, id string, metrics []string, scopes []schema.MetricScope) int
+		JobMetrics      func(childComplexity int, id string, metrics []string, scopes []schema.MetricScope, resolution *int) int
 		Jobs            func(childComplexity int, filter []*model.JobFilter, page *model.PageRequest, order *model.OrderByInput) int
 		JobsFootprints  func(childComplexity int, filter []*model.JobFilter, metrics []string) int
 		JobsStatistics  func(childComplexity int, filter []*model.JobFilter, metrics []string, page *model.PageRequest, sortBy *model.SortByAggregate, groupBy *model.Aggregate) int
@@ -368,7 +368,7 @@ type QueryResolver interface {
 	User(ctx context.Context, username string) (*model.User, error)
 	AllocatedNodes(ctx context.Context, cluster string) ([]*model.Count, error)
 	Job(ctx context.Context, id string) (*schema.Job, error)
-	JobMetrics(ctx context.Context, id string, metrics []string, scopes []schema.MetricScope) ([]*model.JobMetricWithName, error)
+	JobMetrics(ctx context.Context, id string, metrics []string, scopes []schema.MetricScope, resolution *int) ([]*model.JobMetricWithName, error)
 	JobsFootprints(ctx context.Context, filter []*model.JobFilter, metrics []string) (*model.Footprints, error)
 	Jobs(ctx context.Context, filter []*model.JobFilter, page *model.PageRequest, order *model.OrderByInput) (*model.JobResultList, error)
 	JobsStatistics(ctx context.Context, filter []*model.JobFilter, metrics []string, page *model.PageRequest, sortBy *model.SortByAggregate, groupBy *model.Aggregate) ([]*model.JobsStatistics, error)
@@ -1290,7 +1290,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 			return 0, false
 		}
 
-		return e.complexity.Query.JobMetrics(childComplexity, args["id"].(string), args["metrics"].([]string), args["scopes"].([]schema.MetricScope)), true
+		return e.complexity.Query.JobMetrics(childComplexity, args["id"].(string), args["metrics"].([]string), args["scopes"].([]schema.MetricScope), args["resolution"].(*int)), true
 
 	case "Query.jobs":
 		if e.complexity.Query.Jobs == nil {
@@ -2059,7 +2059,7 @@ type Query {
   allocatedNodes(cluster: String!): [Count!]!
 
   job(id: ID!): Job
-  jobMetrics(id: ID!, metrics: [String!], scopes: [MetricScope!]): [JobMetricWithName!]!
+  jobMetrics(id: ID!, metrics: [String!], scopes: [MetricScope!], resolution: Int): [JobMetricWithName!]!
   jobsFootprints(filter: [JobFilter!], metrics: [String!]!): Footprints
 
   jobs(filter: [JobFilter!], page: PageRequest, order: OrderByInput): JobResultList!
@@ -2370,6 +2370,15 @@ func (ec *executionContext) field_Query_jobMetrics_args(ctx context.Context, raw
 		}
 	}
 	args["scopes"] = arg2
+	var arg3 *int
+	if tmp, ok := rawArgs["resolution"]; ok {
+		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("resolution"))
+		arg3, err = ec.unmarshalOInt2ᚖint(ctx, tmp)
+		if err != nil {
+			return nil, err
+		}
+	}
+	args["resolution"] = arg3
 	return args, nil
 }
 
@@ -8499,7 +8508,7 @@ func (ec *executionContext) _Query_jobMetrics(ctx context.Context, field graphql
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
-		return ec.resolvers.Query().JobMetrics(rctx, fc.Args["id"].(string), fc.Args["metrics"].([]string), fc.Args["scopes"].([]schema.MetricScope))
+		return ec.resolvers.Query().JobMetrics(rctx, fc.Args["id"].(string), fc.Args["metrics"].([]string), fc.Args["scopes"].([]schema.MetricScope), fc.Args["resolution"].(*int))
 	})
 	if err != nil {
 		ec.Error(ctx, err)

internal/graph/schema.resolvers.go

@@ -224,13 +224,19 @@ func (r *queryResolver) Job(ctx context.Context, id string) (*schema.Job, error)
 }
 
 // JobMetrics is the resolver for the jobMetrics field.
-func (r *queryResolver) JobMetrics(ctx context.Context, id string, metrics []string, scopes []schema.MetricScope) ([]*model.JobMetricWithName, error) {
+func (r *queryResolver) JobMetrics(ctx context.Context, id string, metrics []string, scopes []schema.MetricScope, resolution *int) ([]*model.JobMetricWithName, error) {
+	defaultRes := 600
+	if resolution == nil {
+		resolution = &defaultRes
+	}
+
 	job, err := r.Query().Job(ctx, id)
 	if err != nil {
 		log.Warn("Error while querying job for metrics")
 		return nil, err
 	}
 
+	log.Debugf(">>>>> REQUEST DATA HERE FOR %v AT SCOPE %v WITH RESOLUTION OF %d", metrics, scopes, *resolution)
 	data, err := metricdata.LoadData(job, metrics, scopes, ctx)
 	if err != nil {
 		log.Warn("Error while loading job data")

web/frontend/src/Job.root.svelte

@@ -122,14 +122,14 @@
     variables: { dbid, selectedMetrics, selectedScopes },
   });
 
-  function loadAllScopes() {
+  // function loadAllScopes() {
-    selectedScopes = [...selectedScopes, "socket", "core"]
+  //   selectedScopes = [...selectedScopes, "socket", "core"]
-    jobMetrics = queryStore({
+  //   jobMetrics = queryStore({
-      client: client,
+  //     client: client,
-      query: query,
+  //     query: query,
-      variables: { dbid, selectedMetrics, selectedScopes},
+  //     variables: { dbid, selectedMetrics, selectedScopes},
-    });
+  //   });
-  }
+  // }
 
   // Handle Job Query on Init -> is not executed anymore
   getContext("on-init")(() => {
@@ -229,11 +229,6 @@
         $initq.data.job.subCluster,
       ),
     }));
-
-
-    const loadRes = ({ detail }) => {
-      console.log(">>> UPPER RES REQUEST", detail)
-    }
 </script>
 
 <Row>
@@ -362,8 +357,6 @@
         {#if item.data}
           <Metric
             bind:this={plots[item.metric]}
-            on:load-all={loadAllScopes}
-            on:new-res={loadRes}
             job={$initq.data.job}
             metricName={item.metric}
             metricUnit={$initq.data.globalMetrics.find((gm) => gm.name == item.metric)?.unit}

web/frontend/src/job/Metric.svelte

@@ -13,7 +13,12 @@
  -->
 
 <script>
-  import { createEventDispatcher } from "svelte";
+  import { 
+    queryStore,
+    gql,
+    getContextClient 
+  } from "@urql/svelte";
+  // import { createEventDispatcher } from "svelte";
   import {
     InputGroup,
     InputGroupText,
@@ -32,24 +37,79 @@
   export let rawData;
   export let isShared = false;
 
-  const dispatch = createEventDispatcher();
-  const unit = (metricUnit?.prefix ? metricUnit.prefix : "") + (metricUnit?.base ? metricUnit.base : "")
-    
   let selectedHost = null,
     plot,
-    fetching = false,
     error = null;
   let selectedScope = minScope(scopes);
-  let selectedResolution = 60
+  let selectedResolution = 600
-  $: dispatch("new-res", selectedResolution)
-
   let statsPattern = /(.*)-stat$/
   let statsSeries = rawData.map((data) => data?.statisticsSeries ? data.statisticsSeries : null)
   let selectedScopeIndex
 
-  const resolutions = [60, 240, 600]
+  // const dispatch = createEventDispatcher();
+  const unit = (metricUnit?.prefix ? metricUnit.prefix : "") + (metricUnit?.base ? metricUnit.base : "")
+  const resolutions = [600, 240, 60]
+  const client = getContextClient();
+  const subQuery = gql`
+    query ($dbid: ID!, $selectedMetrics: [String!]!, $selectedScopes: [MetricScope!]!, $selectedResolution: Int) {
+      singleUpdate: jobMetrics(id: $dbid, metrics: $selectedMetrics, scopes: $selectedScopes, resolution: $selectedResolution) {
+        name
+        scope
+        metric {
+          unit {
+            prefix
+            base
+          }
+          timestep
+          statisticsSeries {
+            min
+            median
+            max
+          }
+          series {
+            hostname
+            id
+            data
+            statistics {
+              min
+              avg
+              max
+            }
+          }
+        }
+      }
+    }
+  `;
+
+  let metricData;
+  let selectedScopes = [...scopes]
+  const dbid = job.id;
+  const selectedMetrics = [metricName]
+
+  function loadUpdate() {
+
+    // useQuery('repoData', () =>
+    //   fetch('https://api.github.com/repos/SvelteStack/svelte-query').then(res =>
+    //     res.json()
+    //   )
+
+    metricData = queryStore({
+      client: client,
+      query: subQuery,
+      variables: { dbid, selectedMetrics, selectedScopes, selectedResolution },
+    });
+
+    console.log('S> OLD DATA:', rawData)
+    // rawData = {...$metricData?.data?.singleUpdate}
+  };
+
+  $: if (selectedScope == "load-all") {
+    scopes = [...scopes, "socket", "core"]
+    selectedScope = nativeScope
+    selectedScopes = [...scopes]
+    loadUpdate()
+  };
 
-  $: availableScopes = scopes;
   $: patternMatches = statsPattern.exec(selectedScope)
   $: if (!patternMatches) {
       selectedScopeIndex = scopes.findIndex((s) => s == selectedScope);
@@ -61,7 +121,10 @@
     (series) => selectedHost == null || series.hostname == selectedHost,
   );
 
-  $: if (selectedScope == "load-all") dispatch("load-all");
+  $: if ($metricData && !$metricData.fetching) console.log('S> NEW DATA:', rawData)
+  // $: console.log('Pattern', patternMatches)
+  $: console.log('SelectedScope', selectedScope)
+  $: console.log('ScopeIndex', selectedScopeIndex)
 </script>
 
 <InputGroup>
@@ -69,13 +132,13 @@
     {metricName} ({unit})
   </InputGroupText>
   <select class="form-select" bind:value={selectedScope}>
-    {#each availableScopes as scope, index}
+    {#each scopes as scope, index}
       <option value={scope}>{scope}</option>
       {#if statsSeries[index]}
         <option value={scope + '-stat'}>stats series ({scope})</option>
       {/if}
     {/each}
-    {#if availableScopes.length == 1 && nativeScope != "node"}
+    {#if scopes.length == 1 && nativeScope != "node"}
       <option value={"load-all"}>Load all...</option>
     {/if}
   </select>
@@ -87,14 +150,19 @@
       {/each}
     </select>
   {/if}
-  <select class="form-select" bind:value={selectedResolution}>
+  <select class="form-select" bind:value={selectedResolution} on:change={() => {
+      scopes = ["node"]
+      selectedScope = "node"
+      selectedScopes = [...scopes]
+      loadUpdate
+    }}>
     {#each resolutions as res}
       <option value={res}>Timestep: {res}</option>
     {/each}
   </select>
 </InputGroup>
 {#key series}
-  {#if fetching == true}
+  {#if $metricData?.fetching == true}
     <Spinner />
   {:else if error != null}
     <Card body color="danger">{error.message}</Card>