Skip to content

CMS-1940: Add pending review subsets - #692

Open
ayumi-oxd wants to merge 7 commits into
mainfrom
CMS-1940
Open

CMS-1940: Add pending review subsets#692
ayumi-oxd wants to merge 7 commits into
mainfrom
CMS-1940

Conversation

@ayumi-oxd

@ayumi-oxd ayumi-oxd commented Aug 3, 2026

Copy link
Copy Markdown
Collaborator

Jira Ticket

CMS-1940

Description

  • Added "IS review" and "RS review" below "Pending HQ review" and have both indented as a subset of the HQ review
    • Only visible to the approver roles
    • When "Pending HQ review" is checked, both "IS review" and "RS review" is checked
    • When only one "IS review/RS review" is checked, "Pending HQ review" should still be checked

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Adds “IS review” and “RS review” as approver-only subset filters under “Pending HQ review” on the Submit page, including UI indentation and consistent badge-removal behavior, and wires the filtering logic to season approval flags returned by the API.

Changes:

  • Adds approver-only indented status filter options (“IS review”, “RS review”) and parent/child selection rules in the Submit page status MultiSelect.
  • Updates filtering logic to support the new subset filters, using informationSvcApproved / reservationSvcApproved.
  • Extends /parks API payload to include the approval-flag fields needed by the frontend.

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
frontend/src/router/pages/SubmitPage.jsx Adds approver-only subset status options and enforces parent/child checkbox behavior in the status filter.
frontend/src/lib/submitPageFilters.js Implements status matching logic for the new subset filters.
frontend/src/constants/seasonStatus.js Introduces filter-only status constants and adds them to labelByValue.
frontend/src/components/MultiSelect.jsx Extends onInput to pass metadata and supports indented option rendering.
frontend/src/components/FilterStatus.jsx Keeps badge removal consistent with the parent/child status selection rules.
backend/routes/api/parks.js Exposes season approval flags required for subset filtering.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread frontend/src/lib/submitPageFilters.js
@ayumi-oxd
ayumi-oxd marked this pull request as ready for review August 3, 2026 20:07
@ayumi-oxd
ayumi-oxd requested review from duncan-oxd and molund August 3, 2026 20:07
@duncan-oxd

Copy link
Copy Markdown
Collaborator

Rebasing onto main to resolve a merge conflict I created when I merged #697 👍

@duncan-oxd duncan-oxd left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Cool! I realized there's a logical issue with the dual approval process that we might need to go over together and/or check with Amanda, but the UI stuff all looks great.

A few nitpicks about variable names and comments to consider in the meantime 👍

Comment thread frontend/src/components/FilterStatus.jsx Outdated
Comment thread frontend/src/lib/submitPageFilters.js Outdated
Comment thread frontend/src/components/FilterStatus.jsx Outdated
Comment thread frontend/src/lib/submitPageFilters.js
Comment thread frontend/src/router/pages/SubmitPage.jsx Outdated
@ayumi-oxd
ayumi-oxd requested a review from duncan-oxd August 17, 2026 22:50

@duncan-oxd duncan-oxd left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Looks great! I had one request about changing a .forEach to a .map for clarity, and a note for both of us about rebasing when we merge. Otherwise it looks good!

I think the Sept 24 stuff will be okay to merge later this week 👍

Comment thread backend/utils/seasonApprovalHelpers.js
Comment thread backend/utils/seasonApprovalHelpers.js Outdated
Comment thread backend/utils/seasonApprovalHelpers.js Outdated
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants