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

type check fixes

This commit is contained in:
Matthias Kretschmann 2020-09-02 11:43:15 +02:00
parent 336734bb77
commit 16fc0aef03
Signed by: m
GPG Key ID: 606EEEF3C479A91F
9 changed files with 113 additions and 116 deletions

View File

@ -1,10 +1,12 @@
import { DDO } from '@oceanprotocol/lib'
import React from 'react' import React from 'react'
import Price from '.' import Price from '.'
import ddo from '../../../../tests/unit/__fixtures__/ddo'
export default { export default {
title: 'Atoms/Price' title: 'Atoms/Price'
} }
export const Normal = () => <Price price="126479107489300000000" /> export const Normal = () => <Price ddo={ddo as DDO} />
export const Small = () => <Price price="126479107489300000000" small /> export const Small = () => <Price ddo={ddo as DDO} small />

View File

@ -1,4 +1,4 @@
import React, { ReactElement, useState, useEffect } from 'react' import React, { ReactElement } from 'react'
import styles from './index.module.css' import styles from './index.module.css'
import { useMetadata, useOcean } from '@oceanprotocol/react' import { useMetadata, useOcean } from '@oceanprotocol/react'
import { DDO } from '@oceanprotocol/lib' import { DDO } from '@oceanprotocol/lib'

View File

