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

First working version of staff admin screens #2430

Merged
merged 4 commits into from
Oct 16, 2023
Merged

Conversation

JeanMarie-PM
Copy link
Contributor

@JeanMarie-PM JeanMarie-PM commented Oct 6, 2023

PR checklist: submitters

  • Link to an issue if possible. If there’s no issue, describe what your branch does. Even if there is an issue, a brief description in the PR is still useful.
  • List any special steps reviewers have to follow to test the PR. For example, adding a local environment variable, creating a local test file, etc.
  • For extra credit, submit a screen recording like this one.
  • Make sure you’ve merged main into your branch shortly before creating the PR. (You should also be merging main into your branch regularly during development.)
  • Make sure that whatever feature you’re adding has tests that cover the feature. This includes test coverage to make sure that the previous workflow still works, if applicable.
  • Do manual testing locally. Our tests are not good enough yet to allow us to skip this step. If that’s not applicable for some reason, check this box.
  • Verify that no Git surgery was necessary, or, if it was necessary at any point, repeat the testing after it’s finished.
  • Once a PR is merged, keep an eye on it until it’s deployed to dev, and do enough testing on dev to verify that it deployed successfully, the feature works as expected, and the happy path for the broad feature area (such as submission) still works.

PR checklist: reviewers

  • Pull the branch to your local environment and run make docker-clean; make docker-first-run && docker compose up; then run docker compose exec web /bin/bash -c "python manage.py test"
  • Manually test out the changes locally, or check this box to verify that it wasn’t applicable in this case.
  • Check that the PR has appropriate tests. Look out for changes in HTML/JS/JSON Schema logic that may need to be captured in Python tests even though the logic isn’t in Python.
  • Verify that no Git surgery is necessary at any point (such as during a merge party), or, if it was, repeat the testing after it’s finished.

The larger the PR, the stricter we should be about these points.

Design Outline

  • Create a table StaffUser to keep a list of users with is_staff set to True in their User instance
  • Currently, only a superuser can add or delete to StaffUser. Log delete actions in StaffUserLog
  • When a user account is created, check to see if the user's email is present in StaffUser and set is_staff. This is done in backend/users/signals.py
  • Allow staff users to view the list of StaffUsers in the django admin screen. Add view privileges on SingleAuditChecklist as well. admin screens should be visible at <fac_url>/admin.

@JeanMarie-PM JeanMarie-PM temporarily deployed to dev October 6, 2023 18:17 — with GitHub Actions Inactive
@JeanMarie-PM JeanMarie-PM temporarily deployed to meta October 6, 2023 18:17 — with GitHub Actions Inactive
@github-actions
Copy link
Contributor

github-actions bot commented Oct 6, 2023

Terraform plan for dev

No changes. Your infrastructure matches the configuration.
No changes. Your infrastructure matches the configuration.

Terraform has compared your real infrastructure against your configuration
and found no differences, so no changes are needed.

Warning: Argument is deprecated

  with module.dev.module.database.cloudfoundry_service_instance.rds,
  on /tmp/terraform-data-dir/modules/dev.database/database/main.tf line 14, in resource "cloudfoundry_service_instance" "rds":
  14:   recursive_delete = var.recursive_delete

Since CF API v3, recursive delete is always done on the cloudcontroller side.
This will be removed in future releases

(and 2 more similar warnings elsewhere)

✅ Plan applied in Deploy to Development and Management Environment #282

@github-actions
Copy link
Contributor

github-actions bot commented Oct 6, 2023

Terraform plan for meta

No changes. Your infrastructure matches the configuration.
No changes. Your infrastructure matches the configuration.

Terraform has compared your real infrastructure against your configuration
and found no differences, so no changes are needed.

Warning: Argument is deprecated

  with module.s3-backups.cloudfoundry_service_instance.bucket,
  on /tmp/terraform-data-dir/modules/s3-backups/s3/main.tf line 14, in resource "cloudfoundry_service_instance" "bucket":
  14:   recursive_delete = var.recursive_delete

Since CF API v3, recursive delete is always done on the cloudcontroller side.
This will be removed in future releases

✅ Plan applied in Deploy to Development and Management Environment #282

@github-actions
Copy link
Contributor

github-actions bot commented Oct 6, 2023

File Coverage Missing
All files 86%
api/serializers.py 88% 177-178 183 188
api/test_views.py 96% 105
api/uei.py 87% 17-18 87 119-120 164 168-169
api/views.py 97% 196-197 204-205 226 362-363
audit/forms.py 47% 22-29 142-149
audit/intake_to_dissemination.py 92% 67-68 201-207 257
audit/models.py 86% 57 59 64 66 213 246 419 437-438 446 468 544-545 549 557 566 572
audit/test_commands.py 87%
audit/test_mixins.py 90% 112-113 117-119 184-185 189-191
audit/test_validators.py 95% 436 440 608-609 848 855 862 869
audit/test_workbooks_should_fail.py 85% 56 83-84 88
audit/test_workbooks_should_pass.py 90% 56 81
audit/utils.py 70% 13 21 33-35 38
audit/validators.py 94% 137 189 288-289 304-305 486-490 495-499 515-524
audit/views.py 42% 87-108 131-132 206-207 252-253 264-265 267-271 318-331 334-348 353-366 383-389 394-414 441-445 450-479 522-526 531-551 578-582 587-616 659-663 668-680 683-693 698-710 737-738 743-792 795-835 838-855
audit/cross_validation/additional_ueis.py 93% 33
audit/cross_validation/check_award_ref_declaration.py 90%
audit/cross_validation/check_award_reference_uniqueness.py 93%
audit/cross_validation/check_certifying_contacts.py 87%
audit/cross_validation/check_findings_count_consistency.py 91%
audit/cross_validation/check_ref_number_in_cap.py 90%
audit/cross_validation/check_ref_number_in_findings_text.py 90%
audit/cross_validation/errors.py 78% 30 69
audit/cross_validation/naming.py 68% 178-182
audit/cross_validation/submission_progress_check.py 92% 62 79
audit/cross_validation/tribal_data_sharing_consent.py 81% 33 36 40
audit/cross_validation/validate_general_information.py 93% 28-29
audit/fixtures/single_audit_checklist.py 79% 156 231-240
audit/intakelib/exceptions.py 71% 7-9 12
audit/intakelib/intermediate_representation.py 94% 23-24 87 125 158 182-185
audit/intakelib/mapping_audit_findings.py 97% 51
audit/intakelib/mapping_audit_findings_text.py 97% 51
audit/intakelib/mapping_federal_awards.py 93% 87
audit/intakelib/mapping_util.py 40% 28 32 36 70-99 104 124-135 142-158 162-167 171-185 190 195-215 220-237 258 263-264 273-279 289 304 309
audit/intakelib/checks/check_all_unique_award_numbers.py 79% 24
audit/intakelib/checks/check_cluster_name_always_present.py 82% 21
audit/intakelib/checks/check_federal_award_passed_always_present.py 82% 18
audit/intakelib/checks/check_findings_grid_validation.py 84% 57
audit/intakelib/checks/check_is_a_workbook.py 68% 16
audit/intakelib/checks/check_loan_guarantee.py 81% 42 51
audit/intakelib/checks/check_look_for_empty_rows.py 91% 18
audit/intakelib/checks/check_missing_award_numbers.py 72% 16 22-23
audit/intakelib/checks/check_no_major_program_no_type.py 72% 22 31 40
audit/intakelib/checks/check_no_repeat_findings.py 76% 17 26
audit/intakelib/checks/check_other_cluster_names.py 81% 24 34
audit/intakelib/checks/check_passthrough_name_when_no_direct.py 88% 9 47
audit/intakelib/checks/check_sequential_award_numbers.py 76% 14 22
audit/intakelib/checks/check_start_and_end_rows_of_all_columns_are_same.py 89% 14
audit/intakelib/checks/check_state_cluster_names.py 65% 23-24 34
audit/intakelib/checks/check_uei_exists.py 65% 17-18
audit/intakelib/checks/runners.py 90% 98 105
audit/intakelib/checks/util.py 84% 16 33 38
audit/management/commands/load_fixtures.py 46% 39-45
audit/viewlib/submission_progress_view.py 96% 171-172
audit/viewlib/tribal_data_consent.py 34% 23-41 44-79
audit/viewlib/upload_report_view.py 26% 32-35 44 91-117 120-170 178-209
cms/views.py 57% 11-16 29-30
config/urls.py 71% 87
dissemination/models.py 99% 458
dissemination/migrations/0002_general_fac_accepted_date.py 47% 10-12
djangooidc/backends.py 78% 32 57-63
djangooidc/exceptions.py 66% 19 21 23 28
djangooidc/oidc.py 16% 32-35 45-51 64-70 92-149 153-199 203-226 230-275 280-281 286
djangooidc/views.py 80% 22 43 114
djangooidc/tests/common.py 96%
report_submission/forms.py 92% 35
report_submission/views.py 76% 83 215-216 218 240-241 260-261 287-396 399-409
report_submission/templatetags/get_attr.py 76% 8 11-14 18
support/admin.py 88% 76 79 84 91-97 100-102
support/cog_over.py 90% 30-33 86 93 145
support/signals.py 66% 23-24 33-34
support/test_cog_over.py 98% 134-135 224
support/management/commands/seed_cog_baseline.py 98% 20-21
tools/update_program_data.py 89% 96
users/auth.py 95% 40-41
users/models.py 97% 51-52
users/fixtures/user_fixtures.py 91%

Minimum allowed coverage is 90%

Generated by 🐒 cobertura-action against cee1190

@JeanMarie-PM JeanMarie-PM mentioned this pull request Oct 10, 2023
30 tasks
@JeanMarie-PM JeanMarie-PM temporarily deployed to dev October 11, 2023 21:49 — with GitHub Actions Inactive
@JeanMarie-PM JeanMarie-PM temporarily deployed to meta October 11, 2023 21:49 — with GitHub Actions Inactive
@JeanMarie-PM JeanMarie-PM temporarily deployed to dev October 12, 2023 00:33 — with GitHub Actions Inactive
@JeanMarie-PM JeanMarie-PM temporarily deployed to meta October 12, 2023 00:33 — with GitHub Actions Inactive
@JeanMarie-PM JeanMarie-PM marked this pull request as ready for review October 12, 2023 19:50
@JeanMarie-PM
Copy link
Contributor Author

@tadhg-ohiggins Could not find a simple way to change field display names in admin.py. Had to make the necessary changes in models.py.

@tadhg-ohiggins
Copy link
Contributor

@JeanMarie-TTS this appears to work as a method in the admin class:

    def get_form(self, request, obj=None, **kwargs):
        form = super().get_form(request, obj, **kwargs)
        form.base_fields["report_id"].label = "new label for report_id"
        return form

@JeanMarie-PM JeanMarie-PM marked this pull request as draft October 12, 2023 20:21
@JeanMarie-PM
Copy link
Contributor Author

@JeanMarie-TTS this appears to work as a method in the admin class:

    def get_form(self, request, obj=None, **kwargs):
        form = super().get_form(request, obj, **kwargs)
        form.base_fields["report_id"].label = "new label for report_id"
        return form

@tadhg-ohiggins Will check this out. Thamls!

@JeanMarie-PM JeanMarie-PM marked this pull request as ready for review October 13, 2023 17:33
@tadhg-ohiggins tadhg-ohiggins temporarily deployed to dev October 16, 2023 20:23 — with GitHub Actions Inactive
@tadhg-ohiggins tadhg-ohiggins temporarily deployed to meta October 16, 2023 20:23 — with GitHub Actions Inactive
@JeanMarie-PM JeanMarie-PM added this pull request to the merge queue Oct 16, 2023
Merged via the queue into main with commit 405b184 Oct 16, 2023
@JeanMarie-PM JeanMarie-PM deleted the jmm/staff-admin branch October 16, 2023 20:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants