Preselect default task (#22)

src/js/components/App.js

@@ -14,6 +14,7 @@ import {
   findProjectByValue,
   findProjectByIdentifier,
   findTask,
+  defaultTask,
   formatDate,
 } from "utils"
 import { parseISO } from "date-fns"
@@ -73,7 +74,7 @@ class App extends Component {
     const { service, lastTaskId } = this.props
     return (
       findTask(this.changeset.task_id || service?.taskId || lastTaskId)(this.project) ||
-      head(this.project?.tasks)
+      defaultTask(this.project?.tasks)
     )
   }
 
@@ -121,7 +122,7 @@ class App extends Component {
 
     if (name === "assignment_id") {
       const project = findProjectByValue(value)(projects)
-      this.changeset.task_id = head(project?.tasks)?.value
+      this.changeset.task_id = defaultTask(project?.tasks)?.value
     }
   }
 

src/js/utils/index.js

@@ -10,6 +10,8 @@ import {
   find,
   curry,
   pick,
+  head,
+  defaultTo,
 } from "lodash/fp"
 import { format } from "date-fns"
 
@@ -42,11 +44,19 @@ export const findTask = id =>
     get("tasks"),
   )
 
+export const defaultTask = tasks =>
+  compose(
+    defaultTo(head(tasks)),
+    find(pathEq("isDefault", true)),
+    nilToArray,
+  )(tasks)
+
 function taskOptions(tasks) {
-  return tasks.map(({ id, name, billable }) => ({
+  return tasks.map(({ id, name, billable, default: isDefault }) => ({
     label: billable ? name : `(${name})`,
     value: id,
     billable,
+    isDefault,
   }))
 }
 

test/data.js

@@ -9,14 +9,16 @@ export const projects = [
       {
         id: 2733682,
         name: "Bugfixing",
-        billable: true
+        billable: true,
+        default: false,
       },
       {
         id: 2733681,
         name: "Development",
-        billable: true
+        billable: true,
-      }
+        default: true,
-    ]
+      },
+    ],
   },
   {
     id: 944724773,
@@ -28,24 +30,28 @@ export const projects = [
       {
         id: 1621304,
         name: "Roadmap Features",
-        billable: true
+        billable: true,
+        default: false,
       },
       {
         id: 1621310,
         name: "Bugfixing",
-        billable: true
+        billable: true,
+        default: false,
       },
       {
         id: 1621305,
         name: "Quickwins",
-        billable: true
+        billable: true,
+        default: true,
       },
       {
         id: 1621323,
         name: "Refactorings",
-        billable: true
+        billable: true,
-      }
+        default: false,
-    ]
+      },
+    ],
   },
   {
     id: 944837106,
@@ -57,24 +63,28 @@ export const projects = [
       {
         id: 2500080,
         name: "Intercom & Mails",
-        billable: false
+        billable: false,
+        default: false,
       },
       {
         id: 2500081,
         name: "Demos",
-        billable: false
+        billable: false,
+        default: true,
       },
       {
         id: 2506050,
         name: "Calls",
-        billable: false
+        billable: false,
+        default: false,
       },
       {
         id: 2500084,
         name: "Importe",
-        billable: false
+        billable: false,
-      }
+        default: false,
-    ]
+      },
+    ],
   },
   {
     id: 944621413,
@@ -86,23 +96,27 @@ export const projects = [
       {
         id: 874014,
         name: "Entwicklung",
-        billable: true
+        billable: true,
+        default: false,
       },
       {
         id: 874015,
         name: "Grafik",
-        billable: true
+        billable: true,
+        default: false,
       },
       {
         id: 874016,
         name: "Konzept",
-        billable: true
+        billable: true,
+        default: false,
       },
       {
         id: 874017,
         name: "Projektleitung",
-        billable: true
+        billable: true,
-      }
+        default: false,
-    ]
+      },
-  }
+    ],
+  },
 ]

test/utils/index.test.js

@@ -3,16 +3,25 @@ import {
   findProjectByValue,
   findProjectByIdentifier,
   findTask,
+  defaultTask,
   groupedProjectOptions,
-  extractAndSetTag
+  extractAndSetTag,
 } from "../../src/js/utils"
