more publish data flow changes

src/components/pages/Publish/Feedback.tsx

@@ -4,17 +4,18 @@ import Loader from '../../atoms/Loader'
 import React, { ReactElement } from 'react'
 import styles from './Feedback.module.css'
 import SuccessConfetti from '../../atoms/SuccessConfetti'
+import { DDO } from '@oceanprotocol/lib'
 
 export default function Feedback({
   error,
   success,
-  did,
+  ddo,
   publishStepText,
   setError
 }: {
   error: string
   success: string
-  did: string
+  ddo: DDO
   publishStepText: string
   setError: (error: string) => void
 }): ReactElement {
@@ -22,7 +23,7 @@ export default function Feedback({
     <Button
       style="primary"
       size="small"
-      href={`/asset/${did}`}
+      href={`/asset/${ddo.id}`}
       className={styles.action}
     >
       Go to data set →

src/components/pages/Publish/Pricing.tsx

@@ -1,34 +1,42 @@
-import React, { ReactElement, useState, useEffect } from 'react'
+import React, { ReactElement } from 'react'
 import { Field, FieldInputProps, Formik } from 'formik'
 import Input from '../../atoms/Input'
-import { FormPricing } from 'models/FormPricing'
+import { initialValues, validationSchema } from 'models/FormPricing'
+import { DDO } from '@oceanprotocol/lib'
+import { usePricing } from '@oceanprotocol/react'
+import { PriceOptionsMarket } from '../../../@types/MetaData'
+
+export default function Pricing({ ddo }: { ddo: DDO }): ReactElement {
+  const { createPricing } = usePricing(ddo)
+
+  async function handleCreatePricing(values: Partial<PriceOptionsMarket>) {
+    const priceOptions = {
+      price: values.price,
+      tokensToMint: values.tokensToMint,
+      type: values.type,
+      weightOnDataToken: values.weightOnDataToken,
+      swapFee: values.swapFee
+    }
+    const tx = await createPricing(priceOptions)
+  }
 
-export default function Pricing(): ReactElement {
   return (
     <Formik
       initialValues={initialValues}
       validationSchema={validationSchema}
       onSubmit={async (values, { setSubmitting, resetForm }) => {
-        await handlePricing(values.amount, resetForm)
+        await handleCreatePricing(values)
         setSubmitting(false)
       }}
     >
-      {({
+      {() => (
-        values,
-        touched,
-        setTouched,
-        isSubmitting,
-        setFieldValue,
-        submitForm,
-        handleChange
-      }) => (
         <>
           <Field name="price">
             {({
               field,
               form
             }: {
-              field: FieldInputProps<FormPricing>
+              field: FieldInputProps<PriceOptionsMarket>
               form: any
             }) => (
               <Input

src/components/pages/Publish/index.tsx

@@ -10,7 +10,7 @@ import { transformPublishFormToMetadata } from './utils'
 import Preview from './Preview'
 import { MetadataPublishForm } from '../../../@types/MetaData'
 import { useUserPreferences } from '../../../providers/UserPreferences'
-import { Logger, Metadata } from '@oceanprotocol/lib'
+import { DDO, Logger, Metadata } from '@oceanprotocol/lib'
 import { Persist } from '../../atoms/FormikPersist'
 import Debug from './Debug'
 import Feedback from './Feedback'
@@ -27,7 +27,7 @@ export default function PublishPage({
 
   const [success, setSuccess] = useState<string>()
   const [error, setError] = useState<string>()
-  const [did, setDid] = useState<string>()
+  const [ddo, setDdo] = useState<DDO>()
 
   const hasFeedback = isLoading || error || success
 
@@ -61,7 +61,7 @@ export default function PublishPage({
 
       // Publish succeeded
       if (ddo) {
-        setDid(ddo.id)
+        setDdo(ddo)
         setSuccess('🎉 Successfully published your data set. 🎉')
         resetForm()
       }
@@ -93,7 +93,7 @@ export default function PublishPage({
               error={error}
               success={success}
               publishStepText={publishStepText}
-              did={did}
+              ddo={ddo}
               setError={setError}
             />
           ) : (

src/models/FormPricing.ts

@@ -1,41 +1,26 @@
 import { PriceOptionsMarket } from '../@types/MetaData'
 import * as Yup from 'yup'
 
-export interface FormPricing {
+export const validationSchema = Yup.object().shape<PriceOptionsMarket>({
-  price: PriceOptionsMarket
+  price: Yup.number().min(1, 'Must be greater than 0').required('Required'),
-}
+  tokensToMint: Yup.number()
-
+    .min(1, 'Must be greater than 0')
-export const validationSchema = Yup.object().shape<FormPricing>({
+    .required('Required'),
-  price: Yup.object()
+  type: Yup.string()
-    .shape({
+    .matches(/fixed|dynamic/g)
-      price: Yup.number().min(1, 'Must be greater than 0').required('Required'),
+    .required('Required'),
-      tokensToMint: Yup.number()
+  weightOnDataToken: Yup.string().required('Required'),
-        .min(1, 'Must be greater than 0')
+  swapFee: Yup.number()
-        .required('Required'),
+    .min(0.1, 'Must be more or equal to 0.1')
-      type: Yup.string()
+    .max(0.9, 'Must be less or equal to 0.9')
-        .matches(/fixed|dynamic/g)
-        .required('Required'),
-      weightOnDataToken: Yup.string().required('Required'),
-      swapFee: Yup.number()
-        .min(0.1, 'Must be more or equal to 0.1')
-        .max(0.9, 'Must be less or equal to 0.9')
-        .required('Required'),
-      datatoken: Yup.object()
-        .shape({
-          name: Yup.string(),
-          symbol: Yup.string()
-        })
-        .nullable()
-    })
     .required('Required')
+    .nullable()
 })
 
-export const initialValues: Partial<FormPricing> = {
+export const initialValues: Partial<PriceOptionsMarket> = {
-  price: {
+  price: 1,
-    price: 1,
+  type: 'dynamic',
-    type: 'dynamic',
+  tokensToMint: 1,
-    tokensToMint: 1,
+  weightOnDataToken: '9', // 90% on data token
-    weightOnDataToken: '9', // 90% on data token
+  swapFee: 0.1 // in %
-    swapFee: 0.1 // in %
-  }
 }