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 21455 int #14326

Open
wants to merge 2,438 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2438 commits
Select commit Hold shift + click to select a range
b33a421
Merge branch 'B-21375-I-13559-MAIN' into B-21375-I-13559-INT
traskowskycaci Nov 21, 2024
9e1b09f
Merge branch 'integrationTesting' into INT-B-21668-stored-procs-for-o…
deandreJones Nov 21, 2024
c61e813
Merge pull request #14211 from transcom/B21575-INT3-Add_order_type
JamesHawks224 Nov 21, 2024
f68a091
Merge branch 'MAIN-B-21114-Office-Address-Language' of https://github…
brooklyn-welsh Nov 21, 2024
266a495
Merge branch 'INT-B-21114-Office-Address-Language' of https://github.…
brooklyn-welsh Nov 21, 2024
345d544
Merge branch 'integrationTesting' into turning-on-dtod-simulate-outag…
antgmann Nov 21, 2024
6841660
remove odd dup
deandreJones Nov 21, 2024
d61385a
Merge branch 'INT-B-21668-stored-procs-for-ordering-service-items' of…
deandreJones Nov 21, 2024
c060f32
Merge pull request #14244 from transcom/INT-B-20496-safety-move-auth
brooklyn-welsh Nov 21, 2024
779aad3
put that back
deandreJones Nov 21, 2024
3b5b242
Merge pull request #14122 from transcom/INT-B-21114-Office-Address-La…
brooklyn-welsh Nov 21, 2024
7253238
Merge branch 'main' into B-20535-special-moves-queue-assigned
pambecker Nov 21, 2024
4f78a36
Merge branch 'main' into B-21680-fix-timeout-counseling-office
pambecker Nov 21, 2024
a043127
Merge branch 'integrationTesting' into B-20535-INT
pambecker Nov 21, 2024
dccd6dd
Merge pull request #14262 from transcom/B-21367-INT3-Updated-third-ad…
joeydoyecaci Nov 21, 2024
a7d01e8
B-21671
msaki-caci Nov 21, 2024
b96b841
Merge branch 'MAIN-B-21671-DB-create-re_fsc_multipliers' into INT-B-2…
msaki-caci Nov 21, 2024
fb26888
Merge pull request #14246 from transcom/B-21667-I-13550-INT
traskowskycaci Nov 21, 2024
06c6bc5
Merge branch 'integrationTesting' into INT-B-21668-stored-procs-for-o…
deandreJones Nov 21, 2024
049ae37
point to latest react-file-viewer release
cameroncaci Nov 21, 2024
79992f7
Merge remote-tracking branch 'origin/integrationTesting' into b-21230…
cameroncaci Nov 21, 2024
197e27f
Merge branch 'integrationTesting' into INT-B-21509-DB-Add-POE-and-POD
msaki-caci Nov 21, 2024
5fab721
cleanup - renaming..
deandreJones Nov 21, 2024
72847b6
merges
deandreJones Nov 21, 2024
605296f
updates
pambecker Nov 21, 2024
2c5110e
update shipment section labels
traskowskycaci Nov 21, 2024
55a764f
Merge branch 'B-21667-I-13567-MAIN' into B-21667-I-13567-INT
traskowskycaci Nov 21, 2024
6acb4ba
extra debug step
cameroncaci Nov 21, 2024
ea4941f
B-21671
msaki-caci Nov 21, 2024
b744132
Merge branch 'MAIN-B-21671-DB-create-re_fsc_multipliers' into INT-B-2…
msaki-caci Nov 21, 2024
548ef54
Merge branch 'integrationTesting' into B-21375-I-13559-INT
traskowskycaci Nov 21, 2024
5507d81
B-21671
msaki-caci Nov 21, 2024
ca8b068
Merge branch 'MAIN-B-21671-DB-create-re_fsc_multipliers' into INT-B-2…
msaki-caci Nov 21, 2024
f8f9f9e
Merge pull request #14238 from transcom/INT-V2-B-21608-Alaska-Update-…
MInthavongsay Nov 21, 2024
c8a7800
added weight entitlements for student travel orders type
taeJungCaci Nov 21, 2024
cb02c01
Merge branch 'main' into MAIN-B-21578-overall-weight-limit-and-too-tio
taeJungCaci Nov 21, 2024
8d9ba4d
Merge branch 'integrationTesting' into INT-B-21671-DB-create-re_fsc_m…
msaki-caci Nov 21, 2024
b5c5e44
Merge branch 'MAIN-B-21578-overall-weight-limit-and-too-tio' into INT…
taeJungCaci Nov 21, 2024
825a8e8
Merge pull request #14255 from transcom/INT-B-21509-DB-Add-POE-and-POD
msaki-caci Nov 21, 2024
9523273
Merge branch 'integrationTesting' into B-21667-I-13567-INT
traskowskycaci Nov 22, 2024
dbc9877
tests
pambecker Nov 22, 2024
8e5dc30
Merge branch 'integrationTesting' into B-21375-I-13559-INT
traskowskycaci Nov 22, 2024
f6d7710
Merge branch 'integrationTesting' into B-20535-INT
pambecker Nov 22, 2024
6bd27d0
gen
taeJungCaci Nov 22, 2024
284eeb9
Merge branch 'integrationTesting' into INT-B-21671-DB-create-re_fsc_m…
msaki-caci Nov 22, 2024
3745d32
Merge branch 'B-20535-special-moves-queue-assigned' into B-20535-INT
pambecker Nov 22, 2024
ba1c754
Merge pull request #14253 from transcom/B-21375-I-13559-INT
traskowskycaci Nov 22, 2024
2c6b717
Merge branch 'integrationTesting' into INT-B-21376-I-13558
danieljordan-caci Nov 22, 2024
d53848c
Merge branch 'integrationTesting' into B-21667-I-13567-INT
traskowskycaci Nov 22, 2024
8fd11f5
Merge pull request #14263 from transcom/INT-B-21376-I-13558
danieljordan-caci Nov 22, 2024
8e0eb09
Merge branch 'integrationTesting' into B-21667-I-13567-INT
traskowskycaci Nov 22, 2024
6419dc0
merge issue, test
pambecker Nov 22, 2024
bbbfc30
potential test fixes for 21490
ajlusk Nov 22, 2024
5a3d1e1
Merge branch 'B-21490' into B-21490-INT
ajlusk Nov 22, 2024
b4d96a2
Merge branch 'integrationTesting' into INT-B-21578-overall-weight-lim…
taeJungCaci Nov 22, 2024
c2c35d1
Merge branch 'MAIN-B-21414-TOO-international-crate-request' into INT-…
taeJungCaci Nov 22, 2024
da85ba6
adjust total dependents to be a db generated column
cameroncaci Nov 22, 2024
66c184d
gen
taeJungCaci Nov 22, 2024
1190b53
Merge branch 'b-21682-store-total-dependents-main' into b-21682-store…
cameroncaci Nov 22, 2024
d0e979d
duplicate test whoopsy
cameroncaci Nov 22, 2024
639ab96
cleanup cleanup
cameroncaci Nov 22, 2024
9995107
final cleanup
cameroncaci Nov 22, 2024
3a14f14
dont need this anymore
cameroncaci Nov 22, 2024
934e568
Merge branch 'MAIN-B-21414-TOO-international-crate-request' into INT-…
taeJungCaci Nov 22, 2024
d637ae5
added test- fix call to proc after renaming
deandreJones Nov 22, 2024
f1da27c
Merge branch 'integrationTesting' into INT-B-21668-stored-procs-for-o…
deandreJones Nov 22, 2024
c4b1db8
Merge pull request #14269 from transcom/B-21667-I-13567-INT
traskowskycaci Nov 22, 2024
3f35b67
pdfjs debugging
cameroncaci Nov 22, 2024
37b672c
Merge remote-tracking branch 'origin/integrationTesting' into b-21230…
cameroncaci Nov 22, 2024
186525e
added fields that are part of the ListMove and Move objects that are …
WeatherfordAaron Nov 22, 2024
642f0ad
fix test
pambecker Nov 22, 2024
1967f57
Merge branch 'integrationTesting' into turning-on-dtod-simulate-outag…
antgmann Nov 22, 2024
1d297cd
one more
pambecker Nov 22, 2024
8843c41
Merge branch 'main' into B-21680-fix-timeout-counseling-office
pambecker Nov 22, 2024
52f8058
debugging
cameroncaci Nov 22, 2024
00b3ca5
Merge pull request #14260 from transcom/turning-on-dtod-simulate-outa…
antgmann Nov 22, 2024
f7f4e6c
Merge branch 'integrationTesting' into B-21680-INT
pambecker Nov 22, 2024
749c698
Merge remote-tracking branch 'origin/MAIN-B-21113-Customer-Address-La…
brooklyn-welsh Nov 22, 2024
35fa1fb
Merge branch 'B-21680-fix-timeout-counseling-office' into B-21680-INT
pambecker Nov 22, 2024
2b1342f
Merge branch 'integrationTesting' into B-21680-INT
pambecker Nov 22, 2024
aa2afbf
Merge branch 'integrationTesting' into B-21490-INT
ajlusk Nov 22, 2024
6f8683e
Merge branch 'integrationTesting' into b-21682-store-total-dependents…
cameroncaci Nov 22, 2024
d324042
mto_service_item_type
deandreJones Nov 22, 2024
65a36b6
Merge pull request #14252 from transcom/b-21682-store-total-dependent…
cameroncaci Nov 22, 2024
abaab40
Merge branch 'integrationTesting' into INT-B-21668-stored-procs-for-o…
deandreJones Nov 22, 2024
bdc7014
INT merge
MInthavongsay Nov 22, 2024
462587b
Merge pull request #14256 from transcom/INT-B-21676-exclude-NSRA15-du…
MInthavongsay Nov 22, 2024
a30605b
Merge branch 'MAIN-B-21414-TOO-international-crate-request' into INT-…
taeJungCaci Nov 23, 2024
f72a3a7
Merge branch 'integrationTesting' into B-21393V2-Integration
ajlusk Nov 23, 2024
34a9853
Merge branch 'integrationTesting' into B-20535-INT
pambecker Nov 25, 2024
4ca0562
Merge branch 'integrationTesting' into INT-B-21636
pambecker Nov 25, 2024
fb24d96
tests added for new int code
pambecker Nov 25, 2024
94f6903
Merge branch 'main' into B-21680-fix-timeout-counseling-office
pambecker Nov 25, 2024
10f72dc
create filestorage env var for circleci playwright
cameroncaci Nov 25, 2024
ffbcff6
Merge branch 'integrationTesting' into B-21680-INT
pambecker Nov 25, 2024
8a3a1dc
Merge branch 'integrationTesting' into INT-B-21414-TOO-international-…
taeJungCaci Nov 25, 2024
56f77b1
Merge pull request #14204 from transcom/B-21393V2-Integration
ajlusk Nov 25, 2024
1a0bd43
cleanup
deandreJones Nov 25, 2024
acf63a4
Merge branch 'INT-B-21668-stored-procs-for-ordering-service-items' of…
deandreJones Nov 25, 2024
aea0f0c
Merge branch 'integrationTesting' into B-21492-Integration2
ajlusk Nov 25, 2024
7084688
Merge branch 'integrationTesting' into INT-B-21414-TOO-international-…
taeJungCaci Nov 25, 2024
624af89
adding tooltip, removing unnecessary useEffect
danieljordan-caci Nov 25, 2024
c07e5f8
Merge pull request #14221 from transcom/B-21492-Integration2
ajlusk Nov 25, 2024
8004b97
Merge branch 'integrationTesting' into INT-I-13558-B-21376-part-deaux
danieljordan-caci Nov 25, 2024
8a06cd1
Merge pull request #14274 from transcom/INT-B-21414-TOO-international…
taeJungCaci Nov 25, 2024
5947990
Merge branch 'B-21667-MAIN' into B-21667-I-13574-MAIN
traskowskycaci Nov 25, 2024
d65910f
Merge branch 'B-21487-MAIN' into B-21667-I-13574-MAIN
traskowskycaci Nov 25, 2024
42e2d04
Merge branch 'B-21667-I-13550-MAIN' into B-21667-I-13574-MAIN
traskowskycaci Nov 25, 2024
c203bf8
fix varibale name on edit shipment details
traskowskycaci Nov 25, 2024
84b699c
Merge branch 'MAIN-B-21113-Customer-Address-Language' of https://gith…
brooklyn-welsh Nov 25, 2024
68fc9a3
Merge branch 'B-21667-I-13574-MAIN' into B-21667-I-13574-INT
traskowskycaci Nov 25, 2024
7f6f014
turning off dtod simulate outage in loadtest
CoryKleinjanCACI Nov 25, 2024
c62785e
fix ternary
cameroncaci Nov 25, 2024
791473d
tests added for new int code
pambecker Nov 25, 2024
8406704
correctiuions
deandreJones Nov 25, 2024
b4f7924
Merge branch 'integrationTesting' into INT-B-21668-stored-procs-for-o…
deandreJones Nov 25, 2024
3264843
Merge pull request #14279 from transcom/b-21374-issue-fixes-int
cameroncaci Nov 25, 2024
dd59db8
Merge pull request #14210 from transcom/B-20535-INT
pambecker Nov 25, 2024
77a60ea
fixed case where boat shipment and mobile home wasn't displaying dest…
WeatherfordAaron Nov 25, 2024
c4de12d
Merge branch 'integrationTesting' into turning-off-dtod-simulate-outa…
CoryKleinjanCACI Nov 25, 2024
7e138bb
Merge pull request #14278 from transcom/turning-off-dtod-simulate-out…
antgmann Nov 25, 2024
9c3c1f1
Merge branch 'integrationTesting' into INT-B-21671-DB-create-re_fsc_m…
msaki-caci Nov 25, 2024
cb68ba2
accounted for NTS
WeatherfordAaron Nov 25, 2024
c5e51ce
apparently := narrows scope
ajlusk Nov 25, 2024
d4fe2f1
replacing more misused := with =
ajlusk Nov 25, 2024
3069853
Merge branch 'integrationTesting' into INT-B-21668-stored-procs-for-o…
deandreJones Nov 26, 2024
1a72ff7
testing test failing remotely but passing locally
ajlusk Nov 26, 2024
5b168ee
uncomment tests and narrow scope of test that was added in the ticket…
ajlusk Nov 26, 2024
df47ad3
Merge branch 'B-21490' into B-21490-INT
ajlusk Nov 26, 2024
6bd6055
Merge branch 'integrationTesting' into B-21490-INT
ajlusk Nov 26, 2024
998be6c
json it is
deandreJones Nov 26, 2024
f0bf7f0
Merge branch 'INT-B-21668-stored-procs-for-ordering-service-items' of…
deandreJones Nov 26, 2024
e13ce75
Merge branch 'integrationTesting' into B-21667-I-13574-INT
traskowskycaci Nov 26, 2024
174b8c6
Merge pull request #14271 from transcom/INT-B-21578-overall-weight-li…
taeJungCaci Nov 26, 2024
63b9ca1
Merge branch 'integrationTesting' into B-21490-INT
r-mettler Nov 26, 2024
7cdcee8
Merge pull request #14275 from transcom/INT-B-21113-Customer-Address-…
brooklyn-welsh Nov 26, 2024
9ac40f5
Merge branch 'integrationTesting' into B-21667-I-13574-INT
traskowskycaci Nov 26, 2024
06d0331
Merge branch 'integrationTesting' into B-21490-INT
r-mettler Nov 26, 2024
fb50268
Merge pull request #14230 from transcom/INT-B-21668-stored-procs-for-…
deandreJones Nov 26, 2024
cc66200
Merge branch 'integrationTesting' into INT-B-21675
WeatherfordAaron Nov 26, 2024
90d1d87
Merge branch 'main' into MAIN-B-21509-DB-Add-POE-and-POD
msaki-caci Nov 26, 2024
0f0bac0
Merge pull request #14276 from transcom/INT-I-13558-B-21376-part-deaux
danieljordan-caci Nov 26, 2024
424f17e
Merge branch 'integrationTesting' into INT-B-21675
WeatherfordAaron Nov 26, 2024
0573a97
Merge pull request #14277 from transcom/B-21667-I-13574-INT
traskowskycaci Nov 26, 2024
21a9e6c
Merge branch 'integrationTesting' into INT-B-21675
WeatherfordAaron Nov 26, 2024
cb69251
Merge branch 'main' into B-21455-MAIN
CoryKleinjanCACI Nov 26, 2024
50ad5f0
remove testing comment from TableQueue.jsx
ajlusk Nov 26, 2024
300cc93
Merge remote-tracking branch 'origin/main' into B-21490
ajlusk Nov 26, 2024
5647df2
Adding nil check for prime weights
CoryKleinjanCACI Nov 26, 2024
287df93
Merge branch 'B-21464' into B-21464-INT
CoryKleinjanCACI Nov 26, 2024
95b8038
Merge branch 'integrationTesting' into B-21464-INT
CoryKleinjanCACI Nov 26, 2024
54418d2
Merge branch 'B-21490' into B-21490-INT
ajlusk Nov 26, 2024
2152d92
UI logic to let TOO and SC create UB shipments
danieljordan-caci Nov 26, 2024
b49add0
Merge main into B-21568
brianmanley-caci Nov 26, 2024
b800846
Merge branch 'integrationTesting' into B-21490-INT
ajlusk Nov 26, 2024
68778aa
Merge pull request #14225 from transcom/INT-B-21675
WeatherfordAaron Nov 26, 2024
bf625c0
Merge branch 'integrationTesting' into B-21464-INT
CoryKleinjanCACI Nov 26, 2024
9cd2dc3
Merge branch 'integrationTesting' into B-21490-INT
antgmann Nov 26, 2024
1fd1541
Merge pull request #14070 from transcom/B-21490-INT
antgmann Nov 26, 2024
b418714
Merge branch 'integrationTesting' into B-21464-INT
CoryKleinjanCACI Nov 26, 2024
712f409
Merge pull request #14283 from transcom/B-21464-INT
CoryKleinjanCACI Nov 26, 2024
4711e21
Merge pull request #14242 from transcom/B-21680-INT
pambecker Nov 26, 2024
4fa4e1d
Merge branch 'integrationTesting' into INT-B-21671-DB-create-re_fsc_m…
msaki-caci Nov 26, 2024
dbc650f
Merge pull request #14284 from transcom/INT-B-21846
danieljordan-caci Nov 26, 2024
92ff60e
Merge branch 'integrationTesting' into INT-B-21671-DB-create-re_fsc_m…
msaki-caci Nov 26, 2024
2b17d18
local storage mount logs
cameroncaci Nov 26, 2024
5957038
Merge pull request #14231 from transcom/INT-B-21671-DB-create-re_fsc_…
msaki-caci Nov 26, 2024
4023367
local storage override
cameroncaci Nov 26, 2024
1eb1885
B-21568 service item sort order
brianmanley-caci Nov 26, 2024
7f9bc77
Merge B-21568 into INT-B-21568
brianmanley-caci Nov 26, 2024
74fa48f
try new env location
cameroncaci Nov 27, 2024
97a2748
B-21568 update sort value for port fsc
brianmanley-caci Nov 27, 2024
162728c
Merge B-21568 into INT-B-21568
brianmanley-caci Nov 27, 2024
1792b6b
that should do it...
cameroncaci Nov 27, 2024
e86cd75
Merge branch 'integrationTesting' into b-21230-resolve-canvas-depende…
cameroncaci Nov 27, 2024
bbd4031
Merge branch 'main' into MAIN-B-21509-DB-Add-POE-and-POD
brianmanley-caci Nov 27, 2024
747b79a
B-21568 improves sql statement
brianmanley-caci Nov 27, 2024
064a5cb
Merge remote-tracking branch 'origin/MAIN-B-21568-Show-UB-Preapproved…
brianmanley-caci Nov 27, 2024
c2961af
Merge branch 'main' into B-21680-fix-timeout-counseling-office
pambecker Nov 27, 2024
7cfe297
adding indexes to prevent timeout issue on counseling office query
pambecker Nov 27, 2024
c041d80
Merge branch 'B-21680-fix-timeout-counseling-office' into B-21680-INT…
pambecker Nov 27, 2024
c67e88a
using func for proc and added test
KonstanceH Nov 29, 2024
a8369e7
addede hhg check
KonstanceH Nov 29, 2024
97ec48a
move sequence creation from sequencer_test.go to migration
traskowskycaci Nov 29, 2024
eed5726
Merge branch 'integrationTesting' into INT-B-21636
loganwc Dec 2, 2024
28ef196
update codeowners for new SOP
deandreJones Dec 2, 2024
187d28f
add circleci to codeowners
deandreJones Dec 2, 2024
504fec2
add playwright to FE
deandreJones Dec 2, 2024
6edec3f
and more
deandreJones Dec 2, 2024
073f2f9
additions
deandreJones Dec 2, 2024
0753688
go.mod
deandreJones Dec 2, 2024
641911b
and another one
deandreJones Dec 2, 2024
3a22fd0
and another one
deandreJones Dec 2, 2024
c131ebc
Merge branch 'main' into B-21455-MAIN
r-mettler Dec 2, 2024
1f02981
move to secure migration to run in dev env only
traskowskycaci Dec 2, 2024
f38548e
deploy canvas dependency to int
cameroncaci Dec 2, 2024
7b4293a
Merge branch 'b-21230-resolve-canvas-dependency-v2-int' of github.com…
cameroncaci Dec 2, 2024
472f195
Merge pull request #14299 from transcom/sequencer_test_improvements-INT
deandreJones Dec 2, 2024
2235144
Merge integrationTesting into INT-B-21568
brianmanley-caci Dec 2, 2024
9a3cbc3
Merge branch 'main' into B-21455-MAIN
r-mettler Dec 2, 2024
fde342c
Merge branch 'integrationTesting' into B-21680-INT-add-indexes
pambecker Dec 2, 2024
31e6624
fix flaky timeout
cameroncaci Dec 2, 2024
dee32b4
Merge pull request #14289 from transcom/INT-B-21568
brianmanley-caci Dec 2, 2024
a9b0408
Merge branch 'integrationTesting' into updateCodeOwners-INT
deandreJones Dec 2, 2024
fa8b614
Merge pull request #14308 from transcom/updateCodeOwners-INT
deandreJones Dec 2, 2024
b52179e
Revert "deploy canvas dependency to int"
cameroncaci Dec 2, 2024
5063d9b
Merge branch 'integrationTesting' into b-21230-resolve-canvas-depende…
cameroncaci Dec 2, 2024
5cf935c
Merge branch 'integrationTesting' into B-21680-INT-add-indexes
pambecker Dec 2, 2024
1a46cf8
Merge branch 'integrationTesting' into B-21548-BE-Update-service-item…
KonstanceH Dec 2, 2024
200254b
Merge pull request #14294 from transcom/B-21680-INT-add-indexes
pambecker Dec 2, 2024
7dddb94
Merge branch 'integrationTesting' into B-21548-BE-Update-service-item…
KonstanceH Dec 2, 2024
23b2082
Merge pull request #14218 from transcom/b-21230-resolve-canvas-depend…
cameroncaci Dec 2, 2024
4dadd78
Merge branch 'integrationTesting' into B-21548-BE-Update-service-item…
KonstanceH Dec 2, 2024
c162cf0
Merge remote-tracking branch 'origin/MAIN-B-21986' into INT-B-21986
danieljordan-caci Dec 2, 2024
e378ffb
updating fake pricing data
danieljordan-caci Dec 2, 2024
cb21f27
revert
danieljordan-caci Dec 2, 2024
2c38b11
revert
danieljordan-caci Dec 2, 2024
2d6780e
Revert "revert"
danieljordan-caci Dec 2, 2024
d5b18e0
forgotten test
danieljordan-caci Dec 2, 2024
5ef4249
Merge pull request #14316 from transcom/INT-B-21986
danieljordan-caci Dec 2, 2024
a72322a
Merge remote-tracking branch 'origin/MAIN-B-21986' into INT-B-21986-v2
danieljordan-caci Dec 3, 2024
b3b2842
using shipment instead of serviceItem.Shipment
CoryKleinjanCACI Dec 3, 2024
fe2964d
Merge branch 'B-21464' into B-21464-INT
CoryKleinjanCACI Dec 3, 2024
a766e7c
tests and additional cleanup
danieljordan-caci Dec 3, 2024
97a0270
removing nil check when calculating max incentive
danieljordan-caci Dec 3, 2024
57345ed
Merge remote-tracking branch 'origin/integrationTesting' into INT-B-2…
danieljordan-caci Dec 3, 2024
af35078
comment cleanup
danieljordan-caci Dec 3, 2024
273b357
removing dup test from merge conflict
danieljordan-caci Dec 3, 2024
4793ca6
adding status check to not recalculate max incentive if the PPM statu…
danieljordan-caci Dec 3, 2024
a2dcd2b
Merge pull request #14235 from transcom/INT-B-21636
pambecker Dec 3, 2024
9c2af7b
Merge branch 'integrationTesting' into B-21464-INT
CoryKleinjanCACI Dec 3, 2024
e1fa2c9
Merge branch 'integrationTesting' into B-21548-BE-Update-service-item…
KonstanceH Dec 3, 2024
2723322
Merge pull request #14318 from transcom/B-21464-INT
CoryKleinjanCACI Dec 3, 2024
68a152a
Fixing failing servicecounselormovedetails test
CoryKleinjanCACI Dec 3, 2024
39a3585
B-21509
msaki-caci Dec 3, 2024
fbce83f
Merge branch 'B-21455-MAIN' into B-21455-INT
CoryKleinjanCACI Dec 3, 2024
dded446
Merge branch 'integrationTesting' into B-21548-BE-Update-service-item…
KonstanceH Dec 3, 2024
b3c2834
Merge branch 'MAIN-B-21509-DB-Add-POE-and-POD' into INT-B-21509
msaki-caci Dec 3, 2024
21e449a
Merge pull request #14323 from transcom/INT-B-21509
msaki-caci Dec 3, 2024
8085d0f
Merge branch 'integrationTesting' into B-21548-BE-Update-service-item…
KonstanceH Dec 3, 2024
e6016e8
Merge branch 'integrationTesting' into B-21455-INT
CoryKleinjanCACI Dec 3, 2024
e4e805d
updating estimator to use order values instead of pickup/dest when es…
danieljordan-caci Dec 3, 2024
c130f82
Merge pull request #14295 from transcom/B-21548-BE-Update-service-ite…
KonstanceH Dec 3, 2024
6fa6ef8
Merge branch 'integrationTesting' into B-21455-INT
CoryKleinjanCACI Dec 3, 2024
af4e146
fixing playwright test to change locator
danieljordan-caci Dec 3, 2024
009c8a2
changing logic to use shipment postals when appropriate else use orde…
danieljordan-caci Dec 3, 2024
2718d84
removing orders fetch for estimating
danieljordan-caci Dec 3, 2024
c9765f3
Merge pull request #14317 from transcom/INT-B-21986-v2
danieljordan-caci Dec 3, 2024
34c2429
Merge branch 'integrationTesting' into B-21455-INT
CoryKleinjanCACI Dec 3, 2024
eb4a21d
Merge pull request #14322 from transcom/B-21455-INT
CoryKleinjanCACI Dec 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
72 changes: 64 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ references:

