Fix [Jobs and Workflows, Jobs Monitoring] The 'Auto Refresh' issues (#…

…3029)
mlrun · Jan 17, 2025 · 6cfb8f2 · 6cfb8f2
1 parent 959d8a4
commit 6cfb8f2
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/src/components/ActionBar/ActionBar.js b/src/components/ActionBar/ActionBar.js
@@ -289,7 +289,7 @@ const ActionBar = ({
   }, [filterMenu, filtersConfig])
 
   useEffect(() => {
-    if ((autoRefresh || internalAutoRefresh) && !hidden) {
+    if (((autoRefresh && !withInternalAutoRefresh) || internalAutoRefresh) && !hidden) {
       const intervalId = setInterval(() => {
         if (!autoRefreshIsStopped) {
           refresh(formRef.current.getState())

diff --git a/src/components/Jobs/Jobs.js b/src/components/Jobs/Jobs.js
@@ -235,9 +235,7 @@ const Jobs = () => {
                   }
                 ]}
                 autoRefreshIsStopped={
-                  jobWizardIsOpened ||
-                  jobsStore.loading ||
-                  Boolean(jobsStore.jobLoadingCounter)
+                  jobWizardIsOpened || jobsStore.loading || Boolean(jobsStore.jobLoadingCounter)
                 }
                 autoRefreshStopTrigger={!isEmpty(selectedJob)}
                 filters={filters}
@@ -249,8 +247,8 @@ const Jobs = () => {
                 page={JOBS_MONITORING_PAGE}
                 setSearchParams={setSearchParams}
                 tab={selectedTab}
-                withAutoRefresh
-                withInternalAutoRefresh={params.jobName}
+                withAutoRefresh={selectedTab === MONITOR_JOBS_TAB}
+                withInternalAutoRefresh={selectedTab === MONITOR_JOBS_TAB && params.jobName}
                 withRefreshButton
                 withoutExpandButton
               >

diff --git a/src/components/ProjectsJobsMonitoring/JobsMonitoring/JobsMonitoring.js b/src/components/ProjectsJobsMonitoring/JobsMonitoring/JobsMonitoring.js
@@ -41,6 +41,7 @@ const JobsMonitoring = () => {
     abortControllerRef,
     abortJobRef,
     abortingJobs,
+    autoRefreshPrevValue,
     fetchJobFunctionsPromiseRef,
     initialTabData,
     jobRuns,
@@ -97,6 +98,7 @@ const JobsMonitoring = () => {
       {params.jobName && <TableTop link={getBackLink(true)} text={params.jobName} />}
       <JobsTable
         abortingJobs={abortingJobs}
+        autoRefreshPrevValue={autoRefreshPrevValue}
         context={ProjectJobsMonitoringContext}
         filters={filters}
         filtersConfig={jobsFiltersConfig}

diff --git a/src/components/ProjectsJobsMonitoring/ProjectsJobsMonitoring.js b/src/components/ProjectsJobsMonitoring/ProjectsJobsMonitoring.js
@@ -63,6 +63,7 @@ const ProjectsJobsMonitoring = () => {
   const [selectedCard, setSelectedCard] = useState(
     jobsMonitoringData.filters?.status || STATS_TOTAL_CARD
   )
+  const [autoRefreshPrevValue, setAutoRefreshPrevValue] = useState(false)
   const location = useLocation()
   const params = useParams()
   const navigate = useNavigate()
@@ -184,23 +185,22 @@ const ProjectsJobsMonitoring = () => {
                 onClick={handleTabChange}
                 tabs={tabs}
               />
-
               <ActionBar
-                autoRefreshIsEnabled={selectedTab === JOBS_MONITORING_JOBS_TAB}
                 autoRefreshIsStopped={
-                  jobWizardIsOpened ||
-                  jobsStore.loading ||
-                  Boolean(jobsStore.jobLoadingCounter) ||
-                  !isEmpty(selectedJob)
+                  jobWizardIsOpened || jobsStore.loading || Boolean(jobsStore.jobLoadingCounter)
                 }
+                autoRefreshStopTrigger={!isEmpty(selectedJob)}
                 filters={filters}
                 filtersConfig={initialTabData[selectedTab].filtersConfig}
                 handleRefresh={tabData[selectedTab].handleRefresh}
+                handleAutoRefreshPrevValueChange={setAutoRefreshPrevValue}
                 hidden={Boolean(params.workflowId)}
                 key={selectedTab}
                 page={JOBS_MONITORING_PAGE}
                 setSearchParams={setSearchParams}
                 tab={selectedTab}
+                withAutoRefresh={selectedTab === JOBS_MONITORING_JOBS_TAB}
+                withInternalAutoRefresh={selectedTab === JOBS_MONITORING_JOBS_TAB && params.jobName}
                 withRefreshButton
                 withoutExpandButton
               >
@@ -213,6 +213,7 @@ const ProjectsJobsMonitoring = () => {
                   abortControllerRef,
                   abortJobRef,
                   abortingJobs,
+                  autoRefreshPrevValue,
                   editableItem,
                   fetchJobFunctionsPromiseRef,
                   getWorkflows,

diff --git a/src/elements/JobsTable/JobsTable.js b/src/elements/JobsTable/JobsTable.js
@@ -377,7 +377,8 @@ const JobsTable = React.forwardRef(
                 disabledNextDoubleBtnTooltip={
                   filtersStore.autoRefresh
                     ? 'Uncheck Auto Refresh to view more results'
-                    : autoRefreshPrevValue
+                    : autoRefreshPrevValue &&
+                        paginationConfigJobsRef.current?.paginationResponse?.['page-token']
                       ? 'Close detailed view and uncheck Auto Refresh to view more results'
                       : ''
                 }