feat: 3601 - Follow/Notes updates to My Grants #3633

phm200 · 2024-10-13T20:11:19Z

Ticket #3601

Description

When Follow/Notes feature flag is enabled, make the following updates to My Grants page:

Rename "Shared With Your Team" tab to "Shared With My Team", no functional changes to this tab
Remove "Interested", "Not Applying", "Applied" tabs
Add "Followed by My Team" tab
- List of grants followed by any user on current user's team
Grants table column "Interested Teams" renamed to "Followed By"
Display full name of team (not abbreviation like is shown now) for teams listed in Followed By and Viewed By Columns
Grants table changes reflected in "Browse Grants" page as well
Export to CSV should reflect new column names and other changes to grants table
URL slugs for "Shared With My Team" and "Followed by My Team" pages will reflect their titles

Screenshots / Demo Video

with followNotesEnabled feature flag on

...

with followNotesEnabled feature flag off

Testing

Automated and Unit Tests

Added Unit tests

Manual tests for Reviewer

Added steps to test feature/functionality manually

Checklist

Provided ticket and description
Provided screenshots/demo
Provided testing information
Provided adequate test coverage for all new code
Added PR reviewers

github-actions · 2024-10-13T20:15:04Z

QA Summary

QA Check	Result
🌐 Client Tests	✅
🔗 Server Tests	✅
🤝 E2E Tests	✅
📏 ESLint	✅
🧹 TFLint	✅

Test Coverage

Coverage report for `packages/client`

