Merge branch 'main' into B-21467-MAIN-PPM-Verbiage-Update-to-Customer…

…-Submit-Confirmation-Screen
transcom · Nov 8, 2024 · 65b9dfa · 65b9dfa
2 parents 0619981 + e3a72bd
commit 65b9dfa
Show file tree

Hide file tree

Showing 52 changed files with 99 additions and 385 deletions.
diff --git a/migrations/app/migrations_manifest.txt b/migrations/app/migrations_manifest.txt
@@ -1025,5 +1025,4 @@
 20241011201326_changes_for_actual_expense_reimbursement_field.up.sql
 20241017183144_add_AK_HI_duty_locations.up.sql
 20241024114748_create_gbloc_aors.up.sql
-20241029125015_add_orders_type_enum.up.sql
 20241029144404_hdt-614-adjust-accomack-county.up.sql
diff --git a/migrations/app/schema/20241029125015_add_orders_type_enum.up.sql b/migrations/app/schema/20241029125015_add_orders_type_enum.up.sql
diff --git a/pkg/gen/ghcapi/embedded_spec.go b/pkg/gen/ghcapi/embedded_spec.go
diff --git a/pkg/gen/ghcmessages/orders_type.go b/pkg/gen/ghcmessages/orders_type.go
diff --git a/pkg/gen/internalapi/embedded_spec.go b/pkg/gen/internalapi/embedded_spec.go
diff --git a/pkg/gen/internalmessages/orders_type.go b/pkg/gen/internalmessages/orders_type.go
diff --git a/pkg/gen/primeapi/embedded_spec.go b/pkg/gen/primeapi/embedded_spec.go
diff --git a/pkg/gen/primemessages/orders_type.go b/pkg/gen/primemessages/orders_type.go
diff --git a/pkg/gen/primev2api/embedded_spec.go b/pkg/gen/primev2api/embedded_spec.go
diff --git a/pkg/gen/primev2messages/orders_type.go b/pkg/gen/primev2messages/orders_type.go
diff --git a/pkg/gen/primev3api/embedded_spec.go b/pkg/gen/primev3api/embedded_spec.go
diff --git a/pkg/gen/primev3messages/orders_type.go b/pkg/gen/primev3messages/orders_type.go
diff --git a/pkg/gen/supportapi/embedded_spec.go b/pkg/gen/supportapi/embedded_spec.go
diff --git a/pkg/gen/supportmessages/orders_type.go b/pkg/gen/supportmessages/orders_type.go
diff --git a/src/components/Customer/EditOrdersForm/EditOrdersForm.stories.jsx b/src/components/Customer/EditOrdersForm/EditOrdersForm.stories.jsx
@@ -2,10 +2,8 @@ import React from 'react';
 
 import EditOrdersForm from './EditOrdersForm';
 
-import { ORDERS_TYPE } from 'constants/orders';
-
 const testInitialValues = {
-  orders_type: ORDERS_TYPE.PERMANENT_CHANGE_OF_STATION,
+  orders_type: 'PERMANENT_CHANGE_OF_STATION',
   issue_date: '2020-11-08',
   report_by_date: '2020-11-26',
   has_dependents: 'no',
@@ -95,7 +93,6 @@ const testProps = {
     { key: 'LOCAL_MOVE', value: 'Local Move' },
     { key: 'RETIREMENT', value: 'Retirement' },
     { key: 'SEPARATION', value: 'Separation' },
-    { key: 'TEMPORARY_DUTY', value: 'Temporary Duty (TDY)' },
   ],
   currentDutyLocation: {},
 };