move viz at the top, remove tabs and improve dust app

dust-tt · Jul 25, 2024 · 275559c · 275559c
1 parent 6d2ab76
commit 275559c
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 69 deletions.
diff --git a/front/components/assistant/conversation/AgentMessage.tsx b/front/components/assistant/conversation/AgentMessage.tsx
@@ -509,6 +509,27 @@ export function AgentMessage({
     return (
       <div className="flex flex-col gap-y-4">
         <AgentMessageActions agentMessage={agentMessage} size={size} />
+        <>
+          {agentMessage.actions
+            .filter((a) => isVisualizationActionType(a))
+            .map((a, i) => {
+              const streamingViz = streamedVisualizations.find(
+                (sv) => sv.actionId === a.id
+              );
+              assert(isVisualizationActionType(a));
+              return (
+                <VisualizationActionIframe
+                  action={a}
+                  conversationId={conversationId}
+                  isStreaming={!!streamingViz}
+                  key={i}
+                  onRetry={() => retryHandler(agentMessage)}
+                  owner={owner}
+                  streamedCode={streamingViz?.visualization || null}
+                />
+              );
+            })}
+        </>
 
         {agentMessage.chainOfThought?.length ? (
           <div className="flex w-full flex-col gap-2 rounded-2xl border border-slate-200 bg-slate-100 p-4 text-sm text-slate-800">
@@ -556,27 +577,6 @@ export function AgentMessage({
             )}
           </div>
         )}
-        <>
-          {agentMessage.actions
-            .filter((a) => isVisualizationActionType(a))
-            .map((a, i) => {
-              const streamingViz = streamedVisualizations.find(
-                (sv) => sv.actionId === a.id
-              );
-              assert(isVisualizationActionType(a));
-              return (
-                <VisualizationActionIframe
-                  action={a}
-                  conversationId={conversationId}
-                  isStreaming={!!streamingViz}
-                  key={i}
-                  onRetry={() => retryHandler(agentMessage)}
-                  owner={owner}
-                  streamedCode={streamingViz?.visualization || null}
-                />
-              );
-            })}
-        </>
         {agentMessage.status === "cancelled" && (
           <Chip
             label="Message generation was interrupted"

diff --git a/front/components/assistant/conversation/actions/VisualizationActionIframe.tsx b/front/components/assistant/conversation/actions/VisualizationActionIframe.tsx
@@ -1,4 +1,4 @@
-import { BracesIcon, PlayIcon, Tab } from "@dust-tt/sparkle";
+import { BracesIcon, IconToggleButton } from "@dust-tt/sparkle";
 import type {
   CommandResultMap,
   VisualizationActionType,
@@ -135,8 +135,8 @@ export function VisualizationActionIframe({
   isStreaming: boolean;
   onRetry: () => void;
 }) {
-  const [activeTab, setActiveTab] = useState<"code" | "runtime">("code");
-  const [tabManuallyChanged, setTabManuallyChanged] = useState(false);
+  // const [activeTab, setActiveTab] = useState<"code" | "runtime">("code");
+  const [showIframe, setShowIframe] = useState<boolean | null>(null);
   const [contentHeight, setContentHeight] = useState(0);
 
   const workspaceId = owner.sId;
@@ -148,11 +148,10 @@ export function VisualizationActionIframe({
   });
 
   useEffect(() => {
-    if (activeTab === "code" && action.generation && !tabManuallyChanged) {
-      setActiveTab("runtime");
-      setTabManuallyChanged(true);
+    if (showIframe === null && action.generation) {
+      setShowIframe(true);
     }
-  }, [action.generation, activeTab, tabManuallyChanged]);
+  }, [action.generation, showIframe]);
 
   let extractedCode: string | null = null;
 
@@ -161,48 +160,36 @@ export function VisualizationActionIframe({
   );
 
   return (
-    <>
-      <Tab
-        tabs={[
-          {
-            label: "Code",
-            id: "code",
-            current: activeTab === "code",
-            icon: BracesIcon,
-            sizing: "expand",
-          },
-          {
-            label: "Run",
-            id: "runtime",
-            current: activeTab === "runtime",
-            icon: PlayIcon,
-            sizing: "expand",
-            hasSeparator: true,
-          },
-        ]}
-        setCurrentTab={(tabId, event) => {
-          event.preventDefault();
-          setActiveTab(tabId as "code" | "runtime");
-        }}
-      />
-      {activeTab === "code" && extractedCode && extractedCode.length > 0 && (
-        <RenderMessageMarkdown
-          content={"```javascript\n" + extractedCode + "\n```"}
-          isStreaming={isStreaming}
-        />
-      )}
-      {activeTab === "runtime" && (
-        <div
-          style={{ height: `${contentHeight}px` }}
-          className="max-h-[40vh] w-full"
-        >
-          <iframe
-            className="h-full w-full"
-            src={`${process.env.NEXT_PUBLIC_VIZ_URL}/content?aId=${action.id}`}
-            sandbox="allow-scripts"
+    <div className="relative">
+      <div>
+        {!showIframe && extractedCode && extractedCode.length > 0 && (
+          <RenderMessageMarkdown
+            content={"```javascript\n" + extractedCode + "\n```"}
+            isStreaming={isStreaming}
+          />
+        )}
+        {showIframe && (
+          <div
+            style={{ height: `${contentHeight}px` }}
+            className="max-h-[40vh] w-full"
+          >
+            <iframe
+              className="h-full w-full"
+              src={`${process.env.NEXT_PUBLIC_VIZ_URL}/content?aId=${action.id}`}
+              sandbox="allow-scripts"
+            />
+          </div>
+        )}
+      </div>
+      {action.generation && contentHeight > 0 && (
+        <div className="absolute left-4 top-4">
+          <IconToggleButton
+            icon={BracesIcon}
+            selected={!showIframe}
+            onClick={() => setShowIframe((prev) => !prev)}
           />
         </div>
       )}
-    </>
+    </div>
   );
 }
diff --git a/types/src/front/lib/actions/registry.ts b/types/src/front/lib/actions/registry.ts
@@ -238,7 +238,7 @@ export const DustProdActionRegistry = createActionRegistry({
       workspaceId: PRODUCTION_DUST_APPS_WORKSPACE_ID,
       appId: "tWcuYDj1OE",
       appHash:
-        "e404a057516d5d1bb7b1807b74a20484c3f60bf0a36c510cb799127f060f032b",
+        "9c25f18c9a913f810045dc15ad0aae4814dff712ea6cfcf21c48da4e81b6814f",
     },
     config: {
       MODEL: {