Skip to content

[Lookout] merge in job with job spec object when templating links #4534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mauriceyap wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Lookout] merge in job with job spec object when templating links #4534

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions internal/lookoutui/src/pages/jobs/components/sidebar/SidebarLinks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ interface JobLink {
href: string
}

const getJobLinks = (job: Job): JobLink[] => {
const getJobLinks = (mergedJob: Record<string, any>): JobLink[] => {
// Template links using all job annotation keys, plus all job annotation keys prepended with userAnnotationPrefix
const templateContext = { ...job, annotations: { ...job.annotations } }
const templateContext = { ...mergedJob, annotations: { ...mergedJob.annotations } }
Object.entries(templateContext.annotations).forEach(([k, v]) => {
templateContext.annotations[userAnnotationPrefix + k] = v
})
Expand Down Expand Up @@ -62,13 +62,11 @@ export interface SidebarLinksProps {
}

export const SidebarLinks = ({ job }: SidebarLinksProps) => {
// The Lookout ingester may be configured to filter out annotation. We therefore
// merge in the annotations present in the job spec on a best-effort basis.
// Merge the job and the job spec objects to create the template context for job links
const { status, data } = useGetJobSpec(job.jobId, Boolean(job.jobId))
const linksForJob = useMemo(() => {
if (status === "success") {
const mergedJob: Job = { ...job, annotations: { ...job.annotations, ...(data.annotations ?? {}) } }
return getJobLinks(mergedJob)
return getJobLinks({ ...job, ...data, annotations: { ...job.annotations, ...(data.annotations ?? {}) } })
}
return getJobLinks(job)
}, [job, data])
Expand Down