# In addition, it's common practice to disable acceptance tests and
# ignore tests for dp3 deploys. See the branch settings below.
dp3-branch: &dp3-branch placeholder_branch_name
dp3-branch: &dp3-branch integrationTesting
# MUST BE ONE OF: loadtest, demo, exp.
# These are used to pull in env vars so the spelling matters!
dp3-env: &dp3-env placeholder_env
dp3-env: &dp3-env loadtest

# set integration-ignore-branch to the branch if you want to IGNORE
# integration tests, or `placeholder_branch_name` if you do want to
Expand All @@ -53,7 +53,7 @@ references:
# set integration-mtls-ignore-branch to the branch if you want to
# IGNORE mtls integration tests, or `placeholder_branch_name` if you
# do want to run them
integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name
integration-mtls-ignore-branch: &integration-mtls-ignore-branch integrationTesting

# set client-ignore-branch to the branch if you want to IGNORE
# client tests, or `placeholder_branch_name` if you do want to run
Expand Down Expand Up @@ -226,8 +226,6 @@ executors:
# maybe don't need xlarge, but getting many timeouts with large
# ahobson - 2023-02-07
resource_class: xlarge
# use ~/project as that already exists in cimg/node and is owned
# by circleci
working_directory: ~/project
docker:
- image: *playwright
Expand Down Expand Up @@ -805,6 +803,27 @@ commands:
- restore_cache:
keys:
- v4-cache-yarn-v4-{{ checksum "yarn.lock" }}
- run:
# Needed for PDF e2e
name: Verify react-file-viewer client dependency exists
command: |
if [ ! -d "/home/circleci/project/public/static/react-file-viewer" ]; then
echo "Error: /home/circleci/project/public/static/react-file-viewer not found, the server will not be able to serve frontend dependencies"
exit 1
fi
- run:
# Needed for PDF e2e
name: Verify react-file-viewer pdfjs chunk exists
command: |
ls -l /home/circleci/project/public/static/react-file-viewer
if [ ! -f "/home/circleci/project/public/static/react-file-viewer/pdfjs-dist-webpack.chunk.js" ]; then
echo "Error: /home/circleci/project/public/static/react-file-viewer/pdfjs-dist-webpack.chunk.js not found, the server will not be able to serve frontend dependencies"
exit 1
fi
- run:
name: Verify small.pdf is in workspace
command: |
ls -l ./pkg/testdatagen/testdata/bandwidth_test_docs/
- run:
name: setup hosts
command: |
Expand All @@ -827,6 +846,7 @@ commands:
export LOGIN_GOV_SECRET_KEY=$(echo $E2E_LOGIN_GOV_SECRET_KEY | base64 --decode)
export HERE_MAPS_APP_ID=$E2E_HERE_MAPS_APP_ID
export HERE_MAPS_APP_CODE=$E2E_HERE_MAPS_APP_CODE
export LOCAL_STORAGE_WEB_ROOT=storage
# pull in review app settings here so we don't have to
# reproduce them
sed 's,^,export ,' config/env/review.app.env > server_env
Expand Down Expand Up @@ -877,14 +897,16 @@ commands:
export FEATURE_FLAG_MANAGE_SUPPORTING_DOCS=false
export FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false
export FEATURE_FLAG_QUEUE_MANAGEMENT=false
export FEATURE_FLAG_UNACCOMPANIED_BAGGAGE=false
export FEATURE_FLAG_ENABLE_ALASKA=false
export FEATURE_FLAG_UNACCOMPANIED_BAGGAGE=false
export FEATURE_FLAG_ENABLE_HAWAII=false

