Skip to content

Conversation

@wjames111
Copy link
Contributor

@wjames111 wjames111 commented Oct 30, 2025

Description

This PR is for updating the PGA report to function as the 12-Month Donation Summary Report. The full scope of work is available here.
I'm doing most of the work in this PR but splitting out the print functionality into a separate one as that will introduce a good amount of complexity.
Here are the following tickets that this PR addresses:

  • MPDX-8973 Include Print Button
  • MPDX-8974 Directly Show Donations Tab in Contact Panel
  • MPDX-8981 Staff Account Balance card (Total Donations for this Period will be added in a separate PR
  • MPDX-8982 Creates query for getting getting Staff Account Balance
  • MPDX-8987 Add preselected filters
  • MPDX-8988 additional Field to PGA Report (no longer including donor id)
  • MPDX-9030 Add “toal donations for this period” to front-end
  • MPDX-9028 Add pledge_frequency to commitment amount

Checklist:

  • I have given my PR a title with the format "MPDX-(JIRA#) (summary sentence max 80 chars)"
  • I have applied the appropriate labels. (Add the label "On Staging" to get the branch automatically merged into staging.)
  • I have requested a review from another person on the project

@github-actions
Copy link
Contributor

github-actions bot commented Oct 30, 2025

Bundle sizes [mpdx-react]

Compared against 88bb693

Route Size (gzipped) Diff
/accountLists/[accountListId]/reports/partnerGivingAnalysis/[[...contactId]] 289.51 KB +2.22 KB

@wjames111 wjames111 changed the title MPDX 8988 additional pga fields [MPDX-8973 MPDX-8974 MPDX-8981 MPDX-8982 MPDX-8987 MPDX-8988] - PGA Report Update Oct 30, 2025
@wjames111 wjames111 self-assigned this Oct 30, 2025
@wjames111 wjames111 added On Staging Will be merged to the staging branch by Github Actions Preview Environment Add this label to create an Amplify Preview labels Oct 30, 2025
@wjames111 wjames111 marked this pull request as ready for review October 30, 2025 20:06
@github-actions
Copy link
Contributor

@wjames111 wjames111 requested a review from canac October 30, 2025 20:14
Copy link
Contributor

@canac canac left a comment

Choose a reason for hiding this comment

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

This looks really good! I guess you're still working on making printing print all pages? And are you still working on adding the donor ID?

You grouped a lot of tickets into this PR. That's OK since they're small, but I would have also been OK with multiple tiny PRs. They're fast to test and approve.

Is it OK for this PR to merge into production since we don't have a production SAA server yet? No production users will have a staff account. So we might want to hide comment out the skeleton for now. Also, is Scott OK with these changes going live as soon as they are approved? Or does he want to do UAT first?

@canac
Copy link
Contributor

canac commented Oct 31, 2025

I see now in the ticket that you said you're no longer adding the donor id to the report. Can you update the Jira ticket to reflect that?

Copy link
Contributor

@canac canac left a comment

Choose a reason for hiding this comment

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

One more minor comment. The code looked great while I was testing it!

@wjames111
Copy link
Contributor Author

@canac, let me check with Scott on merging this to production. The BalanceCard should only show for those with a staff account

     {!staffAccountLoading && staffAccountData?.staffAccount?.id ? (
            <BalanceCard />
          ) : null}

Let me know if you want me to break these up. That was my plan initially but after realizing how small some of these tasks were I decided to just put it all in one PR.

@wjames111 wjames111 requested a review from canac October 31, 2025 16:13
@canac
Copy link
Contributor

canac commented Oct 31, 2025

The BalanceCard should only show for those with a staff account

@wjames111 Correct, but won't the skeleton show temporarily while loading and then disappear and cause layout shift since no production users have staff accounts yet?

Copy link
Contributor

@canac canac left a comment

Choose a reason for hiding this comment

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

Basically there, so I'll approve. Thanks for all of the improvements! Before merging, make sure to test that the double-scrolling is gone, and let's have a plan for the loading skeleton (I'm thinking we comment it out, but we can discuss).

@wjames111
Copy link
Contributor Author

@canac I'm having trouble recreating the double scrolling issue. I do see two scrollbars one for the page and one for the table, is this what you are talking about? If so do you know of a good fix? I could make the BalanceCard smaller but then it wouldn't be uniform to the other reports or I could reduce the size of the table but then that makes reading it a little more difficult.

@canac
Copy link
Contributor

canac commented Nov 3, 2025

I do see two scrollbars one for the page and one for the table, is this what you are talking about?

Yeah, that's it. I see what you're saying about keeping the same card. That balance card takes up a lot of vertical screen real estate though. It also makes it so that you have to scroll the page to the bottom of the table then scroll the table to get to the pagination controls.

Is it a requirement that we use the same balance card? If not, put we put that information inline with the search bar (just a quick mockup, the padding and layout is a little off)?

Screenshot 2025-11-03 at 11 42 28 AM

As a user, I think I'd rather see a shorter balance card so that I can see more rows of the table. As a user, I personally don't care that much about the primary account balance because I probably just saw it on the dashboard page before navigating to the PGA report. So I would want it to be unobtrusive. In the current layout on my large laptop, the table only gets half of the vertical space. I'm not familiar with any requirements discussions though, these are just my own personal thoughts. If you want feedback from someone on the UX team, feel free to ping Ryan to see if he has ideas (not required though).

If we need to use the same budget card, then we should probably remove height: 'calc(100vh - 240px)', from Table.tsx to remove the double-scrolling.

On an unrelated note, I see the "total donation for this period" requirement in MPDX-8981? Where is that implemented?

@wjames111
Copy link
Contributor Author

I do see two scrollbars one for the page and one for the table, is this what you are talking about?

Yeah, that's it. I see what you're saying about keeping the same card. That balance card takes up a lot of vertical screen real estate though. It also makes it so that you have to scroll the page to the bottom of the table then scroll the table to get to the pagination controls.

Is it a requirement that we use the same balance card? If not, put we put that information inline with the search bar (just a quick mockup, the padding and layout is a little off)?

Screenshot 2025-11-03 at 11 42 28 AM As a user, I think I'd rather see a shorter balance card so that I can see more rows of the table. As a user, I personally don't care that much about the primary account balance because I probably just saw it on the dashboard page before navigating to the PGA report. So I would want it to be unobtrusive. In the current layout on my large laptop, the table only gets half of the vertical space. I'm not familiar with any requirements discussions though, these are just my own personal thoughts. If you want feedback from someone on the UX team, feel free to ping Ryan to see if he has ideas (not required though).

If we need to use the same budget card, then we should probably remove height: 'calc(100vh - 240px)', from Table.tsx to remove the double-scrolling.

On an unrelated note, I see the "total donation for this period" requirement in MPDX-8981? Where is that implemented?

So the use of the current balanceCard was suggested by Joanna, I don't believe it was a requirement though, so I think we could probably do your inline suggestion. I forgot "total donation for this period" needs to be added to the card as well. This might cost us some space too, let me play around with the card and see if I can get something that fits.

@wjames111 wjames111 added Staging API Run GraphQL codegen against the staging API and removed Staging API Run GraphQL codegen against the staging API labels Nov 6, 2025
@wjames111 wjames111 force-pushed the MPDX-8988-additional-pga-fields branch 4 times, most recently from 476cf83 to 078f9a3 Compare November 17, 2025 20:56
@wjames111 wjames111 force-pushed the MPDX-8988-additional-pga-fields branch from b0a01f0 to 4d45795 Compare November 17, 2025 21:43
@wjames111 wjames111 force-pushed the MPDX-8988-additional-pga-fields branch from 4d45795 to c1eac12 Compare November 17, 2025 21:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

On Staging Will be merged to the staging branch by Github Actions Preview Environment Add this label to create an Amplify Preview

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants