B 21966 add rejected admin int #14694

KonstanceH · 2025-01-30T06:46:15Z

B-21966

Summary

This PR adds the Rejected Office users view on the admin page.
This also adds rejected_on and deleted_on columns to the office users table.

Verification Steps for Reviewers

These are to be checked by a reviewer.

Has the branch been pulled in and checked out?
Have the BL acceptance criteria been met for this change?
Was the CircleCI build successful?
Has the code been reviewed from a standards and best practices point of view?

How to test

Go to Office Users login page.*
Click "Request Account" fill out necessary info and click submit.
Go to Admins Page http://adminlocal:3000/system.
Create new admin user if none available.
Find requested account.
Give it a rejection reason and reject.
Go to "Rejected Users" tab and confirm that you see these fields:
“email, first name, last name, Transportation Office, status, reason for rejection, rejected on, roles requested”
Confirm that you can sort by the header's columns

*Can use RejectedOfficeUser and RequestedOfficeUser testharness to make needed users

Frontend

There are no aXe warnings for UI.
This works in Supported Browsers and their phone views (Chrome, Firefox, Edge).
There are no new console errors in the browser devtools.
There are no new console errors in the test output.
If this PR adds a new component to Storybook, it ensures the component is fully responsive, OR if it is intentionally not, a wrapping div using the officeApp class or custom min-width styling is used to hide any states the would not be visible to the user.
This change meets the standards for Section 508 compliance.

Backend

Code follows the guidelines for Logging.
The requirements listed in Querying the Database Safely have been satisfied.

Database

Any new migrations/schema changes:

Follows our guidelines for Zero-Downtime Deploys.
Have been communicated to #g-database.
Secure migrations have been tested following the instructions in our docs.

Screenshots

Rejected users Page with partial columns

Rejected users Page with remaining columns

…arness and add ui.

robot-mymove · 2025-01-30T06:59:24Z

	Warnings
⚠️	Files located in legacy directories (src/shared or src/scenes) have been edited. Are you sure you don’t want to also relocate them to the new file structure? View the frontend file org ADR for more information

Generated by 🚫 dangerJS against 88a3faf

danieljordan-caci

So I just finished some work for the requested office users and searching by transpo office (which is a requirement for this feature as well I see) and ran into searching nested object values through FetchMany not being possible. Had to refactor.

Could you look at this PR and see how I did the list function and copy that over (except for change the status from REQUESTED to REJECTED)? I just don't want the next dev to have to refactor it when it could be tackled in this one.

Also, I don't think you need the deleted_on column. We are hard deleting users, not soft.

Thoughts? Def welcome to hear them!

JamesHawks224

testing: success
code: looks good, but have comments

Makefile

.circleci/config.yml

.gitlab-ci.yml

KonstanceH · 2025-01-30T16:17:26Z

So I just finished some work for the requested office users and searching by transpo office (which is a requirement for this feature as well I see) and ran into searching nested object values through FetchMany not being possible. Had to refactor.

Could you look at this PR and see how I did the list function and copy that over (except for change the status from REQUESTED to REJECTED)? I just don't want the next dev to have to refactor it when it could be tackled in this one.

Also, I don't think you need the deleted_on column. We are hard deleting users, not soft.

Thoughts? Def welcome to hear them!

Ahh okay I'll get rid of the deleted_on column. But for the transportationOffice search we took that off the feature AC because Paul was gonna add it to a new feature(E-06352) to be handled. I want to say I can just add your changes to my PR here but we had a whole meeting about it so before I say yes let me just get some guidance from my scrum master. I think we can either add a new story to handle it on this feature or just add it on to this story's AC.

…-dest-move B-22480 - fix issue with null Prime API call and AK destination moves

…ErrorFix

…tRequestIDInUseErrorFix B 22271 main office user account request id in use error fix

KonstanceH · 2025-02-11T21:33:42Z

Couple of things:

the font styling is different for the roles column, this is likely due to you using <p> which has styling overrides in the app, I would try and copy what the requested office user page is doing with react-admin's ArrayField component to match styling

I think this SHOULD be fixed once you make the above change, but I'd like to try and get rid of the side scrolling behavior if possible. It seems the font being bigger/different is causing some sizing differences when it should be similar to the other office user pages

Screen.Recording.2025-02-04.at.9.46.45.AM.mov
Let me know if any of that doesn't make sense. Re-request when you got it all fixed up! Thanks!

I'm working on getting the font the same. But there's 2 added columns in the rejected table vs the requested so I think that's why it's scrolling.

That's fair! I'm hoping that it'll fix when you adjust that font because I believe it should condense it down a lot. But... We'll see.

yea changing the font to match the others definitely cut out a good chunk of the white space. I removed those unused functions too. Idk what I was talking about earlier saying the testharness uses them because they don't lol But I was also just having issues with my environment lol

taeJungCaci · 2025-02-11T22:19:53Z

One thing I saw while testing the functionality - should Rejected Roles column also be sortable?

danieljordan-caci · 2025-02-11T22:21:46Z

B-21966

Was literally about to comment that while testing it. In the AC:

Given I am a MilMove Admin in the Rejected Office Users queue,
When I select the option to sort the Rejected Office Users queue,
Then I will be able to sort the queue by any of the queue's columns.

Looks like it

taeJungCaci · 2025-02-11T22:22:52Z

Also, I think they use the label Requested on in Requested Office Users page. Should we do Rejected on instead of Rejected date?

KonstanceH · 2025-02-11T22:28:12Z

Also, I think they use the label Requested on in Requested Office Users page. Should we do Rejected on instead of Rejected date?

I'll work on making that column sortable. Also I added the "Rejected date" because it's in the AC

taeJungCaci · 2025-02-11T22:30:10Z

Also, I think they use the label Requested on in Requested Office Users page. Should we do Rejected on instead of Rejected date?

I'll work on making that column sortable. Also I added the "Rejected date" because it's in the AC

Yeah I was looking at the feature AC and I think they just say " • Date of Rejection (Most recent rejection date)" - but I'm okay with whatever.

KonstanceH · 2025-02-11T22:32:21Z

Also, I think they use the label Requested on in Requested Office Users page. Should we do Rejected on instead of Rejected date?

I'll work on making that column sortable. Also I added the "Rejected date" because it's in the AC

Yeah I was looking at the feature AC and I think they just say " • Date of Rejection (Most recent rejection date)" - but I'm okay with whatever.

That's fair. In the BL AC its Rejected Date but I agree it'd be more consistent to just make it Rejected on so I'll add that change

taeJungCaci · 2025-02-11T22:32:24Z

Also, I think they use the label Requested on in Requested Office Users page. Should we do Rejected on instead of Rejected date?

I'll work on making that column sortable. Also I added the "Rejected date" because it's in the AC

Actually I just found this on the description lol:

danieljordan-caci

From GH discussion, need some small changes

Rejected roles header should be Roles requested per the BL AC

Given I am a MilMove Admin on the admin app,
When I select the "Rejected Office Users" menu item,
Then I will see a list of account requests in the status of Rejected, with the following fields: “email, first name, last name, Transportation Office, status, reason for rejection, rejected date, roles requested”

I'd also suggest removing the deleted_on part of the AC as we are not deleting users when they are rejected, just status updates

Roles column needs to be sortable

danieljordan-caci · 2025-02-11T22:32:47Z

migrations/app/schema/20250131205338_add_rejected_col_to_admin_users.up.sql

+-- Adds new columns to office_users table
+ALTER TABLE public.office_users
+ADD COLUMN IF NOT EXISTS rejected_on timestamptz;
+
+-- Comments on new columns
+COMMENT on COLUMN office_users.rejected_on IS 'Date requested office users were rejected.';


I think the -- Comments on new columns comment is not really necessary

danieljordan-caci · 2025-02-11T22:34:34Z

pkg/services/rejected_office_users/rejected_office_users_list_fetcher.go

+// FetchAdminUserList uses the passed query builder to fetch a list of office users
+func (o *rejectedOfficeUserListFetcher) FetchRejectedOfficeUsersList(appCtx appcontext.AppContext, filters []services.QueryFilter, associations services.QueryAssociations, pagination services.Pagination, ordering services.QueryOrder) (models.OfficeUsers, error) {
+	var rejectedUsers models.OfficeUsers
+	err := o.builder.FetchMany(appCtx, &rejectedUsers, filters, associations, pagination, ordering)
+	return rejectedUsers, err
+}
+
+// FetchAdminUserList uses the passed query builder to fetch a list of office users
+func (o *rejectedOfficeUserListFetcher) FetchRejectedOfficeUsersCount(appCtx appcontext.AppContext, filters []services.QueryFilter) (int, error) {
+	var rejectedUsers models.OfficeUsers
+	count, err := o.builder.Count(appCtx, &rejectedUsers, filters)
+	return count, err
+}
+
+// NewAdminUserListFetcher returns an implementation of AdminUserListFetcher
+func NewRejectedOfficeUsersListFetcher(builder rejectedOfficeUsersListQueryBuilder) services.RejectedOfficeUserListFetcher {
+	return &rejectedOfficeUserListFetcher{builder}
+}


Need to fix your copy/pasta comments here

KonstanceH and others added 14 commits January 24, 2025 15:41

added cols to table/swagger and generated files.

ba3cfee

merging in latest main and fixing conflicts

f2119a3

added testharness fir requested/rejected office users

8aff514

adding services/tests/api. working on how rejected is added in test h…

6cb024b

…arness and add ui.

pause on frontend

3d188de

can see listed from ui. Need to fix data column and index test

e307356

Merge branch 'main' into B-21966-Add-Rejected-Admin-MAIN

6ab7fd3

Merge branch 'main' into B-21966-Add-Rejected-Admin-MAIN

75970c6

fixed index test

dbb9c0d

fixed pull in also dont need roles on main page just show page

c5b624e

update show page added roles sep by ,

bfecade

Merge branch 'main' into B-21966-Add-Rejected-Admin-MAIN

66074ca

trying to get test coverage up

2818a10

merge in from main and fix conflicts

7f87328

KonstanceH self-assigned this Jan 30, 2025

KonstanceH added ByteSize M&Ms Team ByteSized M&Ms INTEGRATION Slated for Integration Testing labels Jan 30, 2025

KonstanceH added 2 commits January 30, 2025 07:36

fix rejected testharness

a69d87b

fix rejected testharness

e0c7d0e

KonstanceH marked this pull request as ready for review January 30, 2025 14:26

KonstanceH requested review from a team as code owners January 30, 2025 14:26

KonstanceH requested review from JamesHawks224 and WeatherfordAaron January 30, 2025 14:27

danieljordan-caci requested changes Jan 30, 2025

View reviewed changes

JamesHawks224 requested changes Jan 30, 2025

View reviewed changes

Makefile Outdated Show resolved Hide resolved

.circleci/config.yml Outdated Show resolved Hide resolved

.gitlab-ci.yml Outdated Show resolved Hide resolved

pambecker and others added 5 commits February 11, 2025 14:26

Merge pull request #14785 from transcom/B-22480-fix-prime-api-with-AK…

05ee3ad

…-dest-move B-22480 - fix issue with null Prime API call and AK destination moves

Merge branch 'main' into B-22271-MAIN-OfficeUserAccountRequestIDInUse…

8e00c9c

…ErrorFix

Merge branch 'integrationTesting' into B-21966-Add-Rejected-Admin-INT

bd01fec

Merge branch 'main' into B-21966-Add-Rejected-Admin-MAIN

4082878

Merge pull request #14713 from transcom/B-22271-MAIN-OfficeUserAccoun…

abbc4f8

…tRequestIDInUseErrorFix B 22271 main office user account request id in use error fix

KonstanceH requested review from danieljordan-caci and JamesHawks224 and removed request for WeatherfordAaron and JamesHawks224 February 11, 2025 21:13

remove tester comment

3b13637

danieljordan-caci requested changes Feb 11, 2025

View reviewed changes

KonstanceH and others added 11 commits February 12, 2025 02:50

made roles column sortable and changed to rejected on

d51827e

adding missing files

6fbf29a

more missing stuff

71ab962

Merge branch 'main' into B-21966-Add-Rejected-Admin-MAIN

3464035

Merge branch 'integrationTesting' into B-21966-Add-Rejected-Admin-INT

39b4d95

change headers and comments

8c1401c

change headers and comments

382ea50

update migration comment

f77ff7c

deleted needed stuff lol

55e0754

fixed search bar and updated tests

75f99f6

sort roles list and update comments

b532836

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

B 21966 add rejected admin int #14694

B 21966 add rejected admin int #14694

KonstanceH commented Jan 30, 2025 •

edited

Loading

robot-mymove commented Jan 30, 2025 •

edited

Loading

danieljordan-caci left a comment

JamesHawks224 left a comment

KonstanceH commented Jan 30, 2025

KonstanceH commented Feb 11, 2025

taeJungCaci commented Feb 11, 2025

danieljordan-caci commented Feb 11, 2025

taeJungCaci commented Feb 11, 2025

KonstanceH commented Feb 11, 2025

taeJungCaci commented Feb 11, 2025

KonstanceH commented Feb 11, 2025

taeJungCaci commented Feb 11, 2025

danieljordan-caci left a comment

danieljordan-caci Feb 11, 2025

danieljordan-caci Feb 11, 2025

B 21966 add rejected admin int #14694

Are you sure you want to change the base?

B 21966 add rejected admin int #14694

Conversation

KonstanceH commented Jan 30, 2025 • edited Loading

B-21966

Summary

Verification Steps for Reviewers

How to test

Frontend

Backend

Database

Any new migrations/schema changes:

Screenshots

robot-mymove commented Jan 30, 2025 • edited Loading

danieljordan-caci left a comment

Choose a reason for hiding this comment

JamesHawks224 left a comment

Choose a reason for hiding this comment

KonstanceH commented Jan 30, 2025

KonstanceH commented Feb 11, 2025

taeJungCaci commented Feb 11, 2025

danieljordan-caci commented Feb 11, 2025

taeJungCaci commented Feb 11, 2025

KonstanceH commented Feb 11, 2025

taeJungCaci commented Feb 11, 2025

KonstanceH commented Feb 11, 2025

taeJungCaci commented Feb 11, 2025

danieljordan-caci left a comment

Choose a reason for hiding this comment

danieljordan-caci Feb 11, 2025

Choose a reason for hiding this comment

danieljordan-caci Feb 11, 2025

Choose a reason for hiding this comment

KonstanceH commented Jan 30, 2025 •

edited

Loading

robot-mymove commented Jan 30, 2025 •

edited

Loading