Skip to content

Commit 370d1db

Browse files
jhashjhash
committed
Merge remote-tracking branch 'andy/add-labels-to-fields' into feat/DateFiltersForJobs
2 parents 2ad77f1 + 697318c commit 370d1db

File tree

1 file changed

+60
-67
lines changed

1 file changed

+60
-67
lines changed

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

Lines changed: 60 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,87 @@
1-
<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| %>
1+
<%# TODO: get this working in custom css file %>
2+
<div class="filter level-left" style="max-width: 100%;">
3+
<%= form_for :filter, url: application_jobs_path(MissionControl::Jobs::Current.application, jobs_status), method: :get,
4+
data: { controller: "form", action: "input->form#debouncedSubmit" } do |form| %>
65

6+
<div class="field is-grouped is-grouped-multiline">
7+
<div class="control">
8+
<%= form.label :job_class_name, class: "label" %>
79
<div class="select is-rounded">
810
<%= form.text_field :job_class_name, value: @job_filters[:job_class_name], class: "input", list: "job-classes", placeholder: "Filter by job class...", autocomplete: "off" %>
911
</div>
12+
</div>
1013

14+
<div class="control">
15+
<%= form.label :queue_name, class: "label" %>
1116
<div class="select is-rounded">
1217
<%= form.text_field :queue_name, value: @job_filters[:queue_name], class: "input", list: "queue-names", placeholder: "Filter by queue name...", autocomplete: "off" %>
1318
</div>
19+
</div>
1420

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>
21+
<% if jobs_status == "finished" %>
22+
<div class="control">
23+
<%= form.label :finished_at_start, class: "label" %>
4024
<div class="select is-rounded">
41-
<%= form.datetime_field :enqueued_at_start, value: @job_filters[:enqueued_at]&.begin, class: "input", placeholder: "Enqueued from" %>
25+
<%= form.datetime_field :finished_at_start, value: @job_filters[:finished_at]&.begin, class: "input", placeholder: "Finished from" %>
4226
</div>
4327
</div>
4428

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>
29+
<div class="control">
30+
<%= form.label :finished_at_end, class: "label" %>
4931
<div class="select is-rounded">
5032
<%# TODO: add max date of today? %>
51-
<%= form.datetime_field :enqueued_at_end, value: @job_filters[:enqueued_at]&.end, class: "input", placeholder: "Enqueued to" %>
33+
<%= form.datetime_field :finished_at_end, value: @job_filters[:finished_at]&.end, class: "input", placeholder: "Finished to" %>
5234
</div>
5335
</div>
36+
<% end %>
5437

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>
38+
<div class="control">
39+
<%= form.label :enqueued_at_start, class: "label" %>
40+
<div class="select is-rounded">
41+
<%= form.datetime_field :enqueued_at_start, value: @job_filters[:enqueued_at]&.begin, class: "input", placeholder: "Enqueued from" %>
6242
</div>
43+
</div>
6344

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>
45+
<div class="control">
46+
<%= form.label :enqueued_at_end, class: "label" %>
47+
<div class="select is-rounded">
48+
<%# TODO: add max date of today? %>
49+
<%= form.datetime_field :enqueued_at_end, value: @job_filters[:enqueued_at]&.end, class: "input", placeholder: "Enqueued to" %>
7250
</div>
51+
</div>
7352

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

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>
60+
<div class="control">
61+
<%= form.label :scheduled_at_start, class: "label" %>
62+
<div class="select is-rounded">
63+
<%# TODO: add max date of today? %>
64+
<%= form.datetime_field :scheduled_at_end, value: @job_filters[:scheduled_at]&.end, class: "input", placeholder: "Scheduled to" %>
65+
</div>
66+
</div>
8167

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>
68+
<%= hidden_field_tag :server_id, MissionControl::Jobs::Current.server.id %>
69+
70+
<datalist id="job-classes" class="is-hidden">
71+
<% job_class_names.each do |job_class_name| %>
72+
<option value="<%= job_class_name %>"></option>
73+
<% end %>
74+
</datalist>
75+
76+
<datalist id="queue-names" class="is-hidden">
77+
<% queue_names.each do |queue_name| %>
78+
<option value="<%= queue_name %>"></option>
79+
<% end %>
80+
</datalist>
8981

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" %>
82+
<div class="control is-align-self-flex-end">
83+
<%= 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" %>
84+
</div>
9285
</div>
93-
</div>
86+
<% end %>
9487
</div>

0 commit comments

Comments
 (0)