Merge branch 'B-18059' of github.com:transcom/mymove into B-18059-INT

.circleci/config.yml

@@ -2010,6 +2010,18 @@ jobs:
           repo: app-tasks
       - announce_failure
 
+  # `prod_auth_check` checks if approved before going to prod
+  prod_auth_check:
+    executor: tls_small
+    steps:
+      - run: echo "build approved by $CIRCLE_USERNAME"
+      - run:
+          name: Check if Prod approval has rights
+          command: |
+            if [[ $CIRCLE_USERNAME != "josiahzimmerman-caci" && $CIRCLE_USERNAME != "deandreJones" && $CIRCLE_USERNAME != "cameroncaci" ]]; then
+               exit 1
+            fi
+      - announce_failure
   # All of the deploy tasks need to checkout the code so they can run the `scripts/do-exclusively` script
 
   # `deploy_dp3_migrations` deploys migrations to the dp3 environment
@@ -2566,6 +2578,13 @@ workflows:
             - deploy_stg_app
             - deploy_stg_app_client_tls
 
+      - prod_auth_check:
+          requires:
+           - approve_prd_deploy
+          filters:
+            branches:
+              only: main
+
       - deploy_storybook_dp3:
           requires:
             - build_storybook
@@ -2580,28 +2599,28 @@ workflows:
 
       - push_otel_collector_image_prd:
           requires:
-            - approve_prd_deploy
+            - prod_auth_check
           filters:
             branches:
               only: main
 
       - push_app_prd:
           requires:
-            - approve_prd_deploy
+            - prod_auth_check
           filters:
             branches:
               only: main
 
       - push_migrations_prd:
           requires:
-            - approve_prd_deploy
+            - prod_auth_check
           filters:
             branches:
               only: main
 
       - push_tasks_prd:
           requires:
-            - approve_prd_deploy
+            - prod_auth_check
           filters:
             branches:
               only: main

.github/workflows/auto-approve.yml

@@ -13,6 +13,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: approve
-        uses: hmarr/auto-approve-action@v3.2.1
+        uses: hmarr/auto-approve-action@v4.0.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/go-auto-approve.yml

@@ -55,7 +55,7 @@ jobs:
     needs: [tidy]
     steps:
       - name: approve
-        uses: hmarr/auto-approve-action@v3.2.1
+        uses: hmarr/auto-approve-action@v4.0.0
         if: github.actor == 'dependabot[bot]' && contains(github.event.pull_request.labels.*.name, 'dependencies')
         with:
           github-token: '${{ secrets.GITHUB_TOKEN }}'

migrations/app/migrations_manifest.txt

@@ -895,4 +895,4 @@
 20240124153121_remove_ppmid_from_signedcertification_table.up.sql
 20240124155759_20240124-homesafeconnect-cert.up.sql
 20240129153006_20240129-homesafeconnect-cert.up.sql
-20240201201343_update_duty_location_names.up.sql
+20240201201343_update_duty_location_names.up.sql

migrations/app/secure/20240201174442_20240201_homesafe_prd_cert.up.sql

@@ -0,0 +1,4 @@
+-- Local test migration.
+-- This will be run on development environments.
+-- It should mirror what you intend to apply on prd/stg/exp/demo
+-- DO NOT include any sensitive data.

src/components/Office/DefinitionLists/PPMShipmentInfoList.jsx

@@ -182,6 +182,19 @@ const PPMShipmentInfoList = ({
     </div>
   );
 
+  const aoaPacketElement = (
+    <div>
+      <dt>AOA Packet</dt>
+      <dd data-testid="aoaPacketDownload">
+        <p className={styles.downloadLink}>
+          <a href="">
+            <span>Download AOA Paperwork (PDF)</span>
+          </a>
+        </p>
+      </dd>
+    </div>
+  );
+
   const counselorRemarksElementFlags = getDisplayFlags('counselorRemarks');
   const counselorRemarksElement = (
     <div className={counselorRemarksElementFlags.classes}>
@@ -214,6 +227,7 @@ const PPMShipmentInfoList = ({
       {showElement(estimatedIncentiveElementFlags) && estimatedIncentiveElement}
       {hasRequestedAdvanceElement}
       {hasRequestedAdvance === true && advanceStatusElement}
+      {advanceStatus === ADVANCE_STATUSES.APPROVED.apiValue && aoaPacketElement}
       {counselorRemarksElement}
     </dl>
   );

src/components/Office/ShipmentDisplay/ShipmentDisplay.test.jsx

@@ -204,6 +204,22 @@ describe('Shipment Container', () => {
       expect(screen.getByText('PPM')).toBeInTheDocument();
       expect(screen.queryByRole('button', { name: 'Review documents' })).toBeInTheDocument();
     });
+    it('renders aoa packet link when approved', () => {
+      render(
+        <MockProviders permissions={[permissionTypes.updateShipment]}>
+          <ShipmentDisplay
+            displayInfo={{ ...ppmInfo }}
+            ordersLOA={ordersLOA}
+            shipmentType={SHIPMENT_OPTIONS.PPM}
+            isSubmitted
+            allowApproval={false}
+            warnIfMissing={['counselorRemarks']}
+            reviewURL="/"
+          />
+        </MockProviders>,
+      );
+      expect(screen.getByTestId('aoaPacketDownload')).toBeInTheDocument();
+    });
     describe("renders the 'packet ready for download' tag when", () => {
       it('approved', () => {
         render(

src/components/Office/ShipmentDisplay/ShipmentDisplayTestData.js

@@ -159,6 +159,7 @@ export const ppmInfo = {
     shipmentId: 'b5c2d9a1-d1e6-485d-9678-8b62deb0d801',
     spouseProGearWeight: 498,
     status: 'SUBMITTED',
+    advanceStatus: 'APPROVED',
     submittedAt: '2022-04-29T21:48:21.573Z',
     updatedAt: '2022-04-29T21:48:21.581Z',
   },