# disable for speed, playwright tests can fail otherwise
export DB_DEBUG=false

make db_dev_create
bin/milmove migrate

# playwright tests DO NOT NEED SEED DATA
bin/milmove serve 2>&1 | fmt
- run:
Expand Down Expand Up @@ -1179,6 +1201,20 @@ jobs:
- save_cache_for_go
- announce_failure

# Prep the public folder for frontend dependency serving
# This is needed for things like pdfjs-dist
prep_server_hosted_client_deps:
executor: mymove_compiler
steps:
- checkout
- attach_workspace:
at: .
- run: scripts/fetch-react-file-viewer-from-yarn
- persist_to_workspace:
root: ~/transcom/mymove
paths:
- public

# `pre_deps_yarn` is used to cache yarn sources
pre_deps_yarn:
executor: mymove_compiler
Expand All @@ -1191,6 +1227,9 @@ jobs:
name: Install Frozen YARN dependencies
command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
- run: scripts/check-generated-code yarn.lock
- run:
name: Rebuild dependencies without binaries
command: ./scripts/rebuild-dependencies-without-binaries
# `v4-cache-yarn-v4-{{ checksum "yarn.lock" }}` is used to cache yarn sources
- save_cache:
key: v4-cache-yarn-v4-{{ checksum "yarn.lock" }}
Expand Down Expand Up @@ -1301,6 +1340,9 @@ jobs:
- run:
name: Install Frozen YARN dependencies
command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
- run:
name: Rebuild dependencies without binaries
command: ./scripts/rebuild-dependencies-without-binaries
# this is so we can avoid go mod downloading and resulting in an error on a false positive
- run: scripts/pre-commit-go-mod || exit 0
- run:
Expand Down Expand Up @@ -1587,6 +1629,9 @@ jobs:
- run:
name: Install Frozen YARN dependencies
command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
- run:
name: Rebuild dependencies without binaries
command: ./scripts/rebuild-dependencies-without-binaries
- run:
name: client test coverage
command: JEST_JUNIT_OUTPUT_DIR=jest-junit-reports make client_test_coverage
Expand Down Expand Up @@ -1737,6 +1782,8 @@ jobs:
# save scripts for deploy
- scripts
- swagger
# Client dependency for PDF enabling
- public/static/react-file-viewer
- pkg/testdatagen/testdata
- announce_failure

Expand Down Expand Up @@ -1764,7 +1811,9 @@ jobs:
- run:
name: Install Frozen YARN dependencies
command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn

- run:
name: Rebuild dependencies without binaries
command: ./scripts/rebuild-dependencies-without-binaries
# babel and terser both have a cache
#
# see https://webpack.js.org/loaders/babel-loader/ and look for
Expand Down Expand Up @@ -1922,6 +1971,9 @@ jobs:
- run:
name: Install Frozen YARN dependencies
command: yarn install --frozen-lockfile
- run:
name: Rebuild dependencies without binaries
command: ./scripts/rebuild-dependencies-without-binaries
- restore_cache:
keys:
- v1-node-modules-cache
Expand Down Expand Up @@ -2279,6 +2331,8 @@ workflows:

- pre_deps_golang

- prep_server_hosted_client_deps

- pre_deps_yarn

- base_noop
Expand Down Expand Up @@ -2355,6 +2409,7 @@ workflows:
- integration_tests_devseed:
requires:
- pre_deps_golang
- prep_server_hosted_client_deps
# See comments at the top of this file for configuring/using
# this branch config
filters:
Expand Down Expand Up @@ -2433,6 +2488,7 @@ workflows:
requires:
- anti_virus
- pre_deps_golang
- prep_server_hosted_client_deps

