Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from solidusio:main #368

Merged
merged 24 commits into from
Oct 11, 2023
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
68915c7
Remove order promotions promotion code value from search key
rainerdema Sep 20, 2023
679001c
Include search_param in `ui/table` component
rainerdema Sep 28, 2023
c3744d4
Update Stimulus actions for improved search behavior
rainerdema Sep 28, 2023
1850b99
Round table borders directly instead of relying overflow:hidden
elia Oct 10, 2023
53e5b45
Introduce dynamic ransack filter component for complex queries
elia Oct 10, 2023
01f75cf
Implement dynamic checkboxes sorting within options
rainerdema Sep 28, 2023
5f9aad1
Add click outside to close details
rainerdema Sep 28, 2023
2f41a2b
Introduce dynamic search bar when selections are more than 6
rainerdema Sep 28, 2023
f48eef8
Initialize checkboxes based on URL parameters
rainerdema Sep 28, 2023
983dcc9
Highlight the filter if there are selected options
rainerdema Sep 28, 2023
ca9e9f8
Introduce new filters for the products index
rainerdema Sep 28, 2023
58d4bda
Introduce new filters for the orders index
rainerdema Sep 28, 2023
0d54847
Refactor event dispatching in Stimulus controllers
rainerdema Sep 28, 2023
9fd261a
Let /admin/products/new fallback to the backend
elia Oct 10, 2023
8302a83
Don't show missing order shipment and payment states
elia Oct 10, 2023
ef86996
Enable clickable filter labels for checkboxes
rainerdema Oct 10, 2023
6e78e0a
Add no-options message for empty filter
rainerdema Oct 10, 2023
dc8dad1
Merge pull request #5376 from nebulab/rainerd/add-dropdown-filter-com…
rainerdema Oct 10, 2023
5b24d71
Resolve issue with clickable labels due to spaces in IDs
rainerdema Oct 10, 2023
cfa016a
Merge pull request #5427 from solidusio/elia/admin/order-states
elia Oct 11, 2023
7aec6d0
Merge pull request #5426 from solidusio/elia/admin/misc-fixes
elia Oct 11, 2023
0b2c035
Extract the table search field to a component
elia Oct 4, 2023
ce69e2c
Merge pull request #5429 from nebulab/rainerd/ransack-filter/fix/para…
rainerdema Oct 11, 2023
afc630e
Merge pull request #5428 from solidusio/elia/admin/search-field
elia Oct 11, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add no-options message for empty filter
  • Loading branch information
rainerdema committed Oct 10, 2023
commit 6e78e0af0e24d752654578ddad20035f6a3a268a
Original file line number Diff line number Diff line change
@@ -37,27 +37,33 @@
</div>
<% end %>
<div class="py-1 max-h-[240px] overflow-y-auto" role="menu" aria-orientation="vertical" aria-labelledby="options-menu" data-<%= stimulus_id %>-target="menu">
<% @selections.each do |selection| %>
<div class="px-4 py-2" data-<%= stimulus_id %>-target="option">
<input type="hidden" form="<%= @form %>"
name="<%= selection.attribute.name %>"
value="<%= selection.attribute.value %>">
<input type="hidden" form="<%= @form %>"
name="<%= selection.predicate.name %>"
value="<%= selection.predicate.value %>">
<% if @selections.any? %>
<% @selections.each do |selection| %>
<div class="px-4 py-2" data-<%= stimulus_id %>-target="option">
<input type="hidden" form="<%= @form %>"
name="<%= selection.attribute.name %>"
value="<%= selection.attribute.value %>">
<input type="hidden" form="<%= @form %>"
name="<%= selection.predicate.name %>"
value="<%= selection.predicate.value %>">

<%= render component('ui/forms/checkbox').new(
id: selection.id,
name: selection.option.name,
value: selection.option.value,
checked: selection.checked,
size: :s,
form: @form,
"data-action": "#{stimulus_id}#search #{stimulus_id}#sortCheckboxes",
"data-#{stimulus_id}-target": "checkbox"
) %>
<%= render component('ui/forms/checkbox').new(
id: selection.id,
name: selection.option.name,
value: selection.option.value,
checked: selection.checked,
size: :s,
form: @form,
"data-action": "#{stimulus_id}#search #{stimulus_id}#sortCheckboxes",
"data-#{stimulus_id}-target": "checkbox"
) %>

<%= label_tag selection.id, selection.presentation, class: "ml-2 text-sm text-gray-700" %>
<%= label_tag selection.id, selection.presentation, class: "ml-2 text-sm text-gray-700" %>
</div>
<% end %>
<% else %>
<div class="px-4 py-2 text-sm text-gray-700">
<%= t('.no_filter_options') %>
</div>
<% end %>
</div>
Original file line number Diff line number Diff line change
@@ -2,3 +2,4 @@
# Use the translation in the example in your template with `t(".hello")`.
en:
search: Search
no_filter_options: No options available