Merge pull request #76 from soma-dalda/feat/#73

🩹 : hotfix
soma-dalda · Oct 30, 2022 · 303906a · 303906a
2 parents 9caee80 + 4413f75
commit 303906a
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 34 deletions.
diff --git a/src/hooks/useGetTemplate.ts b/src/hooks/useGetTemplate.ts
@@ -11,9 +11,7 @@ const useGetTemplate = (templateId: string, options?: UseQueryOption) => {
   return useQuery<Template, RequestError>(
     ['getTemplate', templateId],
     () => getTemplate({ templateId }),
-    {
-      ...options,
-    }
+    options
   )
 }
 

diff --git a/src/pages/Domain/index.tsx b/src/pages/Domain/index.tsx
@@ -29,7 +29,7 @@ const Domain = () => {
       if (err.status === AxiosError.ECONNABORTED) {
         dispatchUpdateError({ code: 400, message: err?.message })
       } else {
-        dispatchUpdateError({ code: err?.code, message: err.response?.data?.error?.message })
+        dispatchUpdateError({ code: err?.code, message: err.response?.data?.message })
       }
     },
   })
@@ -41,7 +41,7 @@ const Domain = () => {
         if (err.status === AxiosError.ECONNABORTED) {
           dispatchUpdateError({ code: 400, message: err?.message })
         } else {
-          dispatchUpdateError({ code: err?.code, message: err.response?.data?.error?.message })
+          dispatchUpdateError({ code: err?.code, message: err.response?.data?.message })
         }
       },
       enabled: Boolean(company?.id),

diff --git a/src/pages/Order/context/OrderContextProvider.tsx b/src/pages/Order/context/OrderContextProvider.tsx
@@ -37,7 +37,7 @@ const OrderContextProvider = ({ children }: PropsWithChildren) => {
       if (err.status === AxiosError.ECONNABORTED) {
         dispatchUpdateError({ code: 400, message: err.message })
       } else {
-        dispatchUpdateError({ code: err.code, message: err.response?.data.error.message })
+        dispatchUpdateError({ code: err.code, message: err.response?.data.message })
       }
     },
     enabled: Boolean(id),
@@ -58,7 +58,7 @@ const OrderContextProvider = ({ children }: PropsWithChildren) => {
       if (err.status === AxiosError.ECONNABORTED) {
         dispatchUpdateError({ code: 400, message: err.message })
       } else {
-        dispatchUpdateError({ code: err.code, message: err.response?.data.error.message })
+        dispatchUpdateError({ code: err.code, message: err.response?.data.message })
       }
     },
   })
@@ -74,24 +74,9 @@ const OrderContextProvider = ({ children }: PropsWithChildren) => {
       const { companyId, templateId, image, templateResponses, pickupDate, pickupNoticePhone } =
         order
       mutate({ companyId, templateId, image, templateResponses, pickupDate, pickupNoticePhone })
-      hide()
     },
   })
 
-  const setTemplateResponse = ({
-    question,
-    answer,
-    index,
-  }: {
-    question: string
-    answer: string[]
-    index: number
-  }) => {
-    setOrder((draft) => {
-      draft.templateResponses[index] = { question, answer }
-    })
-  }
-
   const handlePickupdate = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
     setOrder((draft) => {
       draft.pickupDate = e.target.value
@@ -123,7 +108,8 @@ const OrderContextProvider = ({ children }: PropsWithChildren) => {
       (index) => (e) => {
         setOrder((draft) => {
           draft.answers[index] = [e.target.value]
-          setTemplateResponse({ question: e.target.name, answer: draft.answers[index], index })
+          draft.templateResponses[index].question = e.target.name
+          draft.templateResponses[index].answer = [e.target.value]
         })
       },
       []
@@ -143,16 +129,17 @@ const OrderContextProvider = ({ children }: PropsWithChildren) => {
             } else {
               draft.answers[index] = [e.target.value]
             }
-            setTemplateResponse({ question: e.target.name, answer: draft.answers[index], index })
+            draft.templateResponses[index].question = e.target.name
+            draft.templateResponses[index].answer = [e.target.value]
           })
         }
 
         if (!e.target.checked) {
           setOrder((draft) => {
             const options: string[] = draft.answers[index]
             draft.answers[index] = options.filter((option) => option !== e.target.value)
-
-            setTemplateResponse({ question: e.target.name, answer: draft.answers[index], index })
+            draft.templateResponses[index].question = e.target.name
+            draft.templateResponses[index].answer = [e.target.value]
           })
         }
       },
