Merge pull request #558 from hackaru-app/no-project

Add no project to select tag

__tests__/src/renderer/components/molecules/project-select.spec.js

@@ -10,12 +10,12 @@ describe('ProjectSelect', () => {
       propsData: {
         projects: [
           {
-            id: 1,
-            name: 'Development',
-            color: '#f00',
+            id: null,
+            name: 'No Project',
+            color: '#cccfd9',
           },
           {
-            id: 2,
+            id: 1,
             name: 'Review',
             color: '#ff0',
           },
@@ -30,7 +30,19 @@ describe('ProjectSelect', () => {
     })
 
     it('emits input', () => {
-      expect(wrapper.emitted('input')[0][0]).toBe(2)
+      expect(wrapper.emitted('input')[0][0]).toBe(1)
+    })
+  })
+
+  describe('when select no-project', () => {
+    beforeEach(async () => {
+      wrapper = factory()
+      await wrapper.setProps({ value: 1 })
+      wrapper.find(testId('select')).findAll('option').at(0).setSelected()
+    })
+
+    it('emits input', () => {
+      expect(wrapper.emitted('input')[0][0]).toBeNull()
     })
   })
 })

src/renderer/components/molecules/project-select.vue

@@ -38,7 +38,8 @@ export default {
   },
   methods: {
     change(e) {
-      this.$emit('input', Number(e.target.value))
+      const id = e.target.value
+      this.$emit('input', id ? Number(id) : null)
     },
   },
 }

src/renderer/components/organisms/timer-form.vue

@@ -80,8 +80,13 @@ export default {
   computed: {
     ...mapGetters({
       activity: 'activities/working',
-      projects: 'projects/all',
     }),
+    projects() {
+      return [
+        { id: null, name: 'No Project', color: '#cccfd9' },
+        ...this.$store.getters['projects/all'],
+      ]
+    },
     working() {
       return !!this.activity
     },