St	File	% Stmts	% Branch	% Funcs	% Lines	Uncovered Line #s
🔴	All files	35.86	34.62	32.58	37.43
🔴	src	0	100	100	0
🔴	App.vue	0	100	100	0	2-9
🔴	src/arpa_reporter	0	100	100	0
🔴	App.vue	0	100	100	0	2-13
🟡	...ter/components	58.58	48	46.8	59.78
🟡	AlertBox.vue	80	75	50	80	13
🔴	...oadButton.vue	20	0	0	20	2-7,38-67
🟢	...ileButton.vue	100	100	100	100
🟢	...ttonSmall.vue	100	100	100	100
🟢	...mplateBtn.vue	100	100	100	100
🟡	...avigation.vue	67.74	63.63	52.63	67.74	...14-220,229-236
🔴	StandardForm.vue	45	50	41.66	45.45	...25-129,136-158
🟢	...porter/helpers	84.61	79.48	87.5	84.61
🟢	form-helpers.js	84.21	79.48	85.71	84.21	7,16,25,81-83
🟢	short-uuid.js	100	100	100	100
🔴	...eporter/router	0	0	0	0
🔴	index.js	0	0	0	0	20-131
🔴	...reporter/store	3.92	0	2.17	4.12
🔴	index.js	3.92	0	2.17	4.12	11-14,32-261
🔴	...reporter/views	40.98	25.13	41.37	42.91
🟢	AgenciesView.vue	100	0	100	100	16
🔴	AgencyView.vue	40.74	36.36	50	45.83	53-62,70-96
🔴	HomeView.vue	26.66	34.14	36.36	26.66	36-66,113,137-207
🔴	LoginView.vue	29.62	36.36	20	30.76	1,6,21-36,74-102
🔴	...plateView.vue	27.02	35.71	45.45	25	...2,30-37,69-113
🔴	...ploadView.vue	24.24	16.66	33.33	26.66	1,30-31,116-144
🔴	...eriodView.vue	48	18.18	75	52.17	64-90
🟡	...riodsView.vue	57.57	28.57	60	59.37	101,132,149-171
🔴	...pientView.vue	40	10.52	30.76	41.02	73-93,110-152
🔴	...ientsView.vue	48.48	8.33	46.66	53.33	...46,165-190,203
🟡	UploadView.vue	61.53	43.75	62.5	61.36	...41-442,448-449
🔴	UploadsView.vue	16.66	0	0	18.18	61,112-289
🔴	UserView.vue	46.34	33.33	68.75	48.64	84,97-137
🟡	UsersView.vue	60	7.69	62.5	66.66	91-92,105-107,123
🔴	...ationView.vue	37.03	18.18	26.66	41.66	...20,239,247-271
🟡	src/components	54.7	44.13	55.47	55.42
🔴	...vityTable.vue	18.75	0	28.57	19.35	115-185
🟡	BaseLayout.vue	69.56	53.84	60	69.56	172,219-231
🔴	CopyButton.vue	30	33.33	40	30	6,54-63
🟢	...tActivity.vue	80.76	62.85	83.33	80.76	...31-136,179,201
🟢	GrantNotes.vue	90	78.26	85	89.79	...87,207,216-217
🔴	GrantsTable.vue	43.58	38.18	41.86	45.27	...72-476,484-564
🔴	...dUploader.vue	24.24	33.33	37.5	24.24	16,25,74-111
🔴	SearchFilter.vue	40.74	28	37.5	40	...52,64,67,72-82
🔴	ShareGrant.vue	38.7	64.28	23.07	40	...08-112,131-152
🟢	...ivityItem.vue	96.15	90.9	100	96.15	64
🟡	UserAvatar.vue	70	75	100	62.5	35-37
🟢	...eaderText.vue	100	100	100	100
🔴	...ponents/Modals	29.21	44.34	33.1	32.94
🔴	...anization.vue	17.39	65.62	30	22.22	1-14,149-178
🔴	AddTeam.vue	45.45	55.55	61.53	57.69	...06,212,224-247
🔴	AddUser.vue	36.66	66.66	60	37.5	...40,145,148-176
🔴	...anization.vue	15.38	64.28	14.28	16.66	1-17,60-80
🔴	EditTeam.vue	18.18	26.43	33.33	20.83	...32,211,219-304
🔴	EditUser.vue	21.05	66.66	25	22.22	1,102-129
🔴	...ilsLegacy.vue	22.03	0	0	24.07	131,177,205-369
🟢	...Followers.vue	83.33	88.88	57.14	83.33	10,114-115
🟡	ImportTeams.vue	50	41.17	50	53.33	28,64-69,81-82
🔴	ImportUsers.vue	42.85	60	40	46.15	29,65-80
🔴	...archPanel.vue	27.9	15.78	23.52	28.57	...68-178,211-255
🔴	SearchPanel.vue	21.62	63.26	32	27.58	...77-380,386-458
🔴	src/helpers	18.12	17.92	18.6	18.88
🟢	constants.js	100	100	100	100
🟢	currency.js	100	100	100	100
🟡	dates.js	66.66	100	33.33	100
🔴	fetchApi.js	6	13.79	5.26	6.12	10-12,20-132
🔴	filters.js	4	0	0	4.54	19-51
🔴	form-helpers.js	0	0	0	0	5-82
🟡	gtag.js	77.77	90	75	77.77	12,51
🟢	testHelpers.js	100	100	100	100
🔴	...patWarning.js	0	0	0	0	39-61
🟢	...s/featureFlags	92.3	100	85.71	92.3
🟡	index.js	80	100	80	80	8
🟢	utils.js	100	100	100	100
🔴	src/mixin	20	0	28.57	20
🔴	...zableTable.js	20	0	28.57	20	16-31,36-37,42
🔴	src/router	18.91	16.66	11.11	18.91
🔴	index.js	18.91	16.66	11.11	18.91	...81-182,186-205
🟢	src/store	100	100	100	100
🟢	index.js	100	100	100	100
🔴	src/store/modules	2.82	0	4.48	2.94
🔴	agencies.js	5.26	100	8.33	5.55	13-70
🔴	alerts.js	20	100	20	20	10-24
🔴	grants.js	0.99	0	0.97	1.03	61-456
🔴	organization.js	33.33	100	33.33	33.33	21-25
🔴	roles.js	20	100	20	25	13-22
🔴	tenants.js	11.11	100	14.28	12.5	13-32
🔴	users.js	2.43	0	4.76	2.5	17-100
🔴	src/views	45.16	38.12	33.98	46.95
🔴	...orterView.vue	25.58	51.85	18.18	26.82	...,64,87,112-154
🟡	...boardView.vue	50	17.64	50	52	89-98,114-125
🔴	...tailsView.vue	32.97	14.28	17.07	33.69	...98-437,443-464
🟢	GrantsView.vue	100	100	100	100
🟡	LoginView.vue	56	38.88	44.44	58.33	25,140-162
🟡	MyGrantsView.vue	73.33	85.71	62.5	73.33	1,80,91,99
🟡	...ofileView.vue	78.26	80	42.85	78.26	1,32,63,136-140
🟢	NotFoundView.vue	100	100	100	100
🔴	...tionsView.vue	47.05	57.14	41.66	53.33	...97-100,114-118
🔴	...ivityView.vue	46.42	23.8	43.75	46.42	...01,114,120-134
🔴	TeamsView.vue	44.44	88.88	41.66	53.33	1,58,142,156-163
🟡	UsersView.vue	50	66.66	36.36	53.84	...16-121,133-139

