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.

Sign up for GitHub

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

Jump to bottom

B 20473 int #13957

Open
wants to merge 51 commits into
base: integrationTesting
Choose a base branch
from
Open

B 20473 int #13957

wants to merge 51 commits into from
+373 −73

Conversation

pambecker
Copy link
Contributor

Agility ticket

Summary

This story will add the ability for the SC and TOO to Cancel a move from the Move Details page. The move cannot have shipment in Approved status (non-PPM) or in Closeout complete status (PPM). Also, move cannot be in Canceled status.

How to test

  1. Access the SC Counseling queue. Select a move in Needs Services Counseling status.
  2. Click on the Cancel move link on the top of the Move details page.
  3. Click on the Cancel Move button on the confirmation modal.
  4. Verify that the Cancel link is now removed and that the shipment cards now display Canceled.
  5. Navigate back to the SC queue, verify that the move is no longer in the queue.
  6. Navigate to the Search tab and search for the move that was canceled.
  7. Verify that it has a Canceled status.
  8. Access the TOO Task Order queue, run through steps 2-7 for a move that does not have any previously approved shipments.
  9. Go back as a TOO and find a move that does have at least 1 approved shipment, verify that the Cancel move link is not available.
  10. Find a shipment in Closeout Complete status and verify for that move that the Cancel move link is not available.

pambecker and others added 28 commits October 1, 2024 21:30
@pambecker
cancel move for SC and TOO
4ec32e8
@pambecker
updates to button and modal
249bdb7
@WeatherfordAaron
wrapped in changes from previous merge
c3cfaf1
@pambecker
connect cancel to backend call
31fcb59
@pambecker
cleanup
903e2ae
@pambecker
fix issue with PPM only not canceling
65d6e3c
@pambecker
Fix MTO Canceled label for PPM
29804ed
@WeatherfordAaron
Merge branch 'main' into MAIN-remerge-B20617-SC-TOO-Creating-Mobile-H…
90c28f3 
…ome-Shipment-and-Shipment-Card-Display
@pambecker
button placement
bf5634f
@pambecker
Merge branch 'main' into B-20473-Office-user-cancel-move
9fc955c
@pambecker
update tests
5710bc5
@WeatherfordAaron
Merge branch 'main' into MAIN-remerge-B20617-SC-TOO-Creating-Mobile-H…
b161971 
…ome-Shipment-and-Shipment-Card-Display
@pambecker
updates to refresh page
abca4eb
@WeatherfordAaron
Merge branch 'main' into MAIN-remerge-B20617-SC-TOO-Creating-Mobile-H…
e4da453 
…ome-Shipment-and-Shipment-Card-Display
@pambecker
update shipment labels on cards
dc08742
@pambecker
Merge branch 'main' into B-20473-Office-user-cancel-move
d305f72
@pambecker
update
6dd1149
@pambecker
Merge branch 'main' into B-20473-Office-user-cancel-move
71165cd
@pambecker
Merge remote-tracking branch 'origin/B-21077-Move-Shipment-Button-MAI…
81e6332 
…N' into B-20473-Office-user-cancel-move
@pambecker
button alignment, css changes
b65c621
@WeatherfordAaron
Merge branch 'main' into MAIN-remerge-B20617-SC-TOO-Creating-Mobile-H…
742f698 
…ome-Shipment-and-Shipment-Card-Display
@WeatherfordAaron
removed extra code
4d4b9b9
@WeatherfordAaron
re-added the formatForBoatShipment import
2cb6991
@WeatherfordAaron
added additional testing
42289dd
@WeatherfordAaron
Merge branch 'main' into MAIN-remerge-B20617-SC-TOO-Creating-Mobile-H…
bf109e7 
…ome-Shipment-and-Shipment-Card-Display
@pambecker
Merge branch 'B-21077-Move-Shipment-Button-MAIN' into B-20473-Office-…
82ba4ea 
…user-cancel-move
@pambecker
Merge branch 'B-21077-Move-Shipment-Button-MAIN' into B-20473-Office-…
8798f41 
…user-cancel-move
@pambecker
Merge branch 'B-20473-Office-user-cancel-move' into B-20473-INT
20fa246
@pambecker pambecker added G-Unit Scrum Team G INTEGRATION Slated for Integration Testing labels Oct 18, 2024
@pambecker pambecker marked this pull request as ready for review October 18, 2024 16:41
@robot-mymove
Copy link

robot-mymove commented Oct 21, 2024 •
edited
Loading

Test coverage on client failed.

Last run: Tue 22 Oct 2024 08:48:28 PM UTC
Refer to this report to see coverage details for the client app.
Documentation for test coverage can be found at this link.

JamesHawks224 and others added 10 commits October 21, 2024 09:36
@JamesHawks224
Merge branch 'main' into b20884-MAIN2-fix_prime_weight_tool_tip
dffc793
@pambecker
Merge branch 'integrationTesting' into B-20473-INT
4670835
@pambecker
Merge branch 'main' into B-20473-Office-user-cancel-move
e466457
@pambecker
Merge branch 'main' into B-20473-Office-user-cancel-move
dca783f
@taeJungCaci
Merge branch 'main' into MAIN-remerge-B20617-SC-TOO-Creating-Mobile-H…
9025926 
…ome-Shipment-and-Shipment-Card-Display
@taeJungCaci
remove comment
bfebbf3
@taeJungCaci
fixing changes to match IntegrationBranch
c0564c6
@taeJungCaci
Merge pull request #13839 from transcom/MAIN-remerge-B20617-SC-TOO-Cr…
d702365 
…eating-Mobile-Home-Shipment-and-Shipment-Card-Display

B-20617: SC TOO Creating Mobile Home Shipment and Shipment Card Display
@taeJungCaci
Merge branch 'main' into b20884-MAIN2-fix_prime_weight_tool_tip
1fbf38b
@taeJungCaci
Merge pull request #13958 from transcom/b20884-MAIN2-fix_prime_weight…
ff71810 
…_tool_tip

B20884-MAIN2-fix prime weight tool tip
paulstonebraker
paulstonebraker reviewed Oct 22, 2024
View reviewed changes
src/services/ghcApi.js Outdated
operationPath,
{
moveID,
'If-Match': ifMatchETag,
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need the ETag here? I don't see us doing anythign with it

Copy link
Contributor

Choose a reason for hiding this comment

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

we do use it when we are making requests like PATCH or POST to help avoid conflicts if the same record is being updated.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do we need the ETag here? I don't see us doing anythign with it

removed. thanks, I meant to try it without also, but forgot.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh, so since the /definitions/Move has eTag it will use the eTag if I pass it? so leave it there @joeydoyecaci

Copy link
Contributor

@joeydoyecaci joeydoyecaci Oct 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

it would, but mainly if a call is made directly to it like through postman. It is a field in the Move table that is updated on each call involving that record.

paulstonebraker
paulstonebraker approved these changes Oct 22, 2024
View reviewed changes
Copy link
Contributor

@paulstonebraker paulstonebraker left a comment

Choose a reason for hiding this comment

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

Works and looks good! I bet your brain is so happy to have updated 'cancelled' to 'canceled' 😺

joeydoyecaci
joeydoyecaci approved these changes Oct 22, 2024
View reviewed changes
Copy link
Contributor

@joeydoyecaci joeydoyecaci left a comment

Choose a reason for hiding this comment

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

Looks good!

@pambecker
Copy link
Contributor Author

All changes from comments have been pushed up.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joeydoyecaci joeydoyecaci joeydoyecaci approved these changes

@paulstonebraker paulstonebraker paulstonebraker approved these changes

@JonSpight JonSpight JonSpight approved these changes

Assignees

@pambecker pambecker

Labels
G-Unit Scrum Team G INTEGRATION Slated for Integration Testing
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@pambecker @robot-mymove @paulstonebraker @joeydoyecaci @JonSpight @WeatherfordAaron @JamesHawks224 @taeJungCaci