update get prev order method & small typo

This commit is contained in:
Bogdan Fazakas 2021-04-12 17:09:41 +03:00
parent 0740917731
commit a27bc6718a
3 changed files with 12 additions and 13 deletions

View File

@ -122,14 +122,14 @@ export default function Compute({
isJobStarting === true || file === null || !ocean || !isBalanceSufficient
const hasDatatoken = Number(dtBalance) >= 1
async function checkPreviousOrders(ddo: DDO, serviceType: ServiceType) {
async function checkPreviousOrders(ddo: DDO) {
const { timeout } = (
ddo.findServiceByType('access') || ddo.findServiceByType('compute')
).attributes.main
const orderId = await getPreviousOrders(
ddo.dataToken?.toLowerCase(),
accountId?.toLowerCase(),
secondsToString(timeout)
timeout.toString()
)
const assetType = ddo.findServiceByType('metadata').attributes.main.type
if (assetType === 'algorithm') {
@ -253,23 +253,23 @@ export default function Compute({
useEffect(() => {
if (!ocean || !accountId) return
checkPreviousOrders(ddo, 'compute')
checkPreviousOrders(ddo)
}, [ocean, ddo, accountId])
useEffect(() => {
if (!ocean || !accountId || !selectedAlgorithmAsset) return
if (selectedAlgorithmAsset.findServiceByType('access')) {
checkPreviousOrders(selectedAlgorithmAsset, 'access').then(() => {
checkPreviousOrders(selectedAlgorithmAsset).then(() => {
if (
!hasPreviousAlgorithmOrder &&
selectedAlgorithmAsset.findServiceByType('compute')
) {
checkPreviousOrders(selectedAlgorithmAsset, 'compute')
checkPreviousOrders(selectedAlgorithmAsset)
}
})
} else if (selectedAlgorithmAsset.findServiceByType('compute')) {
checkPreviousOrders(selectedAlgorithmAsset, 'compute')
checkPreviousOrders(selectedAlgorithmAsset)
}
checkAssetDTBalance(selectedAlgorithmAsset)
initMetadata(selectedAlgorithmAsset)

View File

@ -69,7 +69,6 @@ export default function Consume({
})
useEffect(() => {
console.log('data', data)
if (!data || !assetTimeout || data.tokenOrders.length === 0) return
const lastOrder = data.tokenOrders[0]

View File

@ -65,20 +65,20 @@ export async function getPreviousOrders(
id: id,
account: account
}
const fatchedPreviousOrders: any = await fetchData(
const fetchedPreviousOrders: any = await fetchData(
previousOrderQuery,
variables
)
if (fatchedPreviousOrders.data?.tokenOrders?.length === 0) return null
if (assetTimeout === 'Forever') {
return fatchedPreviousOrders?.data?.tokenOrders[0]?.tx
if (fetchedPreviousOrders.data?.tokenOrders?.length === 0) return null
if (assetTimeout === '0') {
return fetchedPreviousOrders?.data?.tokenOrders[0]?.tx
} else {
const expiry = new BigNumber(
fatchedPreviousOrders?.data?.tokenOrders[0]?.timestamp
fetchedPreviousOrders?.data?.tokenOrders[0]?.timestamp
).plus(assetTimeout)
const unixTime = new BigNumber(Math.floor(Date.now() / 1000))
if (unixTime.isLessThan(expiry)) {
return fatchedPreviousOrders?.data?.tokenOrders[0]?.tx
return fetchedPreviousOrders?.data?.tokenOrders[0]?.tx
} else {
return null
}