Merge pull request #338 from scientist-softserv/337-api-changes

337 api changes

Author: alishaevn

pages/requests/[uuid].js

@@ -70,7 +70,7 @@ const Request = ({ session }) => {
   if (session === null) return unauthorizedUser
 
   const isLoading = isLoadingRequest || isLoadingSOWs || isLoadingFiles || isLoadingMessages
-  const isError = isRequestError || isSOWError || isFilesError|| isMessagesError || isPOError
+  const isError = isRequestError || isSOWError || isFilesError || isMessagesError || isPOError
   const documents = (allSOWs) ? [...allSOWs, ...allPOs] : []
 
   if (isLoading) return pageLoading

utils/api/configurations.js

@@ -172,7 +172,7 @@ export const configureMessages = (data) => {
   }))
 }
 
-export const  configureFiles = (data) => {
+export const configureFiles = (data) => {
   // filter out the notes that do not have attachments
   const notesWithFiles = data.filter(d => d.attachments?.length)
   let fileArrays = []
@@ -235,7 +235,7 @@ export const configurePO = (po, requestIdentifier) => ({
   ...configureDocument(po, requestIdentifier),
   turnaroundTime: po.turn_around_time.human,
   poNumber: po.po_number,
-  relatedSOWIdentifier: po.proposal_ref?.identifier,
+  relatedSOWIdentifier: po.proposal_refs.first?.identifier,
   adPO: po.scientist_identifier,
 })
 

utils/api/requests.js

@@ -65,8 +65,8 @@ export const getAllPOs = async (quotedWareId, uuid, requestIdentifier, accessTok
     const url = () => accessToken ? `quote_groups/${uuid}/quoted_wares/${quotedWareId}/purchase_orders.json` : null
     const data = await fetcher(url(), accessToken)
     const configuredPOs = data?.purchase_orders.map(async (po) => {
-      const purchaseOrder = await fetcher(`quote_groups/${uuid}/quoted_wares/${quotedWareId}/purchase_orders/${po.id}.json`, accessToken)
-      return configurePO(purchaseOrder, requestIdentifier)
+      const res = await fetcher(`quote_groups/${uuid}/quoted_wares/${quotedWareId}/purchase_orders/${po.id}.json`, accessToken)
+      return configurePO(res.purchase_order, requestIdentifier)
     })
     const allPOs = await Promise.all(configuredPOs).then(res => res)