oceanprotocol/market
1
0
Fork 0
mirror of https://github.com/oceanprotocol/market.git synced 2024-12-02 05:57:29 +01:00
Code Releases Activity

update get prev order method & small typo

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/organisms/AssetActions/Compute/index.tsx
View File

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

1
src/components/organisms/AssetActions/Consume.tsx
View File

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

12
src/utils/subgraph.ts
View File

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