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

Fix pagination indicators when using list slices #14

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix pagination indicators when using list slices #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cb3731
Fix pagination indicators when using list slices
sciyoshi Nov 22, 2017
a2df9a8
Fix tests for pagination markers
sciyoshi Nov 22, 2017
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
6 changes: 2 additions & 4 deletions graphql_relay/connection/arrayconnection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,14 @@ def connection_from_list_slice(list_slice, args=None, connection_type=None,

first_edge_cursor = edges[0].cursor if edges else None
last_edge_cursor = edges[-1].cursor if edges else None
lower_bound = after_offset + 1 if after else 0
upper_bound = before_offset if before else list_length

return connection_type(
edges=edges,
page_info=pageinfo_type(
start_cursor=first_edge_cursor,
end_cursor=last_edge_cursor,
has_previous_page=isinstance(last, int) and start_offset > lower_bound,
has_next_page=isinstance(first, int) and end_offset < upper_bound
has_previous_page=start_offset > 0,
has_next_page=end_offset < list_length
)
)

Expand Down
46 changes: 23 additions & 23 deletions graphql_relay/connection/tests/test_arrayconnection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ def test_pagination_respects_first_after():
'pageInfo': {
'startCursor': 'YXJyYXljb25uZWN0aW9uOjI=',
'endCursor': 'YXJyYXljb25uZWN0aW9uOjM=',
'hasPreviousPage': False,
'hasPreviousPage': True,
'hasNextPage': True,
}
}
Expand Down Expand Up @@ -207,7 +207,7 @@ def test_pagination_respects_longfirst_after():
'pageInfo': {
'startCursor': 'YXJyYXljb25uZWN0aW9uOjI=',
'endCursor': 'YXJyYXljb25uZWN0aW9uOjQ=',
'hasPreviousPage': False,
'hasPreviousPage': True,
'hasNextPage': False,
}
}
Expand All @@ -231,7 +231,7 @@ def test_pagination_respects_last_before():
'startCursor': 'YXJyYXljb25uZWN0aW9uOjE=',
'endCursor': 'YXJyYXljb25uZWN0aW9uOjI=',
'hasPreviousPage': True,
'hasNextPage': False,
'hasNextPage': True,
}
}
assert c.to_dict() == expected
Expand Down Expand Up @@ -259,7 +259,7 @@ def test_pagination_respects_longlast_before():
'startCursor': 'YXJyYXljb25uZWN0aW9uOjA=',
'endCursor': 'YXJyYXljb25uZWN0aW9uOjI=',
'hasPreviousPage': False,
'hasNextPage': False,
'hasNextPage': True,
}
}
assert c.to_dict() == expected
Expand All @@ -283,7 +283,7 @@ def test_first_after_before_few():
'pageInfo': {
'startCursor': 'YXJyYXljb25uZWN0aW9uOjE=',
'endCursor': 'YXJyYXljb25uZWN0aW9uOjI=',
'hasPreviousPage': False,
'hasPreviousPage': True,
'hasNextPage': True,
}
}
Expand Down Expand Up @@ -312,8 +312,8 @@ def test_first_after_before_many():
'pageInfo': {
'startCursor': 'YXJyYXljb25uZWN0aW9uOjE=',
'endCursor': 'YXJyYXljb25uZWN0aW9uOjM=',
'hasPreviousPage': False,
'hasNextPage': False,
'hasPreviousPage': True,
'hasNextPage': True,
}
}
assert c.to_dict() == expected
Expand Down Expand Up @@ -341,8 +341,8 @@ def test_first_after_before_exact():
'pageInfo': {
'startCursor': 'YXJyYXljb25uZWN0aW9uOjE=',
'endCursor': 'YXJyYXljb25uZWN0aW9uOjM=',
'hasPreviousPage': False,
'hasNextPage': False,
'hasPreviousPage': True,
'hasNextPage': True,
}
}
assert c.to_dict() == expected
Expand All @@ -367,7 +367,7 @@ def test_last_after_before_few():
'startCursor': 'YXJyYXljb25uZWN0aW9uOjI=',
'endCursor': 'YXJyYXljb25uZWN0aW9uOjM=',
'hasPreviousPage': True,
'hasNextPage': False,
'hasNextPage': True,
}
}
assert c.to_dict() == expected
Expand Down Expand Up @@ -395,8 +395,8 @@ def test_last_after_before_many():
'pageInfo': {
'startCursor': 'YXJyYXljb25uZWN0aW9uOjE=',
'endCursor': 'YXJyYXljb25uZWN0aW9uOjM=',
'hasPreviousPage': False,
'hasNextPage': False,
'hasPreviousPage': True,
'hasNextPage': True,
}
}
assert c.to_dict() == expected
Expand Down Expand Up @@ -424,8 +424,8 @@ def test_last_after_before_exact():
'pageInfo': {
'startCursor': 'YXJyYXljb25uZWN0aW9uOjE=',
'endCursor': 'YXJyYXljb25uZWN0aW9uOjM=',
'hasPreviousPage': False,
'hasNextPage': False,
'hasPreviousPage': True,
'hasNextPage': True,
}
}
assert c.to_dict() == expected
Expand Down Expand Up @@ -528,8 +528,8 @@ def test_no_elements_cursors_cross():
'pageInfo': {
'startCursor': None,
'endCursor': None,
'hasPreviousPage': False,
'hasNextPage': False,
'hasPreviousPage': True,
'hasNextPage': True,
}
}
assert c.to_dict() == expected
Expand Down Expand Up @@ -627,7 +627,7 @@ def test_list_slice_works_with_a_just_right_array_slice():
'pageInfo': {
'startCursor': 'YXJyYXljb25uZWN0aW9uOjE=',
'endCursor': 'YXJyYXljb25uZWN0aW9uOjI=',
'hasPreviousPage': False,
'hasPreviousPage': True,
'hasNextPage': True,
}
}
Expand Down Expand Up @@ -658,7 +658,7 @@ def test_list_slice_works_with_an_oversized_array_slice_left_side():
'pageInfo': {
'startCursor': 'YXJyYXljb25uZWN0aW9uOjE=',
'endCursor': 'YXJyYXljb25uZWN0aW9uOjI=',
'hasPreviousPage': False,
'hasPreviousPage': True,
'hasNextPage': True,
}
}
Expand All @@ -685,7 +685,7 @@ def test_list_slice_works_with_an_oversized_array_slice_right_side():
'pageInfo': {
'startCursor': 'YXJyYXljb25uZWN0aW9uOjI=',
'endCursor': 'YXJyYXljb25uZWN0aW9uOjI=',
'hasPreviousPage': False,
'hasPreviousPage': True,
'hasNextPage': True,
}
}
Expand All @@ -712,7 +712,7 @@ def test_list_slice_works_with_an_oversized_array_slice_both_sides():
'pageInfo': {
'startCursor': 'YXJyYXljb25uZWN0aW9uOjI=',
'endCursor': 'YXJyYXljb25uZWN0aW9uOjI=',
'hasPreviousPage': False,
'hasPreviousPage': True,
'hasNextPage': True,
}
}
Expand Down Expand Up @@ -743,7 +743,7 @@ def test_list_slice_works_with_an_undersized_array_slice_left_side():
'pageInfo': {
'startCursor': 'YXJyYXljb25uZWN0aW9uOjM=',
'endCursor': 'YXJyYXljb25uZWN0aW9uOjQ=',
'hasPreviousPage': False,
'hasPreviousPage': True,
'hasNextPage': False,
}
}
Expand Down Expand Up @@ -774,7 +774,7 @@ def test_list_slice_works_with_an_undersized_array_slice_right_side():
'pageInfo': {
'startCursor': 'YXJyYXljb25uZWN0aW9uOjI=',
'endCursor': 'YXJyYXljb25uZWN0aW9uOjM=',
'hasPreviousPage': False,
'hasPreviousPage': True,
'hasNextPage': True,
}
}
Expand All @@ -801,7 +801,7 @@ def test_list_slice_works_with_an_undersized_array_slice_both_sides():
'pageInfo': {
'startCursor': 'YXJyYXljb25uZWN0aW9uOjM=',
'endCursor': 'YXJyYXljb25uZWN0aW9uOjM=',
'hasPreviousPage': False,
'hasPreviousPage': True,
'hasNextPage': True,
}
}
Expand Down