From 89709cbe73332e387f55bb51b750df94cf472da9 Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Wed, 21 Oct 2020 16:43:23 +0200
Subject: [PATCH] periodically try to get DDO when not present yet

---
 .../molecules/FormFields/Datatoken/index.tsx         |  4 ++--
 src/components/pages/Publish/Feedback.tsx            |  2 +-
 src/components/templates/AssetDetails.tsx            | 12 ++++++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/components/molecules/FormFields/Datatoken/index.tsx b/src/components/molecules/FormFields/Datatoken/index.tsx
index 2f25e54fe..bd83bfc0c 100644
--- a/src/components/molecules/FormFields/Datatoken/index.tsx
+++ b/src/components/molecules/FormFields/Datatoken/index.tsx
@@ -16,9 +16,9 @@ export default function Datatoken(props: InputProps): ReactElement {
     helpers.setValue({ ...dataTokenOptions })
   }
 
-  // Generate new DT name & symbol, but only once automatically
+  // Generate new DT name & symbol
   useEffect(() => {
-    if (!ocean || typeof field?.value?.name !== 'undefined') return
+    if (!ocean) return
     generateName()
   }, [ocean])
 
diff --git a/src/components/pages/Publish/Feedback.tsx b/src/components/pages/Publish/Feedback.tsx
index 2395955d7..036382953 100644
--- a/src/components/pages/Publish/Feedback.tsx
+++ b/src/components/pages/Publish/Feedback.tsx
@@ -23,7 +23,7 @@ export default function Feedback({
     <Button
       style="primary"
       size="small"
-      href={`/asset/${ddo?.id}`}
+      to={`/asset/${ddo?.id}`}
       className={styles.action}
     >
       Go to data set →
diff --git a/src/components/templates/AssetDetails.tsx b/src/components/templates/AssetDetails.tsx
index a2a385ce6..e72075263 100644
--- a/src/components/templates/AssetDetails.tsx
+++ b/src/components/templates/AssetDetails.tsx
@@ -23,13 +23,17 @@ export default function PageTemplateAssetDetails({
 
   useEffect(() => {
     async function init() {
+      if (ddo) return
+
       try {
         const metadataCache = new MetadataCache(config.metadataCacheUri, Logger)
         const ddo = await metadataCache.retrieveDDO(did)
 
         if (!ddo) {
           setTitle('Could not retrieve asset')
-          setError('The DDO was not found in MetadataCache.')
+          setError(
+            `The DDO for ${did} was not found in MetadataCache. If you just published a new data set, wait some seconds and refresh this page.`
+          )
           return
         }
 
@@ -44,7 +48,11 @@ export default function PageTemplateAssetDetails({
       }
     }
     init()
-  }, [did, config.metadataCacheUri])
+
+    // Periodically try to get DDO when not present yet
+    const timer = !ddo && setInterval(() => init(), 2000)
+    return () => clearInterval(timer)
+  }, [ddo, did, config.metadataCacheUri])
 
   return did && metadata ? (
     <Layout title={title} uri={uri}>