Fix child workflow not loading custom instance content

CHANGELOG.md

@@ -72,6 +72,7 @@
   - Improved formatting timestamps
   - Fix retry on endpoint change
   - Fix querying with parent instance id
+  - Fix loading custom instance content for child workflow
 
 ## 8.0.0 (2022-06-09)
 

nflow-explorer-ng/src/workflow-instance/WorkflowInstanceDetailsPage.tsx

@@ -210,38 +210,26 @@ function WorkflowInstanceDetailsPage() {
       getWorkflowInstance(config, id),
       listChildWorkflowInstances(config, id)
     ]).then(([instance, childInstances]) => {
-      if (instance.parentWorkflowId) {
         return Promise.all([
-          getWorkflowInstance(config, instance.parentWorkflowId),
+          instance.parentWorkflowId ? getWorkflowInstance(config, instance.parentWorkflowId) : Promise.resolve(undefined),
           getWorkflowDefinition(config, instance.type)
         ]).then(([parent, definition]) => {
           setDefinition(definition);
           setParentInstance(parent);
           setInstance(instance);
           setChildInstances(childInstances);
-        });
-      }
-      return getWorkflowDefinition(config, instance.type)
-        .then(definition => {
-          setDefinition(definition);
-          setParentInstance(undefined);
-          setInstance(instance);
-          setChildInstances(childInstances);
-          return definition;
-        })
-        .then(definition =>
-          Promise.resolve(
+          return Promise.resolve(
             config.customInstanceContent &&
-              config.customInstanceContent(
-                definition,
-                instance,
-                undefined,
-                childInstances
-              )
+            config.customInstanceContent(
+              definition,
+              instance,
+              parent,
+              childInstances
+            )
           ).then(content => {
             setExternalContent(content);
-          })
-        );
+          });
+        });
     });
   }, [config, id]);