fix: ui stopped showing source code in Code block details

Signed-off-by: Nick Mitchell <[email protected]>

Author: starpit

pdl-live-react/src/helpers.ts

@@ -305,3 +305,15 @@ export function extractStructuredModelResponse({
 export function isArgs(block: ArgsBlock | CodeBlock): block is ArgsBlock {
   return Array.isArray((block as ArgsBlock).args)
 }
+
+export function extractCode({ code }: CodeBlock): string {
+  if (
+    isNonScalarPdlBlock(code) &&
+    hasResult(code) &&
+    typeof code.pdl__result !== "object"
+  ) {
+    return String(code.pdl__result)
+  }
+
+  return String(code)
+}

pdl-live-react/src/view/detail/DrawerContentBody.tsx

@@ -53,7 +53,7 @@ export default function DrawerContentBody({
 
     default: {
       // some blocks have nothing interesting to show other than their result
-      const hasSummary = !(block.kind === "data" || block.kind === "code")
+      const hasSummary = !(block.kind === "data")
 
       return [
         ...(!hasSummary

pdl-live-react/src/view/detail/kind/Code.tsx

@@ -1,8 +1,7 @@
 import Group from "../Group"
 
 import Code from "../../code/Code"
-import Result from "../../Result"
-import { isArgs } from "../../../helpers"
+import { isArgs, extractCode } from "../../../helpers"
 
 export default function CodeItems({
   block,
@@ -11,27 +10,25 @@ export default function CodeItems({
     | import("../../../pdl_ast").ArgsBlock
     | import("../../../pdl_ast").CodeBlock
 }) {
-  const { lang, pdl__result } = block
-  const code = isArgs(block) ? block.args.join(" ") : block.code
+  const { lang } = block
+  const code = isArgs(block) ? block.args.join(" ") : extractCode(block)
+
   return (
     <>
-      {typeof code === "string" && (
-        <Group
-          term="Code"
-          description={
-            <Code
-              block={code.trim()}
-              showLineNumbers
-              language={
-                lang === "pdl" || lang === "jinja" || lang === "command"
-                  ? "plaintext"
-                  : lang || "yaml"
-              }
-            />
-          }
-        />
-      )}
-      <Result result={pdl__result} term="Execution Output" />
+      <Group
+        term="Code"
+        description={
+          <Code
+            block={code.trim()}
+            showLineNumbers
+            language={
+              lang === "pdl" || lang === "jinja" || lang === "command"
+                ? "plaintext"
+                : lang || "yaml"
+            }
+          />
+        }
+      />
     </>
   )
 }