diff --git a/src/@utils/compute.ts b/src/@utils/compute.ts index ae65f38f2..c858acdf4 100644 --- a/src/@utils/compute.ts +++ b/src/@utils/compute.ts @@ -214,42 +214,43 @@ async function getJobs( assets: Asset[] ): Promise { const computeJobs: ComputeJobMetaData[] = [] - for await (const providerUrl of providerUrls) { - try { - const providerComputeJobs = (await ProviderInstance.computeStatus( - providerUrl, - accountId - )) as ComputeJob[] + // commented loop since we decide how to filter jobs + // for await (const providerUrl of providerUrls) { + try { + const providerComputeJobs = (await ProviderInstance.computeStatus( + providerUrls[0], + accountId + )) as ComputeJob[] - if (providerComputeJobs) { - providerComputeJobs.sort((a, b) => { - if (a.dateCreated > b.dateCreated) { - return -1 - } - if (a.dateCreated < b.dateCreated) { - return 1 - } - return 0 - }) + if (providerComputeJobs) { + providerComputeJobs.sort((a, b) => { + if (a.dateCreated > b.dateCreated) { + return -1 + } + if (a.dateCreated < b.dateCreated) { + return 1 + } + return 0 + }) - providerComputeJobs.forEach((job) => { - const did = job.inputDID[0] - const asset = assets.filter((x) => x.id === did)[0] - if (asset) { - const compJob: ComputeJobMetaData = { - ...job, - assetName: asset.metadata.name, - assetDtSymbol: asset.datatokens[0].symbol, - networkId: asset.chainId - } - computeJobs.push(compJob) + providerComputeJobs.forEach((job) => { + const did = job.inputDID[0] + const asset = assets.filter((x) => x.id === did)[0] + if (asset) { + const compJob: ComputeJobMetaData = { + ...job, + assetName: asset.metadata.name, + assetDtSymbol: asset.datatokens[0].symbol, + networkId: asset.chainId } - }) - } - } catch (err) { - LoggerInstance.error(err.message) + computeJobs.push(compJob) + } + }) } + } catch (err) { + LoggerInstance.error(err.message) } + // } return computeJobs } export async function getComputeJobs( diff --git a/src/components/Profile/History/ComputeJobs/Results.tsx b/src/components/Profile/History/ComputeJobs/Results.tsx index 6231aae48..44668dbaa 100644 --- a/src/components/Profile/History/ComputeJobs/Results.tsx +++ b/src/components/Profile/History/ComputeJobs/Results.tsx @@ -1,4 +1,4 @@ -import { LoggerInstance } from '@oceanprotocol/lib' +import { LoggerInstance, Provider } from '@oceanprotocol/lib' import React, { ReactElement, useState } from 'react' import Loader from '@shared/atoms/Loader' import { ListItem } from '@shared/atoms/Lists' @@ -13,7 +13,8 @@ export default function Results({ }: { job: ComputeJobMetaData }): ReactElement { - const { accountId } = useWeb3() + const providerInstance = new Provider() + const { accountId, web3 } = useWeb3() const [isLoading, setIsLoading] = useState(false) const [hasFetched, setHasFetched] = useState(false) const isFinished = job.dateFinished !== null @@ -23,13 +24,15 @@ export default function Results({ try { setIsLoading(true) - // const jobStatus = await ocean.compute.status( - // account, - // job.did, - // undefined, - // undefined, - // job.jobId - // ) + console.log('getResults job: ', job) + const jobResult = await providerInstance.computeResult( + job.jobId, + 0, + accountId, + 'https://v4.provider.rinkeby.oceanprotocol.com/', + web3 + ) + console.log('getResults jobResult: ', jobResult) // if (jobStatus?.length > 0) { // job.algorithmLogUrl = jobStatus[0].algorithmLogUrl // job.resultsUrl = jobStatus[0].resultsUrl