From 9bd9156553f5fca7a5735b0f6f5f3ea8afabf061 Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Mon, 29 Nov 2021 16:49:38 +0000
Subject: [PATCH] integrate compute options into form data, expose default
 option

---
 content/publish/form.json                 |  9 +++++++
 src/components/Publish/Services/index.tsx | 15 +++++++++++-
 src/components/Publish/_constants.tsx     | 29 ++++++++++++-----------
 src/components/Publish/_types.ts          |  1 +
 4 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/content/publish/form.json b/content/publish/form.json
index a1ecef957..7ddc0c78f 100644
--- a/content/publish/form.json
+++ b/content/publish/form.json
@@ -141,6 +141,15 @@
         "options": ["Forever", "1 day", "1 week", "1 month", "1 year"],
         "sortOptions": false,
         "required": true
+      },
+      {
+        "name": "computeOptions",
+        "label": "Compute Environment",
+        "type": "radio",
+        "options": [
+          "populated from computeEnvironmentDefaults in Publish/_constants & computeEnvironmentOptions in Publish/Services/"
+        ],
+        "required": true
       }
     ]
   },
diff --git a/src/components/Publish/Services/index.tsx b/src/components/Publish/Services/index.tsx
index 28153f229..2b3738d62 100644
--- a/src/components/Publish/Services/index.tsx
+++ b/src/components/Publish/Services/index.tsx
@@ -6,8 +6,8 @@ import IconCompute from '@images/compute.svg'
 import content from '../../../../content/publish/form.json'
 import { getFieldContent } from '../_utils'
 import { FormPublishData } from '../_types'
-import { useWeb3 } from '@context/Web3'
 import { getOceanConfig } from '@utils/ocean'
+import { computeEnvironmentDefaults } from '../_constants'
 
 const accessTypeOptionsTitles = getFieldContent(
   'access',
@@ -38,6 +38,10 @@ export default function ServicesFields(): ReactElement {
     }
   ]
 
+  const computeEnvironmentOptions = [
+    `Default: ${computeEnvironmentDefaults.cpu} CPU, ${computeEnvironmentDefaults.memory} memory, ${computeEnvironmentDefaults.volumeSize} disk`
+  ]
+
   // Auto-change access type based on algo privacy boolean.
   // Could be also done later in transformPublishFormToDdo().
   useEffect(() => {
@@ -84,6 +88,15 @@ export default function ServicesFields(): ReactElement {
         component={Input}
         name="services[0].providerUrl"
       />
+      {values.services[0].access === 'compute' && (
+        <Field
+          {...getFieldContent('computeOptions', content.services.fields)}
+          component={Input}
+          name="services[0].computeOptions"
+          options={computeEnvironmentOptions}
+          disabled
+        />
+      )}
       <Field
         {...getFieldContent('files', content.services.fields)}
         component={Input}
diff --git a/src/components/Publish/_constants.tsx b/src/components/Publish/_constants.tsx
index 4ed088420..8e91693eb 100644
--- a/src/components/Publish/_constants.tsx
+++ b/src/components/Publish/_constants.tsx
@@ -36,6 +36,19 @@ export const wizardSteps: StepContent[] = [
   }
 ]
 
+export const computeEnvironmentDefaults: ServiceComputeOptions = {
+  namespace: 'ocean-compute',
+  cpu: 1,
+  gpu: 0,
+  gpuType: '',
+  memory: '1Gb',
+  volumeSize: '1Gb',
+  allowRawAlgorithm: false,
+  allowNetworkAccess: true,
+  publisherTrustedAlgorithmPublishers: null,
+  publisherTrustedAlgorithms: null
+}
+
 export const initialValues: FormPublishData = {
   user: {
     stepCurrent: 1,
@@ -65,7 +78,8 @@ export const initialValues: FormPublishData = {
       providerUrl: {
         url: 'https://provider.mainnet.oceanprotocol.com',
         valid: true
-      }
+      },
+      computeOptions: computeEnvironmentDefaults
     }
   ],
   pricing: {
@@ -98,16 +112,3 @@ export const algorithmContainerPresets: MetadataAlgorithmContainer[] = [
     checksum: ''
   }
 ]
-
-export const computeEnvironmentDefaults: ServiceComputeOptions = {
-  namespace: 'ocean-compute',
-  cpu: 1,
-  gpu: 0,
-  gpuType: '',
-  memory: '1Gb',
-  volumeSize: '1Gb',
-  allowRawAlgorithm: false,
-  allowNetworkAccess: true,
-  publisherTrustedAlgorithmPublishers: null,
-  publisherTrustedAlgorithms: null
-}
diff --git a/src/components/Publish/_types.ts b/src/components/Publish/_types.ts
index c4db91878..94cd42eae 100644
--- a/src/components/Publish/_types.ts
+++ b/src/components/Publish/_types.ts
@@ -17,6 +17,7 @@ export interface FormPublishService {
   access: 'Download' | 'Compute' | string
   providerUrl?: { url: string; valid: boolean }
   algorithmPrivacy?: boolean
+  computeOptions?: ServiceComputeOptions
 }
 
 export interface FormPublishData {