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.

Sign up for GitHub

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

Jump to bottom

Sortable fields with scope:name_of_scope #5

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Sortable fields with scope:name_of_scope #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1afd676
fix #2: now you can sort by scope and attributes mixed;
FiloSpaTeam Mar 20, 2023
6d9d159
convert back to string when the value is an Array; this actually fixe…
FiloSpaTeam Feb 6, 2024
f2ae8e2
remove join in filters that breaks date filters
FiloSpaTeam Mar 5, 2024
e2047ec
fix(filters): add safe operator for splitting values
FiloSpaTeam Jul 11, 2024
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
2 changes: 1 addition & 1 deletion lib/jsonapi/scopes/filters.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def apply_filter(params)
filtering_params = params.dig(:filter) || {}

filtering_params.each do |key, value|
value = value.to_s.split(',').reject(&:blank?) if value.include?(',')
value = value.to_s.split(',').reject(&:blank?) if value&.include?(',')

raise InvalidAttributeError, "#{key} is not valid as filter attribute." unless @filters.include?(key.to_sym)

Expand Down
15 changes: 13 additions & 2 deletions lib/jsonapi/scopes/sorts.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,20 @@ def apply_sort(params = {}, options = { allowed: [], default: {} })
raise InvalidAttributeError, "#{field} is not valid as sort attribute." unless allowed_fields.include?(field)
end

order = ordered_fields.presence || default_order
res = self

self.order(order)
order_to_follow = ordered_fields.presence || default_order
order_to_follow.each do |single_order_q, direction|
if single_order_q.to_s.include? 'scope:'
scope_name = single_order_q.to_s.split(':').last

res = send(scope_name.to_sym, direction)
else
res = order("#{single_order_q}": direction)
end
end

res
end

private
Expand Down