B-21569-INT 2

[stevengleason-caci]

B-21569 INT Part 2

B-21569

Summary

Fix the order of the service items. I did this by retrieving the sort column and using that in the jsx code.
I also changed "International UB" to "International UB price."

Previous PR: #14491

Verification Steps for the Author

These are to be checked by the author.

• Have the Agility acceptance criteria been met for this change?

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?

Setup to Run the Code

• Instructions for starting storybook
• Instructions for starting the MilMove application
• Instructions for running tests

How to test

1. Run with feature flags on: FEATURE_FLAG_UNACCOMPANIED_BAGGAGE=true FEATURE_FLAG_ENABLE_ALASKA=true make server_run
2. Login as a Customer and create an OCONUS-to-CONUS UB shipment
3. And create an OCONUS-to-OCONUS UB shipment
4. Log in as a Counselor and complete and approve both shipments
5. Log in as a TOO and submit the OCONUS-to-CONUS shipment
6. See the 4 service items in order
   a. International UB price
   b. International POD Fuel Surcharge
   c. International UB pack
   d. International UB unpack
7. Submit the OCONUS-to-OCONUS shipment
8. See only 3 service items (no Fuel Surcharge) in order:
   a. International UB price
   b. International UB pack
   c. International UB unpack

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

CONUS-OCONUS with POE FSC

OCONUS-CONUS with POD FSC

OCONUS-OCONUS (no FSC)

[danieljordan-caci]

Not sure if I like this approach of adjusting the stored proc for a UI ordering issue.

I know we do have the sort value in the re_service_items table that would fix this issue if we can leverage that in the UI. Can you take a look at that approach and passing that sort value to the service item payload that's being used in the MTO tab?

Another option would be to add a variable that we can use to handle sorting based on shipment type and market code.

Feel free to share your thoughts! Not trying to derail your PR, but I do think we can use existing data we have and/or create a UI variable we can use for sorting.

[stevengleason-caci]

Not sure if I like this approach of adjusting the stored proc for a UI ordering issue.

I know we do have the sort value in the re_service_items table that would fix this issue if we can leverage that in the UI. Can you take a look at that approach and passing that sort value to the service item payload that's being used in the MTO tab?

I looked at it as if the data being inserted out of order was the underlying issue. I am using the re_service_items.sort value now in the proc, but if that's not ideal I'll look into bringing that into the UI layer.

[danieljordan-caci]

Not sure if I like this approach of adjusting the stored proc for a UI ordering issue.
I know we do have the sort value in the re_service_items table that would fix this issue if we can leverage that in the UI. Can you take a look at that approach and passing that sort value to the service item payload that's being used in the MTO tab?

I looked at it as if the data being inserted out of order was the underlying issue. I am using the re_service_items.sort value now in the proc, but if that's not ideal I'll look into bringing that into the UI layer.

Would you mind looking into bringing that value into the UI as an alternate approach? I would much prefer that - let me know if it gets too wild or something and I'll reconsider! Thank you!

[stevengleason-caci]

. . .

Would you mind looking into bringing that value into the UI as an alternate approach? I would much prefer that - let me know if it gets too wild or something and I'll reconsider! Thank you!

Updated

Edit: Happo is showing some errors with my sort comparison. I'll see what's happening.
Edit2: Updated to handle null sort values, with test.

[danieljordan-caci]

Excellent! Thanks for going with this approach! Just one little test and the rest looks good!

[brianmanley-caci]

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 a946e9c

Do I need to move my code from src/shared/utils.js? I don't think so since there have been other additions there recently.

@stevengleason-caci there is a guide for getting away from these "legacy" directories. Frontend File Layout Guide. I see there is a src/utils directory that may be more appropriate to add a utility function to.

[stevengleason-caci]

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 a946e9c

Do I need to move my code from src/shared/utils.js? I don't think so since there have been other additions there recently.

@stevengleason-caci there is a guide for getting away from these "legacy" directories. Frontend File Layout Guide. I see there is a src/utils directory that may be more appropriate to add a utility function to.

The files in src/utils/ all seem pretty specific. Should I make a new one, strings.js or stringUtils.js or something?

[brianmanley-caci]

The files in src/utils/ all seem pretty specific. Should I make a new one, strings.js or stringUtils.js or something?

Sounds good to me.

[msaki-caci]

I think you might want to update your main B-21569 branch with the latest from main because I was running your latest changes with a fresh merge from main on my branch (B-21659) and I get a crash when I approve the requested shipment as a TOO.

ERROR ghcapi/mto_shipment.go:531 ghcapi.ApproveShipmentHandler {"git_branch": "MAIN-B-21659_Display_estimated_prices_UB", "git_commit": "3f08f4a4ee05e5d6ac8672256c000b565d868ef2", "host": "officelocal:3000", "milmove_trace_id": "87d79eac-ffe8-4f6a-8292-782605d236d5", "session_id": "ioprjFRnZx9Nk4vnAC3D5VEbWRmpS5BJMQC-Qq6r1lo", "error": "error creating approved service items: pq: Error creating POEFSC service item for shipment 8c948d8b-7c73-49c9-8e68-050e7f36dcbd: Service item already exists for service_id f75758d8-2fcd-40ba-9432-3ff3032a71d1 and shipment_id 8c948d8b-7c73-49c9-8e68-050e7f36dcbd"}

[brianmanley-caci]

Working well for me. Thanks for all the changes.

[danieljordan-caci]

Thanks for adding that test!