refine-rails 2.9.9 → 2.9.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 446a8130188530cee2fb75c67578c600275c0a828fb2231196d3517f5f95a837
4
- data.tar.gz: a5a22667df259ae68c2ce26c5e18dae49a02708342580e9569d26237d2632281
3
+ metadata.gz: 64fe80e7dcd7ca840c20101b7085466d63482d9dbd69f70edd521319530bab54
4
+ data.tar.gz: 7799610f7a21b824fe718fcbbfacbd4361effb636c14fbe817d3da986af6549e
5
5
  SHA512:
6
- metadata.gz: abb49f9681a6fbd5079b1fe745bab2e993a59855092023d9b2ae7fd312f38d143701e9666400de69b4ef71b81f797e3e3fff616082029589971d0e2659b5b4f0
7
- data.tar.gz: 78b5b26f113149a4ed8e1aff5063be84afa462a9aaf5091514ef96f8f81ed01c3a93e68c33f409179d026e7bf79fb8bc9173ca9fd6e4ca0790f88ea90fc3731e
6
+ metadata.gz: 69c1c06d278965e2781730c5f4e1eb7f178eae986da41b3b4fdb09fc8cd2ae5d98a84ab1d6e4af7b71b0c7dcb6ce0de9715dcdce130cca22423c52529e2e7f24
7
+ data.tar.gz: 96fe4a9b0e501b6542a7a02ac541aedd338554ade49ad1cad6ee8578b3ac53dd3a2426e173f84bff0bbee9d51f216a737ff3bff14d11ba5bacefeaddbd5483bc
@@ -607,6 +607,9 @@
607
607
  margin: 0.5rem 0;
608
608
  }
609
609
 
610
+ .refine--date-refinement-clause-container > .refine--block {
611
+ display: block;
612
+ }
610
613
 
611
614
  /* _date_condition.html.erb */
612
615
  .refine--date-condition-days-text {
@@ -22,15 +22,6 @@
22
22
 
23
23
  <%= form.fields :input_attributes, model: @criterion.input do |input_fields| %>
24
24
 
25
-
26
- <%# Input Value %>
27
- <% unless ['st', 'nst'].include? condition_clause %>
28
- <%= render @criterion.input_partial, criterion: @criterion, form: form, input_fields: input_fields, form_id: form_id %>
29
- <% if last_clause_select == :criterion %>
30
- <div class="refine--separator"></div>
31
- <% end %>
32
- <% end %>
33
-
34
25
  <%# Clause Select %>
35
26
  <div class="refine--criterion-clause-container">
36
27
  <%= input_fields.label :clause, t('.rule') %>
@@ -43,24 +34,26 @@
43
34
  data: {action: "change->refine--criterion-form#refresh"},
44
35
  form: form_id
45
36
  %>
46
- <% if last_clause_select == :criterion %>
47
- <%= form.button t('global.buttons.apply'), class: "refine--apply-button", type: "submit", form: form_id %>
48
- <% end %>
49
37
  </div>
50
38
 
39
+
40
+ <%# Input Value %>
41
+ <% unless ['st', 'nst'].include? condition_clause %>
42
+ <div class="refine--separator"></div>
43
+ <%= render @criterion.input_partial, criterion: @criterion, form: form, input_fields: input_fields, form_id: form_id %>
44
+ <% end %>
45
+
46
+ <% if last_clause_select == :criterion %>
47
+ <div class="refine--separator"></div>
48
+ <%= form.button t('global.buttons.apply'), class: "refine--apply-button", type: "submit", form: form_id %>
49
+ <% end %>
50
+
51
51
  <%# Date Refinement %>
52
52
  <% if @criterion.condition.has_date_refinement? %>
53
53
  <div class="refine--separator"></div>
54
- <label style="color: black;"><%= date_refinement_condition.display %></label>
55
- <%= input_fields.fields :date_refinement_attributes, model: @criterion.input.date_refinement do |date_fields| %>
56
- <div class="refine--refinement-input-container">
57
- <% unless ['st', 'nst'].include? @criterion.input.date_refinement.clause %>
58
- <%= render "refine/inline/inputs/date_condition", criterion: @criterion, form: form, input_fields: date_fields, form_id: form_id %>
59
- <% end %>
60
-
61
- </div>
62
-
63
- <div class="refine--criterion-clause-container">
54
+ <div class="refine--criterion-clause-container refine--date-refinement-clause-container">
55
+ <%= input_fields.label :clause, date_refinement_condition.display, class: "refine--block" %>
56
+ <%= input_fields.fields :date_refinement_attributes, model: @criterion.input.date_refinement do |date_fields| %>
64
57
  <%= date_fields.label :clause, t('.rule') %>
65
58
  <%= date_fields.collection_select :clause,
66
59
  date_refinement_condition.approved_clauses,
@@ -71,17 +64,21 @@
71
64
  data: {action: "change->refine--criterion-form#refresh"},
72
65
  form: form_id
73
66
  %>
74
- <% if last_clause_select == :date %>
75
- <%= form.button t('global.buttons.apply'), class: "refine--apply-button", type: "submit", form: form_id %>
67
+ </div>
68
+ <div class="refine--refinement-input-container">
69
+ <% unless ['st', 'nst'].include? @criterion.input.date_refinement.clause %>
70
+ <%= render "refine/inline/inputs/date_condition", criterion: @criterion, form: form, input_fields: date_fields, form_id: form_id %>
76
71
  <% end %>
77
72
  </div>
78
73
  <% end %>
79
-
74
+ <% if last_clause_select == :date %>
75
+ <%= form.button t('global.buttons.apply'), class: "refine--apply-button", type: "submit", form: form_id %>
76
+ <% end %>
80
77
  <% end %>
81
78
 
82
79
  <%# Count Refinement %>
83
80
  <% if count_refinement_condition %>
84
- <label style="color: black;"><%= @criterion.condition.get_count_refinement_condition.display %></label>
81
+ <label><%= @criterion.condition.get_count_refinement_condition.display %></label>
85
82
  <%= input_fields.fields :count_refinement_attributes, model: @criterion.input.count_refinement do |count_fields| %>
86
83
  <div class="refine--criterion-clause-container">
87
84
  <%= count_fields.collection_select :clause,
@@ -113,18 +110,8 @@
113
110
  <%= form.button t('global.buttons.apply'), class: "refine--apply-button", type: "submit", form: form_id %>
114
111
  <% end %>
115
112
  </div>
116
-
117
-
118
-
119
113
  <% end %>
120
-
121
114
  <% end %>
122
-
123
-
124
-
125
-
126
-
127
-
128
115
  <% end %>
129
116
 
130
117
  <% @error_messages&.each do |msg| %>
@@ -21,6 +21,7 @@
21
21
  <%= form_with url: refine_inline_criterion_path(@criterion.position),
22
22
  method: :put,
23
23
  id: form_id,
24
+ html: { autocomplete: "off" },
24
25
  data: {controller: "refine--turbo-stream-form", action: "submit->refine--turbo-stream-form#submit"}
25
26
  %>
26
27
  <% end %>
@@ -17,6 +17,17 @@
17
17
  <input class="refine--search-trigger" data-search-target="filterProperties" placeholder="<%= t('.type_to_search') %>..." type="text" data-action="refine--typeahead-list#filter" autofocus>
18
18
  </div>
19
19
 
20
+ <%= render "refine/inline/filters/popup",
21
+ frame_id: dom_id(@criterion, :load),
22
+ src: refine_inline_stored_filters_path(@criterion.to_params),
23
+ frame_class: "refine--stored-filter-list-popup" do
24
+ %>
25
+ <%= link_to "#", class: "refine--stored-filters-link", data: {action: "click->refine--popup#show"} do %>
26
+ <div class="material-icons-outlined refine--list-icon">save</div>
27
+ <%= t('.saved_filters') %>
28
+ <% end %>
29
+ <% end %>
30
+
20
31
  <div class="refine--separator-m0"></div>
21
32
 
22
33
  <div class="refine--condition-list">
@@ -52,14 +63,5 @@
52
63
 
53
64
  </div>
54
65
  <div class="refine--separator"></div>
55
- <%= render "refine/inline/filters/popup",
56
- frame_id: dom_id(@criterion, :load),
57
- src: refine_inline_stored_filters_path(@criterion.to_params),
58
- frame_class: "refine--stored-filter-list-popup" do
59
- %>
60
- <%= link_to "#", class: "refine--stored-filters-link", data: {action: "click->refine--popup#show"} do %>
61
- <div class="material-icons-outlined refine--list-icon">save</div>
62
- <%= t('.saved_filters') %>
63
- <% end %>
64
- <% end %>
66
+
65
67
  <% end %>
@@ -18,6 +18,9 @@
18
18
  <%# The actual form tag is appended to the end of the body html. Inputs are attached using the `form` attribute. This allows the query builder to be placed inside an outer form on the page. %>
19
19
  <%= turbo_stream.append_all "body" do %>
20
20
  <%= form_with url: refine_inline_criteria_path,
21
- method: :post, id: form_id, data: {controller: "refine--turbo-stream-form", action: "submit->refine--turbo-stream-form#submit"} %>
21
+ method: :post,
22
+ id: form_id,
23
+ html: { autocomplete: "off" },
24
+ data: {controller: "refine--turbo-stream-form", action: "submit->refine--turbo-stream-form#submit"} %>
22
25
  <% end %>
23
26
 
@@ -4,8 +4,6 @@
4
4
  <input class="refine--search-trigger" data-search-target="filterProperties" placeholder="<%= t('.type_to_search') %>..." type="text" data-action="refine--typeahead-list#filter" autofocus>
5
5
  </div>
6
6
 
7
- <div class="refine--separator-m0"></div>
8
-
9
7
  <div class="refine--option-list">
10
8
  <% criterion.options.each do |option| %>
11
9
  <%= tag.label class: "refine--option-label",
@@ -1,5 +1,5 @@
1
1
  module Refine
2
2
  module Rails
3
- VERSION = "2.9.9"
3
+ VERSION = "2.9.11"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: refine-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.9.9
4
+ version: 2.9.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Colleen Schnettler
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2024-03-18 00:00:00.000000000 Z
12
+ date: 2024-04-03 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -145,7 +145,6 @@ files:
145
145
  - app/views/refine/inline/filters/_and_button.html.erb
146
146
  - app/views/refine/inline/filters/_criterion.html.erb
147
147
  - app/views/refine/inline/filters/_group.html.erb
148
- - app/views/refine/inline/filters/_load_button.html.erb
149
148
  - app/views/refine/inline/filters/_or_button.html.erb
150
149
  - app/views/refine/inline/filters/_popup.html.erb
151
150
  - app/views/refine/inline/filters/_save_button.html.erb
@@ -1,15 +0,0 @@
1
- <%
2
- criterion = Refine::Inline::Criterion.new(
3
- stable_id: @refine_filter.to_stable_id,
4
- client_id: @refine_client_id,
5
- )
6
- %>
7
-
8
- <%= render "refine/inline/filters/popup",
9
- frame_id: dom_id(criterion, :load),
10
- src: refine_inline_stored_filters_path(criterion.to_params) do
11
- %>
12
- <button class="refine--inline-btn" type="button" data-action="click->refine--popup#show">
13
- <%= t(".load_filter") %>
14
- </button>
15
- <% end %>