Skip to content

Conversation

@ZahraaChreim-Atmire
Copy link

@ZahraaChreim-Atmire ZahraaChreim-Atmire commented Jun 25, 2025

References

Description

Added paging state management to the vocabulary treeview service, updating after each query based on whether previous or next pages exist; this state is exposed to the component to conditionally render navigation buttons in the hierarchical vocabulary browse.

Instructions for Reviewers

List of changes in this PR:

  • First, added currentPage, totalPages, showNextPageSubject, and showPreviousPageSubject to the vocabulary-treeview.service to manage and expose pagination state.
  • Second, created a new method searchByQueryAndPage(query, selectedItems, page) to support page-specific vocabulary search requests. The existing searchByQuery method was updated to call this with page 1 by default.
  • Third, updated searchByQueryAndPage to extract pagination info from the search response and update the showNextPageSubject and showPreviousPageSubject based on whether more pages are available.
  • Fourth, exposed showNextPage$ and showPreviousPage$ in the component, derived from showNextPageSubject, and showPreviousPageSubject, to reactively control the display of pagination buttons.
  • Fifth, added conditional rendering of “Show next results” and “Show previous results” buttons in the template, along with loadNextPage and `loadPreviousPage to trigger paging behavior.

To test this PR:

  1. Create a custom vocabulary XML file containing more than 20 nodes. Example: nodes with label="label1" through label="label100" and corresponding values like "value test 1" to "value test 100".
  2. Deploy the vocabulary to your backend instance.
  3. Navigate to the hierarchical browse interface in the UI (e.g., /browse/srsc).
  4. Enter the query label.

Expected behavior after applying this PR:

  • Only the first 20 matching entries are displayed initially.
  • A “Show next results” button appears below the filtered tree.
  • Clicking it displays the next 20 results and replaces the tree content.
  • When on subsequent pages, a “Show previous results” button also appears to navigate back.
  • On the final page, only the “Show previous results” button should be visible (no “Show next”).
  • On the first page, only the “Show next results” button should be visible.

First page:
image

Intermediate page:
image

Last page:
image

  • My PR is created against the main branch of code (unless it is a backport or is fixing an issue specific to an older branch).
  • My PR is small in size (e.g. less than 1,000 lines of code, not including comments & specs/tests), or I have provided reasons as to why that's not possible.
  • My PR passes ESLint validation using npm run lint
  • My PR doesn't introduce circular dependencies (verified via npm run check-circ-deps)
  • My PR includes TypeDoc comments for all new (or modified) public methods and classes. It also includes TypeDoc for large or complex private methods.
  • My PR passes all specs/tests and includes new/updated specs or tests based on the Code Testing Guide.
  • My PR aligns with Accessibility guidelines if it makes changes to the user interface.
  • My PR uses i18n (internationalization) keys instead of hardcoded English text, to allow for translations.
  • My PR includes details on how to test it. I've provided clear instructions to reviewers on how to successfully test this fix or feature.
  • If my PR includes new libraries/dependencies (in package.json), I've made sure their licenses align with the DSpace BSD License based on the Licensing of Contributions documentation.
  • If my PR includes new features or configurations, I've provided basic technical documentation in the PR itself.
  • If my PR fixes an issue ticket, I've linked them together.

@tdonohue tdonohue changed the title Main: Add paginated vocabulary search with 'Show previous/next results' controls in hierarchical browse [main] Add paginated vocabulary search with 'Show previous/next results' controls in hierarchical browse Jun 25, 2025
@tdonohue tdonohue moved this to 🙋 Needs Reviewers Assigned in DSpace 10.0 Release Jun 25, 2025
@tdonohue tdonohue added bug component: Discovery related to discovery search or browse system 1 APPROVAL pull request only requires a single approval to merge port to dspace-9_x This PR needs to be ported to `dspace-9_x` branch for next bug-fix release labels Jun 25, 2025
Copy link
Contributor

@nwoodward nwoodward left a comment

Choose a reason for hiding this comment

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

Thanks @ZahraaChreim-Atmire. The pagination works very well, except for one small issue. If there are more than 20 nodes and I click "Show next results" and then navigate away from Browsing by Subject Category to any other page of the repository when I come back to Browsing by Subject Category the "Show previous results" button still appears, even though I'm on the first page of subjects. Is there a way to reset the buttons when the user navigates away from this page?

Zahraa Chreim added 2 commits October 30, 2025 10:42
…ix-issue4500-hierarchical-browse-pagination-10_x'
…ubject category page

(cherry picked from commit 231da9c)
@ZahraaChreim-Atmire
Copy link
Author

Thanks @ZahraaChreim-Atmire. The pagination works very well, except for one small issue. If there are more than 20 nodes and I click "Show next results" and then navigate away from Browsing by Subject Category to any other page of the repository when I come back to Browsing by Subject Category the "Show previous results" button still appears, even though I'm on the first page of subjects. Is there a way to reset the buttons when the user navigates away from this page?

Thank you for your feedback! I’ve updated the code to reset the pagination observables on component initialization, ensuring the buttons are hidden when returning to the page.

@nwoodward
Copy link
Contributor

Thanks @ZahraaChreim-Atmire! Now when I navigate away from browsing by subject category the pagination resets. Can you also reset the pagination when the user clicks on the "Reset" button? When I search for "label" in the subject categories and then navigate though the results and then click "Reset" then the bottom of the categories list looks like the screenshot. It's still showing the previous and next buttons, but the search box is empty so it's a bit confusing.

Screenshot 2025-11-05 at 2 52 13 PM

(cherry picked from commit 9aacba6)
@ZahraaChreim-Atmire
Copy link
Author

Thanks @ZahraaChreim-Atmire! Now when I navigate away from browsing by subject category the pagination resets. Can you also reset the pagination when the user clicks on the "Reset" button? When I search for "label" in the subject categories and then navigate though the results and then click "Reset" then the bottom of the categories list looks like the screenshot. It's still showing the previous and next buttons, but the search box is empty so it's a bit confusing.

Screenshot 2025-11-05 at 2 52 13 PM

@nwoodward Fixed! Pagination is also reset when the "Reset" button is clicked.

Copy link
Contributor

@nwoodward nwoodward left a comment

Choose a reason for hiding this comment

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

👍 Thanks @ZahraaChreim-Atmire! I tested again this morning, and the pagination works really well in every scenario I could envision.

@github-project-automation github-project-automation bot moved this from 🙋 Needs Reviewers Assigned to 👍 Reviewer Approved in DSpace 10.0 Release Nov 7, 2025
@github-actions
Copy link

Hi @ZahraaChreim-Atmire,
Conflicts have been detected against the base branch.
Please resolve these conflicts as soon as you can. Thanks!

@tdonohue
Copy link
Member

Temporarily closing & reopening to get an updated test result. Apologies this has taken long to get back to, but I'd like to see if we can merge this soon.

@tdonohue tdonohue closed this Jan 14, 2026
@github-project-automation github-project-automation bot moved this from 👍 Reviewer Approved to ✅ Done in DSpace 10.0 Release Jan 14, 2026
@tdonohue tdonohue reopened this Jan 14, 2026
@tdonohue tdonohue moved this from ✅ Done to 👍 Reviewer Approved in DSpace 10.0 Release Jan 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1 APPROVAL pull request only requires a single approval to merge bug component: Discovery related to discovery search or browse system port to dspace-9_x This PR needs to be ported to `dspace-9_x` branch for next bug-fix release

Projects

Status: 👍 Reviewer Approved

Development

Successfully merging this pull request may close these issues.

Hierarchical browse returns only first 20 results when searching/filtering

3 participants