Skip to content

Commit

Permalink
Fix [Details Popup] Missing Run on spot, Priority data in Job Details…
Browse files Browse the repository at this point in the history
… Popup.
  • Loading branch information
illia-prokopchuk committed Feb 26, 2025
1 parent 3baf25f commit 6608830
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions src/elements/DetailsPopUp/JobPopUp/JobPopUp.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ illegal under applicable law, and the grant of the foregoing license
under the Apache 2.0 license is conditioned upon your compliance with
such restriction.
*/
import React, { useCallback, useEffect, useMemo, useState } from 'react'
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'

import { isEmpty } from 'lodash'
import { useDispatch, useSelector } from 'react-redux'
Expand All @@ -28,7 +28,7 @@ import DetailsPopUp from '../DetailsPopUp'
import { parseJob } from '../../../utils/parseJob'
import { generatePageData } from '../../JobsTable/jobsTable.util'
import { getJobLogs } from '../../../utils/getJobLogs.util'
import { monitorJob } from '../../../components/Jobs/jobs.util'
import { enrichRunWithFunctionFields, monitorJob } from '../../../components/Jobs/jobs.util'
import { generateActionsMenu } from '../../../components/Jobs/MonitorJobs/monitorJobs.util'
import { showErrorNotification } from '../../../utils/notifications.util'
import { usePods } from '../../../hooks/usePods.hook'
Expand All @@ -41,6 +41,7 @@ const JobPopUp = ({ isOpen, jobData, onResolve }) => {
const frontendSpec = useSelector(store => store.appStore.frontendSpec)
const [selectedJob, setSelectedJob] = useState({})
const [isLoading, setIsLoading] = useState(true)
const fetchJobFunctionsPromiseRef = useRef()

usePods(dispatch, detailsActions.fetchJobPods, detailsActions.removePods, selectedJob)

Expand Down Expand Up @@ -105,8 +106,13 @@ const JobPopUp = ({ isOpen, jobData, onResolve }) => {
.unwrap()
.then(job => {
if (job) {
setSelectedJob(parseJob(job))
setIsLoading(false)
enrichRunWithFunctionFields(dispatch, parseJob(job), fetchJobFunctionsPromiseRef).then(
jobRun => {
setSelectedJob(jobRun)
setIsLoading(false)
fetchJobFunctionsPromiseRef.current = null
}
)
} else {
showErrorNotification(dispatch, {}, '', 'Failed to retrieve job data')
onResolve()
Expand Down

0 comments on commit 6608830

Please sign in to comment.