Skip to content

Commit ae88963

Browse files
andycandreajhash
andycandrea
authored and
jhash
committed
Add labels to filter fields
1 parent bf3a0d6 commit ae88963

File tree

1 file changed

+58
-66
lines changed

1 file changed

+58
-66
lines changed

‎app/views/mission_control/jobs/jobs/_filters.html.erb‎

Lines changed: 58 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,86 @@
11
<div class="filter level-left">
2-
<div class="field is-grouped">
3-
<div class="control">
4-
<%= form_for :filter, url: application_jobs_path(MissionControl::Jobs::Current.application, jobs_status), method: :get,
5-
data: { controller: "form", action: "input->form#debouncedSubmit" } do |form| %>
2+
<%= form_for :filter, url: application_jobs_path(MissionControl::Jobs::Current.application, jobs_status), method: :get,
3+
data: { controller: "form", action: "input->form#debouncedSubmit" } do |form| %>
64

5+
<div class="field is-grouped">
6+
<div class="control">
7+
<%= form.label :job_class_name, class: "label" %>
78
<div class="select is-rounded">
89
<%= form.text_field :job_class_name, value: @job_filters[:job_class_name], class: "input", list: "job-classes", placeholder: "Filter by job class...", autocomplete: "off" %>
910
</div>
11+
</div>
1012

13+
<div class="control">
14+
<%= form.label :queue_name, class: "label" %>
1115
<div class="select is-rounded">
1216
<%= form.text_field :queue_name, value: @job_filters[:queue_name], class: "input", list: "queue-names", placeholder: "Filter by queue name...", autocomplete: "off" %>
1317
</div>
18+
</div>
1419

15-
<% if jobs_status == "finished" %>
16-
<div class="field is-flex is-flex-direction-column is-align-items-flex-start">
17-
<label class="has-text-grey is-size-7">
18-
Finished from:
19-
</label>
20-
<div class="select is-rounded">
21-
<%= form.datetime_field :finished_at_start, value: @job_filters[:finished_at]&.begin, class: "input", placeholder: "Finished from" %>
22-
</div>
23-
</div>
24-
25-
<div class="field is-flex is-flex-direction-column is-align-items-flex-start">
26-
<label class="has-text-grey is-size-7">
27-
Finished to:
28-
</label>
29-
<div class="select is-rounded">
30-
<%# TODO: add max date of today? %>
31-
<%= form.datetime_field :finished_at_end, value: @job_filters[:finished_at]&.end, class: "input", placeholder: "Finished to" %>
32-
</div>
33-
</div>
34-
<% end %>
35-
36-
<div class="field is-flex is-flex-direction-column is-align-items-flex-start">
37-
<label class="has-text-grey is-size-7">
38-
Enqueued from:
39-
</label>
20+
<% if jobs_status == "finished" %>
21+
<div class="control">
22+
<%= form.label :finished_at_start, class: "label" %>
4023
<div class="select is-rounded">
41-
<%= form.datetime_field :enqueued_at_start, value: @job_filters[:enqueued_at]&.begin, class: "input", placeholder: "Enqueued from" %>
24+
<%= form.datetime_field :finished_at_start, value: @job_filters[:finished_at]&.begin, class: "input", placeholder: "Finished from" %>
4225
</div>
4326
</div>
4427

45-
<div class="field is-flex is-flex-direction-column is-align-items-flex-start">
46-
<label class="has-text-grey is-size-7">
47-
Enqueued to:
48-
</label>
28+
<div class="control">
29+
<%= form.label :finished_at_end, class: "label" %>
4930
<div class="select is-rounded">
5031
<%# TODO: add max date of today? %>
51-
<%= form.datetime_field :enqueued_at_end, value: @job_filters[:enqueued_at]&.end, class: "input", placeholder: "Enqueued to" %>
32+
<%= form.datetime_field :finished_at_end, value: @job_filters[:finished_at]&.end, class: "input", placeholder: "Finished to" %>
5233
</div>
5334
</div>
35+
<% end %>
5436

