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

Disable "Next" button in Paginator when the next page is empty #2114

Merged
merged 14 commits into from
Sep 7, 2023
Merged

Disable "Next" button in Paginator when the next page is empty #2114

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
56afdb8
Store communityLimit as a constant in the config
noskla Sep 4, 2023
52d0655
Block Next button on communities list if the next page is empty
noskla Sep 4, 2023
d35d838
Use this.props instead of undefined props, compare number to the leng…
noskla Sep 4, 2023
4a22813
Set nextDisabled prop for Paginator in registration-applications comp…
noskla Sep 4, 2023
c4bc779
Set nextDisabled prop in Paginator required
noskla Sep 5, 2023
2345c16
Ignore nextDisabled prop in Paginator component used in person/inbox.…
noskla Sep 5, 2023
b919622
Set nextDisabled to true if community is not yet loaded or no more pa…
noskla Sep 5, 2023
d16a7e6
Set nextDisabled to false for Paginator in emojis-form.tsx
noskla Sep 5, 2023
5ea599a
Fix swapped bool logic in community.tsx
noskla Sep 5, 2023
fe4d56f
Set nextDisabled for Paginator in home.tsx
noskla Sep 5, 2023
d3ee464
Set nextDisabled for Comments and Posts in person-details.tsx
noskla Sep 5, 2023
bc8b79c
Set nextDisabled for reports.tsx
noskla Sep 5, 2023
c60f181
Set nextDisabled for search.tsx
noskla Sep 5, 2023
1876efa
Merge branch 'main' into communities-pages
SleeplessOne1917 Sep 6, 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
2 changes: 2 additions & 0 deletions src/shared/components/common/paginator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { I18NextService } from "../../services";
interface PaginatorProps {
page: number;
onChange(val: number): any;
nextDisabled?: boolean;
}

export class Paginator extends Component<PaginatorProps, any> {
Expand All @@ -23,6 +24,7 @@ export class Paginator extends Component<PaginatorProps, any> {
<button
className="btn btn-secondary"
onClick={linkEvent(this, this.handleNext)}
disabled={this.props.nextDisabled || false}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the || false necessary here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, it's a residue after nextDisabled was optional to not pass "undefined" to the property, I'll fix it

>
{I18NextService.i18n.t("next")}
</button>
Expand Down
11 changes: 9 additions & 2 deletions src/shared/components/community/communities.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import { Paginator } from "../common/paginator";
import { SortSelect } from "../common/sort-select";
import { CommunityLink } from "./community-link";

const communityLimit = 50;
import { communityLimit } from "../../config";

type CommunitiesData = RouteDataResponse<{
listCommunitiesResponse: ListCommunitiesResponse;
Expand Down Expand Up @@ -221,7 +221,14 @@ export class Communities extends Component<any, CommunitiesState> {
</tbody>
</table>
</div>
<Paginator page={page} onChange={this.handlePageChange} />
<Paginator
page={page}
onChange={this.handlePageChange}
nextDisabled={
communityLimit >
this.state.listCommunitiesResponse.data.communities.length
dessalines marked this conversation as resolved.
Show resolved Hide resolved
}
/>
</div>
);
}
Expand Down
4 changes: 4 additions & 0 deletions src/shared/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ export const relTags = "noopener nofollow";
export const emDash = "\u2014";
export const authCookieName = "jwt";

// No. of max displayed communities per
// page on route "/communities"
export const communityLimit = 50;

/**
* Accepted formats:
* [email protected]
Expand Down