Fix `Departments` pagination automatic filter application #1078

Spraynard · 2023-12-27T04:20:13Z

Implementing behavior that will allow use of pagination without automatically applying filters

Fixes issue

Description of Changes

Changes check if there are "filters" being applied to the list given in the departments view. If there are no filters applied then we generate a "next" link that does not automatically apply filters.

Notes for Deployment

Screenshots (if appropriate)

Tests and linting

This branch is up-to-date with the develop branch.
pytest passes on my local development environment.
pre-commit passes on my local development environment.

sea-kelp · 2023-12-27T10:41:42Z

Hello, thank you for reporting this bug! I took a look and I think the bug you're experiencing might be related to OpenOversight automatically adding the require_photo parameter to the url when you click to the next/previous page. Can you please try removing the "&require_photo=True" url parameter to see if that yields your expected search results?

If that works, we should be able to fix this issue by having the redirect_list_officer and list_officer routes default the require_photo parameter to None instead of False 🙂

Updating default value for "require_photo" to None

Spraynard · 2023-12-27T17:16:54Z

Hello,

Yes from looking at the bug it seems that removing the require_photo=FALSE parameter from the URL gave me the next page with the "correct" amount of Officer records in the total list.

So that means the bug isn't due to filters being applied but because of that require_photo parameter having a value that gives us unintended consequences.

This pull request should now have changes that provide a fix to this buggy behavior

sea-kelp

This looks good to me! Would you please update the type annotation to Optional[bool]?

Adding Optional[bool] typing for "redirect_list_officer" and "list_officer" routes

Spraynard · 2023-12-28T01:47:26Z

Sure thing. Added the optional typings

sea-kelp · 2023-12-28T02:54:25Z

Thank you for making those changes! Tagging in @michplunkett and @abandoned-prototype to take a second look

michplunkett · 2023-12-28T04:25:01Z

Is there a ticket this is based off of, @Spraynard?

michplunkett

This is a great find! Could you add a validation test similar to the test_officer_browse_pagination function in test_functional.py?

sea-kelp · 2023-12-31T22:31:02Z

@michplunkett Added a quick functional test - would you mind taking a look?

michplunkett

Excellent work, @Spraynard! Thank you for making the test addition, @sea-kelp, I appreciate it.

…s#1078) ## Fixes issue Fixes lucyparsons#1077 ## Description of Changes Changes check if there are "filters" being applied to the list given in the `departments` view. If there are no filters applied then we generate a "next" link that does not automatically apply filters. ## Tests and linting - [x] This branch is up-to-date with the `develop` branch. - [x] `pytest` passes on my local development environment. - [x] `pre-commit` passes on my local development environment. --------- Co-authored-by: sea-kelp <[email protected]>

