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

activate form validation

Browse Source
This commit is contained in:
Matthias Kretschmann 2022-01-11 13:13:13 +00:00
parent f576aadbfe
commit e87bdfadfc
Signed by: m
GPG Key ID: 606EEEF3C479A91F
5 changed files with 33 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package-lock.json generated
View File

@ -35,7 +35,6 @@
"gray-matter": "^4.0.3", "gray-matter": "^4.0.3",
"is-url-superb": "^6.1.0", "is-url-superb": "^6.1.0",
"js-cookie": "^3.0.1", "js-cookie": "^3.0.1",
"js-sha256": "^0.9.0",
"jwt-decode": "^3.1.2", "jwt-decode": "^3.1.2",
"lodash.debounce": "^4.0.8", "lodash.debounce": "^4.0.8",
"lodash.omit": "^4.5.0", "lodash.omit": "^4.5.0",
@ -17040,11 +17039,6 @@
"node": ">=12" "node": ">=12"
} }
}, },
"node_modules/js-sha256": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz",
"integrity": "sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA=="
},
"node_modules/js-sha3": { "node_modules/js-sha3": {
"version": "0.8.0", "version": "0.8.0",
"resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
@ -43508,11 +43502,6 @@
"resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz", "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz",
"integrity": "sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==" "integrity": "sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw=="
}, },
"js-sha256": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz",
"integrity": "sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA=="
},
"js-sha3": { "js-sha3": {
"version": "0.8.0", "version": "0.8.0",
"resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",

1
package.json
View File

@ -45,7 +45,6 @@
"gray-matter": "^4.0.3", "gray-matter": "^4.0.3",
"is-url-superb": "^6.1.0", "is-url-superb": "^6.1.0",
"js-cookie": "^3.0.1", "js-cookie": "^3.0.1",
"js-sha256": "^0.9.0",
"jwt-decode": "^3.1.2", "jwt-decode": "^3.1.2",
"lodash.debounce": "^4.0.8", "lodash.debounce": "^4.0.8",
"lodash.omit": "^4.5.0", "lodash.omit": "^4.5.0",

60
src/@hooks/useConsume.ts
View File

@ -44,36 +44,36 @@ function useConsume(): UseConsume {
try { try {
setStep(0) setStep(0)
if (!orderId) { // if (!orderId) {
// if we don't have a previous valid order, get one // if we don't have a previous valid order, get one
// const userOwnedTokens = await ocean.accounts.getTokenBalance( // const userOwnedTokens = await ocean.accounts.getTokenBalance(
// dataTokenAddress, // dataTokenAddress,
// account // account
// ) // )
// if (parseFloat(userOwnedTokens) < 1) { // if (parseFloat(userOwnedTokens) < 1) {
// setConsumeError('Not enough datatokens') // setConsumeError('Not enough datatokens')
// return 'Not enough datatokens' // return 'Not enough datatokens'
// } else { // } else {
// setStep(1) // setStep(1)
// try { // try {
// orderId = await ocean.assets.order( // orderId = await ocean.assets.order(
// did as string, // did as string,
// serviceType, // serviceType,
// accountId, // accountId,
// undefined, // undefined,
// marketFeeAddress, // marketFeeAddress,
// undefined, // undefined,
// null, // null,
// false // false
// ) // )
// LoggerInstance.log('order created', orderId) // LoggerInstance.log('order created', orderId)
// setStep(2) // setStep(2)
// } catch (error) { // } catch (error) {
// setConsumeError(error.message) // setConsumeError(error.message)
// return error.message // return error.message
// } // }
// } // }
} // }
setStep(3) setStep(3)
// if (orderId) // if (orderId)
// await ocean.assets.download( // await ocean.assets.download(

1
src/components/Publish/Navigation/index.module.css
View File

@ -90,5 +90,6 @@
.success.current:before { .success.current:before {
background: var(--font-color-heading); background: var(--font-color-heading);
color: var(--brand-alert-green);
border-color: var(--brand-alert-green); border-color: var(--brand-alert-green);
} }

4
src/components/Publish/index.tsx
View File

@ -28,10 +28,10 @@ import {
LoggerInstance LoggerInstance
} from '@oceanprotocol/lib' } from '@oceanprotocol/lib'
import { useSiteMetadata } from '@hooks/useSiteMetadata' import { useSiteMetadata } from '@hooks/useSiteMetadata'
import Web3 from 'web3'
import axios, { Method } from 'axios' import axios, { Method } from 'axios'
import { useCancelToken } from '@hooks/useCancelToken' import { useCancelToken } from '@hooks/useCancelToken'
import { getOceanConfig } from '@utils/ocean' import { getOceanConfig } from '@utils/ocean'
import { validationSchema } from './_validation'
// TODO: restore FormikPersist, add back clear form action // TODO: restore FormikPersist, add back clear form action
const formName = 'ocean-publish-form' const formName = 'ocean-publish-form'
@ -284,7 +284,7 @@ export default function PublishPage({
return isInPurgatory && purgatoryData ? null : ( return isInPurgatory && purgatoryData ? null : (
<Formik <Formik
initialValues={initialValues} initialValues={initialValues}
// validationSchema={validationSchema} validationSchema={validationSchema}
onSubmit={async (values, { resetForm }) => { onSubmit={async (values, { resetForm }) => {
// kick off publishing // kick off publishing
await handleSubmit(values) await handleSubmit(values)