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

Forecasted UI #3346

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Forecasted UI #3346

wants to merge 6 commits into from

Conversation

masimons
Copy link
Contributor

@masimons masimons commented Aug 6, 2024

Ticket #2201

Description

UI changes that display forecasted grant data. The bulk of these changes touch the grants table, and the grants detail page.

Screenshots / Demo Video

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 github-actions bot added the javascript Pull requests that update Javascript code label Aug 6, 2024
@masimons masimons mentioned this pull request Aug 6, 2024
@usdigitalresponse usdigitalresponse deleted a comment from github-actions bot Aug 9, 2024
@usdigitalresponse usdigitalresponse deleted a comment from github-actions bot Aug 9, 2024
@masimons
Copy link
Contributor Author

masimons commented Aug 9, 2024

@TylerHendrickson would you mind taking a look at this draft PR to make sure I'm on the right track as far as implementation goes for this ticket

Copy link
Member

@TylerHendrickson TylerHendrickson left a comment

Choose a reason for hiding this comment

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

@TylerHendrickson would you mind taking a look at this draft PR to make sure I'm on the right track as far as implementation goes for this ticket

@masimons Left a few notes for clarification / consideration, but I think overall this is on the right track!

Comment on lines 390 to 393
} if (this.currentGrant.opportunity_status === 'forecasted') { // what if we check for posted status as well?
if (!this.currentGrant.close_date) {
return this.currentGrant.close_date_explanation ? this.currentGrant.close_date_explanation : 'Not yet issued';
}
Copy link
Member

Choose a reason for hiding this comment

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

Seems like this check would also be useful for posted status.

I think this is already on your radar, but just calling out for posterity that this (undesired) fallback behavior would need to be addressed in order to have potentially-null close_date values.

Comment on lines 65 to 67
// Note: in the knex query, we are deriving the status based on
// archive_date and close_date. Probably we just want to pass
// the opportunity_status to the frontend, and not re-derive it here?
Copy link
Member

Choose a reason for hiding this comment

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

Unlike the transition from forecasted to non-forecasted, there's (currently) no explicit grants-ingest event that we expect to receive that would allow us to store a new materialized value for the grant being closed or archived. In other words, to determine whether a grant is forecasted or fully published, we have these options:

  • Check is_forecasted / some value that signifies whether the upstream record was sourced only from forecasted data
  • Check whether post_date is in the future

However, the post_date may well be the last time we ever see an event from grants-ingest for a particular grant, so the status of being closed or archived need to be derived from a check like

if (close_date <= today) {
  if (archive_date > today) {
    status = 'closed';
  } else {
    status = 'archived';
  }
}

(Hopefully that's useful and I'm not misunderstanding the question!)

Copy link

github-actions bot commented Sep 14, 2024

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 34.29 33.12 30.69 35.85
🔴  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 ...13-219,228-235
🔴   StandardForm.vue 45 50 41.66 45.45 ...24-128,135-157
🟢  ...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,4,19-34,72-100
🔴   ...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 59,110-287
🔴   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 ...19,238,246-270
🔴  src/components 47.2 39.68 48.24 47.92
🔴   ...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 28.57 33.33 25 28.57 5,48-55
🟡   ...tActivity.vue 77.77 63.63 80 77.77 ...29-134,165,179
🔴   GrantsTable.vue 46.95 38.88 47.61 48.71 ...70-474,482-562
🔴   ...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 44.11 71.42 23.07 45.45 ...03-107,126-147
🟡   UserAvatar.vue 70 75 100 62.5 35-37
🔴  ...ponents/Modals 31.97 44.1 34 35.89
🔴   ...anization.vue 17.39 65.62 30 22.22 1-14,149-178
🔴   AddTeam.vue 45.45 55.55 61.53 57.69 ...04,210,222-245
🔴   AddUser.vue 36.66 66.66 60 37.5 ...40,145,148-176
🔴   ...anization.vue 15.38 64.28 14.28 16.66 1-15,58-78
🔴   EditTeam.vue 18.18 26.43 33.33 20.83 ...29,208,216-301
🔴   EditUser.vue 21.05 66.66 25 22.22 1,101-128
🔴   ...ilsLegacy.vue 22.03 0 0 24.07 131,177,205-369
🟢   ...Followers.vue 86.48 69.23 66.66 86.48 ...32,134,149-150
🟡   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 ...78-381,387-459
🔴  src/helpers 16.66 18.86 17.07 17.39
🟢   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 5.88 3.03 14.28 5.88 8-82
🟡   gtag.js 77.77 90 75 77.77 12,51
🔴   ...patWarning.js 0 0 0 0 39-61
🟢  ...s/featureFlags 83.33 100 66.66 83.33
🟡   index.js 50 100 50 50 8,16
🟢   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 14.28 11.11 18.91
🔴   index.js 18.91 14.28 11.11 18.91 ...76-177,181-200
🟢  src/store 100 100 100 100
🟢   index.js 100 100 100 100
🔴  src/store/modules 3.07 0 4.57 3.21
🔴   agencies.js 5.26 100 8.33 5.55 13-70
🔴   alerts.js 20 100 20 20 10-24
🔴   grants.js 1.12 0 1 1.16 61-419
🔴   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 42.07 34.78 32.23 43.72
🔴   ...orterView.vue 25.58 51.85 18.18 26.82 ...,62,84,109-151
🟡   ...boardView.vue 50 17.64 50 52 89-98,114-125
🔴   ...tailsView.vue 31.31 12.9 16.66 31.95 ...02-441,447-468
🟢   GrantsView.vue 100 100 100 100
🔴   LoginView.vue 34.61 33.33 22.22 36 1,22,57,109-136
🟡   MyGrantsView.vue 77.77 66.66 66.66 77.77 1,69
🟡   ...ofileView.vue 77.27 75 42.85 77.27 1,32,63,130-134
🟢   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.71 52.9 55.33 59.79
🟢  src 81.63 33.33 60 81.63
🟢   configure.js 81.63 33.33 60 81.63 42,61-68,97-99
🟢  src/arpa_reporter 98.75 66.66 100 98.75
🟢   configure.js 97.36 40 100 97.36 36
🟢   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.32 34.79 46.42 44.6
🔴   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 68.6 90 69.56 68.67 ...58-200,221-235,273-295
🔴   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 74.3 71.42 68.42 74.33
🟢   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 82.44 78.54 82.08 82.38 ...53-1419,1601-1602,1609
🟢   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-40,48-210,220
🔴  src/db/arpa_reporter_db_shims 23.68 0 0 23.68
🔴   agencies.js 22.22 100 0 22.22 11-51
🔴   [users.js](https://github.com/usdigitalresponse/usdr-gost/blob/5bdc831803e0d9719640ebb59eee085809338630/pack...*[Comment body truncated]*

Copy link

github-actions bot commented Sep 14, 2024

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/ActivityTable-ChUxfSiA.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/ActivityTable-ChUxfSiA.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/ArpaAnnualPerformanceReporterView-Cv1J0cFo.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/ArpaAnnualPerformanceReporterView-Cv1J0cFo.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/DashboardView-Di8icPnb.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/DashboardView-Di8icPnb.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/GrantDetailsLegacy-Bb_k8Jiu.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/GrantDetailsLegacy-Bb_k8Jiu.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/GrantDetailsView-B5KBep7N.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/GrantDetailsView-B5KBep7N.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/GrantsTable-B1pjFNF6.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/GrantsTable-B1pjFNF6.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/GrantsView-BUfMmhfu.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/GrantsView-BUfMmhfu.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/MyGrantsView-ivn48Mwa.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/MyGrantsView-ivn48Mwa.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/MyProfileView-CZ0AMUzO.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/MyProfileView-CZ0AMUzO.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/NotFoundView-Dz1ZiWag.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/NotFoundView-Dz1ZiWag.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/OrganizationsView-C18aEq7I.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/OrganizationsView-C18aEq7I.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/RecentActivityView-mNWAlrWa.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/RecentActivityView-mNWAlrWa.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/RecordUploader-B_CAzQcx.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/RecordUploader-B_CAzQcx.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/TeamsView-DA8x09I-.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/TeamsView-DA8x09I-.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/UsersView-D-1rr9OT.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/UsersView-D-1rr9OT.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/arpa_reporter-CTm0BrPw.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/arpa_reporter-CTm0BrPw.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/form-helpers-BIYH6pJM.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/form-helpers-BIYH6pJM.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/main-CvIrUSG3.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/main-CvIrUSG3.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/style-CWfXHaBR.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/style-CWfXHaBR.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["arpa_reporter/index.html"]
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/ActivityTable-CqXhJABV.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/ActivityTable-CqXhJABV.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/ArpaAnnualPerformanceReporterView-DpoHNu6J.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/ArpaAnnualPerformanceReporterView-DpoHNu6J.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/DashboardView-z-JtKolb.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/DashboardView-z-JtKolb.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/GrantDetailsLegacy-Cvzaojbp.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/GrantDetailsLegacy-Cvzaojbp.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/GrantDetailsView-CnCoG4SD.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/GrantDetailsView-CnCoG4SD.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/GrantsTable-B7BBRb22.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/GrantsTable-B7BBRb22.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/GrantsView-C8eix88Z.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/GrantsView-C8eix88Z.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/MyGrantsView-BfkQZUJb.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/MyGrantsView-BfkQZUJb.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/MyProfileView-WIzT6v9W.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/MyProfileView-WIzT6v9W.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/NotFoundView-DwGBZ__t.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/NotFoundView-DwGBZ__t.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/OrganizationsView-Bd6fvF9t.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/OrganizationsView-Bd6fvF9t.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/RecentActivityView-CgW7gegV.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/RecentActivityView-CgW7gegV.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/RecordUploader-BHzcxXpj.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/RecordUploader-BHzcxXpj.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/TeamsView-B-HTDwLf.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/TeamsView-B-HTDwLf.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/UsersView-BBCMuq4n.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/UsersView-BBCMuq4n.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/arpa_reporter-BGP7bPpg.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/arpa_reporter-BGP7bPpg.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/form-helpers-DsvNpejg.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/form-helpers-DsvNpejg.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/main-Dm2VsPDN.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/main-Dm2VsPDN.js.map"]
module.website.aws_s3_object.origin_dist_artifact["assets/style-CuAne-tt.js"]
module.website.aws_s3_object.origin_dist_artifact["assets/style-CuAne-tt.js.map"]

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

@masimons masimons marked this pull request as ready for review September 30, 2024 03:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
javascript Pull requests that update Javascript code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants