mirror of
				https://github.com/ClusterCockpit/cc-backend
				synced 2025-10-31 16:05:06 +01:00 
			
		
		
		
	Merge branch 'sample_resolution_select' into dev
This commit is contained in:
		| @@ -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 | ||||
| @@ -369,7 +369,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) | ||||
| @@ -1291,7 +1291,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 { | ||||
| @@ -2068,7 +2068,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! | ||||
| @@ -2388,6 +2388,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 | ||||
| } | ||||
|  | ||||
| @@ -8527,7 +8536,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) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user