Skip to content

Commit 2fed9f5

Browse files
authored
[fix] [Lookout UI] fix cancellations and reprioritisations (#4588)
2225364 broke cancelling and reprioritising jobs on the Lookout UI as it adds the authorization header twice. This fixes it by removing the second addition (the fetch function in API clients provided by `useApiClients()` already performs this job).
1 parent 2225364 commit 2fed9f5

File tree

2 files changed

+14
-36
lines changed

2 files changed

+14
-36
lines changed

internal/lookoutui/src/services/lookout/useCancelJobs.ts

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { useMutation } from "@tanstack/react-query"
33
import { getErrorMessage } from "../../common/utils"
44
import { getConfig } from "../../config"
55
import { Job, JobId } from "../../models/lookoutModels"
6-
import { appendAuthorizationHeaders, useGetAccessToken } from "../../oidcAuth"
76

87
import { useApiClients } from "../apiClients"
98

@@ -45,7 +44,6 @@ function createJobBatches(jobs: Job[], batchSize: number): Map<string, Map<strin
4544
export const useCancelJobs = () => {
4645
const config = getConfig()
4746
const { submitApi } = useApiClients()
48-
const getAccessToken = useGetAccessToken()
4947

5048
return useMutation<UpdateJobsResponse, string, CancelJobsVariables>({
5149
mutationFn: async ({ jobs, reason }: CancelJobsVariables) => {
@@ -63,28 +61,19 @@ export const useCancelJobs = () => {
6361
const maxJobsPerRequest = 10000
6462
const chunks = createJobBatches(jobs, maxJobsPerRequest)
6563

66-
const accessToken = await getAccessToken()
67-
6864
const apiResponsePromises = []
6965
for (const [queue, jobSetMap] of chunks) {
7066
for (const [jobSet, batches] of jobSetMap) {
7167
for (const batch of batches) {
72-
const headers = new Headers()
73-
if (accessToken) {
74-
appendAuthorizationHeaders(headers, accessToken)
75-
}
7668
apiResponsePromises.push({
77-
promise: submitApi.cancelJobs(
78-
{
79-
body: {
80-
jobIds: batch,
81-
queue: queue,
82-
jobSetId: jobSet,
83-
reason: reason,
84-
},
69+
promise: submitApi.cancelJobs({
70+
body: {
71+
jobIds: batch,
72+
queue: queue,
73+
jobSetId: jobSet,
74+
reason: reason,
8575
},
86-
{ headers },
87-
),
76+
}),
8877
jobIds: batch,
8978
})
9079
}

internal/lookoutui/src/services/lookout/useReprioritizeJobs.ts

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import _ from "lodash"
44
import { getErrorMessage } from "../../common/utils"
55
import { getConfig } from "../../config"
66
import { Job, JobId } from "../../models/lookoutModels"
7-
import { appendAuthorizationHeaders, useGetAccessToken } from "../../oidcAuth"
87

98
import { useApiClients } from "../apiClients"
109

@@ -48,7 +47,6 @@ function createJobBatches(jobs: Job[], batchSize: number): Map<string, Map<strin
4847

4948
export const useReprioritizeJobs = () => {
5049
const { submitApi } = useApiClients()
51-
const getAccessToken = useGetAccessToken()
5250

5351
return useMutation<UpdateJobsResponse, string, ReprioritizeJobsVariables>({
5452
mutationFn: async ({ jobs, newPriority }: ReprioritizeJobsVariables) => {
@@ -65,28 +63,19 @@ export const useReprioritizeJobs = () => {
6563

6664
const chunks = createJobBatches(jobs, maxJobsPerRequest)
6765

68-
const accessToken = await getAccessToken()
69-
7066
const apiResponsePromises = []
7167
for (const [queue, jobSetMap] of chunks) {
7268
for (const [jobSet, batches] of jobSetMap) {
7369
for (const batch of batches) {
74-
const headers = new Headers()
75-
if (accessToken) {
76-
appendAuthorizationHeaders(headers, accessToken)
77-
}
7870
apiResponsePromises.push({
79-
promise: submitApi.reprioritizeJobs(
80-
{
81-
body: {
82-
jobIds: batch,
83-
queue: queue,
84-
jobSetId: jobSet,
85-
newPriority: newPriority,
86-
},
71+
promise: submitApi.reprioritizeJobs({
72+
body: {
73+
jobIds: batch,
74+
queue: queue,
75+
jobSetId: jobSet,
76+
newPriority: newPriority,
8777
},
88-
{ headers },
89-
),
78+
}),
9079
jobIds: batch,
9180
})
9281
}

0 commit comments

Comments
 (0)