-import { map } from "lodash/fp"
+import { map, compose } from "lodash/fp"
+
+const getProjectBy = finder => key =>
+  compose(
+    finder(key),
+    groupedProjectOptions,
+  )(projects)
+
+const getProjectByValue = getProjectBy(findProjectByValue)
+const getProjectByIdentifier = getProjectBy(findProjectByIdentifier)
 
 describe("utils", () => {
   describe("findProjectByValue", () => {
     it("finds an existing project", () => {
-      const options = groupedProjectOptions(projects)
+      const project = getProjectByValue(944837106)
-      const project = findProjectByValue(944837106)(options)
       expect(project.value).toEqual(944837106)
       expect(project.label).toEqual("Support")
       expect(project.customerName).toEqual("MOCO APP")
@@ -20,14 +29,12 @@ describe("utils", () => {
     })
 
     it("returns undefined if project is not found", () => {
-      const options = groupedProjectOptions(projects)
+      const project = getProjectByValue(123)
-      const project = findProjectByValue(123)(options)
       expect(project).toBe(undefined)
     })
 
     it("returns undefined for undefined id", () => {
-      const options = groupedProjectOptions(projects)
+      const project = getProjectByValue(undefined)
-      const project = findProjectByValue(undefined)(options)
       expect(project).toBe(undefined)
     })
   })
@@ -57,16 +64,14 @@ describe("utils", () => {
 
   describe("findTask", () => {
     it("find an existing task", () => {
-      const options = groupedProjectOptions(projects)
+      const project = getProjectByValue(944837106)
-      const project = findProjectByValue(944837106)(options)
       const task = findTask(2506050)(project)
       expect(task.value).toEqual(2506050)
       expect(task.label).toEqual("(Calls)")
     })
 
     it("returns undefined if task is not found", () => {
-      const options = groupedProjectOptions(projects)
+      const project = getProjectByValue(944837106)
-      const project = findProjectByValue(944837106)(options)
       const task = findTask(123)(project)
       expect(task).toBe(undefined)
     })
@@ -77,14 +82,32 @@ describe("utils", () => {
     })
   })
 
+  describe("defaultTask", () => {
+    it("find a default task", () => {
+      const project = getProjectByValue(944837106)
+      const task = defaultTask(project.tasks)
+      expect(task.label).toBe("(Demos)")
+    })
+
+    it("returns first task if no default is defined", () => {
+      const project = getProjectByValue(944621413)
+      const task = defaultTask(project.tasks)
+      expect(task.label).toBe("Entwicklung")
+    })
+
+    it("return undefined if no tasks given", () => {
+      let task = defaultTask(null)
+      expect(task).toBeUndefined()
+
+      task = defaultTask([])
+      expect(task).toBeUndefined()
+    })
+  })
+
   describe("groupedProjectOptions", () => {
     it("transforms projects into grouped options by company", () => {
       const result = groupedProjectOptions(projects)
-      expect(map("label", result)).toEqual([
+      expect(map("label", result)).toEqual(["Simplificator", "MOCO APP", "sharoo"])
-        "Simplificator",
-        "MOCO APP",
-        "sharoo"
-      ])
     })
   })
 
@@ -92,19 +115,19 @@ describe("utils", () => {
     it("sets the correct tag and updates description", () => {
       const changeset = {
         description: "#meeting Lorem ipsum",
-        tag: ""
+        tag: "",
       }
 
       expect(extractAndSetTag(changeset)).toEqual({
         description: "Lorem ipsum",
-        tag: "meeting"
+        tag: "meeting",
       })
     })
 
     it("only matches tag at the beginning", () => {
       const changeset = {
         description: "Lorem #meeting ipsum",
-        tag: ""
+        tag: "",
       }
 
       expect(extractAndSetTag(changeset)).toEqual(changeset)
@@ -113,7 +136,7 @@ describe("utils", () => {
     it("returns the changeset if not tag is set", () => {
       const changeset = {
         description: "Without tag",
-        tag: ""
+        tag: "",
       }
 
       expect(extractAndSetTag(changeset)).toEqual(changeset)