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.

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

Merge master to develop #189

Merged
merged 2 commits into from
Jan 8, 2024
Merged

Merge master to develop #189

merged 2 commits into from
Jan 8, 2024

Conversation

restjohn
Copy link
Member

@restjohn restjohn commented Jan 8, 2024

This merge contains the recently merged changes on master to address the admin page user search bug.

kimura-developer and others added 2 commits January 5, 2024 09:47
* buildFilter func

* WIP

* downgrade UserReadService, inject into AdminUserController

* explicit add, user-read.service.ts

* WIP - UserReadService, replace UserPageingService

* [web-app] fix import specifier to resolve typescript compilation error

* [web-app] better variable names in post_build script

* getAllUsers endpoint api/next-users/search

* removed UserReadService

* remove left over UserReadService references

* UserReadService.search, to incorporate  UserPagingService.search functionality in order to deprecate

* refactored UserReadService for statelessness, improved search parameters.

* fixed recursion issue

* fix: Reintroduced 'includeTotalCount' to UserSearchParams for test compatibility

* update to user-search-helper.ts file name

* PR -fix

* fix: Refactor userSearchObservable to prevent state interference.

* Adjusted user search function to conditionally send query parameters based on input values.

* removed SearchQueryParam from user-read.service

* add UserReadService to AdminUserController

* remove unused

* WIP enabled param

* WIP - rest included

* active, enabled include only if set

* remove UserReadService

* calculateLinks

* Refactor pagination: Enhance 'move', 'next', and 'previous' in UserPagingService

* getAllUser remove comments

* Refactor pageIndex logic and optimize total param handling in search

* [web-app] restore user read service

* Added changeFilter method; Fixed previous button pagination bug

* "Fixed 'Next' button functionality for correct page navigation"

* current searh term added to userFilter

* Refactored performNewSearch to reset pageIndex for new searches

* removed duplicate function, search function refactor

* [service] fix timestamp bug in observation test

---------

Co-authored-by: Robert St. John <[email protected]>
@restjohn restjohn merged commit 955441f into develop Jan 8, 2024
7 checks passed
@restjohn restjohn deleted the develop.merge.master branch January 8, 2024 22:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants