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

B 21983 MAIN - Display Counseling Office in Move Details (Review After B-21977) #14736

Draft
wants to merge 46 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
09d3cfa
21977 functioning - Services counselor can select counseling office w…
ajlusk Dec 18, 2024
c61301b
tests for 21997
ajlusk Dec 18, 2024
1b14403
Merge remote-tracking branch 'origin/main' into B-21977
ajlusk Dec 18, 2024
fdb8347
expand 21997 tests
ajlusk Dec 18, 2024
1dda9fe
Merge remote-tracking branch 'origin/main' into B-21983
ajlusk Dec 18, 2024
c4c1438
Merge branch 'proxyMiddlewareFix' into B-21983
ajlusk Dec 18, 2024
4c9b0ca
removed jest debugs and added no counseling office test case
ajlusk Dec 19, 2024
d308a38
Added counseling office to move payload
ajlusk Dec 20, 2024
6bce710
Merge remote-tracking branch 'origin/main' into B-21983
ajlusk Dec 20, 2024
f5b127b
Merge remote-tracking branch 'origin/main' into B-21977
ajlusk Dec 20, 2024
b35066b
update counseling office selction instructions
ajlusk Dec 20, 2024
591503c
Merge remote-tracking branch 'origin/MAIN-B-22122' into B-21977
ajlusk Dec 20, 2024
787e038
Merge remote-tracking branch 'origin/main' into B-21977
ajlusk Jan 6, 2025
09d855d
Merge branch 'B-21977' into B-21983
ajlusk Jan 7, 2025
6a76715
Add counseling office to orders list component
ajlusk Jan 7, 2025
9dfc76c
counseling office in orders card test fix
ajlusk Jan 8, 2025
b248256
Merge remote-tracking branch 'origin/main' into B-21977
ajlusk Jan 8, 2025
eb0949e
extend counselor add orders with counseling offices tests
ajlusk Jan 8, 2025
a013127
increase test coverage of counseling offices model to payload per rev…
ajlusk Jan 9, 2025
b9cfd42
Merge branch 'B-21977' into B-21983
ajlusk Jan 9, 2025
8a74e1f
Merge remote-tracking branch 'origin/main' into B-21983
ajlusk Jan 10, 2025
3123707
peer review suggestions
ajlusk Jan 10, 2025
c69023e
Merge remote-tracking branch 'origin/main' into B-21977
ajlusk Jan 16, 2025
9254ad2
fix office user selecting counseling office validation
ajlusk Jan 16, 2025
224a40b
fix AddOrdersForm test
ajlusk Jan 16, 2025
eb05df9
Merge remote-tracking branch 'origin/main' into B-21977
ajlusk Jan 17, 2025
cb4cfaa
consistent required hints on AddOrdersForm.jsx
ajlusk Jan 17, 2025
cf53cfa
test fixes for 21977
ajlusk Jan 17, 2025
f704154
Merge remote-tracking branch 'origin/main' into B-21977
ajlusk Jan 17, 2025
9ad79b6
Merge remote-tracking branch 'origin/main' into B-21977
ajlusk Jan 17, 2025
5b30fcd
test updates for 21977
ajlusk Jan 17, 2025
f05a546
Merge remote-tracking branch 'origin/main' into B-21977
ajlusk Jan 23, 2025
3f19dee
Merge remote-tracking branch 'origin/main' into B-21977
ajlusk Jan 24, 2025
9038658
pass serviceMemberId to office app's get counseling offices handler a…
ajlusk Jan 27, 2025
a47a096
slightly expand tests for counseling offices handlers
ajlusk Jan 27, 2025
4c75262
Merge remote-tracking branch 'origin/main' into B-21977
ajlusk Jan 27, 2025
8255fdb
add path and params to clients tests for AddOrdersForm which now uses…
ajlusk Jan 28, 2025
f83a204
Merge remote-tracking branch 'origin/main' into B-21977
ajlusk Jan 30, 2025
565acdf
Merge branch 'main' into B-21977
ajlusk Jan 31, 2025
8f13aa2
Merge branch 'main' into B-21977
ajlusk Feb 3, 2025
e4fc97c
test fix due to weird merge
ajlusk Feb 4, 2025
a20fa4e
Merge branch 'B-21977' of github.com:transcom/mymove into B-21977
ajlusk Feb 4, 2025
adeec0d
Merge branch 'main' into B-21977
ajlusk Feb 4, 2025
f40deec
Merge remote-tracking branch 'origin/B-21977' into B-21983
ajlusk Feb 4, 2025
2ac1f79
Merge branch 'main' into B-21983
ajlusk Feb 4, 2025
f473e51
Merge branch 'main' into B-21983
ajlusk Feb 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pkg/gen/ghcapi/configure_mymove.go
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,11 @@ func configureAPI(api *ghcoperations.MymoveAPI) http.Handler {
return middleware.NotImplemented("operation ppm.ShowAOAPacket has not yet been implemented")
})
}
if api.TransportationOfficeShowCounselingOfficesHandler == nil {
api.TransportationOfficeShowCounselingOfficesHandler = transportation_office.ShowCounselingOfficesHandlerFunc(func(params transportation_office.ShowCounselingOfficesParams) middleware.Responder {
return middleware.NotImplemented("operation transportation_office.ShowCounselingOffices has not yet been implemented")
})
}
if api.PpmShowPaymentPacketHandler == nil {
api.PpmShowPaymentPacketHandler = ppm.ShowPaymentPacketHandlerFunc(func(params ppm.ShowPaymentPacketParams) middleware.Responder {
return middleware.NotImplemented("operation ppm.ShowPaymentPacket has not yet been implemented")
Expand Down
193 changes: 191 additions & 2 deletions pkg/gen/ghcapi/embedded_spec.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions pkg/gen/ghcapi/ghcoperations/mymove_api.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading