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 7864 - Adding new Task and Contact Phases #940

Closed
wants to merge 145 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
145 commits
Select commit Hold shift + click to select a range
59d08fc
Adding Tags to complete task and log task modals. Needs some editing …
dr-bizz Mar 19, 2024
d62069f
Removing hard-coded results on task completed and log modals
dr-bizz Mar 19, 2024
c977da2
Adding partner status checkbox to the log and complete task.
dr-bizz Mar 20, 2024
da60cac
Replace hard-coded statuses
caleballdrin Mar 22, 2024
3e85c54
Use translated name from contactPartnershpStatus object
caleballdrin Mar 22, 2024
6cca7a9
Rename map pins
caleballdrin Mar 22, 2024
bb8cd0d
Add default status when creating contact
caleballdrin Mar 22, 2024
cea703b
Getting my local set up - REMOVE LATER
dr-bizz Apr 16, 2024
7d11954
Fixing issues with real data from API
dr-bizz Apr 17, 2024
c62d0fb
Starting to work with Live GraphQl data
dr-bizz Apr 17, 2024
56b9714
Adjusting code to work with GraphQl data
dr-bizz Apr 17, 2024
80d7971
Merge branch 'task-phase-1-2' into MPDX-task-phases
dr-bizz Apr 17, 2024
44a4c26
Merge branch 'main' into MPDX-task-phases
dr-bizz Apr 17, 2024
aba62f0
task types
dr-bizz Apr 18, 2024
865dc04
Merge branch 'main' into MPDX-task-phases
dr-bizz Apr 19, 2024
0f093b0
New PhaseEnum & ActivityTypeEnum types and Removing Mock data
dr-bizz Apr 19, 2024
66bfcac
Log Modal edits and ActivityTypeAutocomplete changes
dr-bizz Apr 19, 2024
2e4dc62
REVERT BEFORE PROD - Commenting out husky
dr-bizz Apr 19, 2024
0b4cd37
fixup! Log Modal edits and ActivityTypeAutocomplete changes
dr-bizz Apr 19, 2024
99d5cc2
Fix ActivityTypeEnum on taskActivity and TasksDueThisWeek
caleballdrin Apr 22, 2024
677918e
Fix ActivityTypeEnum on Coaching Activity page
caleballdrin Apr 22, 2024
02db632
Fix ActivityTypeEnum on ContactTaskRow test
caleballdrin Apr 22, 2024
8d05924
Fix ActivityTypeEnum in ContactFlow
caleballdrin Apr 22, 2024
571fee6
Fix ActivityTypeEnum in LogNewsletter
caleballdrin Apr 22, 2024
49f816a
Fix ActivityTypeEnum in PartnerCare tests
caleballdrin Apr 22, 2024
52250f5
Fix ActivityTypeEnum in This Week tests
caleballdrin Apr 22, 2024
55ddc91
Lint Fixes and Task Modal Log form Possible Next Actions and Partner …
dr-bizz Apr 22, 2024
0ecc727
Merge branch 'MPDX-task-phases' of https://github.com/CruGlobal/mpdx-…
dr-bizz Apr 22, 2024
952fa92
Lint fixes and implementing phases on TaskModalForm
dr-bizz Apr 24, 2024
6b26fde
Fix ActivityTypeEnum on Filter Panel and Autocomplete test
caleballdrin Apr 25, 2024
bb5ede8
Dynamically create large taskActionsObject
caleballdrin Apr 25, 2024
4f63a4c
Merge branch 'MPDX-task-phases' of https://github.com/CruGlobal/mpdx-…
caleballdrin Apr 25, 2024
485ad20
Fixing frontend changes since API constant values all changes
dr-bizz Apr 29, 2024
ae4b836
Merge branch 'MPDX-task-phases' of https://github.com/CruGlobal/mpdx-…
dr-bizz Apr 29, 2024
80b59d0
Adding modal changes and removing old code
dr-bizz Apr 29, 2024
5ddc6a3
Add new changes to allow tests and modals to work with error
dr-bizz Apr 29, 2024
0914f49
Fixing modal issues with Results and moving functions into helper file.
dr-bizz May 2, 2024
1b5eb85
Merging Caleb's and Bizz's changes
dr-bizz May 3, 2024
05d16a7
Implementing `taskPhases` in useContactPhaseData
dr-bizz May 6, 2024
d689d44
renaming useContactPhaseData to usePhaseData
dr-bizz May 6, 2024
42bb855
Function to get Phase by activity
dr-bizz May 6, 2024
59ffe1e
If no phase or activity return No phase/activity.
dr-bizz May 6, 2024
d08bf35
Updating code for task complete modal.
dr-bizz May 6, 2024
42f648b
Fixing error when saving on Task modal
dr-bizz May 6, 2024
9d11620
Moving common fields into Components
dr-bizz May 6, 2024
1296f53
Fix tests
caleballdrin May 7, 2024
582b9f9
Add Phase to Task List and Complete Task modal
caleballdrin May 7, 2024
1aed3eb
Merge branch 'MPDX-task-phases' of https://github.com/CruGlobal/mpdx-…
caleballdrin May 7, 2024
fa85665
Turning activityTypes into a Map to make it more readable and faster
dr-bizz May 7, 2024
3ec8941
Next action functionality
dr-bizz May 7, 2024
3b62b96
Set add/log Task's type/phase as the contact's phase
dr-bizz May 7, 2024
da31e3a
Reverting commit cea703bce640de2587ecf26cb06a3cb43c2428bc
dr-bizz May 7, 2024
3e30fc0
Fix contact status tests
caleballdrin May 8, 2024
737d9be
Add activitiesByPhase map
caleballdrin May 9, 2024
fcec674
ActivityTypeAutocomplete add None option and disable when there is no…
caleballdrin May 9, 2024
8dade04
Add phasesMock and fix tests
caleballdrin May 9, 2024
c9b89fd
Set default phase value based on activity
caleballdrin May 9, 2024
7530933
Fix Edit PartnershipInfoModal test
caleballdrin May 9, 2024
3a5be75
Add Phase dropdown to MassActionsEditTasksModal
caleballdrin May 9, 2024
223db19
Small improvements
dr-bizz May 9, 2024
b1a67e8
Merge branch 'MPDX-task-phases' of https://github.com/CruGlobal/mpdx-…
dr-bizz May 9, 2024
94de2fb
remove disabled from src/components/Task/Modal/Form/Inputs/ActivityTy…
dr-bizz May 9, 2024
983cba6
Split saved tags into suggested and additional
caleballdrin May 9, 2024
ccf9a54
Reorder Assignee on TaskModalForm
caleballdrin May 10, 2024
b38f88d
Fixing Next Actions and Task Complete
dr-bizz May 10, 2024
567b9f9
Merge branch 'MPDX-task-phases' of https://github.com/CruGlobal/mpdx-…
dr-bizz May 10, 2024
9dea656
ActivityType only use options
caleballdrin May 10, 2024
5487dcc
stop suggested tags from being default values for the next action
caleballdrin May 10, 2024
d2e9e53
Add bold format to SuggestedContactStatus
caleballdrin May 11, 2024
9d5c949
ActivityType auto select when only 1 option. Show phase when 15+ options
caleballdrin May 11, 2024
8c9b83f
Improve phase/action layout
caleballdrin May 11, 2024
64a145f
Use activities.name for Task subject
caleballdrin May 12, 2024
28c0aca
Change style of Log and Complete task modals
caleballdrin May 13, 2024
48973b9
Fixing Next Actions and Task Complete
dr-bizz May 13, 2024
b5fb2f8
Merge branch 'MPDX-task-phases' of https://github.com/CruGlobal/mpdx-…
dr-bizz May 13, 2024
5f70e68
Switching test to use constant mock data
dr-bizz May 13, 2024
1a02078
Resetting nextActions on phase select
dr-bizz May 13, 2024
4550b93
force commit to deploy PR to Amplify
dr-bizz May 13, 2024
8fdfd46
Merge branch 'main' into MPDX-task-phases
dr-bizz May 13, 2024
7640e8b
Add animation to the task modal
caleballdrin May 13, 2024
8236ca8
Remove Next Actions when there are no suggested options
caleballdrin May 13, 2024
9ead957
Format contacts label on complete modal
caleballdrin May 14, 2024
94d5fd1
Hide suggested status change checkbox when contact is a partner
caleballdrin May 14, 2024
d333555
Rearrange task modal fields
caleballdrin May 14, 2024
c65d181
Fix autofocus with animation
caleballdrin May 14, 2024
f1859f8
Merge branch 'MPDX-task-phases' of https://github.com/CruGlobal/mpdx-…
caleballdrin May 14, 2024
0da7978
Tests for Task Modal
dr-bizz May 14, 2024
8a28b03
Merge branch 'MPDX-task-phases' of https://github.com/CruGlobal/mpdx-…
dr-bizz May 14, 2024
701f8ee
Adding display results
dr-bizz May 14, 2024
62c6a63
DisplayResult and test fixes
dr-bizz May 14, 2024
8ef621d
Suggested Contact checkbox and tests
dr-bizz May 14, 2024
85ae067
Fix test on Task modal completed
dr-bizz May 14, 2024
6c17e14
Refactor with useContactPartnershipStatuses() hook and fix tests
caleballdrin May 14, 2024
d8f0eff
Merge branch 'MPDX-task-phases' of https://github.com/CruGlobal/mpdx-…
caleballdrin May 14, 2024
d40a39e
Fix tests
caleballdrin May 15, 2024
c99fefa
Hide suggested status based on partner status
caleballdrin May 15, 2024
16de5f5
Fixing TaskModal Tests
dr-bizz May 15, 2024
c444a3d
Merge branch 'MPDX-task-phases' of https://github.com/CruGlobal/mpdx-…
dr-bizz May 15, 2024
0e251d9
Fixed SuggestedContactStatus
dr-bizz May 15, 2024
fd7e08f
Fixing taskModalCompleteTest
dr-bizz May 15, 2024
30aef76
Hide suggestedContactStatus when it is the same as the current contac…
caleballdrin May 15, 2024
a3a20b2
Improve styling of TagChips and dark header modal
caleballdrin May 15, 2024
585e91f
Focus on Action input after selecting phase
caleballdrin May 15, 2024
d2fd645
Fixed TaskModalLogForm tests
dr-bizz May 16, 2024
72e085f
Merge branch 'MPDX-task-phases' of https://github.com/CruGlobal/mpdx-…
dr-bizz May 16, 2024
94a57fb
Add status prop to SuggestedContactStatus and tests
caleballdrin May 18, 2024
0a0e17f
Adding Flows functionality
dr-bizz May 20, 2024
18c07a4
Merge branch 'MPDX-task-phases' of https://github.com/CruGlobal/mpdx-…
dr-bizz May 20, 2024
df95d0f
Merge branch 'main' into MPDX-task-phases
dr-bizz May 20, 2024
8601c77
some changes were overwritten with merge.
dr-bizz May 20, 2024
dd2b10b
Test SuggestedContactStatus graphql calls
caleballdrin May 20, 2024
b5fddc4
Merge branch 'MPDX-task-phases' of https://github.com/CruGlobal/mpdx-…
caleballdrin May 20, 2024
e3a7299
Fix FilterPanel tests
caleballdrin May 21, 2024
d48d071
Merge branch 'main' into MPDX-task-phases
caleballdrin May 21, 2024
a70d577
Add default case for switch and prettier formatting
caleballdrin May 21, 2024
9ce6545
Refactor ContactFlow to use API mapped phases
caleballdrin May 21, 2024
afe503a
Rename contactPartnershipStatus and clean up code
caleballdrin May 21, 2024
08c16e8
Add PartnerCareCompleted result
caleballdrin May 21, 2024
224dc4f
** REVERT THIS BEFORE GOING LIVE **
dr-bizz May 21, 2024
4b30a49
Adding timeout to tests to ensure they have enough time to pass
dr-bizz May 21, 2024
2c46c34
Fix activity name error when blank
caleballdrin May 21, 2024
dbef10d
Rename label to Task Type
caleballdrin May 21, 2024
6eb4c6f
Add tests for PhaseTags
caleballdrin May 22, 2024
9a2d4d2
Merge branch 'MPDX-task-phases' of https://github.com/CruGlobal/mpdx-…
caleballdrin May 22, 2024
57ec6f9
Hide results input when there are no suggested results. Update tests
caleballdrin May 22, 2024
35eb4a1
Test activity type and possiblePartnerStatus
caleballdrin May 22, 2024
2863826
PossiblePartnerStatus tests
caleballdrin May 23, 2024
e7d476d
Flows new Functionality with moving contacts
dr-bizz May 23, 2024
5bbaaea
Merge branch 'MPDX-task-phases' of https://github.com/CruGlobal/mpdx-…
dr-bizz May 23, 2024
1b6cd11
Make Location field only show for In Person task actions
caleballdrin May 24, 2024
bcb8b9c
Make Task List responsive
caleballdrin May 24, 2024
983ead6
Merge branch 'MPDX-task-phases' of https://github.com/CruGlobal/mpdx-…
caleballdrin May 24, 2024
ef6f57d
Require task action to save a task
caleballdrin May 24, 2024
02b9082
Fix typescript and prettier
caleballdrin May 24, 2024
9935060
Fix task modal test
caleballdrin May 24, 2024
fad3fc0
Add new coaching data
caleballdrin May 24, 2024
2fe4c03
Flows updates
dr-bizz May 28, 2024
9b67514
Merge branch 'MPDX-task-phases' of https://github.com/CruGlobal/mpdx-…
dr-bizz May 28, 2024
fd7a04a
Add remaining coaching data and fix tests
caleballdrin May 29, 2024
8040f70
Add tooltip to delete filter tag
caleballdrin May 29, 2024
b89e819
Update WeeklyActivity with Phases
caleballdrin May 29, 2024
3ddad87
Add tests
caleballdrin May 29, 2024
9b517aa
Add missing NewConnectionsTotal data
caleballdrin May 29, 2024
c5be361
Fixing tests on multiple contacts
dr-bizz May 30, 2024
fc1c265
Merge branch 'MPDX-task-phases' of https://github.com/CruGlobal/mpdx-…
dr-bizz May 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix ActivityTypeEnum on Coaching Activity page
caleballdrin committed Apr 22, 2024
commit 677918ef07ea1b667fb1d2046037d388848f5dbd
88 changes: 69 additions & 19 deletions src/components/Coaching/CoachingDetail/Activity/Activity.tsx
Original file line number Diff line number Diff line change
@@ -228,14 +228,24 @@ export const Activity: React.FC<ActivityProps> = ({
};
const taskCallFilter: TaskFilterSetInput = {
...taskBaseFilter,
activityType: [ActivityTypeEnum.Call],
activityType: [
ActivityTypeEnum.InitiationPhoneCall,
ActivityTypeEnum.FollowUpPhoneCall,
ActivityTypeEnum.PartnerCarePhoneCall,
],
};
const taskElectronicFilter: TaskFilterSetInput = {
...taskBaseFilter,
activityType: [
ActivityTypeEnum.Email,
ActivityTypeEnum.FacebookMessage,
ActivityTypeEnum.TextMessage,
ActivityTypeEnum.InitiationEmail,
ActivityTypeEnum.FollowUpEmail,
ActivityTypeEnum.PartnerCareEmail,
ActivityTypeEnum.InitiationSocialMedia,
ActivityTypeEnum.FollowUpSocialMedia,
ActivityTypeEnum.PartnerCareSocialMedia,
ActivityTypeEnum.InitiationTextMessage,
ActivityTypeEnum.FollowUpTextMessage,
ActivityTypeEnum.PartnerCareTextMessage,
],
};

@@ -330,7 +340,11 @@ export const Activity: React.FC<ActivityProps> = ({
<Link
href={tasksLink({
...taskBaseFilter,
activityType: [ActivityTypeEnum.Appointment],
activityType: [
ActivityTypeEnum.AppointmentInPerson,
ActivityTypeEnum.AppointmentPhoneCall,
ActivityTypeEnum.AppointmentVideoCall,
],
})}
accountListType={accountListType}
>
@@ -355,7 +369,7 @@ export const Activity: React.FC<ActivityProps> = ({
<Link
href={tasksLink({
...taskBaseFilter,
activityType: [ActivityTypeEnum.PreCallLetter],
activityType: [ActivityTypeEnum.InitiationLetter],
})}
accountListType={accountListType}
>
@@ -369,7 +383,9 @@ export const Activity: React.FC<ActivityProps> = ({
<Link
href={tasksLink({
...taskBaseFilter,
activityType: [ActivityTypeEnum.SupportLetter],
activityType: [
ActivityTypeEnum.InitiationSpecialGiftAppeal,
],
})}
accountListType={accountListType}
>
@@ -385,7 +401,7 @@ export const Activity: React.FC<ActivityProps> = ({
<Link
href={tasksLink({
...taskBaseFilter,
activityType: [ActivityTypeEnum.Thank],
activityType: [ActivityTypeEnum.PartnerCareThank],
})}
accountListType={accountListType}
>
@@ -399,7 +415,9 @@ export const Activity: React.FC<ActivityProps> = ({
<Link
href={tasksLink({
...taskBaseFilter,
activityType: [ActivityTypeEnum.ReminderLetter],
activityType: [
ActivityTypeEnum.InitiationSpecialGiftAppeal,
],
})}
accountListType={accountListType}
>
@@ -467,10 +485,14 @@ export const Activity: React.FC<ActivityProps> = ({
href={tasksLink({
...taskBaseFilter,
activityType: [
ActivityTypeEnum.Call,
ActivityTypeEnum.TalkToInPerson,
ActivityTypeEnum.InitiationPhoneCall,
ActivityTypeEnum.InitiationInPerson,
],
nextAction: [
ActivityTypeEnum.AppointmentInPerson,
ActivityTypeEnum.AppointmentPhoneCall,
ActivityTypeEnum.AppointmentVideoCall,
],
nextAction: [ActivityTypeEnum.Appointment],
})}
accountListType={accountListType}
>
@@ -571,7 +593,11 @@ export const Activity: React.FC<ActivityProps> = ({
<Link
href={tasksLink({
...taskElectronicFilter,
nextAction: [ActivityTypeEnum.Appointment],
nextAction: [
ActivityTypeEnum.AppointmentInPerson,
ActivityTypeEnum.AppointmentPhoneCall,
ActivityTypeEnum.AppointmentVideoCall,
],
})}
accountListType={accountListType}
>
@@ -588,7 +614,11 @@ export const Activity: React.FC<ActivityProps> = ({
<Link
href={tasksLink({
...taskBaseFilter,
activityType: [ActivityTypeEnum.Email],
activityType: [
ActivityTypeEnum.InitiationEmail,
ActivityTypeEnum.FollowUpEmail,
ActivityTypeEnum.PartnerCareEmail,
],
result: [ResultEnum.Completed, ResultEnum.Done],
})}
accountListType={accountListType}
@@ -599,7 +629,11 @@ export const Activity: React.FC<ActivityProps> = ({
<Link
href={tasksLink({
...taskBaseFilter,
activityType: [ActivityTypeEnum.Email],
activityType: [
ActivityTypeEnum.InitiationEmail,
ActivityTypeEnum.FollowUpEmail,
ActivityTypeEnum.PartnerCareEmail,
],
result: [ResultEnum.Received],
})}
accountListType={accountListType}
@@ -615,7 +649,11 @@ export const Activity: React.FC<ActivityProps> = ({
<Link
href={tasksLink({
...taskBaseFilter,
activityType: [ActivityTypeEnum.FacebookMessage],
activityType: [
ActivityTypeEnum.InitiationSocialMedia,
ActivityTypeEnum.FollowUpSocialMedia,
ActivityTypeEnum.PartnerCareSocialMedia,
],
result: [ResultEnum.Completed, ResultEnum.Done],
})}
accountListType={accountListType}
@@ -626,7 +664,11 @@ export const Activity: React.FC<ActivityProps> = ({
<Link
href={tasksLink({
...taskBaseFilter,
activityType: [ActivityTypeEnum.FacebookMessage],
activityType: [
ActivityTypeEnum.InitiationSocialMedia,
ActivityTypeEnum.FollowUpSocialMedia,
ActivityTypeEnum.PartnerCareSocialMedia,
],
result: [ResultEnum.Received],
})}
accountListType={accountListType}
@@ -642,7 +684,11 @@ export const Activity: React.FC<ActivityProps> = ({
<Link
href={tasksLink({
...taskBaseFilter,
activityType: [ActivityTypeEnum.TextMessage],
activityType: [
ActivityTypeEnum.InitiationTextMessage,
ActivityTypeEnum.FollowUpTextMessage,
ActivityTypeEnum.PartnerCareTextMessage,
],
result: [ResultEnum.Completed, ResultEnum.Done],
})}
accountListType={accountListType}
@@ -653,7 +699,11 @@ export const Activity: React.FC<ActivityProps> = ({
<Link
href={tasksLink({
...taskBaseFilter,
activityType: [ActivityTypeEnum.TextMessage],
activityType: [
ActivityTypeEnum.InitiationTextMessage,
ActivityTypeEnum.FollowUpTextMessage,
ActivityTypeEnum.PartnerCareTextMessage,
],
result: [ResultEnum.Received],
})}
accountListType={accountListType}