- build_app:
requires:
Expand Down Expand Up @@ -2719,4 +2775,4 @@ experimental:
notify:
branches:
only:
- main
- main
11 changes: 7 additions & 4 deletions .envrc
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,10 @@ export FEATURE_FLAG_MOBILE_HOME=true
export FEATURE_FLAG_UNACCOMPANIED_BAGGAGE=false

# Feature flag to allow AK to be entered as a state
export FEATURE_FLAG_ENABLE_ALASKA=false
export FEATURE_FLAG_ENABLE_ALASKA=true

# Feature flag to allow HI to be entered as a state
export FEATURE_FLAG_ENABLE_HAWAII=false

# Feature flag to enable/disable customers needing to authenticate with CAC on registration
# When turned to true, this will require each customer user to have the value of true in cac_validated in the service_members table
Expand Down Expand Up @@ -214,9 +217,9 @@ export DEVLOCAL_AUTH=true
export DOD_CA_PACKAGE="${MYMOVE_DIR}/config/tls/milmove-cert-bundle.p7b"

# MyMove client certificate
# All of our DoD-signed certs are currently signed by DOD SW CA-75
# All of our DoD-signed certs are currently signed by DOD SW CA-66
# This cannot be changed unless our certs are all resigned
MOVE_MIL_DOD_CA_CERT=$(cat "${MYMOVE_DIR}"/config/tls/dod-sw-ca-75.pem)
MOVE_MIL_DOD_CA_CERT=$(cat "${MYMOVE_DIR}"/config/tls/dod-sw-ca-66.pem)
require MOVE_MIL_DOD_TLS_CERT "See 'DISABLE_AWS_VAULT_WRAPPER=1 AWS_REGION=us-gov-west-1 aws-vault exec transcom-gov-dev -- chamber read app-devlocal move_mil_dod_tls_cert'"
require MOVE_MIL_DOD_TLS_KEY "See 'DISABLE_AWS_VAULT_WRAPPER=1 AWS_REGION=us-gov-west-1 aws-vault exec transcom-gov-dev -- chamber read app-devlocal move_mil_dod_tls_key'"
export MOVE_MIL_DOD_CA_CERT
Expand Down Expand Up @@ -438,4 +441,4 @@ then
fi