@@ -163,7 +150,8 @@ const OrderContextProvider = ({ children }: PropsWithChildren) => {
     (index: number) => (e: React.ChangeEvent<HTMLInputElement>) => {
       setOrder((draft) => {
         draft.answers[index] = [e.target.value]
-        setTemplateResponse({ question: e.target.name, answer: draft.answers[index], index })
+        draft.templateResponses[index].question = e.target.name
+        draft.templateResponses[index].answer = [e.target.value]
       })
     },
     []
@@ -177,6 +165,12 @@ const OrderContextProvider = ({ children }: PropsWithChildren) => {
     setCurrent(+location.hash.slice(1))
   }, [location.hash])
 
+  useEffect(() => {
+    return () => {
+      hide()
+    }
+  }, [])
+
   const value = useMemo(() => ({ current, order }), [current, order])
   const action: OrderAction = useMemo(
     () => ({

diff --git a/src/pages/Templates/context/TemplateContextProvider.tsx b/src/pages/Templates/context/TemplateContextProvider.tsx
@@ -32,7 +32,7 @@ const TemplateContextProvider = ({ children }: PropsWithChildren) => {
       if (err.status === AxiosError.ECONNABORTED) {
         dispatchUpdateError({ code: 400, message: err.message })
       } else {
-        dispatchUpdateError({ code: err.code, message: err.response?.data.error.message })
+        dispatchUpdateError({ code: err.code, message: err.response?.data.message })
       }
     },
   })

diff --git a/src/pages/Templates/hooks/useTemplate.ts b/src/pages/Templates/hooks/useTemplate.ts
@@ -29,7 +29,7 @@ const useTemplate = () => {
       if (err.status === AxiosError.ECONNABORTED) {
         dispatchUpdateError({ code: 400, message: err.message })
       } else {
-        dispatchUpdateError({ code: err.code, message: err.response?.data.error.message })
+        dispatchUpdateError({ code: err.code, message: err.response?.data.message })
       }
     },
   })
@@ -43,7 +43,7 @@ const useTemplate = () => {
       if (err.status === AxiosError.ECONNABORTED) {
         dispatchUpdateError({ code: 400, message: err.message })
       } else {
-        dispatchUpdateError({ code: err.code, message: err.response?.data.error.message })
+        dispatchUpdateError({ code: err.code, message: err.response?.data.message })
       }
     },
   })
@@ -79,7 +79,7 @@ const useTemplate = () => {
       if (err.status === AxiosError.ECONNABORTED) {
         dispatchUpdateError({ code: 400, message: err.message })
       } else {
-        dispatchUpdateError({ code: err.code, message: err.response?.data.error.message })
+        dispatchUpdateError({ code: err.code, message: err.response?.data.message })
       }
     },
     enabled: false,

diff --git a/src/pages/Templates/hooks/useTemplates.ts b/src/pages/Templates/hooks/useTemplates.ts
@@ -13,7 +13,7 @@ const useTemplates = () => {
       if (err.status === AxiosError.ECONNABORTED) {
         dispatchUpdateError({ code: 400, message: err.message })
       } else {
-        dispatchUpdateError({ code: err.code, message: err.response?.data.error.message })
+        dispatchUpdateError({ code: err.code, message: err.response?.data.message })
       }
     },
   })
@@ -25,7 +25,7 @@ const useTemplates = () => {
         if (err.status === AxiosError.ECONNABORTED) {
           dispatchUpdateError({ code: 400, message: err.message })
         } else {
-          dispatchUpdateError({ code: err.code, message: err.response?.data.error.message })
+          dispatchUpdateError({ code: err.code, message: err.response?.data.message })
         }
       },
     }

diff --git a/src/type/index.ts b/src/type/index.ts
@@ -98,4 +98,4 @@ export type Order = {
 
 export type Company = User
 
-export type RequestError = AxiosError<{ error: { message: string } }>
+export type RequestError = AxiosError<{ message: string }>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -98,4 +98,4 @@ export type Order = {

		export type Company = User

		export type RequestError = AxiosError<{ error: { message: string } }>
		export type RequestError = AxiosError<{ message: string }>