Merge pull request #590 from crawlab-team/develop

Develop

.github/workflows/dockerpush.yml

@@ -57,7 +57,7 @@ jobs:
           # Strip "v" prefix from tag name
           [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
 
-          if [ $VERSION == "release"]; then
+          if [ "$VERSION" == "release" ]; then
             apt-get install -y curl
             curl ${{ secrets.JENKINS_RELEASE_URL }}
           fi

CHANGELOG-zh.md

@@ -1,4 +1,4 @@
-# 0.4.7 (unknown)
+# 0.4.7 (2020-02-24)
 ### 功能 / 优化
 - **更好的支持 Scrapy**. 爬虫识别，`settings.py` 配置，日志级别选择，爬虫选择. [#435](https://github.com/crawlab-team/crawlab/issues/435)
 - **Git 同步**. 允许用户将 Git 项目同步到 Crawlab.
@@ -13,6 +13,7 @@
 - **定时任务爬虫选择问题**. 字段不会随着爬虫变化而响应.
 - **定时任务冲突问题**. 两个不同的爬虫设置定时任务，时间设置成相同的话，可能会有bug. [#515](https://github.com/crawlab-team/crawlab/issues/515) [#565](https://github.com/crawlab-team/crawlab/issues/565)
 - **任务日志问题**. 在同一时间触发的不同任务可能会写入同一个日志文件. [#577](https://github.com/crawlab-team/crawlab/issues/577)
+- **任务列表筛选选项不全**.
 
 # 0.4.6 (2020-02-13)
 ### 功能 / 优化

CHANGELOG.md

@@ -1,4 +1,4 @@
-# 0.4.7 (unknown)
+# 0.4.7 (2020-02-24)
 ### Features / Enhancement
 - **Better Support for Scrapy**. Spiders identification, `settings.py` configuration, log level selection, spider selection. [#435](https://github.com/crawlab-team/crawlab/issues/435)
 - **Git Sync**. Allow users to sync git projects to Crawlab.
@@ -13,6 +13,7 @@
 - **Schedule Spider Selection Issue**. Fields not responding to spider change.
 - **Cron Jobs Conflict**. Possible bug when two spiders set to the same time of their cron jobs. [#515](https://github.com/crawlab-team/crawlab/issues/515) [#565](https://github.com/crawlab-team/crawlab/issues/565)
 - **Task Log Issue**. Different tasks write to the same log file if triggered at the same time. [#577](https://github.com/crawlab-team/crawlab/issues/577)
+- **Task List Filter Options Incomplete**.
 
 # 0.4.6 (2020-02-13)
 ### Features / Enhancement

frontend/src/components/Overview/TaskOverview.vue

@@ -70,12 +70,12 @@ export default {
   },
   methods: {
     onNavigateToSpider () {
-      this.$router.push(`/nodes/${this.nodeForm._id}`)
-      this.$st.sendEv('任务详情', '概览', '点击节点详情')
-    },
-    onNavigateToNode () {
       this.$router.push(`/spiders/${this.spiderForm._id}`)
       this.$st.sendEv('任务详情', '概览', '点击爬虫详情')
+    },
+    onNavigateToNode () {
+      this.$router.push(`/nodes/${this.nodeForm._id}`)
+      this.$st.sendEv('任务详情', '概览', '点击节点详情')
     }
   },
   created () {

frontend/src/components/Settings/GitSettings.vue

@@ -219,6 +219,7 @@ export default {
         this.isGitSyncLoading = false
         await this.$store.dispatch('spider/getSpiderData', this.$route.params.id)
       }
+      this.$st.sendEv('爬虫详情', 'Git 设置', '同步')
     },
     onReset () {
       this.$confirm(
@@ -235,11 +236,13 @@ export default {
             const res = await this.$request.post(`/spiders/${this.spiderForm._id}/git/reset`)
             if (!res.data.error) {
               this.$message.success(this.$t('Git has been reset successfully'))
+              this.$st.sendEv('爬虫详情', 'Git 设置', '确认重置')
             }
           } finally {
             this.isGitResetLoading = false
           }
         })
+      this.$st.sendEv('爬虫详情', 'Git 设置', '点击重置')
     },
     async getSshPublicKey () {
       const res = await this.$request.get('/git/public-key')
@@ -251,6 +254,7 @@ export default {
       el.setSelectionRange(0, this.sshPublicKey.length)
       document.execCommand('copy')
       this.$message.success(this.$t('SSH Public Key is copied to the clipboard'))
+      this.$st.sendEv('爬虫详情', 'Git 设置', '拷贝 SSH 公钥')
     }
   },
   async created () {

frontend/src/views/task/TaskList.vue

@@ -29,10 +29,12 @@
             <el-form-item prop="status" :label="$t('Status')">
               <el-select v-model="filter.status" size="small" :placeholder="$t('Status')" @change="onFilterChange">
                 <el-option value="" :label="$t('All')"></el-option>
-                <el-option value="finished" :label="$t('Finished')"></el-option>
+                <el-option value="pending" :label="$t('Pending')"></el-option>
                 <el-option value="running" :label="$t('Running')"></el-option>
+                <el-option value="finished" :label="$t('Finished')"></el-option>
                 <el-option value="error" :label="$t('Error')"></el-option>
                 <el-option value="cancelled" :label="$t('Cancelled')"></el-option>
+                <el-option value="abnormal" :label="$t('Abnormal')"></el-option>
               </el-select>
             </el-form-item>
           </el-form>
@@ -50,14 +52,15 @@
       <!--./legend-->
 
       <!--table list-->
-      <el-table :data="filteredTableData"
-                ref="table"
-                class="table"
-                :header-cell-style="{background:'rgb(48, 65, 86)',color:'white'}"
-                border
-                row-key="_id"
-                @row-click="onRowClick"
-                @selection-change="onSelectionChange">
+      <el-table
+        :data="filteredTableData"
+        ref="table"
+        class="table"
+        :header-cell-style="{background:'rgb(48, 65, 86)',color:'white'}"
+        border
+        row-key="_id"
+        @row-click="onRowClick"
+        @selection-change="onSelectionChange"
       >
         <el-table-column type="selection" width="45" align="center" reserve-selection/>
         <template v-for="col in columns">
@@ -146,7 +149,8 @@
               <el-button type="primary" icon="el-icon-search" size="mini" @click="onView(scope.row)"></el-button>
             </el-tooltip>
             <el-tooltip :content="$t('Remove')" placement="top">
-              <el-button type="danger" icon="el-icon-delete" size="mini" @click="onRemove(scope.row, $event)"></el-button>
+              <el-button type="danger" icon="el-icon-delete" size="mini"
+                         @click="onRemove(scope.row, $event)"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -331,7 +335,8 @@ export default {
             message: resp.data.error
           })
         })
-      }).catch(() => {})
+      }).catch(() => {
+      })
     },
     onRemove (row, ev) {
       ev.stopPropagation()