Coverage report for `packages/server`

St	File	% Stmts	% Branch	% Funcs	% Lines	Uncovered Line #s
🟡	All files	59.96	53.22	55.69	60.07
🟢	src	81.81	0	50	81.81
🟢	configure.js	81.81	0	50	81.81	47-54,83-85
🟢	src/arpa_reporter	100	71.42	100	100
🟢	configure.js	100	33.33	100	100	34-41
🟢	environment.js	100	100	100	100
🟢	use-request.js	100	100	100	100
🟡	src/arpa_reporter/db	50.73	45.88	50	51.9
🟡	arpa-subrecipients.js	53.19	50	38.46	54.54	23-60,101,113-122
🔴	reporting-periods.js	37.2	46.87	40	38.09	46,77-156
🟢	settings.js	100	83.33	100	100	13
🟡	uploads.js	50	28.57	52.38	51.42	18-29,84,99-124,141-150
🔴	src/arpa_reporter/lib	29.57	33.08	34.56	28.46
🟢	arpa-ec-codes.js	100	100	100	100
🔴	audit-report.js	21.44	19.35	24.19	21.32	...28-529,554-684,732-758
🟡	ensure-async-context.js	75	100	50	100
🟢	format.js	90.62	90	90	91.3	41-42
🟡	log.js	75	50	50	75	13,25
🟡	preconditions.js	66.66	33.33	100	66.66	3
🔴	spreadsheet.js	9.09	0	0	9.09	15-32
🟢	validation-error.js	85.71	100	50	85.71	16
🔴	src/arpa_reporter/routes	40	14.92	14.28	40.6
🔴	agencies.js	22.58	0	0	23.33	13-21,26-53
🟡	application_settings.js	75	100	0	75	10-11
🟡	audit-report.js	68.91	58.33	100	68.91	57-58,64-78,100-116
🟢	exports.js	81.42	83.33	100	81.42	61-75,98-99
🔴	reporting-periods.js	20	0	0	20.43	...25-137,143-149,154-180
🔴	subrecipients.js	23.8	0	0	23.8	12-13,17-27,31-48,52-63
🔴	uploads.js	28.28	7.89	9.09	29.16	...33-154,164-166,173-180
🔴	users.js	19.6	0	0	20	15-35,39-44,48-81
🔴	src/arpa_reporter/services	44.55	34.79	47.55	44.83
🔴	generate-arpa-report.js	36.86	2.77	50	37.24	...-975,984-997,1071-1138
🔴	get-template.js	21.62	0	0	21.62	18-79
🟡	persist-upload.js	69.66	90	73.07	69.76	...64-206,227-241,279-301
🔴	records.js	20.75	0	11.11	21.15	38-204,221-276
🔴	revalidate-uploads.js	37.5	100	0	37.5	5-14
🔴	validate-upload.js	43.56	58.51	37.03	44.2	...52,371,393,411-688,703
🟢	validation-rules.js	98.18	90	90.9	100	157,173
🟡	src/db	73.78	70.28	68	73.89
🟢	connection.js	100	50	100	100	6
🟢	constants.js	100	100	100	100
🟡	helpers.js	75	83.33	50	75	5,21-22
🟢	index.js	81.51	76.8	81.15	81.56	...97-1463,1645-1646,1653
🟢	saved_search_migration.js	92	88.23	71.42	93.61	5,69,134
🔴	tenant_creation.js	10.58	2.7	0	11.11	[15...[Comment body truncated]

github-actions · 2024-10-13T20:17:17Z

Terraform Summary

Step	Result
🖌 Terraform Format & Style	✅
⚙️ Terraform Initialization	✅
🤖 Terraform Validation	✅
📖 Terraform Plan	✅

Hint: If "Terraform Format & Style" failed, run terraform fmt -recursive from the terraform/ directory and commit the results.

Output

Validation Output

stdout:
Success! The configuration is valid.


-------------------------------------
stderr:

Plan Summary

CHANGE	RESOURCE
add	`module.website.aws_s3_object.origin_dist_artifact["assets/DashboardView-B_z9Xd5a.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/DashboardView-B_z9Xd5a.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/GrantDetailsLegacy-BIAujoiq.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/GrantDetailsLegacy-BIAujoiq.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/GrantDetailsView-CEBxjE26.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/GrantDetailsView-CEBxjE26.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/GrantsTable-C77il_2s.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/GrantsTable-C77il_2s.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/GrantsView-tNyQmIFV.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/GrantsView-tNyQmIFV.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/MyGrantsView-D29t-H8M.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/MyGrantsView-D29t-H8M.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/MyProfileView-M5WFwBqx.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/MyProfileView-M5WFwBqx.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/OrganizationsView-B2yxzCtP.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/OrganizationsView-B2yxzCtP.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/RecentActivityView-Cj9Ckx8m.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/RecentActivityView-Cj9Ckx8m.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/TeamsView-DjQ_rJHK.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/TeamsView-DjQ_rJHK.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/UsersView-thU8vF0u.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/UsersView-thU8vF0u.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/main-8SvqKQBT.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/main-8SvqKQBT.js.map"]`
update	`module.api.aws_ecs_service.default[0]`
	`module.api.module.grant_digest_scheduled_task.aws_iam_role_policy.default[0]`
	`module.api.module.grant_digest_scheduled_task.aws_scheduler_schedule.default[0]`
	`module.arpa_audit_report.aws_ecs_service.default`
	`module.arpa_treasury_report.aws_ecs_service.default`
	`module.consume_grants.aws_ecs_service.default`
	`module.website.aws_s3_object.deploy-config[0]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/style-C_Ko3h6y.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["index.html"]`
recreate	`module.api.aws_ecs_task_definition.default[0]`
	`module.arpa_audit_report.aws_ecs_task_definition.consumer`
	`module.arpa_treasury_report.aws_ecs_task_definition.consumer`
	`module.consume_grants.aws_ecs_task_definition.consume_grants`
delete	`module.website.aws_s3_object.origin_dist_artifact["assets/DashboardView-DmBzPaTb.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/DashboardView-DmBzPaTb.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/GrantDetailsLegacy-CJuZ0j3K.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/GrantDetailsLegacy-CJuZ0j3K.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/GrantDetailsView-DEdiTBLV.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/GrantDetailsView-DEdiTBLV.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/GrantsTable-D8Ygx9co.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/GrantsTable-D8Ygx9co.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/GrantsView-KehfO6Xu.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/GrantsView-KehfO6Xu.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/MyGrantsView-zGiiXYpG.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/MyGrantsView-zGiiXYpG.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/MyProfileView-BolnzwlJ.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/MyProfileView-BolnzwlJ.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/OrganizationsView-C8uGq3hZ.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/OrganizationsView-C8uGq3hZ.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/RecentActivityView-BxgXZOBV.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/RecentActivityView-BxgXZOBV.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/TeamsView-DhUscaHf.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/TeamsView-DhUscaHf.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/UsersView-DrdWOVeS.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/UsersView-DrdWOVeS.js.map"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/main-DG-R3pZ3.js"]`
	`module.website.aws_s3_object.origin_dist_artifact["assets/main-DG-R3pZ3.js.map"]`

Pusher: @TylerHendrickson, Action: pull_request_target, Workflow: Continuous Integration

phm200 · 2024-10-20T23:53:18Z

packages/server/.env.example

 ENABLE_GRANTS_SCRAPER=true
 SHARE_TERMINOLOGY_ENABLED=true
+ENABLE_NEW_TEAM_TERMINOLOGY=true


adding in the other feature flags I've seen used throughout the code for reference in the example env

phm200 · 2024-10-21T00:00:26Z

packages/client/src/components/GrantsTable.spec.js

@@ -23,6 +23,7 @@ describe('GrantsTable component', () => {
        {
          interested_agencies: [],
          viewed_by_agencies: [],
+          followed_by_agencies: [],


this component is very lightly tested and I'd like to return to add more test coverage here, but that can be done as a follow up PR; especially as we are likely removing some code soon for feature flag removal and therefore can reduce the test surface to cover

lsr-explore · 2024-10-21T15:34:09Z

Looks good @phm200 !

Wonder how many teams are expected to be displayed in the table. If it is more than say 5, it may be easier to read if they are displayed on separate lines.

feat: 3601 - my grants with follow notes

71b86cd

phm200 self-assigned this Oct 13, 2024

github-actions bot added enhancement New feature or request javascript Pull requests that update Javascript code labels Oct 13, 2024

phm200 added 7 commits October 16, 2024 22:02

feat: update tab specific urls when followNotesEnabled

3303ce9

feat: get followed by grants

deab3e5

feat: add in followed by, fix sorting

0b7f229

Merge branch 'main' into feat/3601_follow_notes_my_grants

ae57ffb

feat: get tests passing again

8d7cafc

feat: fix CSV export

7370099

feat: clean up enhance grant data with feature flag use

0217c6a

phm200 commented Oct 20, 2024

View reviewed changes

feat: consistent use of tables constant

1ae55a2

phm200 commented Oct 21, 2024

View reviewed changes

phm200 marked this pull request as ready for review October 21, 2024 00:00

lsr-explore approved these changes Oct 21, 2024

View reviewed changes

TylerHendrickson enabled auto-merge (squash) November 21, 2024 23:32

TylerHendrickson added 2 commits November 21, 2024 17:32

Merge branch 'main' into feat/3601_follow_notes_my_grants

2bb7500

Merge branch 'main' into feat/3601_follow_notes_my_grants

ec539b8

TylerHendrickson merged commit fa89610 into main Nov 22, 2024
19 checks passed

TylerHendrickson deleted the feat/3601_follow_notes_my_grants branch November 22, 2024 00:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: 3601 - Follow/Notes updates to My Grants #3633

feat: 3601 - Follow/Notes updates to My Grants #3633

phm200 commented Oct 13, 2024 •

edited

Loading

github-actions bot commented Oct 13, 2024 •

edited

Loading

github-actions bot commented Oct 13, 2024 •

edited

Loading

phm200 Oct 20, 2024

phm200 Oct 21, 2024

lsr-explore commented Oct 21, 2024

feat: 3601 - Follow/Notes updates to My Grants #3633

feat: 3601 - Follow/Notes updates to My Grants #3633

Conversation

phm200 commented Oct 13, 2024 • edited Loading

Ticket #3601

Description

Screenshots / Demo Video

Testing

Automated and Unit Tests

Manual tests for Reviewer

Checklist

github-actions bot commented Oct 13, 2024 • edited Loading

QA Summary

Test Coverage

github-actions bot commented Oct 13, 2024 • edited Loading

Terraform Summary

Output

phm200 Oct 20, 2024

Choose a reason for hiding this comment

phm200 Oct 21, 2024

Choose a reason for hiding this comment

lsr-explore commented Oct 21, 2024

phm200 commented Oct 13, 2024 •

edited

Loading

github-actions bot commented Oct 13, 2024 •

edited

Loading

github-actions bot commented Oct 13, 2024 •

edited

Loading