error handling updates

oceanprotocol · Oct 11, 2023 · 52ccfe6 · 52ccfe6
1 parent e8d96c1
commit 52ccfe6
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 21 deletions.
diff --git a/src/@utils/accessDetailsAndPricing.ts b/src/@utils/accessDetailsAndPricing.ts
@@ -193,7 +193,7 @@ export async function getOrderPriceAndFees(
         customProviderUrl || asset?.services[0].serviceEndpoint
       ))
   } catch (error) {
-    const message = getErrorMessage(JSON.parse(error.message))
+    const message = getErrorMessage(error.message)
     LoggerInstance.error('[Initialize Provider] Error:', message)
     toast.error(message)
   }

diff --git a/src/@utils/compute.ts b/src/@utils/compute.ts
@@ -148,7 +148,7 @@ export async function getComputeEnviroment(
     if (!computeEnvs[asset.chainId][0]) return null
     return computeEnvs[asset.chainId][0]
   } catch (e) {
-    const message = getErrorMessage(JSON.parse(e.message))
+    const message = getErrorMessage(e.message)
     LoggerInstance.error(
       '[Compute to Data] Fetch compute environment:',
       message
@@ -261,7 +261,7 @@ async function getJobs(
       })
     }
   } catch (err) {
-    const message = getErrorMessage(JSON.parse(err.message))
+    const message = getErrorMessage(err.message)
     LoggerInstance.error('[Compute to Data] Error:', message)
     toast.error(message)
   }

diff --git a/src/@utils/nft.ts b/src/@utils/nft.ts
@@ -113,7 +113,7 @@ export async function setNftMetadata(
       signal
     )
   } catch (err) {
-    const message = getErrorMessage(JSON.parse(err.message))
+    const message = getErrorMessage(err.message)
     LoggerInstance.error('[Encrypt Data] Error:', message)
     toast.error(message)
   }
@@ -155,7 +155,7 @@ export async function setNFTMetadataAndTokenURI(
       signal
     )
   } catch (err) {
-    const message = getErrorMessage(JSON.parse(err.message))
+    const message = getErrorMessage(err.message)
     LoggerInstance.error('[Encrypt Data] Error:', message)
     toast.error(message)
   }

diff --git a/src/@utils/order.ts b/src/@utils/order.ts
@@ -40,7 +40,7 @@ async function initializeProvider(
     )
     return provider
   } catch (error) {
-    const message = getErrorMessage(JSON.parse(error.message))
+    const message = getErrorMessage(error.message)
     LoggerInstance.log('[Initialize Provider] Error:', message)
     toast.error(message)
   }

diff --git a/src/@utils/provider.ts b/src/@utils/provider.ts
@@ -57,7 +57,7 @@ export async function initializeProviderForCompute(
       accountId
     )
   } catch (error) {
-    const message = getErrorMessage(JSON.parse(error.message))
+    const message = getErrorMessage(error.message)
     LoggerInstance.error('[Initialize Provider] Error:', message)
     toast.error(message)
     return null
@@ -79,7 +79,7 @@ export async function getEncryptedFiles(
     )
     return response
   } catch (error) {
-    const message = getErrorMessage(JSON.parse(error.message))
+    const message = getErrorMessage(error.message)
     LoggerInstance.error('[Provider Encrypt] Error:', message)
     toast.error(message)
   }
@@ -100,9 +100,10 @@ export async function getFileDidInfo(
     )
     return response
   } catch (error) {
-    const message = getErrorMessage(JSON.parse(error.message))
+    const message = getErrorMessage(error.message)
     LoggerInstance.error('[Initialize check file did] Error:', message)
-    toast.error(message)
+    toast.error(`[Initialize check file did] Error: ${message}`)
+    throw new Error(`[Initialize check file did] Error: ${message}`)
   }
 }
 
@@ -137,7 +138,7 @@ export async function getFileInfo(
           customProviderUrl || providerUrl
         )
       } catch (error) {
-        const message = getErrorMessage(JSON.parse(error.message))
+        const message = getErrorMessage(error.message)
         LoggerInstance.error('[Provider Get File info] Error:', message)
         toast.error(message)
       }
@@ -154,7 +155,7 @@ export async function getFileInfo(
           customProviderUrl || providerUrl
         )
       } catch (error) {
-        const message = getErrorMessage(JSON.parse(error.message))
+        const message = getErrorMessage(error.message)
         LoggerInstance.error('[Provider Get File info] Error:', message)
         toast.error(message)
       }
@@ -173,7 +174,7 @@ export async function getFileInfo(
           customProviderUrl || providerUrl
         )
       } catch (error) {
-        const message = getErrorMessage(JSON.parse(error.message))
+        const message = getErrorMessage(error.message)
         LoggerInstance.error('[Provider Get File info] Error:', message)
         toast.error(message)
       }
@@ -193,7 +194,7 @@ export async function getFileInfo(
           customProviderUrl || providerUrl
         )
       } catch (error) {
-        const message = getErrorMessage(JSON.parse(error.message))
+        const message = getErrorMessage(error.message)
         LoggerInstance.error('[Provider Get File info] Error:', message)
         toast.error(message)
       }
@@ -213,7 +214,7 @@ export async function getFileInfo(
           customProviderUrl || providerUrl
         )
       } catch (error) {
-        const message = getErrorMessage(JSON.parse(error.message))
+        const message = getErrorMessage(error.message)
         LoggerInstance.error('[Provider Get File info] Error:', message)
         toast.error(message)
       }
@@ -242,7 +243,7 @@ export async function downloadFile(
       userCustomParameters
     )
   } catch (error) {
-    const message = getErrorMessage(JSON.parse(error.message))
+    const message = getErrorMessage(error.message)
     LoggerInstance.error('[Provider Get download url] Error:', message)
     toast.error(message)
   }
@@ -256,7 +257,7 @@ export async function checkValidProvider(
     const response = await ProviderInstance.isValidProvider(providerUrl)
     return response
   } catch (error) {
-    const message = getErrorMessage(JSON.parse(error.message))
+    const message = getErrorMessage(error.message)
     LoggerInstance.error('[Provider Check] Error:', message)
     toast.error(message)
   }

diff --git a/src/components/@shared/FormInput/InputElement/Provider/index.tsx b/src/components/@shared/FormInput/InputElement/Provider/index.tsx
@@ -76,7 +76,7 @@ export default function CustomProvider(props: InputProps): ReactElement {
       // if all good, add provider to formik state
       helpers.setValue({ url: field.value.url, valid: isValid, custom: true })
     } catch (error) {
-      const message = getErrorMessage(JSON.parse(error.message))
+      const message = getErrorMessage(error.message)
       setFieldError(`${field.name}.url`, message)
       LoggerInstance.error('[Custom Provider]:', message)
     } finally {

diff --git a/src/components/Asset/AssetActions/Compute/index.tsx b/src/components/Asset/AssetActions/Compute/index.tsx
@@ -439,7 +439,7 @@ export default function Compute({
       setRefetchJobs(!refetchJobs)
       initPriceAndFees()
     } catch (error) {
-      const message = getErrorMessage(JSON.parse(error.message))
+      const message = getErrorMessage(error.message)
       LoggerInstance.error('[Compute] Error:', message)
       setError(message)
       setRetry(true)

diff --git a/src/components/Asset/AssetActions/index.tsx b/src/components/Asset/AssetActions/index.tsx
@@ -95,6 +95,7 @@ export default function AssetActions({
 
         setFileIsLoading(false)
       } catch (error) {
+        setFileIsLoading(false)
         LoggerInstance.error(error.message)
       }
     }

diff --git a/src/components/Profile/History/ComputeJobs/Results.tsx b/src/components/Profile/History/ComputeJobs/Results.tsx
@@ -72,7 +72,7 @@ export default function Results({
       )
       await downloadFileBrowser(jobResult)
     } catch (error) {
-      const message = getErrorMessage(JSON.parse(error.message))
+      const message = getErrorMessage(error.message)
       LoggerInstance.error('[Provider Get c2d results url] Error:', message)
       toast.error(message)
     }

diff --git a/src/components/Publish/index.tsx b/src/components/Publish/index.tsx
@@ -149,7 +149,7 @@ export default function PublishPage({
           newAbortController()
         )
       } catch (error) {
-        const message = getErrorMessage(JSON.parse(error.message))
+        const message = getErrorMessage(error.message)
         LoggerInstance.error('[Provider Encrypt] Error:', message)
       }