Merge pull request #286 from scientist-softserv/fix-default-wares

alishaevn · web-flow · commit fb7f4fb352fd · 2023-03-21T08:26:01.000-05:00
fix the default ware
diff --git a/utils/api/requests.js b/utils/api/requests.js
@@ -141,10 +141,12 @@ export const useInitializeRequest = (id, accessToken) => {
 }
 
 export const useDefaultWare = (accessToken) => {
-  const { data, error } = useSWR([`/wares.json?q=make-a-request`, accessToken])
+  const { data, error } = useSWR([`/wares.json`, accessToken])
+  const defaultWare = data?.ware_refs?.find(item => item.slug === 'make-a-request')
 
   return {
-    defaultWareID: data?.ware_refs?.[0]?.id,
+    // TODO(alishaevn): check this still works with the next client
+    defaultWareID: defaultWare?.id,
     isLoadingDefaultWare: !error && !data,
     isDefaultWareError: error,
   }

Original file line number	Diff line number	Diff line change
`@@ -141,10 +141,12 @@ export const useInitializeRequest = (id, accessToken) => {`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`export const useDefaultWare = (accessToken) => {`
`144`		- const { data, error } = useSWR([`/wares.json?q=make-a-request`, accessToken])
	`144`	+ const { data, error } = useSWR([`/wares.json`, accessToken])
	`145`	`+ const defaultWare = data?.ware_refs?.find(item => item.slug === 'make-a-request')`
`145`	`146`
`146`	`147`	`return {`
`147`		`- defaultWareID: data?.ware_refs?.[0]?.id,`
	`148`	`+ // TODO(alishaevn): check this still works with the next client`
	`149`	`+ defaultWareID: defaultWare?.id,`
`148`	`150`	`isLoadingDefaultWare: !error && !data,`
`149`	`151`	`isDefaultWareError: error,`
`150`	`152`	`}`