* Make url_for work with all endpoints (lucyparsons#1070) Some of the `ModelView` based endpoints were missing a distinct name that could be used for `url_for`, and instead string concatenation was used (mostly in templates). I also moved some logic out of templates (e.g. calculation of total pay), added helper methods and made some other changed to reduce the code needed in the templates and improve readability a little bit. I also added an anonymous user class that is useful to call things like `.is_admin_or_coordinator(department)` on any `current_user` object, without first making sure the user is not anonymous. - [x] This branch is up-to-date with the `develop` branch. - [x] `pytest` passes on my local development environment. - [x] `pre-commit` passes on my local development environment. * Replace inline styles with external css (lucyparsons#1073)  lucyparsons#969 Removes the H021 tag and does the relevant clean-up. In this case, inline styles are refactored into external CSS via pre-existing stylesheets. Unsure of the CSS class names, very open to changes. One in particular I really disliked, but left a note-to-self. Historically more of a back-end dev, so apologies if I missed something obvious with these changes! - [x] This branch is up-to-date with the `develop` branch. - [x] `pytest` passes on my local development environment. - [x] `pre-commit` passes on my local development environment. (`pre-commit` technically fails on some .py files and migrations, but none of the new changes it seems) * Add missing <img> alt tags (lucyparsons#1074) ## Fixes issue lucyparsons#970 ## Description of Changes Removes H013 from pre-commit ignore list and adds alt tag + text to <img>s where needed. Adds some tips and resources in the CONTRIB.md for folks who encounter this in the future. ## Tests and linting - [x] This branch is up-to-date with the `develop` branch. - [ ] `pytest` passes on my local development environment. - [x] `pre-commit` passes on my local development environment. * Update font-awesome icons (lucyparsons#1076) * Fix `Departments` pagination automatic filter application (lucyparsons#1078) ## Fixes issue Fixes lucyparsons#1077 ## Description of Changes Changes check if there are "filters" being applied to the list given in the `departments` view. If there are no filters applied then we generate a "next" link that does not automatically apply filters. ## Tests and linting - [x] This branch is up-to-date with the `develop` branch. - [x] `pytest` passes on my local development environment. - [x] `pre-commit` passes on my local development environment. --------- Co-authored-by: sea-kelp <[email protected]> * Add default Officer Overtime value (lucyparsons#1083) ## Fixes issue lucyparsons#856 ## Description of Changes Adds default of $0 in officer "Overtime Pay" field. Users don't have to fill this in if they don't have any overtime pay information and use the form faster! ## Testing and Linting - [x] This branch is up-to-date with the `develop` branch. - [x] `pytest` passes on my local development environment. - [x] `pre-commit` passes on my local development environment. --------- Co-authored-by: abandoned-prototype <[email protected]> Co-authored-by: benj <[email protected]> Co-authored-by: Michael Plunkett <[email protected]> Co-authored-by: Spraynard <[email protected]>

Spraynard changed the title ~~Modifying views.py~~ Fixing Departments Page Pagination Automatically Applying Filters Dec 27, 2023

michplunkett requested review from michplunkett, abandoned-prototype and sea-kelp December 27, 2023 04:36

Spraynard closed this Dec 27, 2023

Spraynard force-pushed the develop branch from 3c8679c to 7681542 Compare December 27, 2023 17:11

Modifying views.py

c178635

Updating default value for "require_photo" to None

Spraynard reopened this Dec 27, 2023

sea-kelp approved these changes Dec 28, 2023

View reviewed changes

Modifying views.py

b23c94d

Adding Optional[bool] typing for "redirect_list_officer" and "list_officer" routes

michplunkett changed the title ~~Fixing Departments Page Pagination Automatically Applying Filters~~ Fix Departments pagination automatically applying filters Dec 28, 2023

michplunkett changed the title ~~Fix Departments pagination automatically applying filters~~ Fix Departments pagination automatically applying filters Dec 28, 2023

michplunkett assigned Spraynard Dec 28, 2023

michplunkett changed the title ~~Fix Departments pagination automatically applying filters~~ Fix Departments pagination automatic filter application Dec 28, 2023

michplunkett reviewed Dec 28, 2023

View reviewed changes

Add functional test for pagination

a36fda9

sea-kelp requested a review from michplunkett December 31, 2023 22:30

michplunkett approved these changes Dec 31, 2023

View reviewed changes

Merge branch 'develop' into develop

48a26a2

michplunkett merged commit 9372411 into lucyparsons:develop Dec 31, 2023
3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix `Departments` pagination automatic filter application #1078

Fix `Departments` pagination automatic filter application #1078

Spraynard commented Dec 27, 2023 •

edited by michplunkett

Loading

sea-kelp commented Dec 27, 2023

Spraynard commented Dec 27, 2023

sea-kelp left a comment

Spraynard commented Dec 28, 2023

sea-kelp commented Dec 28, 2023

michplunkett commented Dec 28, 2023

michplunkett left a comment •

edited

Loading

sea-kelp commented Dec 31, 2023

michplunkett left a comment

Fix Departments pagination automatic filter application #1078

Fix Departments pagination automatic filter application #1078

Conversation

Spraynard commented Dec 27, 2023 • edited by michplunkett Loading

Fixes issue

Description of Changes

Notes for Deployment

Screenshots (if appropriate)

Tests and linting

sea-kelp commented Dec 27, 2023

Spraynard commented Dec 27, 2023

sea-kelp left a comment

Choose a reason for hiding this comment

Spraynard commented Dec 28, 2023

sea-kelp commented Dec 28, 2023

michplunkett commented Dec 28, 2023

michplunkett left a comment • edited Loading

Choose a reason for hiding this comment

sea-kelp commented Dec 31, 2023

michplunkett left a comment

Choose a reason for hiding this comment

Fix `Departments` pagination automatic filter application #1078

Fix `Departments` pagination automatic filter application #1078

Spraynard commented Dec 27, 2023 •

edited by michplunkett

Loading

michplunkett left a comment •

edited

Loading