Skip to content

Commit

Permalink
Revert "error handling updates"
Browse files Browse the repository at this point in the history
This reverts commit 78b7380.
  • Loading branch information
bogdanfazakas committed Oct 11, 2023
1 parent 78b7380 commit e8d96c1
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 23 deletions.
2 changes: 1 addition & 1 deletion src/@utils/accessDetailsAndPricing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ export async function getOrderPriceAndFees(
customProviderUrl || asset?.services[0].serviceEndpoint
))
} catch (error) {
const message = getErrorMessage(error.message)
const message = getErrorMessage(JSON.parse(error.message))
LoggerInstance.error('[Initialize Provider] Error:', message)
toast.error(message)
}
Expand Down
4 changes: 2 additions & 2 deletions src/@utils/compute.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(e.message)
const message = getErrorMessage(JSON.parse(e.message))
LoggerInstance.error(
'[Compute to Data] Fetch compute environment:',
message
Expand Down Expand Up @@ -261,7 +261,7 @@ async function getJobs(
})
}
} catch (err) {
const message = getErrorMessage(err.message)
const message = getErrorMessage(JSON.parse(err.message))
LoggerInstance.error('[Compute to Data] Error:', message)
toast.error(message)
}
Expand Down
4 changes: 2 additions & 2 deletions src/@utils/nft.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export async function setNftMetadata(
signal
)
} catch (err) {
const message = getErrorMessage(err.message)
const message = getErrorMessage(JSON.parse(err.message))
LoggerInstance.error('[Encrypt Data] Error:', message)
toast.error(message)
}
Expand Down Expand Up @@ -155,7 +155,7 @@ export async function setNFTMetadataAndTokenURI(
signal
)
} catch (err) {
const message = getErrorMessage(err.message)
const message = getErrorMessage(JSON.parse(err.message))
LoggerInstance.error('[Encrypt Data] Error:', message)
toast.error(message)
}
Expand Down
2 changes: 1 addition & 1 deletion src/@utils/order.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ async function initializeProvider(
)
return provider
} catch (error) {
const message = getErrorMessage(error.message)
const message = getErrorMessage(JSON.parse(error.message))
LoggerInstance.log('[Initialize Provider] Error:', message)
toast.error(message)
}
Expand Down
23 changes: 11 additions & 12 deletions src/@utils/provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export async function initializeProviderForCompute(
accountId
)
} catch (error) {
const message = getErrorMessage(error.message)
const message = getErrorMessage(JSON.parse(error.message))
LoggerInstance.error('[Initialize Provider] Error:', message)
toast.error(message)
return null
Expand All @@ -79,7 +79,7 @@ export async function getEncryptedFiles(
)
return response
} catch (error) {
const message = getErrorMessage(error.message)
const message = getErrorMessage(JSON.parse(error.message))
LoggerInstance.error('[Provider Encrypt] Error:', message)
toast.error(message)
}
Expand All @@ -100,10 +100,9 @@ export async function getFileDidInfo(
)
return response
} catch (error) {
const message = getErrorMessage(error.message)
const message = getErrorMessage(JSON.parse(error.message))
LoggerInstance.error('[Initialize check file did] Error:', message)
toast.error(`[Initialize check file did] Error: ${message}`)
throw new Error(`[Initialize check file did] Error: ${message}`)
toast.error(message)
}
}

Expand Down Expand Up @@ -138,7 +137,7 @@ export async function getFileInfo(
customProviderUrl || providerUrl
)
} catch (error) {
const message = getErrorMessage(error.message)
const message = getErrorMessage(JSON.parse(error.message))
LoggerInstance.error('[Provider Get File info] Error:', message)
toast.error(message)
}
Expand All @@ -155,7 +154,7 @@ export async function getFileInfo(
customProviderUrl || providerUrl
)
} catch (error) {
const message = getErrorMessage(error.message)
const message = getErrorMessage(JSON.parse(error.message))
LoggerInstance.error('[Provider Get File info] Error:', message)
toast.error(message)
}
Expand All @@ -174,7 +173,7 @@ export async function getFileInfo(
customProviderUrl || providerUrl
)
} catch (error) {
const message = getErrorMessage(error.message)
const message = getErrorMessage(JSON.parse(error.message))
LoggerInstance.error('[Provider Get File info] Error:', message)
toast.error(message)
}
Expand All @@ -194,7 +193,7 @@ export async function getFileInfo(
customProviderUrl || providerUrl
)
} catch (error) {
const message = getErrorMessage(error.message)
const message = getErrorMessage(JSON.parse(error.message))
LoggerInstance.error('[Provider Get File info] Error:', message)
toast.error(message)
}
Expand All @@ -214,7 +213,7 @@ export async function getFileInfo(
customProviderUrl || providerUrl
)
} catch (error) {
const message = getErrorMessage(error.message)
const message = getErrorMessage(JSON.parse(error.message))
LoggerInstance.error('[Provider Get File info] Error:', message)
toast.error(message)
}
Expand Down Expand Up @@ -243,7 +242,7 @@ export async function downloadFile(
userCustomParameters
)
} catch (error) {
const message = getErrorMessage(error.message)
const message = getErrorMessage(JSON.parse(error.message))
LoggerInstance.error('[Provider Get download url] Error:', message)
toast.error(message)
}
Expand All @@ -257,7 +256,7 @@ export async function checkValidProvider(
const response = await ProviderInstance.isValidProvider(providerUrl)
return response
} catch (error) {
const message = getErrorMessage(error.message)
const message = getErrorMessage(JSON.parse(error.message))
LoggerInstance.error('[Provider Check] Error:', message)
toast.error(message)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(error.message)
const message = getErrorMessage(JSON.parse(error.message))
setFieldError(`${field.name}.url`, message)
LoggerInstance.error('[Custom Provider]:', message)
} finally {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Asset/AssetActions/Compute/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ export default function Compute({
setRefetchJobs(!refetchJobs)
initPriceAndFees()
} catch (error) {
const message = getErrorMessage(error.message)
const message = getErrorMessage(JSON.parse(error.message))
LoggerInstance.error('[Compute] Error:', message)
setError(message)
setRetry(true)
Expand Down
1 change: 0 additions & 1 deletion src/components/Asset/AssetActions/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ export default function AssetActions({

setFileIsLoading(false)
} catch (error) {
setFileIsLoading(false)
LoggerInstance.error(error.message)
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Profile/History/ComputeJobs/Results.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export default function Results({
)
await downloadFileBrowser(jobResult)
} catch (error) {
const message = getErrorMessage(error.message)
const message = getErrorMessage(JSON.parse(error.message))
LoggerInstance.error('[Provider Get c2d results url] Error:', message)
toast.error(message)
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Publish/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export default function PublishPage({
newAbortController()
)
} catch (error) {
const message = getErrorMessage(error.message)
const message = getErrorMessage(JSON.parse(error.message))
LoggerInstance.error('[Provider Encrypt] Error:', message)
}

Expand Down

1 comment on commit e8d96c1

@vercel
Copy link

@vercel vercel bot commented on e8d96c1 Oct 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.