Main b 21372 order files uploaded signifier

src/components/Office/DefinitionLists/OrdersList.jsx

@@ -96,6 +96,14 @@ const OrdersList = ({ ordersInfo, showMissingWarnings }) => {
           <dt>Orders type detail</dt>
           <dd data-testid="ordersTypeDetail">{ordersTypeDetailReadable(ordersInfo.ordersTypeDetail, missingText)}</dd>
         </div>
+        <div
+          className={classnames(descriptionListStyles.row, {
+            [styles.missingInfoError]: showMissingWarnings && !ordersInfo.ordersDocuments,
+          })}
+        >
+          <dt>Orders document(s)</dt>
+          <dd data-testid="ordersDocuments">{!ordersInfo.ordersDocuments ? missingText : 'File(s) Uploaded'}</dd>
+        </div>
         <div
           className={classnames(descriptionListStyles.row, {
             [styles.missingInfoError]: showMissingWarnings && !ordersInfo.tacMDC,

src/components/Office/DefinitionLists/OrdersList.stories.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { object, text } from '@storybook/addon-knobs';
+import { array, object, text } from '@storybook/addon-knobs';
 
 import OrdersList from './OrdersList';
 
@@ -22,6 +22,21 @@ export const Basic = () => (
         ordersNumber: text('ordersInfo.ordersNumber', '999999999'),
         ordersType: text('ordersInfo.ordersType', ORDERS_TYPE.PERMANENT_CHANGE_OF_STATION),
         ordersTypeDetail: text('ordersInfo.ordersTypeDetail', 'HHG_PERMITTED'),
+        ordersDocuments: array('ordersInfo.ordersDocuments', [
+          {
+            'c0a22a98-a806-47a2-ab54-2dac938667b3': {
+              bytes: 2202009,
+              contentType: 'application/pdf',
+              createdAt: '2024-10-23T16:31:21.085Z',
+              filename: 'testFile.pdf',
+              id: 'c0a22a98-a806-47a2-ab54-2dac938667b3',
+              status: 'PROCESSING',
+              updatedAt: '2024-10-23T16:31:21.085Z',
+              uploadType: 'USER',
+              url: '/storage/USER/uploads/c0a22a98-a806-47a2-ab54-2dac938667b3?contentType=application%2Fpdf',
+            },
+          },
+        ]),
         tacMDC: text('ordersInfo.tacMDC', '9999'),
         sacSDN: text('ordersInfo.sacSDN', '999 999999 999'),
         NTSsac: text('ordersInfo.NTSsac', '999 999999 999'),
@@ -45,6 +60,21 @@ export const AsServiceCounselor = () => (
         ordersNumber: '',
         ordersType: '',
         ordersTypeDetail: '',
+        ordersDocuments: array('ordersInfo.ordersDocuments', [
+          {
+            'c0a22a98-a806-47a2-ab54-2dac938667b3': {
+              bytes: 2202009,
+              contentType: 'application/pdf',
+              createdAt: '2024-10-23T16:31:21.085Z',
+              filename: 'testFile.pdf',
+              id: 'c0a22a98-a806-47a2-ab54-2dac938667b3',
+              status: 'PROCESSING',
+              updatedAt: '2024-10-23T16:31:21.085Z',
+              uploadType: 'USER',
+              url: '/storage/USER/uploads/c0a22a98-a806-47a2-ab54-2dac938667b3?contentType=application%2Fpdf',
+            },
+          },
+        ]),
         tacMDC: '',
         sacSDN: '',
         NTSsac: '',
@@ -68,6 +98,7 @@ export const AsServiceCounselorProcessingRetirement = () => (
         ordersNumber: '',
         ordersType: 'RETIREMENT',
         ordersTypeDetail: '',
+        ordersDocuments: null,
         tacMDC: '',
         sacSDN: '',
         NTSsac: '',
@@ -91,6 +122,7 @@ export const AsServiceCounselorProcessingSeparation = () => (
         ordersNumber: '',
         ordersType: 'SEPARATION',
         ordersTypeDetail: '',
+        ordersDocuments: null,
         tacMDC: '',
         sacSDN: '',
         NTSsac: '',
@@ -113,6 +145,21 @@ export const AsTOO = () => (
         ordersNumber: '',
         ordersType: '',
         ordersTypeDetail: '',
+        ordersDocuments: array('ordersInfo.ordersDocuments', [
+          {
+            'c0a22a98-a806-47a2-ab54-2dac938667b3': {
+              bytes: 2202009,
+              contentType: 'application/pdf',
+              createdAt: '2024-10-23T16:31:21.085Z',
+              filename: 'testFile.pdf',
+              id: 'c0a22a98-a806-47a2-ab54-2dac938667b3',
+              status: 'PROCESSING',
+              updatedAt: '2024-10-23T16:31:21.085Z',
+              uploadType: 'USER',
+              url: '/storage/USER/uploads/c0a22a98-a806-47a2-ab54-2dac938667b3?contentType=application%2Fpdf',
+            },
+          },
+        ]),
         tacMDC: '',
         sacSDN: '',
         NTSsac: '',
@@ -135,6 +182,7 @@ export const AsTOOProcessingRetirement = () => (
         ordersNumber: '',
         ordersType: 'RETIREMENT',
         ordersTypeDetail: '',
+        ordersDocuments: null,
         tacMDC: '',
         sacSDN: '',
         NTSsac: '',
@@ -157,6 +205,7 @@ export const AsTOOProcessingSeparation = () => (
         ordersNumber: '',
         ordersType: 'SEPARATION',
         ordersTypeDetail: '',
+        ordersDocuments: null,
         tacMDC: '',
         sacSDN: '',
         NTSsac: '',

src/components/Office/DefinitionLists/OrdersList.test.jsx

@@ -12,6 +12,21 @@ const ordersInfo = {
   ordersNumber: '999999999',
   ordersType: 'PERMANENT_CHANGE_OF_STATION',
   ordersTypeDetail: 'HHG_PERMITTED',
+  ordersDocuments: [
+    {
+      'c0a22a98-a806-47a2-ab54-2dac938667b3': {
+        bytes: 2202009,
+        contentType: 'application/pdf',
+        createdAt: '2024-10-23T16:31:21.085Z',
+        filename: 'testFile.pdf',
+        id: 'c0a22a98-a806-47a2-ab54-2dac938667b3',
+        status: 'PROCESSING',
+        updatedAt: '2024-10-23T16:31:21.085Z',
+        uploadType: 'USER',
+        url: '/storage/USER/uploads/c0a22a98-a806-47a2-ab54-2dac938667b3?contentType=application%2Fpdf',
+      },
+    },
+  ],
   tacMDC: '9999',
   sacSDN: '999 999999 999',
   payGrade: 'E_7',
@@ -27,6 +42,7 @@ const expectedRenderedOrdersInfo = {
   ordersNumber: '999999999',
   ordersType: 'Permanent Change Of Station (PCS)',
   ordersTypeDetail: 'Shipment of HHG Permitted',
+  ordersDocuments: 'File(s) Uploaded',
   tacMDC: '9999',
   sacSDN: '999 999999 999',
   payGrade: 'E-7',
@@ -41,6 +57,7 @@ const ordersInfoMissing = {
   ordersNumber: '',
   ordersType: '',
   ordersTypeDetail: '',
+  ordersDocuments: null,
   tacMDC: '',
   sacSDN: '999 999999 999',
   payGrade: '',
@@ -60,6 +77,7 @@ describe('OrdersList', () => {
     expect(screen.getByTestId('ordersNumber').textContent).toEqual('Missing');
     expect(screen.getByTestId('ordersType').textContent).toEqual('Missing');
     expect(screen.getByTestId('ordersTypeDetail').textContent).toEqual('Missing');
+    expect(screen.getByTestId('ordersDocuments').textContent).toEqual('Missing');
     expect(screen.getByTestId('tacMDC').textContent).toEqual('Missing');
     expect(screen.getByTestId('payGrade').textContent).toEqual('Missing');
   });
@@ -70,6 +88,7 @@ describe('OrdersList', () => {
     expect(screen.getByTestId('ordersNumber').textContent).toEqual('—');
     expect(screen.getByTestId('ordersType').textContent).toEqual('—');
     expect(screen.getByTestId('ordersTypeDetail').textContent).toEqual('—');
+    expect(screen.getByTestId('ordersDocuments').textContent).toEqual('—');
     expect(screen.getByTestId('tacMDC').textContent).toEqual('—');
     expect(screen.getByTestId('payGrade').textContent).toEqual('—');
   });

src/components/Office/RequestedShipments/RequestedShipmentsTestData.js

@@ -335,6 +335,21 @@ export const ordersInfo = {
   ordersNumber: 'ORDER3',
   ordersType: ORDERS_TYPE.PERMANENT_CHANGE_OF_STATION,
   ordersTypeDetail: 'TBD',
+  ordersDocuments: [
+    {
+      'c0a22a98-a806-47a2-ab54-2dac938667b3': {
+        bytes: 2202009,
+        contentType: 'application/pdf',
+        createdAt: '2024-10-23T16:31:21.085Z',
+        filename: 'testFile.pdf',
+        id: 'c0a22a98-a806-47a2-ab54-2dac938667b3',
+        status: 'PROCESSING',
+        updatedAt: '2024-10-23T16:31:21.085Z',
+        uploadType: 'USER',
+        url: '/storage/USER/uploads/c0a22a98-a806-47a2-ab54-2dac938667b3?contentType=application%2Fpdf',
+      },
+    },
+  ],
   tacMDC: '',
   sacSDN: '',
 };

src/components/Office/ShipmentApprovalPreview/ShipmentApprovalPreview.test.jsx

@@ -219,6 +219,21 @@ const ordersInfo = {
   ordersNumber: 'ORDER3',
   ordersType: 'PERMANENT_CHANGE_OF_STATION',
   ordersTypeDetail: 'TBD',
+  ordersDocuments: [
+    {
+      'c0a22a98-a806-47a2-ab54-2dac938667b3': {
+        bytes: 2202009,
+        contentType: 'application/pdf',
+        createdAt: '2024-10-23T16:31:21.085Z',
+        filename: 'testFile.pdf',
+        id: 'c0a22a98-a806-47a2-ab54-2dac938667b3',
+        status: 'PROCESSING',
+        updatedAt: '2024-10-23T16:31:21.085Z',
+        uploadType: 'USER',
+        url: '/storage/USER/uploads/c0a22a98-a806-47a2-ab54-2dac938667b3?contentType=application%2Fpdf',
+      },
+    },
+  ],
   tacMDC: '',
   sacSDN: '',
 };

src/components/Office/ShipmentApprovalPreview/shipmentApprovalPreview.stories.jsx

@@ -315,6 +315,21 @@ const ordersInfo = {
   ordersNumber: 'ORDER3',
   ordersType: 'PERMANENT_CHANGE_OF_STATION',
   ordersTypeDetail: 'TBD',
+  ordersDocuments: [
+    {
+      'c0a22a98-a806-47a2-ab54-2dac938667b3': {
+        bytes: 2202009,
+        contentType: 'application/pdf',
+        createdAt: '2024-10-23T16:31:21.085Z',
+        filename: 'testFile.pdf',
+        id: 'c0a22a98-a806-47a2-ab54-2dac938667b3',
+        status: 'PROCESSING',
+        updatedAt: '2024-10-23T16:31:21.085Z',
+        uploadType: 'USER',
+        url: '/storage/USER/uploads/c0a22a98-a806-47a2-ab54-2dac938667b3?contentType=application%2Fpdf',
+      },
+    },
+  ],
   tacMDC: '',
   sacSDN: '',
 };

src/hooks/queries.js

@@ -438,7 +438,7 @@ export const useMoveTaskOrderQueries = (moveCode) => {
 export const useGetDocumentQuery = (documentId) => {
   const staleTime = 15 * 60000; // 15 * 60000 milliseconds = 15 mins
   const cacheTime = staleTime;
-  const { data: { documents, uploads } = {}, ...documentsQuery } = useQuery(
+  const { data: { documents, upload } = {}, ...documentsQuery } = useQuery(
     [ORDERS_DOCUMENTS, documentId],
     ({ queryKey }) => getDocument(...queryKey),
     {
@@ -453,7 +453,7 @@ export const useGetDocumentQuery = (documentId) => {
 
   return {
     documents,
-    uploads,
+    upload,
     isLoading,
     isError,
     isSuccess,
@@ -845,6 +845,8 @@ export const useMoveDetailsQueries = (moveCode) => {
 
   const order = Object.values(orders || {})?.[0];
 
+  const { upload: orderDocuments, ...documentQuery } = useGetDocumentQuery(order.uploaded_order_id);
+
   const { data: mtoShipments, ...mtoShipmentQuery } = useQuery({
     queryKey: [MTO_SHIPMENTS, moveId, false],
     queryFn: ({ queryKey }) => getMTOShipments(...queryKey),
@@ -877,6 +879,7 @@ export const useMoveDetailsQueries = (moveCode) => {
   const { isLoading, isError, isSuccess } = getQueriesStatus([
     moveQuery,
     orderQuery,
+    documentQuery,
     customerQuery,
     mtoShipmentQuery,
     mtoServiceItemQuery,
@@ -886,6 +889,7 @@ export const useMoveDetailsQueries = (moveCode) => {
   return {
     move,
     order,
+    orderDocuments,
     customerData,
     closeoutOffice,
     mtoShipments,

src/hooks/queries.test.jsx

@@ -201,11 +201,11 @@ jest.mock('services/ghcApi', () => ({
       documents: {
         [id]: {
           id,
-          uploads: [`${id}0`],
+          uploads: [`${id}`],
         },
       },
       upload: {
-        id: `${id}0`,
+        id: `${id}`,
       },
     }),
   getMovesQueue: () =>
@@ -501,6 +501,7 @@ describe('useMoveDetailsQueries', () => {
         },
         report_by_date: '2018-08-01',
       },
+      orderDocuments: undefined,
       mtoShipments: undefined,
       mtoServiceItems: undefined,
       isLoading: true,
@@ -540,6 +541,9 @@ describe('useMoveDetailsQueries', () => {
         },
         report_by_date: '2018-08-01',
       },
+      orderDocuments: {
+        id: '2',
+      },
       mtoShipments: [
         {
           id: 'a1',
@@ -863,21 +867,21 @@ describe('useOrdersDocumentQueries', () => {
       documents: {
         2: {
           id: '2',
-          uploads: ['20'],
+          uploads: ['2'],
         },
       },
       upload: {
-        id: '20',
+        id: '2',
       },
       amendedDocuments: {
         3: {
           id: '3',
-          uploads: ['30'],
+          uploads: ['3'],
         },
       },
       amendedOrderDocumentId: '3',
       amendedUpload: {
-        id: '30',
+        id: '3',
       },
       isLoading: false,
       isError: false,

src/pages/Office/MoveDetails/MoveDetails.jsx

@@ -86,8 +86,19 @@ const MoveDetails = ({
 
   const navigate = useNavigate();
 
-  const { move, customerData, order, closeoutOffice, mtoShipments, mtoServiceItems, isLoading, isError } =
-    useMoveDetailsQueries(moveCode);
+  const {
+    move,
+    customerData,
+    order,
+    orderDocuments,
+    closeoutOffice,
+    mtoShipments,
+    mtoServiceItems,
+    isLoading,
+    isError,
+  } = useMoveDetailsQueries(moveCode);
+
+  const validOrdersDocuments = Object.values(orderDocuments || {})?.filter((file) => !file.deletedAt);
 
   // for now we are only showing dest type on retiree and separatee orders
   let isRetirementOrSeparation = false;
@@ -296,16 +307,17 @@ const MoveDetails = ({
 
   // using useMemo here due to this being used in a useEffect
   // using useMemo prevents the useEffect from being rendered on ever render by memoizing the object
-  // so that it only recognizes the change when the orders object changes
+  // so that it only recognizes the change when the orders or validOrdersDocuments objects change
   const requiredOrdersInfo = useMemo(
     () => ({
       ordersNumber: order?.order_number || '',
       ordersType: order?.order_type || '',
       ordersTypeDetail: order?.order_type_detail || '',
+      ordersDocuments: validOrdersDocuments?.length ? validOrdersDocuments : null,
       tacMDC: order?.tac || '',
       departmentIndicator: order?.department_indicator || '',
     }),
-    [order],
+    [order, validOrdersDocuments],
   );
 
   // Keep num of missing orders info synced up
@@ -338,6 +350,7 @@ const MoveDetails = ({
     ordersNumber: order.order_number,
     ordersType: order.order_type,
     ordersTypeDetail: order.order_type_detail,
+    ordersDocuments: validOrdersDocuments?.length ? validOrdersDocuments : null,
     uploadedAmendedOrderID: order.uploadedAmendedOrderID,
     amendedOrdersAcknowledgedAt: order.amendedOrdersAcknowledgedAt,
     tacMDC: order.tac,