From e2f406498905f6248de34f7c02cc92d97e61c58f Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Fri, 6 Sep 2019 19:38:13 +0900
Subject: [PATCH] Update organisms/LabelList

---
 frontend/api/routes/labels.js               |  3 +-
 frontend/components/organisms/LabelList.vue | 62 +++++----------------
 frontend/services/label.service.js          |  6 +-
 3 files changed, 17 insertions(+), 54 deletions(-)

diff --git a/frontend/api/routes/labels.js b/frontend/api/routes/labels.js
index 487f2ba6..8ad71038 100644
--- a/frontend/api/routes/labels.js
+++ b/frontend/api/routes/labels.js
@@ -40,7 +40,8 @@ router.get('/:labelId', (req, res) => {
 router.patch('/:labelId', (req, res) => {
   const labelIndex = db.findIndex(item => item.id === parseInt(req.params.labelId))
   if (labelIndex !== -1) {
-    db[labelIndex] = req.body
+    // db[labelIndex] = req.body
+    Object.assign(db[labelIndex], req.body)
     res.json(db[labelIndex])
   } else {
     res.status(404).json({ detail: 'Not found.' })
diff --git a/frontend/components/organisms/LabelList.vue b/frontend/components/organisms/LabelList.vue
index 4886369a..af392ac1 100644
--- a/frontend/components/organisms/LabelList.vue
+++ b/frontend/components/organisms/LabelList.vue
@@ -19,66 +19,45 @@
       />
     </template>
     <template v-slot:item.text="{ item }">
-      <v-edit-dialog
-        :return-value.sync="item.text"
-      >
+      <v-edit-dialog>
         {{ item.text }}
         <template v-slot:input>
           <v-text-field
-            v-model="item.text"
+            :value="item.text"
             label="Edit"
             single-line
+            @change="updateLabel({ id: item.id, text: $event })"
           />
         </template>
       </v-edit-dialog>
     </template>
     <template v-slot:item.suffix_key="{ item }">
-      <v-edit-dialog
-        :return-value.sync="item.suffix_key"
-        large
-        persistent
-        @save="updateShortcut({ id: item.id, suffix_key: newKey })"
-      >
+      <v-edit-dialog>
         <div>{{ item.suffix_key }}</div>
-        <template v-slot:input>
-          <div class="mt-4 title">
-            Update key
-          </div>
-        </template>
         <template v-slot:input>
           <v-select
             :value="item.suffix_key"
             :items="keys"
             label="Key"
-            @input="setNewKey"
+            @change="updateLabel({ id: item.id, suffix_key: $event })"
           />
         </template>
       </v-edit-dialog>
     </template>
     <template v-slot:item.background_color="{ item }">
-      <v-edit-dialog
-        :return-value.sync="item.background_color"
-        large
-        persistent
-        @save="updateColor({ id:item.id, background_color: newColor })"
-      >
+      <v-edit-dialog>
         <v-chip :color="item.background_color" dark>
           {{ item.background_color }}
         </v-chip>
-        <template v-slot:input>
-          <div class="mt-4 title">
-            Update color
-          </div>
-        </template>
         <template v-slot:input>
           <v-color-picker
             :value="item.backgroundColor"
             show-swatches
             hide-mode-switch
             width="800"
-            :mode.sync="mode"
+            mode="hexa"
             class="ma-2"
-            @input="setNewColor"
+            @update:color="updateLabel({ id:item.id, background_color: $event.hex })"
           />
         </template>
       </v-edit-dialog>
@@ -103,35 +82,22 @@ export default {
       type: Array,
       default: () => [],
       required: true
+    },
+    keys: {
+      type: Array,
+      default: () => 'abcdefghijklmnopqrstuvwxyz'.split('')
     }
   },
   data() {
     return {
-      search: '',
-      newKey: null,
-      newColor: null,
-      keys: 'abcdefghijklmnopqrstuvwxyz'.split(''),
-      mode: 'hexa',
-      color: '#FF00FF'
+      search: ''
     }
   },
   methods: {
-    setNewKey(value) {
-      this.newKey = value
-    },
-    setNewColor(value) {
-      this.newColor = value
-    },
     update(selected) {
       this.$emit('update-selected', selected)
     },
-    updateRole(payload) {
-      this.$emit('update-role', payload)
-    },
-    updateShortcut(payload) {
-      this.$emit('update-label', payload)
-    },
-    updateColor(payload) {
+    updateLabel(payload) {
       this.$emit('update-label', payload)
     }
   }
diff --git a/frontend/services/label.service.js b/frontend/services/label.service.js
index bdabf286..008beead 100644
--- a/frontend/services/label.service.js
+++ b/frontend/services/label.service.js
@@ -18,11 +18,7 @@ class LabelService {
   }
 
   updateLabel(projectId, labelId, payload) {
-    const data = {
-      id: labelId,
-      ...payload
-    }
-    return this.request.patch(`/projects/${projectId}/labels/${labelId}`, data)
+    return this.request.patch(`/projects/${projectId}/labels/${labelId}`, payload)
   }
 }