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

Merge pull request #129 from oceanprotocol/fix/computePreviousOrder

Browse Source 
fix compute previous order
This commit is contained in:
Matthias Kretschmann 2020-10-23 18:27:09 +02:00 committed by GitHub
commit ea41505c7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/organisms/AssetActions/Compute.tsx
View File

@ -58,7 +58,7 @@ export default function Compute({
useEffect(() => {
async function checkPreviousOrders() {
const orderId = await checkPreviousOrder(ocean, accountId, ddo)
const orderId = await checkPreviousOrder(ocean, accountId, ddo, 'compute')
setPreviousOrderId(orderId)
setHasPreviousOrder(!!orderId)
}

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

@ -44,7 +44,7 @@ export default function Consume({
useEffect(() => {
async function checkOrders() {
const orderId = await checkPreviousOrder(ocean, accountId, ddo)
const orderId = await checkPreviousOrder(ocean, accountId, ddo, 'access')
setPreviousOrderId(orderId)
setHasPreviousOrder(!!orderId)
}

12
src/utils/checkPreviousOrder.ts
View File

@ -1,16 +1,18 @@
import { DDO, Ocean } from '@oceanprotocol/lib'
import { DDO, Ocean, ServiceType } from '@oceanprotocol/lib'
export default async function checkPreviousOrder(
ocean: Ocean,
accountId: string,
ddo: DDO
ddo: DDO,
serviceType: ServiceType
) {
const service = ddo.findServiceByType('access')
const service = ddo.findServiceByType(serviceType)
// apparenlty cost and timeout are not found, even though they are there...
const previousOrder = await ocean.datatokens.getPreviousValidOrders(
ddo.dataToken,
service.attributes.main.cost,
(service.attributes.main as any).cost,
service.index,
service.attributes.main.timeout,
(service.attributes.main as any).timeout,
accountId
)
return previousOrder