Skip to content

Commit

Permalink
feat-alignment (#615)
Browse files Browse the repository at this point in the history 
* feat: merge accurate-portal

* fix: edit crash additionalInformation undefined

* fix: update faucet

* fix: update address.config.js, content, images, faucet and publish

* fix: deleted form input styling update
  • Loading branch information
@KevinRohlf
KevinRohlf authored Oct 30, 2024
1 parent 2a88db0 commit a13b58d
Show file tree
Hide file tree
Showing 63 changed files with 689 additions and 324 deletions.
76 changes: 54 additions & 22 deletions content/pages/editMetadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
"name": "name",
"label": "New Title",
"placeholder": "e.g. Shapes of Desert Plants",
"placeholder": "e.g. Production data of a manufacturing process",
"help": "Enter a concise title.",
"required": true
},
Expand Down Expand Up @@ -35,37 +35,28 @@
"type": "tabs",
"fields": [
{
"value": "ipfs",
"title": "IPFS",
"label": "CID",
"placeholder": "e.g. bafkreidgvpkjawlxz6sffxzwgooowe5yt7i6wsyg236mfoks77nywkptdq",
"help": "This CID will be stored encrypted after publishing.",
"computeHelp": "For a compute dataset, your file should match the file type required by the algorithm, and should not exceed 1 GB in file size. ",
"prominentHelp": true,
"type": "files",
"required": true
},
{
"value": "arweave",
"title": "Arweave",
"label": "Transaction ID",
"placeholder": "e.g. DBRCL94j3QqdPaUtt4VWRen8rZfJZBb7Ey40iMpXfhtd",
"help": "This Transaction ID will be stored encrypted after publishing.",
"value": "url",
"title": "URL",
"label": "File",
"placeholder": "e.g. https://file.com/file.json",
"help": "This URL will be stored encrypted after publishing. **Please make sure that the endpoint is accessible over the internet and is not protected by a firewall or by credentials.**",
"computeHelp": "For a compute dataset, your file should match the file type required by the algorithm, and should not exceed 1 GB in file size. ",
"prominentHelp": true,
"type": "files",
"required": true
"required": true,
"methods": false
},
{
"value": "url",
"title": "URL",
"title": "API",
"label": "File",
"placeholder": "e.g. https://file.com/file.json",
"help": "This URL will be stored encrypted after publishing. **Please make sure that the endpoint is accessible over the internet and is not protected by a firewall or by credentials.**",
"computeHelp": "For a compute dataset, your file should match the file type required by the algorithm, and should not exceed 1 GB in file size. ",
"prominentHelp": true,
"type": "files",
"required": true,
"methods": true,
"innerFields": [
{
"value": "headers",
Expand All @@ -74,6 +65,30 @@
"placeholder_value": "Authorization",
"help": "This HEADERS will be stored encrypted after publishing.",
"type": "headers",
"required": false
}
]
},
{
"value": "saas",
"title": "SaaS",
"label": "Redirect URL",
"placeholder": "e.g. https://delta-dao/the-future-is-now",
"help": "The url the user will be redirected to after buying access to the SaaS.",
"prominentHelp": true,
"type": "saas",
"fieldFormPrefix": "saas",
"required": true,
"methods": false,
"innerFields": [
{
"value": "paymentMode",
"title": "PaymentMode",
"label": "PaymentMode",
"help": "Choose how the payment mode for your Saas.",
"type": "select",
"selected": "",
"options": ["Subscription", "Pay per use"],
"required": true
}
]
Expand All @@ -88,7 +103,6 @@
"prominentHelp": true,
"type": "files",
"required": true,
"headers": true,
"innerFields": [
{
"value": "headers",
Expand All @@ -97,7 +111,7 @@
"placeholder_value": "Authorization",
"help": "This HEADERS will be stored encrypted after publishing.",
"type": "headers",
"required": true
"required": false
},
{
"value": "query",
Expand All @@ -109,6 +123,17 @@
"required": true
}
]
},
{
"value": "ipfs",
"title": "IPFS",
"label": "CID",
"placeholder": "e.g. bafkreidgvpkjawlxz6sffxzwgooowe5yt7i6wsyg236mfoks77nywkptdq",
"help": "This CID will be stored encrypted after publishing.",
"computeHelp": "For a compute dataset, your file should match the file type required by the algorithm, and should not exceed 1 GB in file size. ",
"prominentHelp": true,
"type": "files",
"required": true
}
],
"sortOptions": false,
Expand Down Expand Up @@ -140,7 +165,14 @@
"label": "Timeout",
"help": "Define how long buyers should be able to download the dataset again after the initial purchase.",
"type": "select",
"options": ["Forever", "1 day", "1 week", "1 month", "1 year"],
"options": [
"Forever",
"1 hour",
"1 day",
"1 week",
"1 month",
"1 year"
],
"sortOptions": false,
"required": true
},
Expand Down
7 changes: 4 additions & 3 deletions content/price.json
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"create": {
"fixed": {
"title": "Fixed",
"title": "Priced",
"info": "Set your price for accessing this dataset. The datatoken for this dataset will be worth the entered amount of the selected base token.",
"tooltips": {
"communityFee": "Goes to Ocean DAO for teams to improve the tools, build apps, do outreach, and more. A small fraction is used to burn OCEAN. This fee is collected when downloading or using an asset in a compute job.",
"marketplaceFee": "Goes to the marketplace owner that is hosting and providing the marketplace and is collected when downloading or using an asset in a compute job. In Ocean Market, it is treated as network revenue that goes to the Ocean community."
"communityFee": "Goes to the Pontus-X Ecosystem participants to improve the tools, build apps, do outreach, and more. This fee is collected when downloading or using an asset in a compute job.",
"marketplaceFee": "Goes to the marketplace owner that is hosting and providing the marketplace and is collected when downloading or using an asset in a compute job.",
"earningsAfterFees": "The amount of tokens you will receive after the fees are collected."
}
},
"free": {
Expand Down
106 changes: 72 additions & 34 deletions content/publish/form.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"name": "nft",
"label": "Data NFT",
"type": "nft",
"help": "All metadata is stored on-chain in a newly deployed ERC-721 contract representing this asset, created with this name, symbol, description and image.",
"help": "Data NFTs are unique digital assets that represent the intellectual property of your digital services, enabling flexible licensing arrangements and enhanced control over your valuable business data. Each Data NFT can issue multiple access tokens with customized terms, enabling varied access levels and durations for your digital service.",
"required": true
},
{
Expand Down Expand Up @@ -160,7 +160,7 @@
},
{
"name": "providerUrl",
"label": "Provider URL",
"label": "Access Controller URL",
"type": "providerUrl",
"help": "Enter the URL for your custom [provider](https://github.com/oceanprotocol/provider/) or leave as is to use the default one. If you change your provider URL after adding your file, please add & validate your file again.",
"placeholder": "e.g. https://provider.oceanprotocol.com/",
Expand All @@ -173,31 +173,21 @@
"type": "tabs",
"fields": [
{
"value": "ipfs",
"title": "IPFS",
"label": "CID",
"placeholder": "e.g. bafkreidgvpkjawlxz6sffxzwgooowe5yt7i6wsyg236mfoks77nywkptdq",
"help": "This CID will be stored encrypted after publishing.",
"computeHelp": "For a compute dataset, your file should match the file type required by the algorithm, and should not exceed 1 GB in file size. ",
"prominentHelp": true,
"type": "files",
"required": true
},
{
"value": "arweave",
"title": "Arweave",
"label": "Transaction ID",
"placeholder": "e.g. DBRCL94j3QqdPaUtt4VWRen8rZfJZBb7Ey40iMpXfhtd",
"help": "This Transaction ID will be stored encrypted after publishing.",
"value": "url",
"title": "URL",
"label": "File",
"placeholder": "e.g. https://file.com/file.json",
"help": "This URL will be stored encrypted after publishing. **Please make sure that the endpoint is accessible over the internet and is not protected by a firewall or by credentials.**",
"computeHelp": "For a compute dataset, your file should match the file type required by the algorithm, and should not exceed 1 GB in file size. ",
"prominentHelp": true,
"type": "files",
"required": true
"required": true,
"methods": false
},
{
"value": "url",
"title": "URL",
"label": "File",
"title": "API",
"label": "Endpoint",
"placeholder": "e.g. https://file.com/file.json",
"help": "This URL will be stored encrypted after publishing. **Please make sure that the endpoint is accessible over the internet and is not protected by a firewall or by credentials.**",
"computeHelp": "For a compute dataset, your file should match the file type required by the algorithm, and should not exceed 1 GB in file size. ",
Expand All @@ -217,6 +207,30 @@
}
]
},
{
"value": "saas",
"title": "SaaS",
"label": "Redirect URL",
"placeholder": "e.g. https://delta-dao/the-future-is-now",
"help": "The url the user will be redirected to after buying access to the Software as a Service offering.",
"prominentHelp": true,
"type": "saas",
"fieldFormPrefix": "metadata.saas",
"required": true,
"methods": false,
"innerFields": [
{
"value": "paymentMode",
"title": "PaymentMode",
"label": "PaymentMode",
"help": "Choose the payment mode of your Software as a Service offering.",
"type": "select",
"selected": "",
"options": ["Subscription", "Pay per use"],
"required": true
}
]
},
{
"value": "graphql",
"title": "Graphql",
Expand Down Expand Up @@ -247,6 +261,17 @@
"required": true
}
]
},
{
"value": "ipfs",
"title": "IPFS",
"label": "CID",
"placeholder": "e.g. bafkreidgvpkjawlxz6sffxzwgooowe5yt7i6wsyg236mfoks77nywkptdq",
"help": "This CID will be stored encrypted after publishing.",
"computeHelp": "For a compute dataset, your file should match the file type required by the algorithm, and should not exceed 1 GB in file size. ",
"prominentHelp": true,
"type": "files",
"required": true
}
],
"sortOptions": false,
Expand Down Expand Up @@ -290,35 +315,48 @@
"disclaimer": "Please do not provide downloadable personal data without the consent of the data subjects.",
"disclaimerValues": ["Download"]
},
{
"name": "timeout",
"label": "Timeout",
"help": "Define how long buyers should be able to download the dataset again after the initial purchase.",
"type": "select",
"options": ["Forever", "1 day", "1 week", "1 month", "1 year"],
"sortOptions": false,
"required": true
},

{
"name": "usesConsumerParameters",
"label": "User defined parameters",
"help": "User defined parameters are used to filter or query the published asset.",
"type": "checkbox",
"options": ["This asset uses user defined parameters"],
"required": false
}
]
},
"policies": {
"title": "Policies",
"fields": [
{
"name": "timeout",
"label": "Access Period",
"help": "Define how long buyers should be able to access your offering again after the initial purchase.",
"type": "select",
"options": [
"Forever",
"1 hour",
"1 day",
"1 week",
"1 month",
"1 year"
],
"sortOptions": false,
"required": true
},
{
"name": "allow",
"label": "Allow ETH Address",
"label": "Allow Wallet Address",
"placeholder": "e.g. 0xe328aB96B7CbB55A6E1c1054678137bA09780acA",
"help": "Enter an ETH address and click the ADD button to append to the list. Only ETH addresses in the allow list can consume this asset. If the list is empty anyone can download or compute this asset.",
"help": "Enter an wallet address and click the ADD button to append to the list. Only wallet addresses in the allow list can consume this asset. If the list is empty anyone can download or compute this asset. For more information, you can visit the [Pontus-X registry page](https://docs.pontus-x.eu/docs/participants-and-federators/ecosystem-participants).",
"type": "credentials"
},
{
"name": "deny",
"label": "Deny ETH Address",
"label": "Deny Wallet Address",
"placeholder": "e.g. 0xe328aB96B7CbB55A6E1c1054678137bA09780acA",
"help": "Enter an ETH address and click the ADD button to append to the list. If an ETH address is in the deny list, download or compute of this asset will be denied for that ETH address.",
"help": "Enter an wallet address and click the ADD button to append to the list. If an wallet address is in the deny list, download or compute of this asset will be denied for that wallet address. For more information, you can visit the [Pontus-X registry page](https://docs.pontus-x.eu/docs/participants-and-federators/ecosystem-participants).",
"type": "credentials"
}
]
Expand Down
17 changes: 17 additions & 0 deletions content/site.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,23 @@
"isLive": false
}
]
},
{
"name": "Resources",
"subItems": [
{
"name": "Documentation",
"link": "https://docs.pontus-x.eu/"
},
{
"name": "Landing Page",
"link": "https://www.pontus-x.eu/"
},
{
"name": "nautilus",
"link": "https://nautilus.delta-dao.com/"
}
]
}
],
"announcement": "The Pontus-X Devnet is currently undergoing a scheduled load test. The network remains stable and fully operational during this period.",
Expand Down
12 changes: 7 additions & 5 deletions src/@utils/aquarius/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,13 +369,15 @@ export async function getAlgorithmDatasetsForCompute(
const baseQueryParams = {
chainIds: [datasetChainId],
nestedQuery: {
must: {
match_phrase: {
'services.compute.publisherTrustedAlgorithms.did': {
query: algorithmId
must: [
{
match_phrase: {
'services.compute.publisherTrustedAlgorithms.did': {
query: algorithmId
}
}
}
}
]
},
sortOptions: {
sortBy: SortTermOptions.Created,
Expand Down
12 changes: 12 additions & 0 deletions src/@utils/ddo.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ export function mapTimeoutStringToSeconds(timeout: string): number {
switch (timeout) {
case 'Forever':
return 0
case '1 hour':
return 3600
case '1 day':
return 86400
case '1 week':
Expand Down Expand Up @@ -156,6 +158,16 @@ export function normalizeFile(
} as Smartcontract
break
}
case 'saas': {
fileObj = {
type: 'url',
index: 0,
url: file ? file[0]?.url || file?.url : null,
headers: headersProvider,
method: file.method
} as UrlFile
break
}
default: {
fileObj = {
type: 'url',
Expand Down
Loading

0 comments on commit a13b58d

Please sign in to comment.