From 40f61dd6f9c6eed1e43444bf640671f80eb58566 Mon Sep 17 00:00:00 2001
From: ecwu <bitlabwzh@gmail.com>
Date: Sun, 5 Jan 2025 19:43:57 +0800
Subject: [PATCH] refactor: update button labels and improve dialog for saving
 tools templates

---
 src/components/ListAPI.tsx       |  2 +-
 src/components/MessageBubble.tsx | 52 --------------------
 src/components/Settings.tsx      | 83 ++++++++++++++++++++++++--------
 src/pages/App.tsx                |  2 +-
 src/translate/zh_CN.ts           |  2 +
 5 files changed, 68 insertions(+), 73 deletions(-)

diff --git a/src/components/ListAPI.tsx b/src/components/ListAPI.tsx
index c854089..ee61de4 100644
--- a/src/components/ListAPI.tsx
+++ b/src/components/ListAPI.tsx
@@ -139,7 +139,7 @@ function ToolsDropdownList() {
   return (
     <NavigationMenuItem className="p-3">
       <NavigationMenuTrigger>
-        <span>{Tr(`Saved tools templates`)}</span>
+        <span>{Tr(`Tools`)}</span>
         <Button
           variant="link"
           className="ml-2 text-sm"
diff --git a/src/components/MessageBubble.tsx b/src/components/MessageBubble.tsx
index a6c5984..cf5d05e 100644
--- a/src/components/MessageBubble.tsx
+++ b/src/components/MessageBubble.tsx
@@ -244,44 +244,6 @@ export default function Message(props: { messageIndex: number }) {
   const [showEdit, setShowEdit] = useState(false);
   const [renderMarkdown, setRenderWorkdown] = useState(false);
   const [renderColor, setRenderColor] = useState(false);
-  const DeleteIcon = () => (
-    <button
-      onClick={() => {
-        chatStore.history[messageIndex].hide =
-          !chatStore.history[messageIndex].hide;
-
-        //chatStore.totalTokens =
-        chatStore.totalTokens = 0;
-        for (const i of chatStore.history
-          .filter(({ hide }) => !hide)
-          .slice(chatStore.postBeginIndex)
-          .map(({ token }) => token)) {
-          chatStore.totalTokens += i;
-        }
-        setChatStore({ ...chatStore });
-      }}
-    >
-      Delete
-    </button>
-  );
-  const CopiedHint = () => (
-    <div role="alert" className="alert">
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        fill="none"
-        viewBox="0 0 24 24"
-        className="stroke-info h-6 w-6 shrink-0"
-      >
-        <path
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          stroke-width="2"
-          d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
-        ></path>
-      </svg>
-      <span>{Tr("Message copied to clipboard!")}</span>
-    </div>
-  );
 
   const { toast } = useToast();
   const copyToClipboard = async (text: string) => {
@@ -309,20 +271,6 @@ export default function Message(props: { messageIndex: number }) {
     }
   };
 
-  const CopyIcon = ({ textToCopy }: { textToCopy: string }) => {
-    return (
-      <>
-        <button
-          onClick={() => {
-            copyToClipboard(textToCopy);
-          }}
-        >
-          Copy
-        </button>
-      </>
-    );
-  };
-
   return (
     <>
       {chatStore.postBeginIndex !== 0 &&
diff --git a/src/components/Settings.tsx b/src/components/Settings.tsx
index 70a904a..cd9b34f 100644
--- a/src/components/Settings.tsx
+++ b/src/components/Settings.tsx
@@ -53,6 +53,7 @@ import {
 } from "@/components/ui/select";
 import {
   Dialog,
+  DialogClose,
   DialogContent,
   DialogDescription,
   DialogFooter,
@@ -73,6 +74,7 @@ import {
   KeyIcon,
   ListIcon,
   MoveHorizontalIcon,
+  SaveIcon,
   TriangleAlertIcon,
 } from "lucide-react";
 import { Separator } from "@/components/ui/separator";
@@ -581,25 +583,68 @@ export default (props: {}) => {
                 <div className="box">
                   <div className="flex justify-evenly flex-wrap">
                     {ctx.chatStore.toolsString.trim() && (
-                      <Button
-                        onClick={() => {
-                          const name = prompt(
-                            `Give this **Tools** template a name:`
-                          );
-                          if (!name) {
-                            alert("No template name specified");
-                            return;
-                          }
-                          const newToolsTmp: TemplateTools = {
-                            name,
-                            toolsString: ctx.chatStore.toolsString,
-                          };
-                          ctx.templateTools.push(newToolsTmp);
-                          ctx.setTemplateTools([...ctx.templateTools]);
-                        }}
-                      >
-                        {Tr(`Save Tools`)}
-                      </Button>
+                      <Dialog>
+                        <DialogTrigger asChild>
+                          <Button variant="outline">{Tr(`Save Tools`)}</Button>
+                        </DialogTrigger>
+                        <DialogContent className="sm:max-w-md">
+                          <DialogHeader>
+                            <DialogTitle>Save the tool as Template</DialogTitle>
+                            <DialogDescription>
+                              Once saved, you can easily access your tools from
+                              the dropdown menu.
+                            </DialogDescription>
+                          </DialogHeader>
+                          <div className="flex items-center space-x-2">
+                            <div className="grid flex-1 gap-2">
+                              <Label htmlFor="toolsName" className="sr-only">
+                                Name
+                              </Label>
+                              <Input
+                                id="toolsName"
+                                placeholder="Type Something..."
+                              />
+                              <Label
+                                id="toolsNameError"
+                                className="text-red-600"
+                              ></Label>
+                            </div>
+                          </div>
+                          <DialogFooter className="sm:justify-start">
+                            <DialogClose asChild>
+                              <Button
+                                type="submit"
+                                size="sm"
+                                className="px-3"
+                                onClick={() => {
+                                  const name = document.getElementById(
+                                    "toolsName" as string
+                                  ) as HTMLInputElement;
+                                  if (!name.value) {
+                                    const errorLabel = document.getElementById(
+                                      "toolsNameError" as string
+                                    ) as HTMLLabelElement;
+                                    if (errorLabel) {
+                                      errorLabel.textContent =
+                                        "Tool name is required.";
+                                    }
+                                    return;
+                                  }
+                                  const newToolsTmp: TemplateTools = {
+                                    name: name.value,
+                                    toolsString: ctx.chatStore.toolsString,
+                                  };
+                                  ctx.templateTools.push(newToolsTmp);
+                                  ctx.setTemplateTools([...ctx.templateTools]);
+                                }}
+                              >
+                                <SaveIcon className="w-4 h-4" /> Save
+                                <span className="sr-only">Save</span>
+                              </Button>
+                            </DialogClose>
+                          </DialogFooter>
+                        </DialogContent>
+                      </Dialog>
                     )}
                   </div>
                 </div>
diff --git a/src/pages/App.tsx b/src/pages/App.tsx
index b4e7d20..15e9a32 100644
--- a/src/pages/App.tsx
+++ b/src/pages/App.tsx
@@ -115,7 +115,7 @@ import {
 import { Badge } from "@/components/ui/badge";
 import { ModeToggle } from "@/components/ModeToggle";
 
-import Navbar from "@/components/navbar";
+import Navbar from "@/components/Navbar";
 
 export function App() {
   // init selected index
diff --git a/src/translate/zh_CN.ts b/src/translate/zh_CN.ts
index a4eeb3a..edf60cd 100644
--- a/src/translate/zh_CN.ts
+++ b/src/translate/zh_CN.ts
@@ -11,6 +11,8 @@ const LANG_MAP: Record<string, string> = {
   cost: "消费",
   stream: "流式返回",
   fetch: "一次获取",
+  Tools: "工具",
+  Clear: "清空",
   "saved api templates": "已保存的 API 模板",
   "saved prompt templates": "已保存的提示模板",
   "no chat history here": "暂无历史对话记录",