Manager & Webapp: code changes to handle the new worker tag info in Job
Manager: Instead of embedding the worker tag info in a fetched `Job`, just include its UUID. Webapp: fetch the worker tag by UUID, instead of using the embedded info.
This commit is contained in:
parent
2f4124ebc2
commit
8f9ed0cc28
@ -687,7 +687,7 @@ func jobDBtoAPI(dbJob *persistence.Job) api.Job {
|
||||
apiJob.DeleteRequestedAt = &dbJob.DeleteRequestedAt.Time
|
||||
}
|
||||
if dbJob.WorkerTag != nil {
|
||||
apiJob.WorkerTag = workerTagDBtoAPI(dbJob.WorkerTag)
|
||||
apiJob.WorkerTag = &dbJob.WorkerTag.UUID
|
||||
}
|
||||
|
||||
return apiJob
|
||||
|
@ -130,14 +130,10 @@ func TestFetchJob(t *testing.T) {
|
||||
Metadata: &api.JobMetadata{AdditionalProperties: map[string]string{
|
||||
"project": "/projects/exploding-kittens",
|
||||
}},
|
||||
WorkerTag: ptr("d86e1b84-5ee2-4784-a178-65963eeb484b"),
|
||||
},
|
||||
Id: "afc47568-bd9d-4368-8016-e91d945db36d",
|
||||
Status: api.JobStatusActive,
|
||||
WorkerTag: &api.WorkerTag{
|
||||
Id: ptr("d86e1b84-5ee2-4784-a178-65963eeb484b"),
|
||||
Name: "Tikkie terug Kees!",
|
||||
Description: nil, // Empty description should just be excluded from the JSON.
|
||||
},
|
||||
}
|
||||
|
||||
assertResponseJSON(t, echoCtx, http.StatusOK, expectedJob)
|
||||
|
@ -415,11 +415,6 @@ func TestSubmitJobWithWorkerTag(t *testing.T) {
|
||||
DeleteRequestedAt: nil,
|
||||
Activity: "",
|
||||
Status: api.JobStatusQueued,
|
||||
WorkerTag: &api.WorkerTag{
|
||||
Id: ptr(workerTagUUID),
|
||||
Name: "first tag",
|
||||
Description: ptr("my first tag"),
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
|
@ -46,8 +46,8 @@
|
||||
<dd>{{ jobType ? jobType.label : jobData.type }}</dd>
|
||||
|
||||
<dt class="field-worker-tag" title="Worker Tag">Worker Tag</dt>
|
||||
<dd v-if="jobData.worker_tag" :title="jobData.worker_tag.description">
|
||||
{{ jobData.worker_tag.name }}
|
||||
<dd v-if="workerTag" :title="workerTag.description">
|
||||
{{ workerTag.name }}
|
||||
</dd>
|
||||
<dd v-else class="no-worker-tag">All Workers</dd>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user