Merge pull request #229 from scientist-softserv/137-accept-sow

accept sow

Author: summer-cook

pages/browse/index.js

@@ -35,6 +35,7 @@ const Browse = () => {
   if (isError) {
     return (
       <Notice
+        addClass='my-5'
         alert={configureErrors([isError])}
         dismissible={false}
         withBackButton={true}

pages/index.js

@@ -49,6 +49,7 @@ const Home = () => {
           <Notice
             alert={configureErrors([isError])}
             withBackButton={false}
+            addClass='my-5'
           />
         ) : (
           <>

pages/requests/[uuid].js

@@ -14,6 +14,7 @@ import {
   Title,
 } from '@scientist-softserv/webstore-component-library'
 import {
+  acceptSOW,
   configureErrors,
   createMessageOrFile,
   requestActionsBg,
@@ -35,18 +36,19 @@ const Request = () => {
    * the file (key) and path string (value). additional query properties may also exist if they were explicitly passed.
   */
   const { uuid } = router.query
-  const { request, isLoadingRequest, isRequestError } = useOneRequest(uuid, session?.accessToken)
-  const { allSOWs, isLoadingSOWs, isSOWError } = useAllSOWs(uuid, request?.identifier, session?.accessToken)
-  const { messages, isLoadingMessages, isMessagesError, mutateMessages, messagesData } = useMessages(uuid, session?.accessToken)
-  const { files, isLoadingFiles, isFilesError, mutateFiles, filesData } = useFiles(uuid, session?.accessToken)
+  const accessToken = session?.accessToken
+  const { request, isLoadingRequest, isRequestError } = useOneRequest(uuid, accessToken)
+  const { allSOWs, isLoadingSOWs, isSOWError } = useAllSOWs(uuid, request?.identifier, accessToken)
+  const { messages, isLoadingMessages, isMessagesError, mutateMessages, messagesData } = useMessages(uuid, accessToken)
+  const { files, isLoadingFiles, isFilesError, mutateFiles, filesData } = useFiles(uuid, accessToken)
 
   const [allPOs, setAllPOs] = useState([])
   const [isPOError, setIsPOError] = useState(false)
   const [isLoadingPOs, setIsLoadingPOs] = useState(true)
   useEffect(() => {
     if (request) {
       (async () => {
-        const { allPOs, isLoadingPOs, isPOError } = await getAllPOs(request?.quotedWareID, uuid, request?.identifier, session?.accessToken)
+        const { allPOs, isLoadingPOs, isPOError } = await getAllPOs(request?.quotedWareID, uuid, request?.identifier, accessToken)
 
         setIsLoadingPOs(isLoadingPOs)
         setAllPOs(allPOs)
@@ -64,6 +66,7 @@ const Request = () => {
   if (!session) {
     return (
       <Notice
+        addClass='my-5'
         alert={{
           body: ['Please log in to view this request.'],
           title: 'Unauthorized',
@@ -93,7 +96,7 @@ const Request = () => {
       id: request.id,
       message,
       files,
-      accessToken: session?.accessToken,
+      accessToken,
       quotedWareID: request.quotedWareID,
     })
 
@@ -133,7 +136,17 @@ const Request = () => {
           <CollapsibleSection header='Additional Information' description={request.htmlDescription} />
           <Title addClass='mt-4' title='Documents' size='small' />
           {documents.length ? documents.map((document, index) => (
-            <Document key={`${request.id}-${index}`} document={document} addClass='mt-3' />
+            <Document 
+              addClass='mt-3'
+              acceptSOW={acceptSOW(
+                request,
+                document.sowID,
+                accessToken,
+              )}
+              document={document}
+              key={`${request.id}-${index}`}
+              request={request}
+            />
           )) : (
             <TextBox
               alignment='left'

pages/requests/index.js

@@ -30,6 +30,7 @@ const Requests = () => {
   if (!session) {
     return (
       <Notice
+        addClass='my-5'
         alert={{
           body: ['Please log in to make new requests or view existing ones.'],
           title: 'Unauthorized',
@@ -43,6 +44,7 @@ const Requests = () => {
   if (isError) {
     return (
       <Notice
+        addClass='my-5'
         alert={configureErrors([isAllRequestsError, isDefaultWareError])}
         dismissible={false}
         withBackButton={true}

pages/requests/new/[ware].js

@@ -124,6 +124,7 @@ const NewRequest = () => {
   if (!session) {
     return (
       <Notice
+        addClass='my-5'
         alert={{
           body: ['Please log in to make new requests.'],
           title: 'Unauthorized',
@@ -137,6 +138,7 @@ const NewRequest = () => {
   if (isInitialRequestError) {
     return (
       <Notice
+        addClass='my-5'
         alert={configureErrors([isInitialRequestError])}
         dismissible={false}
         withBackButton={true}
@@ -151,6 +153,7 @@ const NewRequest = () => {
   if (createRequestError) {
     return (
       <Notice
+        addClass='my-5'
         alert={configureErrors([createRequestError])}
         dismissible={true}
         withBackButton={false}

pages/services/[ware].js

@@ -14,6 +14,7 @@ const Service = () => {
   if (isError) {
     return (
       <Notice
+        addClass='my-5'
         alert={configureErrors([isError])}
         dismissible={false}
         withBackButton={true}

utils/api/configurations.js

@@ -34,8 +34,15 @@ export const configureRequests = ({ data, path }) => {
     return {
       billingAddress: {
         address: request.billing_address?.text,
+        city: request.billing_address?.city,
+        country: request.billing_address?.country,
+        state: request.billing_address?.state,
+        street: request.billing_address?.street,
+        street2: request.billing_address?.street2,
+        zipcode: request.billing_address?.zipcode,
         id: request.billing_address?.id,
       },
+      billingSameAsShipping: request.billing_same_as_shipping,
       createdAt: normalizeDate(request.created_at),
       description: normalizeDescription(request.description),
       htmlDescription: normalizeHtmlDescription(request.description),
@@ -50,6 +57,12 @@ export const configureRequests = ({ data, path }) => {
       proposedDeadline: normalizeDate(request.proposed_deadline),
       shippingAddress: {
         address: request.shipping_address?.text,
+        city: request.shipping_address?.city,
+        country: request.shipping_address?.country,
+        state: request.shipping_address?.state,
+        street: request.shipping_address?.street,
+        street2: request.shipping_address?.street2,
+        zipcode: request.shipping_address?.zipcode,
         id: request.shipping_address?.id,
       },
       status: {

utils/api/requests.js

@@ -170,6 +170,37 @@ export const createMessageOrFile = ({ id, quotedWareID, message, files, accessTo
   return posting(`/quote_groups/${id}/notes.json`, note, accessToken)
 }
 
+const requestData = ({request, shipping, billing}) => {
+  return {
+    /* eslint-disable camelcase */
+    provider_ids: [process.env.NEXT_PUBLIC_PROVIDER_ID],
+    proposed_deadline_str: request.proposedDeadline,
+    site: {
+      billing_same_as_shipping: request.billingSameAsShipping,
+      name: request.name,
+    },
+    shipping_address_attributes: {
+      city: shipping.city,
+      country: shipping.country,
+      state: shipping.state,
+      street: shipping.street,
+      street2: shipping.street2,
+      zipcode: shipping.zipcode,
+      organization_name: process.env.NEXT_PUBLIC_PROVIDER_NAME
+    },
+    billing_address_attributes: {
+      city: billing.city,
+      country: billing.country,
+      state: billing.state,
+      street: billing.street,
+      street2: billing.street2,
+      zipcode: billing.zipcode,
+      organization_name: process.env.NEXT_PUBLIC_PROVIDER_NAME
+    },
+    /* eslint-enable camelcase */
+  }
+}
+
 export const createRequest = async ({ dynamicFormData, wareID, accessToken }) => {
   /* eslint-disable camelcase */
   // the api currently doesn't account for attachments
@@ -185,37 +216,20 @@ export const createRequest = async ({ dynamicFormData, wareID, accessToken }) =>
     requestTimeline = timeline
   }
 
+  let sharedRequestData = requestData({
+    request: dynamicFormData,
+    shipping: dynamicFormData.shipping,
+    billing: dynamicFormData.billing,
+  })
+
   const pg_quote_group = {
     ...formData,
+    ...sharedRequestData,
     name: dynamicFormData.name,
-    provider_ids: [process.env.NEXT_PUBLIC_PROVIDER_ID],
     suppliers_identified: 'Yes',
     description: requestDescription,
-    proposed_deadline_str: dynamicFormData.proposedDeadline,
     no_proposed_deadline: dynamicFormData.proposedDeadline ? false : true,
     timeline: requestTimeline,
-    site: {
-      billing_same_as_shipping: dynamicFormData.billingSameAsShipping,
-      name: dynamicFormData.name,
-    },
-    shipping_address_attributes: {
-      city: dynamicFormData.shipping.city,
-      country: dynamicFormData.shipping.country,
-      state: dynamicFormData.shipping.state,
-      street: dynamicFormData.shipping.street,
-      street2: dynamicFormData.shipping.street2,
-      zipcode: dynamicFormData.shipping.zipcode,
-      organization_name: process.env.NEXT_PUBLIC_PROVIDER_NAME
-    },
-    billing_address_attributes: {
-      city: dynamicFormData.shipping.city,
-      country: dynamicFormData.shipping.country,
-      state: dynamicFormData.shipping.state,
-      street: dynamicFormData.shipping.street,
-      street2: dynamicFormData.shipping.street2,
-      zipcode: dynamicFormData.shipping.zipcode,
-      organization_name: process.env.NEXT_PUBLIC_PROVIDER_NAME
-    },
   }
 
   let { data, error } = await posting(`/wares/${wareID}/quote_groups.json`, { pg_quote_group }, accessToken)
@@ -250,6 +264,26 @@ export const createRequest = async ({ dynamicFormData, wareID, accessToken }) =>
   /* eslint-enable camelcase */
 }
 
+export const acceptSOW = (request, sowID, accessToken) => {
+  let sharedRequestData = requestData({
+    request: request,
+    shipping: request.shippingAddress,
+    billing: request.billingAddress,
+  })
+
+  const sow = {
+    ...sharedRequestData,
+    name: request.title,
+    description: request.description,
+    provider_names: [process.env.NEXT_PUBLIC_PROVIDER_NAME],
+    winning_proposal_id: sowID,
+    purchase_justifications: [''],
+    purchase_justification_comment: '',
+  }
+
+  return posting(`/quote_groups/${request.id}/accept_sow.json`, { pg_quote_group: sow }, accessToken)
+}
+
 /** PUT METHODS */
 export const sendRequestToVendor = async (requestID, accessToken) => {
   const { data, error } = await updating(`/quote_groups/${requestID}/send_to_vendors.json`, {}, accessToken)