# Check that all required environment variables are set
check_required_variables
check_required_variables
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Negative filter for storybook config folder as dot folders are ignored by eslint by default
# See https://github.com/eslint/eslint/issues/8429#issuecomment-355967308
!/.storybook
public/static/react-file-viewer/*
37 changes: 36 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,39 @@
# owners will be requested for a review.
# Add language specific code owners if it becomes relevant

* @transcom/codeowners
# database team
/migrations/ @transcom/cacidatabaseteam
/pkg/assets/sql_scripts/ @transcom/cacidatabaseteam

# backend team
/pkg/ @transcom/cacibackendteam
/swagger-def/ @transcom/cacibackendteam
*.go @transcom/cacibackendteam


# frontend team
/src/ @transcom/cacifrontendteam
/playwright/tests/ @transcom/cacifrontendteam


## not required for team specific review as prime UI is not deployed to production app
src/components/PrimeUI/
src/pages/PrimeUI/


# Require tech lead review for changes to the following files
.golangci.yml @transcom/codeowners
.pre-commit-config.yaml @transcom/codeowners
.eslintrc.js @transcom/codeowners
/eslint-plugin-ato/ @transcom/codeowners
/pkg/ato-linter/ @transcom/codeowners
/scripts/ @transcom/codeowners
/.circleci/config.yml @transcom/codeowners
/config/ @transcom/codeowners
Dockerfile* @transcom/codeowners
Brewfile* @transcom/codeowners
/Makefile @transcom/codeowners
package.json @transcom/codeowners
go.mod @transcom/codeowners
/github/ @transcom/codeowners
docker-compose* @transcom/codeowners
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ schema.sql

*.stamp

public/static/react-file-viewer/*
!public/static/react-file-viewer/.gitkeep
public/swagger-ui/*
!public/swagger-ui/api.html
!public/swagger-ui/internal.html
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
public/swagger-ui/*
!public/swagger-ui/index.html
public/static/react-file-viewer/*
7 changes: 7 additions & 0 deletions Brewfile.local
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ brew 'pre-commit'
brew 'shellcheck'
brew 'watchman'
brew 'yarn'
brew 'pkg-config'
brew 'cairo'
brew 'pango'
brew 'libpng'
brew 'jpeg'
brew 'giflib'
brew 'librsvg'

cask 'aws-vault'
cask 'opensc'
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ COPY bin/milmove /bin/milmove

COPY config/tls/milmove-cert-bundle.p7b /config/tls/milmove-cert-bundle.p7b
COPY config/tls/dod-sw-ca-75.pem /config/tls/dod-sw-ca-75.pem
COPY config/tls/dod-sw-ca-66.pem /config/tls/dod-sw-ca-66.pem

COPY swagger/* /swagger/
COPY build /build
COPY public/static/react-file-viewer /public/static/react-file-viewer

ENTRYPOINT ["/bin/milmove"]

Expand Down
6 changes: 6 additions & 0 deletions Dockerfile.dp3
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,14 @@ COPY config/tls/api.loadtest.dp3.us.crt /config/tls/api.loadtest.dp3.us.crt
COPY config/tls/api.exp.dp3.us.chain.der.p7b /config/tls/api.exp.dp3.us.chain.der.p7b
COPY config/tls/api.exp.dp3.us.crt /config/tls/api.exp.dp3.us.crt

#copy dod certs
COPY config/tls/milmove-cert-bundle.p7b /config/tls/milmove-cert-bundle.p7b
COPY config/tls/dod-sw-ca-75.pem /config/tls/dod-sw-ca-75.pem
COPY config/tls/dod-sw-ca-66.pem /config/tls/dod-sw-ca-66.pem

COPY swagger/* /swagger/
COPY build /build
COPY public/static/react-file-viewer /public/static/react-file-viewer

ENTRYPOINT ["/bin/milmove"]

Expand Down
1 change: 1 addition & 0 deletions Dockerfile.e2e
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ COPY config /config
COPY swagger /swagger
COPY pkg/testdatagen/testdata /pkg/testdatagen/testdata
COPY scripts /scripts
COPY public/static/react-file-viewer /public/static/react-file-viewer

# Install tools needed in container
# hadolint ignore=DL3018
Expand Down
4 changes: 3 additions & 1 deletion Dockerfile.local
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,16 @@ COPY --from=builder --chown=root:root /home/circleci/project/bin/rds-ca-2019-roo
COPY --from=builder --chown=root:root /home/circleci/project/bin/milmove /bin/milmove

COPY config/tls/milmove-cert-bundle.p7b /config/tls/milmove-cert-bundle.p7b
COPY config/tls/dod-sw-ca-66.pem /config/tls/dod-sw-ca-75.pem
COPY config/tls/dod-sw-ca-75.pem /config/tls/dod-sw-ca-75.pem
COPY config/tls/dod-sw-ca-66.pem /config/tls/dod-sw-ca-66.pem

# While it's ok to have these certs copied locally, they should never be copied into Dockerfile.
COPY config/tls/devlocal-ca.key /config/tls/devlocal-ca.key
COPY config/tls/devlocal-ca.pem /config/tls/devlocal-ca.pem

COPY swagger/* /swagger/
COPY build /build
COPY public/static/react-file-viewer /public/static/react-file-viewer

ENTRYPOINT ["/bin/milmove"]

Expand Down
2 changes: 2 additions & 0 deletions Dockerfile.reviewapp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ ARG GIT_COMMIT
COPY cmd /build/cmd
COPY swagger /build/swagger
COPY pkg /build/pkg
COPY public/static/react-file-viewer /public/static/react-file-viewer

# fake src dir to silence make
RUN mkdir /build/src
Expand Down Expand Up @@ -99,6 +100,7 @@ COPY public /build/public
COPY src /build/src
RUN set -x \
&& ./scripts/copy-swagger-ui \
&& ./scripts/copy-react-file-viewer \
&& yarn build

#########
Expand Down
Loading
Loading