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

MPDX-8264 Fix status and frequency #1089

Merged
merged 4 commits into from
Sep 24, 2024

Conversation

caleballdrin
Copy link
Contributor

Description

https://jira.cru.org/secure/RapidBoard.jspa?rapidView=3&view=detail&selectedIssue=MPDX-8264&sprint=1268#
https://jira.cru.org/secure/RapidBoard.jspa?rapidView=3&view=detail&selectedIssue=MPDX-8265&sprint=1268#

  • Suggested statuses have data like partner_financial and Partner - Financial so we need to convert that to the StatusEnum before passing it to the Select.
  • Suggested frequencies are in number format like 1 instead of 'Monthly'. I convert these to enums.
  • Fix tests with these changes
  • Small styling changes for small screens

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

@caleballdrin caleballdrin self-assigned this Sep 24, 2024
@caleballdrin caleballdrin added the Preview Environment Add this label to create an Amplify Preview label Sep 24, 2024
Copy link
Contributor

Preview branch generated at https://MPDX-8264-fix-commitmen.d3dytjb8adxkk5.amplifyapp.com

Copy link
Contributor

github-actions bot commented Sep 24, 2024

Bundle sizes [mpdx-react]

Compared against 0f988fa

Route Size (gzipped) Diff
/_app 373.17 KB +1.52 KB
/accountLists 119.31 KB -1.2 KB
/accountLists/[accountListId] 271.02 KB -1022 B
/accountLists/[accountListId]/coaching/[coachingId] 247.8 KB +1.57 KB
/accountLists/[accountListId]/contacts/flows/setup 180.41 KB +32.59 KB
/accountLists/[accountListId]/reports/coaching 247.81 KB +1.57 KB
/accountLists/[accountListId]/reports/donations/[[...contactId]] 344.53 KB -2 KB
/accountLists/[accountListId]/reports/expectedMonthlyTotal 110.36 KB +1.69 KB
/accountLists/[accountListId]/reports/partnerCurrency/[[...contactId]] 136.22 KB +2.19 KB
/accountLists/[accountListId]/reports/salaryCurrency/[[...contactId]] 136.21 KB +2.19 KB
/accountLists/[accountListId]/settings/integrations 161.77 KB -2 KB
/accountLists/[accountListId]/settings/manageAccounts 142.42 KB -1.98 KB
/accountLists/[accountListId]/settings/manageCoaches 138.97 KB -1.21 KB
/accountLists/[accountListId]/settings/organizations 136.67 KB -1.07 KB
/accountLists/[accountListId]/settings/preferences 212.4 KB -1.22 KB
/accountLists/[accountListId]/tasks/[[...contactId]] 140.72 KB +2.95 KB
/accountLists/[accountListId]/tools 142.29 KB -1.14 KB
/accountLists/[accountListId]/tools/fix/commitmentInfo/[[...contactId]] 258.69 KB +10.16 KB
/accountLists/[accountListId]/tools/fix/phoneNumbers/[[...contactId]] 259.08 KB +111.32 KB
/accountLists/[accountListId]/tools/fix/sendNewsletter/[[...contactId]] 117.36 KB -1.22 KB
/accountLists/[accountListId]/tools/import/csv 106.89 KB -1.22 KB
/accountLists/[accountListId]/tools/import/google 156.31 KB -2.32 KB
/accountLists/[accountListId]/tools/import/tnt 149.95 KB -2.86 KB
/login 119.37 KB -1.02 KB
Dynamic import Size (gzipped) Diff
../src/components/Contacts/ContactDetails/ContactDetailsTab/DynamicContactDetailsTab.tsx -> ./ContactDetailsTab 66.57 KB -8.76 KB
../src/components/Contacts/ContactDetails/ContactDonationsTab/DynamicContactDonationsTab.tsx -> ./ContactDonationsTab 182.22 KB -7.91 KB
../src/components/Contacts/ContactFlow/DynamicContactFlow.tsx -> ./ContactFlow 67.21 KB +6.14 KB
../src/components/Contacts/ContactsList/DynamicContactsList.tsx -> ./ContactsList 44.71 KB +1.84 KB
../src/components/Contacts/ContactsMap/DynamicContactsMap.tsx -> ./ContactsMap 32.38 KB +1.63 KB
../src/components/Contacts/ContactsMap/DynamicContactsMapPanel.tsx -> ./ContactsMapPanel 8.04 KB +1.8 KB
../src/components/Contacts/ContactsRightPanel/DynamicContactsRightPanel.tsx -> ./ContactsRightPanel 142.43 KB +10.25 KB
../src/components/Contacts/MassActions/Exports/Emails/DynamicMassActionsExportEmailsModal.tsx -> ./MassActionsExportEmailsModal 2.08 KB -1.02 KB
../src/components/Dashboard/ThisWeek/NewsletterMenu/MenuItems/LogNewsLetter/DynamicLogNewsletter.tsx -> ./LogNewsletter 89.88 KB -1.06 KB
../src/components/Dashboard/ThisWeek/WeeklyActivity/WeeklyReportModal/DynamicWeeklyReportModal.tsx -> ./WeeklyReportModal 33.15 KB -1.39 KB
../src/components/EditDonationModal/DynamicEditDonationModal.tsx -> ./EditDonationModal 76.23 KB +2.1 KB
../src/components/Layouts/Primary/TopBar/Items/AddMenu/Items/CreateMultipleContacts/DynamicCreateMultipleContacts.tsx -> ./CreateMultipleContacts 76.61 KB +1.48 KB
../src/components/Task/Modal/Form/Complete/DynamicTaskModalCompleteForm.tsx -> ./TaskModalCompleteForm 111.13 KB +12.47 KB
../src/components/Task/Modal/Form/DynamicTaskModalForm.tsx -> ./TaskModalForm 120.96 KB +14.42 KB
../src/components/Task/Modal/Form/LogForm/DynamicTaskModalLogForm.tsx -> ./TaskModalLogForm 149.69 KB +9.56 KB
../src/components/Tool/Appeal/Flow/DynamicContactFlow.tsx -> ./ContactFlow 67.21 KB +6.14 KB
../src/components/Tool/Appeal/List/ContactsList/DynamicContactsList.tsx -> ./ContactsList 44.71 KB +1.84 KB
../src/components/Tool/Appeal/Modals/PledgeModal/DynamicPledgeModal.tsx -> ./PledgeModal 74.04 KB -1.03 KB
../src/components/Tool/Appeal/Modals/UpdateDonationsModal/DynamicUpdateDonationsModal.tsx -> ./UpdateDonationsModal 103.47 KB -1.96 KB

Copy link
Contributor

@dr-bizz dr-bizz left a comment

Choose a reason for hiding this comment

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

Great work on this! I left a few comments, but it's looking good.

src/components/Tool/FixCommitmentInfo/Contact.tsx Outdated Show resolved Hide resolved
src/components/Tool/FixCommitmentInfo/Contact.tsx Outdated Show resolved Hide resolved
src/components/Tool/FixCommitmentInfo/Contact.tsx Outdated Show resolved Hide resolved
src/components/Tool/FixCommitmentInfo/Contact.tsx Outdated Show resolved Hide resolved
src/components/Tool/FixCommitmentInfo/Contact.tsx Outdated Show resolved Hide resolved
src/components/Tool/FixCommitmentInfo/Contact.tsx Outdated Show resolved Hide resolved
@@ -104,44 +104,8 @@ describe('FixCommitmentContact', () => {
expect(setContactFocus).toHaveBeenCalledWith(testData.id, TabKey.Donations);
});

it('should fail validation', async () => {
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we be removing this? Seems like it's a good test to have in place to ensure the status is filled in before the form can be submitted

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For this tool we actually want users to be able to change certain fields without changing all the fields. So we want them to be able to leave some fields blank. I'll remove required from the yup.

Copy link
Contributor

@dr-bizz dr-bizz left a comment

Choose a reason for hiding this comment

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

I'm approving this PR. Everything looks great. I had one issue with the useMemo, but that's it.

@caleballdrin caleballdrin merged commit 96af2b4 into MPDX-task-phases-new Sep 24, 2024
18 checks passed
@caleballdrin caleballdrin deleted the MPDX-8264-fix-commitmen branch September 24, 2024 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Preview Environment Add this label to create an Amplify Preview
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants