fix: update label to indicate job is attempting to run now

dhis2 · Feb 6, 2024 · eab8605 · eab8605 · dhis2-bot · Feb 6, 2024
1 parent 92c0415
commit eab8605
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/components/JobTable/NextRun.js b/src/components/JobTable/NextRun.js
@@ -28,12 +28,17 @@ const NextRun = ({ nextExecutionTime, enabled }) => {
     const nextRunIsInPast = nextRun.getTime() <= now
 
     /**
-     * If the time is in the past, that could mean that the task is running,
-     * and the nextExecutionTime hasn't been updated yet.
+     * If the nextExecutionTime is in the past that means that
+     * the scheduled execution time has passed, but the allowed
+     * startup delay hasn't expired yet. Effectively this means
+     * that the backend will start the job as soon as possible.
+     *
+     * If the window expires before the job can execute the
+     * nextExecutionTime will be updated to a time in the future.
      */
 
     if (nextRunIsInPast) {
-        return i18n.t('Not scheduled')
+        return i18n.t('Now')
     }
 
     return (

diff --git a/src/components/JobTable/NextRun.test.js b/src/components/JobTable/NextRun.test.js
@@ -47,8 +47,8 @@ describe('<NextRun>', () => {
         expect(wrapper.find(Tooltip).prop('content')).toEqual(expected)
     })
 
-    it('returns fallback message for an enabled job and a past execution time', () => {
-        const expected = 'Not scheduled'
+    it('returns message for an enabled job and a past execution time', () => {
+        const expected = 'Now'
         jest.spyOn(global.Date, 'now').mockImplementation(() => now)
 
         const wrapper = shallow(