From 2ac422f1751addf9b6d5ccb776c50bb0b4a6889d Mon Sep 17 00:00:00 2001
From: Bogdan Fazakas <bogdan.fazakas@gmail.com>
Date: Tue, 20 Sep 2022 17:32:55 +0300
Subject: [PATCH] more ui touches

---
 .../FormFields/ContainerInput/Info.module.css | 11 +++----
 .../FormFields/ContainerInput/Info.tsx        |  9 ++++--
 .../FormFields/ContainerInput/index.tsx       | 31 +++++++++----------
 src/components/Publish/Metadata/index.tsx     |  1 -
 src/components/Publish/_utils.ts              |  1 -
 5 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/components/@shared/FormFields/ContainerInput/Info.module.css b/src/components/@shared/FormFields/ContainerInput/Info.module.css
index a9a95d6d8..ed25b655f 100644
--- a/src/components/@shared/FormFields/ContainerInput/Info.module.css
+++ b/src/components/@shared/FormFields/ContainerInput/Info.module.css
@@ -21,7 +21,11 @@
   color: var(--brand-alert-green);
 }
 
-.url {
+.info li.error {
+  color: var(--brand-alert-red);
+}
+
+.contianer {
   margin: 0;
   font-size: var(--font-size-base);
   line-height: var(--line-height);
@@ -31,11 +35,6 @@
   padding-right: calc(var(--spacer) / 2);
 }
 
-.warning {
-  margin-top: calc(var(--spacer) / 3);
-  margin-left: 0;
-}
-
 .removeButton {
   cursor: pointer;
   border: none;
diff --git a/src/components/@shared/FormFields/ContainerInput/Info.tsx b/src/components/@shared/FormFields/ContainerInput/Info.tsx
index 9054b3101..a24332273 100644
--- a/src/components/@shared/FormFields/ContainerInput/Info.tsx
+++ b/src/components/@shared/FormFields/ContainerInput/Info.tsx
@@ -4,17 +4,22 @@ import styles from './Info.module.css'
 export default function ImageInfo({
   image,
   tag,
+  valid,
   handleClose
 }: {
   image: string
   tag: string
+  valid: boolean
   handleClose(): void
 }): ReactElement {
+  const displayText = valid
+    ? '✓ Image found, container checksum automatically added!'
+    : 'x Container checksum could not be fetched automatically, please add it manually'
   return (
     <div className={styles.info}>
-      <h3 className={styles.url}>{`${image}:${tag}`}</h3>
+      <h3 className={styles.contianer}>{`Image: ${image} Tag: ${tag}`}</h3>
       <ul>
-        <li className={styles.success}>✓ Image found</li>
+        <li className={valid ? styles.success : styles.error}>{displayText}</li>
       </ul>
       <button className={styles.removeButton} onClick={handleClose}>
         &times;
diff --git a/src/components/@shared/FormFields/ContainerInput/index.tsx b/src/components/@shared/FormFields/ContainerInput/index.tsx
index b2375aa65..cf50833f3 100644
--- a/src/components/@shared/FormFields/ContainerInput/index.tsx
+++ b/src/components/@shared/FormFields/ContainerInput/index.tsx
@@ -4,9 +4,6 @@ import UrlInput from '../URLInput'
 import { InputProps } from '@shared/FormInput'
 import { FormPublishData } from 'src/components/Publish/_types'
 import { LoggerInstance } from '@oceanprotocol/lib'
-import { toast } from 'react-toastify'
-import axios from 'axios'
-import isUrl from 'is-url-superb'
 import ImageInfo from './Info'
 import { getContainerChecksum } from '@utils/docker'
 
@@ -14,26 +11,26 @@ export default function ContainerInput(props: InputProps): ReactElement {
   const [field, meta, helpers] = useField(props.name)
   const [isLoading, setIsLoading] = useState(false)
   const [isValid, setIsValid] = useState(false)
+  const [checked, setChecked] = useState(false)
   const { values, setFieldError, setFieldValue } =
     useFormikContext<FormPublishData>()
 
   async function handleValidation(e: React.SyntheticEvent, container: string) {
     e.preventDefault()
     try {
-      console.log('isUrl(container)', isUrl(container))
       setIsLoading(true)
-      if (!isUrl(container, { lenient: false })) {
-        const parsedContainerValue = container.split(':')
-        const image = parsedContainerValue[0]
-        const tag = parsedContainerValue[1]
-        const checksum = await getContainerChecksum(image, tag)
-        setFieldValue('metadata.dockerImageCustom', image)
-        setFieldValue('metadata.dockerImageCustomTag', tag)
-        if (checksum) {
-          setFieldValue('metadata.dockerImageCustomChecksum', checksum)
-          setIsValid(true)
-        }
+      const parsedContainerValue = container?.split(':')
+      const imageNname = parsedContainerValue?.slice(0, -1).join(':')
+      const tag =
+        parsedContainerValue.length > 1 ? parsedContainerValue?.at(-1) : ''
+      setFieldValue('metadata.dockerImageCustom', imageNname)
+      setFieldValue('metadata.dockerImageCustomTag', tag)
+      const checksum = await getContainerChecksum(imageNname, tag)
+      if (checksum) {
+        setFieldValue('metadata.dockerImageCustomChecksum', checksum)
+        setIsValid(true)
       }
+      setChecked(true)
     } catch (error) {
       setFieldError(`${field.name}[0].url`, error.message)
       LoggerInstance.error(error.message)
@@ -46,16 +43,18 @@ export default function ContainerInput(props: InputProps): ReactElement {
     setFieldValue('metadata.dockerImageCustom', '')
     setFieldValue('metadata.dockerImageCustomTag', '')
     setFieldValue('metadata.dockerImageCustomChecksum', '')
+    setChecked(false)
     setIsValid(false)
     helpers.setTouched(false)
   }
 
   return (
     <>
-      {isValid ? (
+      {checked ? (
         <ImageInfo
           image={values.metadata.dockerImageCustom}
           tag={values.metadata.dockerImageCustomTag}
+          valid={isValid}
           handleClose={handleClose}
         />
       ) : (
diff --git a/src/components/Publish/Metadata/index.tsx b/src/components/Publish/Metadata/index.tsx
index 1954acbb6..b2125efdf 100644
--- a/src/components/Publish/Metadata/index.tsx
+++ b/src/components/Publish/Metadata/index.tsx
@@ -129,7 +129,6 @@ export default function MetadataFields(): ReactElement {
                 )}
                 component={Input}
                 name="metadata.dockerImageCustomChecksum"
-                disabled
               />
               <Field
                 {...getFieldContent(
diff --git a/src/components/Publish/_utils.ts b/src/components/Publish/_utils.ts
index 5205c7e22..f5c7aefc3 100644
--- a/src/components/Publish/_utils.ts
+++ b/src/components/Publish/_utils.ts
@@ -42,7 +42,6 @@ async function getAlgorithmContainerPreset(
     (preset) => `${preset.image}:${preset.tag}` === dockerImage
   )
   preset.checksum = await getContainerChecksum(preset.image, preset.tag)
-  console.log('preset')
   return preset
 }