add a search reset button and limit search result to 200 builds

Author: ib-steffen

src/api/handlers/build.py

@@ -38,6 +38,12 @@ def get(self, project_id):
         else:
             cronjob = None
 
+        if build_from:
+            build_from = int(build_from)
+
+        if build_to:
+            build_to = int(build_to)
+
         if not build_to:
             r = g.db.execute_one_dict('''
                 SELECT max(build_number) as max
@@ -53,8 +59,8 @@ def get(self, project_id):
         if not build_from:
             build_from = max(build_to - 10, 0)
 
-        if build_to - build_from > 500:
-            build_from = build_to - 500
+        if build_to - build_from > 200:
+            build_from = build_to - 200
 
         p = g.db.execute_many_dict('''
             SELECT b.id, b.build_number, b.restart_counter, b.is_cronjob

src/api/handlers/projects/jobs.py

@@ -46,6 +46,12 @@ def get(self, project_id):
         else:
             cronjob = None
 
+        if build_from:
+            build_from = int(build_from)
+
+        if build_to:
+            build_to = int(build_to)
+
         if not build_to:
             r = g.db.execute_one_dict('''
                 SELECT max(build_number) as max
@@ -61,8 +67,8 @@ def get(self, project_id):
         if not build_from:
             build_from = max(build_to - 10, 0)
 
-        if build_to - build_from > 500:
-            build_from = build_to - 500
+        if build_to - build_from > 200:
+            build_from = build_to - 200
 
         jobs = g.db.execute_many_dict('''
             SELECT

src/dashboard-client/src/components/build/BuildTable.vue

@@ -33,7 +33,7 @@
                             <md-select name="state" id="state" v-model="form.state">
                                 <md-option value="" class="bg-white">Any</md-option>
                                 <md-option value="running" class="bg-white">Running</md-option>
-                                <md-option value="failed" class="bg-white">Failed</md-option>
+                                <md-option value="failure" class="bg-white">Failure</md-option>
                                 <md-option value="unstable" class="bg-white">Unstable</md-option>
                                 <md-option value="killed" class="bg-white">Killed</md-option>
                                 <md-option value="error" class="bg-white">Error</md-option>
@@ -44,6 +44,10 @@
                             <md-icon md-theme="running" class="md-primary">search</md-icon>
                             <md-tooltip>Search</md-tooltip>
                         </md-button>
+                        <md-button class="md-icon-button md-list-action" @click="resetSearch()">
+                            <md-icon md-theme="running" class="md-primary">clear</md-icon>
+                            <md-tooltip>Clear</md-tooltip>
+                        </md-button>
                     </md-list-item>
                 </md-list>
             </md-card-area>
@@ -97,7 +101,7 @@
                     </md-table-row>
                 </md-table-body>
             </md-table>
-            <md-table-pagination
+            <md-table-pagination v-if="!this.search.search">
                 :md-size="size"
                 :md-total="total"
                 :md-page="page"
@@ -152,7 +156,11 @@ export default {
 
             const p = this.page - 1
             const to = maxBuildNumber - (p * this.size) + 1
-            const from = to - this.size
+            let from = to - this.size
+
+            if (from < 0) {
+                from = 0
+            }
 
             let builds = []
             let foundFrom = maxBuildNumber
@@ -177,7 +185,6 @@ export default {
                         continue
                     }
 
-                    console.log(this.search.from)
                     if (this.search.from && b.number < this.search.from) {
                         continue
                     }
@@ -218,6 +225,10 @@ export default {
             this.size = opt.size
         },
 
+        resetSearch () {
+            this.search.search = false
+        },
+
         doSearch () {
             this.search = {
                 from: this.form.from,