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 #36

Closed
wants to merge 1 commit into from
Closed

Fix pagination indicators when using list slices #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/graphql_relay/connection/arrayconnection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,16 +165,14 @@ def connection_from_array_slice(

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 array_length

return connection_type(
edges=edges,
pageInfo=page_info_type(
startCursor=first_edge_cursor,
endCursor=last_edge_cursor,
hasPreviousPage=isinstance(last, int) and start_offset > lower_bound,
hasNextPage=isinstance(first, int) and end_offset < upper_bound,
hasPreviousPage=start_offset > 0,
hasNextPage=end_offset < array_length,
),
)

Expand Down
46 changes: 23 additions & 23 deletions tests/connection/test_arrayconnection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def respects_first_and_after():
pageInfo=PageInfo(
startCursor="YXJyYXljb25uZWN0aW9uOjI=",
endCursor="YXJyYXljb25uZWN0aW9uOjM=",
hasPreviousPage=False,
hasPreviousPage=True,
hasNextPage=True,
),
)
Expand All @@ -134,7 +134,7 @@ def respects_first_and_after_with_long_first():
pageInfo=PageInfo(
startCursor="YXJyYXljb25uZWN0aW9uOjI=",
endCursor="YXJyYXljb25uZWN0aW9uOjQ=",
hasPreviousPage=False,
hasPreviousPage=True,
hasNextPage=False,
),
)
Expand All @@ -152,7 +152,7 @@ def respects_last_and_before():
startCursor="YXJyYXljb25uZWN0aW9uOjE=",
endCursor="YXJyYXljb25uZWN0aW9uOjI=",
hasPreviousPage=True,
hasNextPage=False,
hasNextPage=True,
),
)

Expand All @@ -170,7 +170,7 @@ def respects_last_and_before_with_long_last():
startCursor="YXJyYXljb25uZWN0aW9uOjA=",
endCursor="YXJyYXljb25uZWN0aW9uOjI=",
hasPreviousPage=False,
hasNextPage=False,
hasNextPage=True,
),
)

Expand All @@ -191,7 +191,7 @@ def respects_first_and_after_and_before_too_few():
pageInfo=PageInfo(
startCursor="YXJyYXljb25uZWN0aW9uOjE=",
endCursor="YXJyYXljb25uZWN0aW9uOjI=",
hasPreviousPage=False,
hasPreviousPage=True,
hasNextPage=True,
),
)
Expand All @@ -214,8 +214,8 @@ def respects_first_and_after_and_before_too_many():
pageInfo=PageInfo(
startCursor="YXJyYXljb25uZWN0aW9uOjE=",
endCursor="YXJyYXljb25uZWN0aW9uOjM=",
hasPreviousPage=False,
hasNextPage=False,
hasPreviousPage=True,
hasNextPage=True,
),
)

Expand All @@ -237,8 +237,8 @@ def respects_first_and_after_and_before_exactly_right():
pageInfo=PageInfo(
startCursor="YXJyYXljb25uZWN0aW9uOjE=",
endCursor="YXJyYXljb25uZWN0aW9uOjM=",
hasPreviousPage=False,
hasNextPage=False,
hasPreviousPage=True,
hasNextPage=True,
),
)

Expand All @@ -260,7 +260,7 @@ def respects_last_and_after_and_before_too_few():
startCursor="YXJyYXljb25uZWN0aW9uOjI=",
endCursor="YXJyYXljb25uZWN0aW9uOjM=",
hasPreviousPage=True,
hasNextPage=False,
hasNextPage=True,
),
)

Expand All @@ -282,8 +282,8 @@ def respects_last_and_after_and_before_too_many():
pageInfo=PageInfo(
startCursor="YXJyYXljb25uZWN0aW9uOjE=",
endCursor="YXJyYXljb25uZWN0aW9uOjM=",
hasPreviousPage=False,
hasNextPage=False,
hasPreviousPage=True,
hasNextPage=True,
),
)

Expand All @@ -305,8 +305,8 @@ def respects_last_and_after_and_before_exactly_right():
pageInfo=PageInfo(
startCursor="YXJyYXljb25uZWN0aW9uOjE=",
endCursor="YXJyYXljb25uZWN0aW9uOjM=",
hasPreviousPage=False,
hasNextPage=False,
hasPreviousPage=True,
hasNextPage=True,
),
)

Expand Down Expand Up @@ -379,8 +379,8 @@ def returns_no_elements_if_cursors_cross():
pageInfo=PageInfo(
startCursor=None,
endCursor=None,
hasPreviousPage=False,
hasNextPage=False,
hasPreviousPage=True,
hasNextPage=True,
),
)

Expand Down Expand Up @@ -560,7 +560,7 @@ def works_with_a_just_right_array_slice():
pageInfo=PageInfo(
startCursor="YXJyYXljb25uZWN0aW9uOjE=",
endCursor="YXJyYXljb25uZWN0aW9uOjI=",
hasPreviousPage=False,
hasPreviousPage=True,
hasNextPage=True,
),
)
Expand All @@ -580,7 +580,7 @@ def works_with_an_oversized_array_slice_left_side():
pageInfo=PageInfo(
startCursor="YXJyYXljb25uZWN0aW9uOjE=",
endCursor="YXJyYXljb25uZWN0aW9uOjI=",
hasPreviousPage=False,
hasPreviousPage=True,
hasNextPage=True,
),
)
Expand All @@ -597,7 +597,7 @@ def works_with_an_oversized_array_slice_right_side():
pageInfo=PageInfo(
startCursor="YXJyYXljb25uZWN0aW9uOjI=",
endCursor="YXJyYXljb25uZWN0aW9uOjI=",
hasPreviousPage=False,
hasPreviousPage=True,
hasNextPage=True,
),
)
Expand All @@ -614,7 +614,7 @@ def works_with_an_oversized_array_slice_both_sides():
pageInfo=PageInfo(
startCursor="YXJyYXljb25uZWN0aW9uOjI=",
endCursor="YXJyYXljb25uZWN0aW9uOjI=",
hasPreviousPage=False,
hasPreviousPage=True,
hasNextPage=True,
),
)
Expand All @@ -634,7 +634,7 @@ def works_with_an_undersized_array_slice_left_side():
pageInfo=PageInfo(
startCursor="YXJyYXljb25uZWN0aW9uOjM=",
endCursor="YXJyYXljb25uZWN0aW9uOjQ=",
hasPreviousPage=False,
hasPreviousPage=True,
hasNextPage=False,
),
)
Expand All @@ -654,7 +654,7 @@ def works_with_an_undersized_array_slice_right_side():
pageInfo=PageInfo(
startCursor="YXJyYXljb25uZWN0aW9uOjI=",
endCursor="YXJyYXljb25uZWN0aW9uOjM=",
hasPreviousPage=False,
hasPreviousPage=True,
hasNextPage=True,
),
)
Expand All @@ -671,7 +671,7 @@ def works_with_an_undersized_array_slice_both_sides():
pageInfo=PageInfo(
startCursor="YXJyYXljb25uZWN0aW9uOjM=",
endCursor="YXJyYXljb25uZWN0aW9uOjM=",
hasPreviousPage=False,
hasPreviousPage=True,
hasNextPage=True,
),
)
Expand Down