add status filter to admin runners page

2 files changed, 24 insertions, 7 deletions

diff --git a/app/views/admin/runners/_statuses.html.haml b/app/views/admin/runners/_statuses.html.haml
new file mode 100644
index 00000000000..4e91b6be6c4
--- /dev/null
+++ b/app/views/admin/runners/_statuses.html.haml
@@ -0,0 +1,13 @@
+- active_status = params[:status].presence
+
+- toggle_text = 'Status'
+- if active_status
+  = hidden_field_tag :status, params[:status]
+  - toggle_text = params[:status].titleize
+
+= dropdown_tag(toggle_text, options: { wrapper_class: 'dropdown-menu-selectable', title: 'Statuses' }) do
+  %ul
+    %li= link_to 'Any Status', admin_runners_path(safe_params.slice(:search)), class: ('is-active' unless active_status)
+    %li.divider
+    - Ci::Runner::AVAILABLE_STATUSES.each do |status|
+      %li= link_to status.titleize, admin_runners_path(safe_params.slice(:search).merge(status: status)), class: ('is-active' if active_status == status)
diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml
index 9280ff4d478..81dfc23641b 100644
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -42,14 +42,18 @@
            locals: { registration_token: Gitlab::CurrentSettings.runners_registration_token }
 
   .append-bottom-20.clearfix
-    .float-left
-      = form_tag admin_runners_path, id: 'runners-search', class: 'form-inline', method: :get do
-        .form-group
-          = search_field_tag :search, params[:search], class: 'form-control input-short', placeholder: 'Runner description or token', spellcheck: false
-        = submit_tag 'Search', class: 'btn'
+    = form_tag admin_runners_path, id: 'runners-search', method: :get do
+      .float-left
+        .form-inline
+          .form-group
+            = search_field_tag :search, params[:search], class: 'form-control input-short', placeholder: 'Runner description or token', spellcheck: false
+          = submit_tag 'Search', class: 'btn'
+
+      .float-left.prepend-left-10
+        = render 'statuses'
 
-    .float-right.light
-      Runners currently online: #{@active_runners_cnt}
+      .float-right.light
+        Runners currently online: #{@active_runners_cnt}
 
   %br