55-
<div class="field is-flex is-flex-direction-column is-align-items-flex-start">
56-
<label class="has-text-grey is-size-7">
57-
Scheduled from:
58-
</label>
59-
<div class="select is-rounded">
60-
<%= form.datetime_field :scheduled_at_start, value: @job_filters[:scheduled_at]&.begin, class: "input", placeholder: "Scheduled from" %>
61-
</div>
37+
<div class="control">
38+
<%= form.label :enqueued_at_start, class: "label" %>
39+
<div class="select is-rounded">
40+
<%= form.datetime_field :enqueued_at_start, value: @job_filters[:enqueued_at]&.begin, class: "input", placeholder: "Enqueued from" %>
6241
</div>
42+
</div>
6343

64-
<div class="field is-flex is-flex-direction-column is-align-items-flex-start">
65-
<label class="has-text-grey is-size-7">
66-
Scheduled to:
67-
</label>
68-
<div class="select is-rounded">
69-
<%# TODO: add max date of today? %>
70-
<%= form.datetime_field :scheduled_at_end, value: @job_filters[:scheduled_at]&.end, class: "input", placeholder: "Scheduled to" %>
71-
</div>
44+
<div class="control">
45+
<%= form.label :enqueued_at_end, class: "label" %>
46+
<div class="select is-rounded">
47+
<%# TODO: add max date of today? %>
48+
<%= form.datetime_field :enqueued_at_end, value: @job_filters[:enqueued_at]&.end, class: "input", placeholder: "Enqueued to" %>
7249
</div>
50+
</div>
7351

74-
<%= hidden_field_tag :server_id, MissionControl::Jobs::Current.server.id %>
52+
<div class="control">
53+
<%= form.label :scheduled_at_start, class: "label" %>
54+
<div class="select is-rounded">
55+
<%= form.datetime_field :scheduled_at_start, value: @job_filters[:scheduled_at]&.begin, class: "input", placeholder: "Scheduled from" %>
56+
</div>
57+
</div>
7558

76-
<datalist id="job-classes" class="is-hidden">
77-
<% job_class_names.each do |job_class_name| %>
78-
<option value="<%= job_class_name %>"></option>
79-
<% end %>
80-
</datalist>
59+
<div class="control">
60+
<%= form.label :scheduled_at_start, class: "label" %>
61+
<div class="select is-rounded">
62+
<%# TODO: add max date of today? %>
63+
<%= form.datetime_field :scheduled_at_end, value: @job_filters[:scheduled_at]&.end, class: "input", placeholder: "Scheduled to" %>
64+
</div>
65+
</div>
8166

82-
<datalist id="queue-names" class="is-hidden">
83-
<% queue_names.each do |queue_name| %>
84-
<option value="<%= queue_name %>"></option>
85-
<% end %>
86-
</datalist>
87-
<% end %>
88-
</div>
67+
<%= hidden_field_tag :server_id, MissionControl::Jobs::Current.server.id %>
68+
69+
<datalist id="job-classes" class="is-hidden">
70+
<% job_class_names.each do |job_class_name| %>
71+
<option value="<%= job_class_name %>"></option>
72+
<% end %>
73+
</datalist>
74+
75+
<datalist id="queue-names" class="is-hidden">
76+
<% queue_names.each do |queue_name| %>
77+
<option value="<%= queue_name %>"></option>
78+
<% end %>
79+
</datalist>
8980

90-
<div class="control">
91-
<%= link_to "Clear", application_jobs_path(MissionControl::Jobs::Current.application, jobs_status, job_class_name: nil, queue_name: nil, finished_at: nil..nil), class: "button" %>
81+
<div class="control is-align-self-flex-end">
82+
<%= link_to "Clear", application_jobs_path(MissionControl::Jobs::Current.application, jobs_status, job_class_name: nil, queue_name: nil, finished_at: nil..nil), class: "button" %>
83+
</div>
9284
</div>
93-
</div>
85+
<% end %>
9486
</div>

0 commit comments

Comments
 (0)