From 93d74e9b41db659c81f210af5d958966d313bbff Mon Sep 17 00:00:00 2001
From: Robert Brennan <accounts@rbren.io>
Date: Wed, 22 Jan 2025 11:18:43 -0500
Subject: [PATCH] make export button more stylistically consistent (#6412)

---
 .../components/feedback-actions.test.tsx      | 29 +++++++++++++++----
 .../features/chat/chat-interface.tsx          |  7 ++---
 .../features/export/export-actions.tsx        | 17 -----------
 .../trajectory-actions.tsx}                   | 20 +++++++++----
 .../shared/buttons/export-action-button.tsx   | 17 -----------
 ...utton.tsx => trajectory-action-button.tsx} |  6 ++--
 frontend/src/icons/export.svg                 |  6 +---
 7 files changed, 44 insertions(+), 58 deletions(-)
 delete mode 100644 frontend/src/components/features/export/export-actions.tsx
 rename frontend/src/components/features/{feedback/feedback-actions.tsx => trajectory/trajectory-actions.tsx} (53%)
 delete mode 100644 frontend/src/components/shared/buttons/export-action-button.tsx
 rename frontend/src/components/shared/buttons/{feedback-action-button.tsx => trajectory-action-button.tsx} (71%)

diff --git a/frontend/__tests__/components/feedback-actions.test.tsx b/frontend/__tests__/components/feedback-actions.test.tsx
index c4f8170eea33..d705cfc44f11 100644
--- a/frontend/__tests__/components/feedback-actions.test.tsx
+++ b/frontend/__tests__/components/feedback-actions.test.tsx
@@ -1,12 +1,13 @@
 import { render, screen, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { afterEach, describe, expect, it, vi } from "vitest";
-import { FeedbackActions } from "#/components/features/feedback/feedback-actions";
+import { TrajectoryActions } from "#/components/features/trajectory/trajectory-actions";
 
-describe("FeedbackActions", () => {
+describe("TrajectoryActions", () => {
   const user = userEvent.setup();
   const onPositiveFeedback = vi.fn();
   const onNegativeFeedback = vi.fn();
+  const onExportTrajectory = vi.fn();
 
   afterEach(() => {
     vi.clearAllMocks();
@@ -14,9 +15,10 @@ describe("FeedbackActions", () => {
 
   it("should render correctly", () => {
     render(
-      <FeedbackActions
+      <TrajectoryActions
         onPositiveFeedback={onPositiveFeedback}
         onNegativeFeedback={onNegativeFeedback}
+        onExportTrajectory={onExportTrajectory}
       />,
     );
 
@@ -27,9 +29,10 @@ describe("FeedbackActions", () => {
 
   it("should call onPositiveFeedback when positive feedback is clicked", async () => {
     render(
-      <FeedbackActions
+      <TrajectoryActions
         onPositiveFeedback={onPositiveFeedback}
         onNegativeFeedback={onNegativeFeedback}
+        onExportTrajectory={onExportTrajectory}
       />,
     );
 
@@ -41,9 +44,10 @@ describe("FeedbackActions", () => {
 
   it("should call onNegativeFeedback when negative feedback is clicked", async () => {
     render(
-      <FeedbackActions
+      <TrajectoryActions
         onPositiveFeedback={onPositiveFeedback}
         onNegativeFeedback={onNegativeFeedback}
+        onExportTrajectory={onExportTrajectory}
       />,
     );
 
@@ -52,4 +56,19 @@ describe("FeedbackActions", () => {
 
     expect(onNegativeFeedback).toHaveBeenCalled();
   });
+
+  it("should call onExportTrajectory when negative feedback is clicked", async () => {
+    render(
+      <TrajectoryActions
+        onPositiveFeedback={onPositiveFeedback}
+        onNegativeFeedback={onNegativeFeedback}
+        onExportTrajectory={onExportTrajectory}
+      />,
+    );
+
+    const exportButton = screen.getByTestId("export-trajectory");
+    await user.click(exportButton);
+
+    expect(onExportTrajectory).toHaveBeenCalled();
+  });
 });
diff --git a/frontend/src/components/features/chat/chat-interface.tsx b/frontend/src/components/features/chat/chat-interface.tsx
index e04efa19b3cc..bb49411b3302 100644
--- a/frontend/src/components/features/chat/chat-interface.tsx
+++ b/frontend/src/components/features/chat/chat-interface.tsx
@@ -4,8 +4,7 @@ import React from "react";
 import posthog from "posthog-js";
 import { useParams } from "react-router";
 import { convertImageToBase64 } from "#/utils/convert-image-to-base-64";
-import { FeedbackActions } from "../feedback/feedback-actions";
-import { ExportActions } from "../export/export-actions";
+import { TrajectoryActions } from "../trajectory/trajectory-actions";
 import { createChatMessage } from "#/services/chat-service";
 import { InteractiveChatBox } from "./interactive-chat-box";
 import { addUserMessage } from "#/state/chat-slice";
@@ -155,15 +154,13 @@ export function ChatInterface() {
 
       <div className="flex flex-col gap-[6px] px-4 pb-4">
         <div className="flex justify-between relative">
-          <FeedbackActions
+          <TrajectoryActions
             onPositiveFeedback={() =>
               onClickShareFeedbackActionButton("positive")
             }
             onNegativeFeedback={() =>
               onClickShareFeedbackActionButton("negative")
             }
-          />
-          <ExportActions
             onExportTrajectory={() => onClickExportTrajectoryButton()}
           />
 
diff --git a/frontend/src/components/features/export/export-actions.tsx b/frontend/src/components/features/export/export-actions.tsx
deleted file mode 100644
index faafd98af293..000000000000
--- a/frontend/src/components/features/export/export-actions.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import ExportIcon from "#/icons/export.svg?react";
-import { ExportActionButton } from "#/components/shared/buttons/export-action-button";
-
-interface ExportActionsProps {
-  onExportTrajectory: () => void;
-}
-
-export function ExportActions({ onExportTrajectory }: ExportActionsProps) {
-  return (
-    <div data-testid="export-actions" className="flex gap-1">
-      <ExportActionButton
-        onClick={onExportTrajectory}
-        icon={<ExportIcon width={15} height={15} />}
-      />
-    </div>
-  );
-}
diff --git a/frontend/src/components/features/feedback/feedback-actions.tsx b/frontend/src/components/features/trajectory/trajectory-actions.tsx
similarity index 53%
rename from frontend/src/components/features/feedback/feedback-actions.tsx
rename to frontend/src/components/features/trajectory/trajectory-actions.tsx
index 2293789c201f..a11cb002b103 100644
--- a/frontend/src/components/features/feedback/feedback-actions.tsx
+++ b/frontend/src/components/features/trajectory/trajectory-actions.tsx
@@ -1,28 +1,36 @@
 import ThumbsUpIcon from "#/icons/thumbs-up.svg?react";
 import ThumbDownIcon from "#/icons/thumbs-down.svg?react";
-import { FeedbackActionButton } from "#/components/shared/buttons/feedback-action-button";
+import ExportIcon from "#/icons/export.svg?react";
+import { TrajectoryActionButton } from "#/components/shared/buttons/trajectory-action-button";
 
-interface FeedbackActionsProps {
+interface TrajectoryActionsProps {
   onPositiveFeedback: () => void;
   onNegativeFeedback: () => void;
+  onExportTrajectory: () => void;
 }
 
-export function FeedbackActions({
+export function TrajectoryActions({
   onPositiveFeedback,
   onNegativeFeedback,
-}: FeedbackActionsProps) {
+  onExportTrajectory,
+}: TrajectoryActionsProps) {
   return (
     <div data-testid="feedback-actions" className="flex gap-1">
-      <FeedbackActionButton
+      <TrajectoryActionButton
         testId="positive-feedback"
         onClick={onPositiveFeedback}
         icon={<ThumbsUpIcon width={15} height={15} />}
       />
-      <FeedbackActionButton
+      <TrajectoryActionButton
         testId="negative-feedback"
         onClick={onNegativeFeedback}
         icon={<ThumbDownIcon width={15} height={15} />}
       />
+      <TrajectoryActionButton
+        testId="export-trajectory"
+        onClick={onExportTrajectory}
+        icon={<ExportIcon width={15} height={15} />}
+      />
     </div>
   );
 }
diff --git a/frontend/src/components/shared/buttons/export-action-button.tsx b/frontend/src/components/shared/buttons/export-action-button.tsx
deleted file mode 100644
index b76443591d39..000000000000
--- a/frontend/src/components/shared/buttons/export-action-button.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-interface ExportActionButtonProps {
-  onClick: () => void;
-  icon: React.ReactNode;
-}
-
-export function ExportActionButton({ onClick, icon }: ExportActionButtonProps) {
-  return (
-    <button
-      type="button"
-      onClick={onClick}
-      className="button-base p-1 hover:bg-neutral-500"
-      title="Export trajectory"
-    >
-      {icon}
-    </button>
-  );
-}
diff --git a/frontend/src/components/shared/buttons/feedback-action-button.tsx b/frontend/src/components/shared/buttons/trajectory-action-button.tsx
similarity index 71%
rename from frontend/src/components/shared/buttons/feedback-action-button.tsx
rename to frontend/src/components/shared/buttons/trajectory-action-button.tsx
index cef1d9184f12..30aab054312c 100644
--- a/frontend/src/components/shared/buttons/feedback-action-button.tsx
+++ b/frontend/src/components/shared/buttons/trajectory-action-button.tsx
@@ -1,14 +1,14 @@
-interface FeedbackActionButtonProps {
+interface TrajectoryActionButtonProps {
   testId?: string;
   onClick: () => void;
   icon: React.ReactNode;
 }
 
-export function FeedbackActionButton({
+export function TrajectoryActionButton({
   testId,
   onClick,
   icon,
-}: FeedbackActionButtonProps) {
+}: TrajectoryActionButtonProps) {
   return (
     <button
       type="button"
diff --git a/frontend/src/icons/export.svg b/frontend/src/icons/export.svg
index d9d52ecb48ac..2ffa65e8ac2b 100644
--- a/frontend/src/icons/export.svg
+++ b/frontend/src/icons/export.svg
@@ -1,5 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 16" fill="none">
-  <path
-    d="M11.875 9.5h-2.5V3.25c0-.16576-.0658-.32473-.1831-.44194-.1172-.11721-.276-.18306-.4419-.18306h-2.5c-.16576 0-.32473.06585-.44194.18306C5.68585 2.92527 5.62 3.08424 5.62 3.25V9.5h-2.5c-.13855 0-.27293.0483-.38002.1367-.10708.0883-.18294.2124-.21493.3508-.03199.1385-.01839.2839.03873.4142.05712.1304.15543.2397.27872.3108l4.375 2.5c.09664.0552.20607.0842.3175.0842.11144 0 .22087-.029.3175-.0842l4.375-2.5c.1233-.0711.2216-.1804.2787-.3108.0571-.1303.0707-.2757.0387-.4142-.032-.1384-.1078-.2625-.2149-.3508-.1071-.0884-.2415-.1367-.38-.1367zM3.75 13.375v1.25c0 .1658.06585.3247.18306.4419.11721.1172.27618.1831.44194.1831h6.25c.1657 0 .3247-.0659.4419-.1831.1172-.1172.1831-.2761.1831-.4419v-1.25c0-.1657-.0659-.3247-.1831-.4419-.1172-.1172-.2762-.1831-.4419-.1831h-6.25c-.16576 0-.32473.0659-.44194.1831C3.81585 13.0503 3.75 13.2093 3.75 13.375z"
-    fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-download"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" x2="12" y1="15" y2="3"/></svg>