fix(menu): consistency bugs in menu

Wording consistency regarding cancelling/closing/editing jobs, especially as it relates to batch jobs; and the status of edited jobs is now reset to null.

Author: marisademeglio

src/main/index.ts

@@ -44,7 +44,8 @@ import {
     selectPipeline,
     selectNextJob,
     selectPrevJob,
-    removeBatchJob
+    removeBatchJob,
+    cancelBatchJob
 } from 'shared/data/slices/pipeline'
 import { setupClipboardEvents } from './ipcs/clipboard'
 import { checkForUpdate } from 'shared/data/slices/update'
@@ -218,6 +219,9 @@ function buildMenu() {
             // Open the settings window
             ipcMain.emit(IPC.WINDOWS.ABOUT.CREATE)
         },
+        onCancelBatchJob: async (jobsInBatch) => {
+            store.dispatch(cancelBatchJob(jobsInBatch))
+        },
     })
     // @ts-ignore
     const menu = Menu.buildFromTemplate(template)

src/main/menu.ts

@@ -7,7 +7,11 @@ import { store } from './data/store'
 import { closeApplication } from './windows'
 import { selectEditOnNewTab } from 'shared/data/slices/settings'
 import { selectDownloadPath } from 'shared/data/slices/settings'
-import { areAllJobsInBatchDone, getCompletedCountInBatch } from 'shared/utils'
+import {
+    areAllJobsInBatchDone,
+    getCompletedCountInBatch,
+    getIdleCountInBatch,
+} from 'shared/utils'
 
 export function buildMenuTemplate({
     appName,
@@ -23,6 +27,7 @@ export function buildMenuTemplate({
     onRemoveJob,
     onEditJob,
     onShowAbout,
+    onCancelBatchJob,
 }) {
     let pipelineStatus = PipelineStatus.UNKNOWN
     const instance = getPipelineInstance(store.getState())
@@ -58,7 +63,7 @@ export function buildMenuTemplate({
         canDelete =
             pipelineStatus == PipelineStatus.RUNNING &&
             currentJob &&
-            currentJob.state == JobState.SUBMITTED &&
+            (currentJob.state == JobState.SUBMITTED || currentJob.state == JobState.ENDED) &&
             currentJob.jobData &&
             currentJob.jobData.status != JobStatus.RUNNING &&
             currentJob.jobData.status != JobStatus.IDLE
@@ -78,7 +83,10 @@ export function buildMenuTemplate({
     if (currentJob?.isPrimaryForBatch) {
         canCloseJob = areAllJobsInBatchDone(currentJob, jobsInBatch)
     } else {
-        canCloseJob = currentJob && currentJob.state == JobState.SUBMITTED
+        canCloseJob =
+            currentJob &&
+            (currentJob.state == JobState.SUBMITTED ||
+                currentJob.state == JobState.ENDED)
     }
 
     let canCreateJob = pipelineStatus == PipelineStatus.RUNNING
@@ -187,11 +195,28 @@ export function buildMenuTemplate({
                       ]
                     : [
                           {
-                              label: 'Cancel job',
+                              label: currentJob?.jobRequest?.batchId
+                                  ? 'Cancel scheduled jobs'
+                                  : 'Cancel job',
                               click: () => {
-                                  onRemoveJob(currentJob)
+                                  if (currentJob?.jobRequest?.batchId) {
+                                      if (
+                                          getIdleCountInBatch(
+                                              currentJob,
+                                              jobsInBatch
+                                          ) > 0
+                                      ) {
+                                          onCancelBatchJob(jobsInBatch)
+                                      }
+                                  } else {
+                                      onRemoveJob(currentJob)
+                                  }
                               },
                               accelerator: 'CommandOrControl+D',
+                              enabled:
+                                  !currentJob?.jobRequest?.batchId ||
+                                  getIdleCountInBatch(currentJob, jobsInBatch) >
+                                      0,
                           },
                       ]),
                 { type: 'separator' },
@@ -232,7 +257,7 @@ export function buildMenuTemplate({
                         onEditJob(currentJob)
                     },
                     accelerator: 'CommandOrControl+E',
-                    enabled: canDelete,
+                    enabled: canDelete && !currentJob?.jobRequest?.batchId,
                 },
                 { type: 'separator' },
                 { role: 'copy' },

src/shared/data/slices/pipeline.ts

@@ -180,6 +180,7 @@ export const pipeline = createSlice({
                     job.state = JobState.NEW
                     if (job.jobData && job.jobData.results) {
                         job.jobData.results = undefined
+                        job.jobData.status = null
                     }
                     if (job.jobRequestError) {
                         job.jobRequestError = undefined