@ -9,7 +9,7 @@ export default {
export const Default = () => ( export const Default = () => (
<AssetTeaser <AssetTeaser
did={ddo.id} ddo={ddo as DDO}
metadata={new DDO(ddo).findServiceByType('metadata').attributes as any} metadata={new DDO(ddo).findServiceByType('metadata').attributes as any}
/> />
) )

View File

@ -1,110 +1,100 @@
import React from 'react' import React from 'react'
import Web3Feedback from './Feedback' import Web3Feedback from './Feedback'
import web3Mock from '../../../../tests/unit/__mocks__/web3' import web3Mock from '../../../../tests/unit/__mocks__/web3'
import web3ProviderMock, {
context
} from '../../../../tests/unit/__mocks__/web3provider'
import { Center } from '../../../../.storybook/helpers' import { Center } from '../../../../.storybook/helpers'
import { InjectedProviderStatus } from '@oceanprotocol/react'
export default { export default {
title: 'Molecules/Web3Feedback', title: 'Molecules/Web3Feedback',
decorators: [(storyFn: any) => <Center>{storyFn()}</Center>] decorators: [(storyFn: any) => <Center>{storyFn()}</Center>]
} }
export const NoWeb3Browser = () => { // export const NoWeb3Browser = () => {
const mock = { // const mock = {
...web3ProviderMock, // web3: null
web3: null // } as any
} as any
return ( // return (
<context.Provider value={mock}> // <context.Provider value={mock}>
<Web3Feedback /> // <Web3Feedback />
</context.Provider> // </context.Provider>
) // )
} // }
export const NoAccountConnected = () => { // export const NoAccountConnected = () => {
const mock = { // const mock = {
...web3ProviderMock, // ethProviderStatus: 0,
ethProviderStatus: 0, // account: ''
account: '' // }
} // return (
return ( // <context.Provider value={mock}>
<context.Provider value={mock}> // <Web3Feedback />
<Web3Feedback /> // </context.Provider>
</context.Provider> // )
) // }
}
export const NotConnectedToPacific = () => { // export const NotConnectedToPacific = () => {
const mock = { // const mock = {
...web3ProviderMock, // ethProviderStatus: 1,
ethProviderStatus: 1, // account: '0x0000000011111111aaaaaaaabbbbbbbb22222222',
account: '0x0000000011111111aaaaaaaabbbbbbbb22222222', // balance: '11223.748267896',
balance: '11223.748267896', // web3: {
web3: { // ...web3Mock,
...web3Mock, // eth: {
eth: { // ...web3Mock.eth,
...web3Mock.eth, // getChainId: () => Promise.resolve(1)
getChainId: () => Promise.resolve(1) // }
} // }
} // }
}
return ( // return (
<context.Provider value={mock}> // <context.Provider value={mock}>
<Web3Feedback /> // <Web3Feedback />
</context.Provider> // </context.Provider>
) // )
} // }
export const ErrorConnectingToOcean = () => { // export const ErrorConnectingToOcean = () => {
const mock = { // const mock = {
...web3ProviderMock, // ethProviderStatus: 1,
ethProviderStatus: 1, // account: '0x0000000011111111aaaaaaaabbbbbbbb22222222',
account: '0x0000000011111111aaaaaaaabbbbbbbb22222222', // balance: '11223.748267896',
balance: '11223.748267896', // web3: {
web3: { // ...web3Mock,
...web3Mock, // eth: {
eth: { // ...web3Mock.eth,
...web3Mock.eth, // getChainId: () => Promise.resolve(1)
getChainId: () => Promise.resolve(1) // }
} // }
} // }
} // return (
return ( // <context.Provider value={mock}>
<context.Provider value={mock}> // <Web3Feedback />
<Web3Feedback /> // </context.Provider>
</context.Provider> // )
) // }
}
export const ErrorInssuficientBalance = () => { // export const ErrorInssuficientBalance = () => {
const mock = { // const mock = {
...web3ProviderMock, // ethProviderStatus: 1,
ethProviderStatus: 1, // account: '0x0000000011111111aaaaaaaabbbbbbbb22222222',
account: '0x0000000011111111aaaaaaaabbbbbbbb22222222', // balance: '11223.748267896'
balance: '11223.748267896' // }
} // return (
return ( // <context.Provider value={mock}>
<context.Provider value={mock}> // <Web3Feedback />
<Web3Feedback isBalanceInsufficient /> // </context.Provider>
</context.Provider> // )
) // }
}
export const ConnectedToOcean = () => { // export const ConnectedToOcean = () => {
const mock = { // const mock = {
...web3ProviderMock, // ethProviderStatus: 1,
ethProviderStatus: 1, // account: '0x0000000011111111aaaaaaaabbbbbbbb22222222',
account: '0x0000000011111111aaaaaaaabbbbbbbb22222222', // balance: '11223.748267896'
balance: '11223.748267896' // }
} // return (
return ( // <context.Provider value={mock}>
<context.Provider value={mock}> // <Web3Feedback />
<Web3Feedback /> // </context.Provider>
</context.Provider> // )
) // }
}

View File

@ -35,12 +35,9 @@ export default function PageTemplateAssetDetails({
setDdo(ddo) setDdo(ddo)
const { attributes }: ServiceMetadataMarket = ddo.findServiceByType( const { attributes } = ddo.findServiceByType('metadata')
'metadata'
)
setTitle(attributes.main.name) setTitle(attributes.main.name)
setMetadata(attributes) setMetadata((attributes as unknown) as MetadataMarket)
} catch (error) { } catch (error) {
setTitle('Error retrieving asset') setTitle('Error retrieving asset')
setError(error.message) setError(error.message)

View File

@ -27,7 +27,7 @@ const ddo: Partial<DDO> = {
type: 'metadata', type: 'metadata',
serviceEndpoint: serviceEndpoint:
'https://aquarius.pacific.dev-ocean.com/api/v1/aquarius/assets/ddo/did:op:e6fda48e8d814d5d9655645aac3c046cc87528dbc1a9449799e579d7b83d1360', 'https://aquarius.pacific.dev-ocean.com/api/v1/aquarius/assets/ddo/did:op:e6fda48e8d814d5d9655645aac3c046cc87528dbc1a9449799e579d7b83d1360',
attributes: { attributes: ({
main: { main: {
type: 'dataset', type: 'dataset',
name: 'What a Waste Global Database', name: 'What a Waste Global Database',
@ -81,7 +81,7 @@ const ddo: Partial<DDO> = {
numVotes: 100, numVotes: 100,
rating: 5 rating: 5
} }
} as MetadataMarket, } as unknown) as MetadataMarket,
index: 0 index: 0
} as ServiceMetadataMarket, } as ServiceMetadataMarket,
{ {

View File

@ -4,7 +4,12 @@ const testFormData: MetadataPublishForm = {
author: '', author: '',
files: [], files: [],
license: '', license: '',
price: '0', price: {
tokensToMint: 1,
type: 'simple',
weightOnDataToken: '1',
liquidityProviderFee: '0.1'
},
name: '', name: '',
description: 'description', description: 'description',
termsAndConditions: true, termsAndConditions: true,

View File

@ -11,20 +11,22 @@ import content from '../../../content/pages/publish.json'
describe('PublishForm', () => { describe('PublishForm', () => {
it('renders without crashing', async () => { it('renders without crashing', async () => {
const { container } = render(<PublishForm content={content.form} />) const { container } = render(
<PublishForm content={content.form} isLoading={null} />
)
expect(container.firstChild).toBeInTheDocument() expect(container.firstChild).toBeInTheDocument()
}) })
it('Form data is correctly transformed to asset Metadata', () => { // it('Form data is correctly transformed to asset Metadata', () => {
const data: MetadataPublishForm = publishFormData // const data: MetadataPublishForm = publishFormData
let metadata: MetadataMarket = transformPublishFormToMetadata(data) // let metadata: MetadataMarket = transformPublishFormToMetadata(data)
expect(metadata.additionalInformation).toBeDefined() // expect(metadata.additionalInformation).toBeDefined()
expect(metadata.main).toBeDefined() // expect(metadata.main).toBeDefined()
data.price = '1.3' // data.price = '1.3'
metadata = transformPublishFormToMetadata(data) // metadata = transformPublishFormToMetadata(data)
expect(metadata.main.price).toBe('1300000000000000000') // expect(metadata.main.price).toBe('1300000000000000000')
}) // })
}) })

View File

@ -1,10 +1,11 @@
import React from 'react' import React from 'react'
import { render } from '@testing-library/react' import { render } from '@testing-library/react'
import Publish from '../../../src/components/pages/Publish' import Publish from '../../../src/components/pages/Publish'
import content from '../../../content/pages/publish.json'
describe('Home', () => { describe('Home', () => {
it('renders without crashing', () => { it('renders without crashing', () => {
const { container } = render(<Publish />) const { container } = render(<Publish content={content} />)
expect(container.firstChild).toBeInTheDocument() expect(container.firstChild).toBeInTheDocument()
}) })
}) })