Merge pull request #347 from scientist-softserv/342-create-requests-v2

342 create requests
assaydepot · Jan 19, 2024 · c26bcf8 · c26bcf8 · vercel · Jan 19, 2024
2 parents feb9e18 + c3f0256
commit c26bcf8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/pages/requests/new/[ware].js b/pages/requests/new/[ware].js
@@ -116,7 +116,7 @@ const NewRequest = ({ session }) => {
     if (requestForm.billingSameAsShipping === true) Object.assign(requestForm.billing, requestForm.shipping)
 
     const { data, error } = await createRequest({
-      dynamicFormData: { name: dynamicForm.name, formData, ...requestForm },
+      dynamicFormData: { ...dynamicForm, formData, ...requestForm },
       wareID,
       accessToken,
     })

diff --git a/utils/api/requests.js b/utils/api/requests.js
@@ -118,13 +118,17 @@ export const useFiles = (id, accessToken) => {
   }
 }
 
-
 export const useInitializeRequest = (id, accessToken) => {
   const { data, error } = useSWR(accessToken ? [`/wares/${id}/quote_groups/new.json`, accessToken] : null)
   let dynamicForm = { name: data?.name }
   let dynamicFormInfo = data?.dynamic_forms[0]
 
   if (dynamicFormInfo) {
+    dynamicForm = {
+      ...dynamicForm,
+      orderPriority: dynamicFormInfo.order_priority || 1,
+      parentDynamicFormId: dynamicFormInfo.parent_dynamic_form_id,
+    }
     const defaultSchema = dynamicFormInfo.schema
     const defaultOptions = dynamicFormInfo.options
     const schema = configureDynamicFormSchema(defaultSchema)
@@ -225,11 +229,14 @@ export const createRequest = async ({ dynamicFormData, wareID, accessToken }) =>
   })
 
   const pg_quote_group = {
-    ...formData,
     ...sharedRequestData,
     name: dynamicFormData.name,
     suppliers_identified: 'Yes',
     description: requestDescription,
+    data_str: JSON.stringify(formData),
+    dynamic_forms_to_embed: [
+      { id: dynamicFormData.parentDynamicFormId, order_priority: dynamicFormData.orderPriority }
+    ],
     no_proposed_deadline: dynamicFormData.proposedDeadline ? false : true,
     timeline: requestTimeline,
   }