From b27a36befc0dfee6131ec58512441eca8292e3f5 Mon Sep 17 00:00:00 2001
From: Marvin Zhang <tikazyq@gmail.com>
Date: Sat, 16 Mar 2019 21:29:30 +0800
Subject: [PATCH] changed the way how task is saved to database

---
 frontend/src/components/InfoView/TaskInfoView.vue |  2 +-
 frontend/src/store/modules/deploy.js              |  1 -
 frontend/src/store/modules/node.js                | 14 ++++----------
 frontend/src/store/modules/spider.js              |  1 -
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/InfoView/TaskInfoView.vue b/frontend/src/components/InfoView/TaskInfoView.vue
index 44730dcf..07b7f431 100644
--- a/frontend/src/components/InfoView/TaskInfoView.vue
+++ b/frontend/src/components/InfoView/TaskInfoView.vue
@@ -11,7 +11,7 @@
         </el-form-item>
         <el-form-item label="Status">
           <el-tag type="success" v-if="taskForm.status === 'SUCCESS'">SUCCESS</el-tag>
-          <el-tag type="warning" v-else-if="taskForm.status === 'PENDING'">PENDING</el-tag>
+          <el-tag type="warning" v-else-if="taskForm.status === 'STARTED'">STARTED</el-tag>
           <el-tag type="danger" v-else-if="taskForm.status === 'FAILURE'">FAILURE</el-tag>
           <el-tag type="info" v-else>{{taskForm.status}}</el-tag>
         </el-form-item>
diff --git a/frontend/src/store/modules/deploy.js b/frontend/src/store/modules/deploy.js
index 56cfe868..f512803c 100644
--- a/frontend/src/store/modules/deploy.js
+++ b/frontend/src/store/modules/deploy.js
@@ -1,5 +1,4 @@
 import request from '../../api/request'
-import dayjs from 'dayjs'
 
 const state = {
   deployList: []
diff --git a/frontend/src/store/modules/node.js b/frontend/src/store/modules/node.js
index b480237c..aec4e681 100644
--- a/frontend/src/store/modules/node.js
+++ b/frontend/src/store/modules/node.js
@@ -1,5 +1,4 @@
 import request from '../../api/request'
-import dayjs from 'dayjs'
 
 const state = {
   // NodeList
@@ -69,10 +68,8 @@ const actions = {
     return request.get(`/nodes/${id}/get_deploys`)
       .then(response => {
         commit('deploy/SET_DEPLOY_LIST',
-          response.data.items.map(d => {
-            if (d.finish_ts) d.finish_ts = dayjs(d.finish_ts.$date).format('YYYY-MM-DD HH:mm:ss')
-            return d
-          }).sort((a, b) => a.finish_ts < b.finish_ts ? 1 : -1),
+          response.data.items.map(d => d)
+            .sort((a, b) => a.finish_ts < b.finish_ts ? 1 : -1),
           { root: true })
       })
   },
@@ -80,11 +77,8 @@ const actions = {
     return request.get(`/nodes/${id}/get_tasks`)
       .then(response => {
         commit('task/SET_TASK_LIST',
-          response.data.items.map(d => {
-            if (d.create_ts) d.create_ts = dayjs(d.create_ts.$date).format('YYYY-MM-DD HH:mm:ss')
-            if (d.finish_ts) d.finish_ts = dayjs(d.finish_ts.$date).format('YYYY-MM-DD HH:mm:ss')
-            return d
-          }).sort((a, b) => a.create_ts < b.create_ts ? 1 : -1),
+          response.data.items.map(d => d)
+            .sort((a, b) => a.create_ts < b.create_ts ? 1 : -1),
           { root: true })
       })
   }
diff --git a/frontend/src/store/modules/spider.js b/frontend/src/store/modules/spider.js
index bdbc1ac7..77e169e2 100644
--- a/frontend/src/store/modules/spider.js
+++ b/frontend/src/store/modules/spider.js
@@ -1,4 +1,3 @@
-import dayjs from 'dayjs'
 import request from '../../api/request'
 
 const state = {