fix: update tasks cloning to include labels (#3944)

Author: TCL735

cypress/e2e/shared/tasks.test.ts

@@ -211,26 +211,47 @@ from(bucket: "defbuck")
     })
 
     it('can clone a task and activate just the cloned one', () => {
-      createTask('task1', 'buckets()')
+      const firstLabel = 'very important task'
+      const secondLabel = 'mission critical'
 
-      cy.getByTestID('task-card')
-        .eq(1)
-        .then(() => {
-          cy.getByTestID('context-menu-task')
-            .eq(1)
-            .click()
-          cy.getByTestID('context-clone-task').click()
-        })
+      cy.get('button.cf-button[title="Add labels"]').click()
+      cy.getByTestID('inline-labels--popover--dialog').should('be.visible')
+      cy.getByTestID('inline-labels--popover-field').type(
+        `${firstLabel}{enter}`
+      )
+      cy.getByTestID('overlay--container').should('be.visible')
+      cy.getByTestID('create-label-form--submit').click()
 
+      cy.getByTestID('overlay--container').should('not.exist')
+      cy.get('button.cf-button[title="Add labels"]').click()
+      cy.getByTestID('inline-labels--popover--dialog').should('be.visible')
+      cy.getByTestID('inline-labels--popover-field').type(
+        `${secondLabel}{enter}`
+      )
+      cy.getByTestID('overlay--container').should('be.visible')
+      cy.getByTestID('create-label-form--submit').click()
+
+      // ensure the two labels are present before cloning
+      cy.getByTestID('overlay--container').should('not.exist')
+      cy.getByTestID(`label--pill ${firstLabel}`).should('be.visible')
+      cy.getByTestID(`label--pill ${secondLabel}`).should('be.visible')
+
+      // clone the task
+      cy.getByTestID('context-menu-task').click()
+      cy.getByTestID('context-clone-task').click()
+      cy.getByTestID('task-card--slide-toggle').should('have.length', 2)
+      cy.getByTestID(`label--pill ${firstLabel}`).should('have.length', 2)
+      cy.getByTestID(`label--pill ${secondLabel}`).should('have.length', 2)
+
+      // disable the first task
       cy.getByTestID('task-card--slide-toggle')
         .eq(0)
         .should('have.class', 'active')
       cy.getByTestID('task-card--slide-toggle')
         .eq(0)
         .click()
-      cy.getByTestID('task-card--slide-toggle')
-        .eq(0)
-        .should('not.have.class', 'active')
+
+      // only the clone should be active
       cy.getByTestID('task-card--slide-toggle')
         .eq(1)
         .should('have.class', 'active')
@@ -688,22 +709,3 @@ from(bucket: "defbuck")
     })
   })
 })
-
-const createTask = (
-  name: string,
-  task: string,
-  every = '3h',
-  offset = '20m'
-) => {
-  cy.getByTestID('create-task--button')
-    .first()
-    .click()
-
-  cy.getByTestID('flux-editor').monacoType(task)
-
-  cy.getByTestIDAndSetInputValue('task-form-name', name)
-  cy.getByTestIDAndSetInputValue('task-form-offset-input', offset)
-  cy.getByTestIDAndSetInputValue('task-form-schedule-input', every)
-  cy.getByTestID('task-save-btn').click()
-  cy.getByTestID('notification-success--dismiss').click()
-}

src/tasks/actions/thunks.ts

@@ -305,10 +305,60 @@ export const deleteTask = (taskID: string) => async (
   }
 }
 
+const cloneTaskLabels = (sourceTask: Task, destinationTask: Task) => async (
+  dispatch: Dispatch<Action>
+) => {
+  try {
+    const pendingLabels = sourceTask.labels.map(labelID =>
+      api.postTasksLabel({
+        taskID: destinationTask.id,
+        data: {labelID},
+      })
+    )
+
+    const mappedLabels = await Promise.all(pendingLabels)
+
+    if (
+      mappedLabels.length &&
+      mappedLabels.some(label => label.status !== 201)
+    ) {
+      throw new Error('An error occurred cloning the labels for this task')
+    }
+
+    dispatch(notify(copy.taskCloneSuccess(sourceTask.name)))
+  } catch {
+    dispatch(notify(copy.addTaskLabelFailed()))
+  }
+}
+
+const refreshTask = (task: Task) => async (dispatch: Dispatch<Action>) => {
+  try {
+    const response = await api.getTask({
+      taskID: task.id,
+    })
+
+    if (response.status !== 200) {
+      throw new Error(response.data.message)
+    }
+
+    const refreshedTask = response.data
+
+    const normTask = normalize<Task, TaskEntities, string>(
+      refreshedTask,
+      taskSchema
+    )
+    dispatch(addTask(normTask))
+  } catch {
+    dispatch(notify(copy.taskNotFound(task.name)))
+  }
+}
+
 export const cloneTask = (task: Task) => async (
   dispatch: Dispatch<Action>,
   getState: GetState
 ) => {
+  let newTask: Task
+
   try {
     const state = getState()
     const resp = await api.getTask({taskID: task.id})
@@ -350,24 +400,19 @@ export const cloneTask = (task: Task) => async (
 
     const fluxWithNewName = format_from_js_file(ast)
 
-    const newTask = await api.postTask({
+    const newTaskResponse = await api.postTask({
       data: {
         ...resp.data,
         flux: fluxWithNewName,
       },
     })
 
-    if (newTask.status !== 201) {
-      throw new Error(newTask.data.message)
+    if (newTaskResponse.status !== 201) {
+      throw new Error(newTaskResponse.data.message)
     }
 
-    const normTask = normalize<Task, TaskEntities, string>(
-      newTask.data,
-      taskSchema
-    )
+    newTask = newTaskResponse.data as Task
 
-    dispatch(notify(copy.taskCloneSuccess(task.name)))
-    dispatch(addTask(normTask))
     dispatch(checkTaskLimits())
   } catch (error) {
     console.error(error)
@@ -378,6 +423,12 @@ export const cloneTask = (task: Task) => async (
       dispatch(notify(copy.taskCloneFailed(task.name, message)))
     }
   }
+
+  // clone the labels
+  cloneTaskLabels(task, newTask)(dispatch)
+
+  // get the updated task
+  refreshTask(newTask)(dispatch)
 }
 
 export const selectTaskByID = (id: string) => async (

src/tasks/containers/TasksPage.test.tsx

@@ -93,7 +93,14 @@ jest.mock('src/client', () => ({
       status: 200,
     }
   }),
-  getTask: jest.fn(() => {
+  getTask: jest.fn(({taskID}) => {
+    if (taskID === replacementID) {
+      return {
+        data: {...InactiveTask, id: replacementID, name: replacementName},
+        headers: {},
+        status: 200,
+      }
+    }
     return {
       data: InactiveTask,
       headers: {},