diff --git a/src/components/molecules/PublishForm/PublishForm.tsx b/src/components/molecules/PublishForm/PublishForm.tsx
index 830da541f..0c7eed204 100644
--- a/src/components/molecules/PublishForm/PublishForm.tsx
+++ b/src/components/molecules/PublishForm/PublishForm.tsx
@@ -16,6 +16,10 @@ import styles from './PublishForm.module.css'
import utils from 'web3-utils'
import AssetModel from '../../../models/Asset'
import { useWeb3, useOcean } from '@oceanprotocol/react'
+import {
+ Service,
+ ServiceCompute
+} from '@oceanprotocol/squid/dist/node/ddo/Service'
declare type PublishFormProps = {}
@@ -49,14 +53,13 @@ export function transformPublishFormToMetadata(
author,
license,
summary,
- category,
holder,
keywords,
termsAndConditions,
- granularity,
supportName,
supportEmail,
- dateRange
+ dateRange,
+ access
} = data
const metadata: MetaDataDexFreight = {
@@ -74,13 +77,12 @@ export function transformPublishFormToMetadata(
additionalInformation: {
...AssetModel.additionalInformation,
description: summary,
- categories: [category],
copyrightHolder: holder,
tags: keywords?.split(','),
termsAndConditions,
- granularity,
supportName,
- supportEmail
+ supportEmail,
+ access: 'Download'
},
// ------- curation -------
curation: AssetModel.curation
@@ -101,8 +103,8 @@ export function transformPublishFormToMetadata(
const PublishForm: React.FC
= () => {
const [buttonDisabled, setButtonDisabled] = useState(false)
- const { web3, web3Connect } = useWeb3()
- const { ocean } = useOcean()
+ const { web3Connect } = useWeb3()
+ const { ocean, account } = useOcean()
const router = useRouter()
const [data, updateData] = useStoredValue(
PUBLISH_FORM_LOCAL_STORAGE_KEY,
@@ -136,22 +138,51 @@ const PublishForm: React.FC = () => {
}
if (ocean) {
- const asset = await ocean.assets.create(
- (transformPublishFormToMetadata(formData) as unknown) as MetaData,
- (await ocean.accounts.list())[0]
- )
+ const metadata = transformPublishFormToMetadata(formData)
+
+ // if services array stays empty, the default access service
+ // will be created by squid-js
+ let services: Service[] = []
+
+ if (metadata.additionalInformation.access === 'Compute') {
+ const computeService: ServiceCompute = await ocean.compute.createComputeServiceAttributes(
+ account,
+ metadata.main.price,
+ // Note: a hack without consequences.
+ // Will make metadata.main.datePublished (automatically created by Aquarius)
+ // go out of sync with this service.main.datePublished.
+ toStringNoMS(new Date(Date.now()))
+ )
+ services = [computeService]
+ }
+
+ try {
+ const asset = await ocean.assets.create(
+ (transformPublishFormToMetadata(formData) as unknown) as MetaData,
+ account,
+ services
+ )
+
+ // Reset the form to initial values
+
+ updateData(publishFormData)
+ clearFilesData()
+
+ // User feedback and redirect
+ toast.success('asset created successfully', {
+ className: styles.success
+ })
+ toast.dismiss(submittingToast)
+ router.push(`/asset/${asset.id}`)
+ } catch (e) {
+ console.log(e)
+ } finally {
+ setButtonDisabled(false)
+ }
// Reset the form to initial values
- updateData(publishFormData)
- clearFilesData()
- setButtonDisabled(false)
// User feedback and redirect
- toast.success('asset created successfully', {
- className: styles.success
- })
- toast.dismiss(submittingToast)
- router.push(`/asset/${asset.id}`)
}
}
diff --git a/src/components/organisms/Compute.module.css b/src/components/organisms/Compute.module.css
index f6527cd5e..aa5609d5e 100644
--- a/src/components/organisms/Compute.module.css
+++ b/src/components/organisms/Compute.module.css
@@ -1,10 +1,7 @@
.jobButtonWrapper {
margin-top: var(--spacer);
}
-.selectType {
- width: 100%;
- margin-bottom: var(--spacer);
-}
+
.feedback {
width: 100%;
margin-top: var(--spacer);
@@ -13,9 +10,9 @@
}
.compute {
+ composes: box from '../atoms/Box.module.css';
display: flex;
flex-wrap: wrap;
- padding: calc(var(--spacer) * 1.5);
}
.compute button {
margin-left: var(--spacer);
@@ -24,14 +21,15 @@
margin-left: 0px;
}
.price {
- padding-bottom: calc(var(--spacer) * 1.5);
+ font-size: var(--font-size-h2);
+ /* padding-bottom: var(--spacer); */
}
.info {
display: flex;
flex-direction: column;
width: 100%;
- padding-top: calc(var(--spacer) * 0.5);
+ /* padding-top: calc(var(--spacer) * 0.5);
padding-bottom: var(--spacer);
- border-top: 1px solid var(--color-secondary);
+ border-top: 1px solid var(--color-secondary); */
}
diff --git a/src/components/organisms/Compute.tsx b/src/components/organisms/Compute.tsx
index ca276e89e..974c6fd7e 100644
--- a/src/components/organisms/Compute.tsx
+++ b/src/components/organisms/Compute.tsx
@@ -1,10 +1,9 @@
import React, { useState, useEffect } from 'react'
-import { DDO, MetaDataAlgorithm, Ocean, DID } from '@oceanprotocol/squid'
+import { DDO, Ocean, Logger } from '@oceanprotocol/squid'
import { ServiceMetadata } from '@oceanprotocol/squid/dist/node/ddo/Service'
import { fromWei } from 'web3-utils'
import compareAsBN, { Comparisson } from '../../utils/compareAsBN'
import Loader from '../atoms/Loader'
-import { config } from '../../config/ocean'
import Web3Feedback from '../molecules/Web3Feedback'
import Dropzone from '../atoms/Dropzone'
import Price from '../atoms/Price'
@@ -14,8 +13,9 @@ import {
useCompute,
readFileContent
} from '@oceanprotocol/react'
-import styles from './Consume.module.css'
+import styles from './Compute.module.css'
import Button from '../atoms/Button'
+import Input from '../atoms/Input/Input'
export default function Compute({
ddo,
@@ -27,10 +27,9 @@ export default function Compute({
ocean: Ocean | null
}) {
if (!ddo) return null
- const { compute, computeStep, computeStepText } = useCompute()
+ const { compute, isLoading, computeStepText, computeError } = useCompute()
const [isJobStarting, setIsJobStarting] = useState(false)
- const [step, setStep] = useState(99)
- const [error, setError] = useState('')
+ const [, setError] = useState('')
const [isBalanceSufficient, setIsBalanceSufficient] = useState(false)
const [computeType, setComputeType] = useState('')
@@ -48,7 +47,7 @@ export default function Compute({
const isFree = price === '0'
- const [isTermsAgreed, setIsTermsAgreed] = useState(false)
+ const [isTermsAgreed, setIsTermsAgreed] = useState(true)
const isComputeButtonDisabled =
isJobStarting ||
file === null ||
@@ -58,6 +57,7 @@ export default function Compute({
!isTermsAgreed
useEffect(() => {
+ console.log(Logger)
setIsBalanceSufficient(
isFree ||
(balance !== null &&
@@ -86,7 +86,9 @@ export default function Compute({
setIsJobStarting(true)
setIsPublished(false)
setError('')
- // compute(ddo.id, algorithmRawCode, computeContainer)
+
+ await compute(ddo.id, algorithmRawCode, computeContainer)
+
setIsPublished(true)
setFile(null)
} catch (error) {
@@ -96,31 +98,28 @@ export default function Compute({
setIsJobStarting(false)
}
- function onCheck(event: any) {
- console.log(event, event.target.checked)
- setIsTermsAgreed(event.target.checked)
- }
-
return (
-
+
- {/* handleChange(e)}
- required
- /> */}
+ x.name)}
+ onChange={handleSelectChange}
+ />
- {isJobStarting &&
}
- {error !== '' &&
{error}
}
+ {isLoading &&
}
+ {computeError !== undefined && (
+
{computeError}
+ )}
{isPublished && (
Your job started! Watch the progress in the history page.
diff --git a/src/components/templates/AssetDetails/MetaFull.tsx b/src/components/templates/AssetDetails/MetaFull.tsx
index f701401f3..ddcdb712f 100644
--- a/src/components/templates/AssetDetails/MetaFull.tsx
+++ b/src/components/templates/AssetDetails/MetaFull.tsx
@@ -13,9 +13,9 @@ export default function MetaFull({
attributes: MetaDataDexFreight
}) {
const { dateCreated, author, license } = attributes.main
- let dateRange, granularity
+ let dateRange
if (attributes && attributes.additionalInformation) {
- ;({ dateRange, granularity } = attributes.additionalInformation)
+ ;({ dateRange } = attributes.additionalInformation)
}
// In practice dateRange will always be defined, but in the rare case it isn't
@@ -43,10 +43,6 @@ export default function MetaFull({
}
/>
- {granularity && (
-
- )}
-
{ddo?.id}} />
)
diff --git a/src/components/templates/AssetDetails/index.tsx b/src/components/templates/AssetDetails/index.tsx
index 627fc240c..0451903b7 100644
--- a/src/components/templates/AssetDetails/index.tsx
+++ b/src/components/templates/AssetDetails/index.tsx
@@ -15,7 +15,8 @@ import RatingAction from './RatingAction'
import styles from './index.module.css'
import { config } from '../../../config/ocean'
import { findServiceByType } from '../../../utils'
-import { useMetadata, useWeb3 } from '@oceanprotocol/react'
+import { useMetadata, useWeb3, useOcean } from '@oceanprotocol/react'
+import Compute from '../../organisms/Compute'
export declare type AssetDetailsPageProps = {
title: string
@@ -33,6 +34,8 @@ const AssetDetailsPageMeta = ({
}) => {
if (!attributes) return null
+ const { web3, account } = useWeb3()
+ const { ocean, balanceInOcean } = useOcean()
const { datePublished } = attributes.main
const {
description,
@@ -83,7 +86,12 @@ const AssetDetailsPageMeta = ({
-
+ {isCompute ? (
+
+ ) : (
+
+ )}
+
diff --git a/src/config/ocean.ts b/src/config/ocean.ts
index f4942811f..a6414caa0 100644
--- a/src/config/ocean.ts
+++ b/src/config/ocean.ts
@@ -19,11 +19,11 @@ export const config: Partial
= {
nodeUri: process.env.NODE_URI || 'https://pacific.oceanprotocol.com',
aquariusUri:
process.env.AQUARIUS_URI ||
- 'https://aquarius.pacific.dexfreight.dev-ocean.com',
+ 'https://aquarius.marketplace.oceanprotocol.com',
brizoUri:
- process.env.BRIZO_URI || 'https://brizo.pacific.dexfreight.dev-ocean.com',
+ process.env.BRIZO_URI || 'https://brizo.marketplace.oceanprotocol.com',
brizoAddress:
- process.env.BRIZO_ADDRESS || '0xeD792C5FcC8bF3322a6ba89A6e51eF0B6fB3C530',
+ process.env.BRIZO_ADDRESS || '0x00c6A0BC5cD0078d6Cd0b659E8061B404cfa5704',
secretStoreUri:
process.env.SECRET_STORE_URI || 'https://secret-store.oceanprotocol.com',
faucetUri: process.env.FAUCET_URI || 'https://faucet.oceanprotocol.com',
diff --git a/src/models/Asset.ts b/src/models/Asset.ts
index a202cb268..d92fe61b1 100644
--- a/src/models/Asset.ts
+++ b/src/models/Asset.ts
@@ -15,7 +15,6 @@ const AssetModel: MetaDataDexFreight = {
additionalInformation: {
description: '',
copyrightHolder: '',
- categories: [''],
tags: undefined,
// links: [],
@@ -23,7 +22,6 @@ const AssetModel: MetaDataDexFreight = {
deliveryType: 'files',
termsAndConditions: false,
dateRange: undefined,
- granularity: undefined,
supportName: undefined,
supportEmail: undefined,
access: 'Download'
diff --git a/src/models/PublishForm.ts b/src/models/PublishForm.ts
index e75c36604..bd837d20f 100644
--- a/src/models/PublishForm.ts
+++ b/src/models/PublishForm.ts
@@ -3,7 +3,7 @@ import { JSONSchema6 } from 'json-schema'
import TermsWidget from '../components/atoms/FormWidgets/TermsWidget'
import DateRangeWidget from '../components/atoms/FormWidgets/DateRangeWidget'
import { ObjectFieldTemplate } from '../components/molecules/Form/ObjectFieldTemplate'
-import { Granularity } from '../@types/MetaData'
+import { Granularity, AccessType } from '../@types/MetaData'
import FileField from '../components/molecules/Form/FileField'
export const customWidgets = {
@@ -11,26 +11,17 @@ export const customWidgets = {
DateRangeWidget
}
-// Ref: https://react-jsonschema-form.readthedocs.io/en/latest/form-customization/#the-uischema-object
-export const CATEGORIES = [
- 'Invoices',
- 'Historical location-based data',
- 'Shipment attribute (without rate information)',
- 'Shipment attribute (with rate information)',
- 'Other'
-]
export const PublishFormSchema: JSONSchema6 = {
type: 'object',
required: [
- 'category',
'title',
'author',
'license',
'price',
'files',
- 'granularity',
'summary',
- 'termsAndConditions'
+ 'termsAndConditions',
+ 'access'
],
definitions: {
files: {
@@ -43,11 +34,6 @@ export const PublishFormSchema: JSONSchema6 = {
}
},
properties: {
- category: {
- type: 'string',
- title: 'What type of data will you be providing?',
- enum: CATEGORIES
- },
title: {
type: 'string',
title: 'Offer Title'
@@ -71,22 +57,15 @@ export const PublishFormSchema: JSONSchema6 = {
type: 'number',
minimum: 0
},
- granularity: {
- type: 'string',
- title: 'Granularity of Data',
- enum: [
- 'Not updated periodically',
- 'Hourly',
- 'Daily',
- 'Weekly',
- 'Monthly',
- 'Annually'
- ]
- },
author: {
type: 'string',
title: 'Author'
},
+ access: {
+ title: 'Access type',
+ type: 'string',
+ enum: ['Download', 'Compute']
+ },
license: {
title: 'License',
type: 'string',
@@ -161,9 +140,9 @@ export const PublishFormUiSchema: UiSchema = {
price: {
'ui:help': 'Set your price in Ocean Tokens.'
},
- granularity: {
+ access: {
'ui:widget': 'select',
- 'ui:help': 'Select the timeframe your data was collected.'
+ 'ui:help': 'Access Type'
},
author: {
'ui:placeholder': 'e.g. Jelly McJellyfish',
@@ -190,8 +169,6 @@ export const PublishFormUiSchema: UiSchema = {
export interface PublishFormDataInterface {
// ---- required fields ----
- category: string
- granularity: Granularity
summary: string
termsAndConditions: boolean
author: string
@@ -199,6 +176,7 @@ export interface PublishFormDataInterface {
files: string[]
price: number
title: string
+ access?: AccessType
// ---- optional fields ----
dateRange?: string
holder?: string
@@ -213,8 +191,6 @@ export const publishFormData: PublishFormDataInterface = {
title: '',
files: [''], // should be empty string initially to display the expanded field
summary: '',
- category: '',
- granularity: '',
license: '',
termsAndConditions: false,
dateRange: undefined,
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index d290116b7..0ade36b1a 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -12,7 +12,8 @@ import '@oceanprotocol/typographies/css/ocean-typo.css'
import 'react-toastify/dist/ReactToastify.css'
import '../styles/global.css'
import '../components/atoms/NProgress.css'
-import { Web3Provider, OceanProvider } from '@oceanprotocol/react'
+import { Web3Provider, OceanProvider, Config } from '@oceanprotocol/react'
+import { config } from '../config/ocean'
export default function dexfreightApp({ Component, pageProps }: AppProps) {
const { asPath } = useRouter()
@@ -26,24 +27,6 @@ export default function dexfreightApp({ Component, pageProps }: AppProps) {
require('../styles/datepicker.css')
}
- const config = {
- nodeUri: process.env.NODE_URI || 'https://pacific.oceanprotocol.com',
- aquariusUri:
- process.env.AQUARIUS_URI ||
- 'https://aquarius.pacific.dexfreight.dev-ocean.com',
- brizoUri:
- process.env.BRIZO_URI || 'https://brizo.pacific.dexfreight.dev-ocean.com',
- brizoAddress:
- process.env.BRIZO_ADDRESS || '0xeD792C5FcC8bF3322a6ba89A6e51eF0B6fB3C530',
- secretStoreUri:
- process.env.SECRET_STORE_URI || 'https://secret-store.oceanprotocol.com',
- faucetUri: process.env.FAUCET_URI || 'https://faucet.oceanprotocol.com',
- ratingUri:
- process.env.RATING_URI ||
- 'https://rating.pacific.dexfreight.dev-ocean.com',
- verbose: 3
- }
-
return (
<>
@@ -72,7 +55,7 @@ export default function dexfreightApp({ Component, pageProps }: AppProps) {
/>
-
+