Merge pull request #418 from tylerslaton/issue-307

fix: address issue with assistant menu in editor

actions/me/scripts.tsx

@@ -123,3 +123,27 @@ export async function getScriptContent(
     return undefined;
   }
 }
+
+const newDefaultAssistant = (name: string): string => {
+  return `
+Name: ${name}
+Chat: true
+
+You are a helpful assistant named ${name}. When you first start, just introduce yourself and wait for the user's next message.
+`;
+};
+
+export async function createDefaultAssistant(): Promise<Script> {
+  const defaultName = 'New Assistant';
+  const slug =
+    defaultName.toLowerCase().replaceAll(' ', '-') +
+    '-' +
+    Math.random().toString(36).substring(2, 7);
+
+  return await createScript({
+    displayName: defaultName,
+    slug,
+    visibility: 'private',
+    content: newDefaultAssistant(defaultName),
+  });
+}

components/edit/scriptNav.tsx

@@ -15,6 +15,7 @@ import { ParsedScript, getScripts } from '@/actions/me/scripts';
 import { EditContext } from '@/contexts/edit';
 import { AuthContext } from '@/contexts/auth';
 import { stringify } from '@/actions/gptscript';
+import { createDefaultAssistant } from '@/actions/me/scripts';
 
 interface ScriptNavProps {
   className?: string;
@@ -27,6 +28,12 @@ const ScriptNav: React.FC<ScriptNavProps> = ({ collapsed, setCollapsed }) => {
   const { script, loading } = useContext(EditContext);
   const { me } = useContext(AuthContext);
 
+  const handleNew = async () => {
+    createDefaultAssistant().then((script) => {
+      window.location.href = `/edit?id=${script?.id}`;
+    });
+  };
+
   useEffect(() => {
     if (!me) return;
     getScripts({ owner: me?.username })
@@ -39,7 +46,7 @@ const ScriptNav: React.FC<ScriptNavProps> = ({ collapsed, setCollapsed }) => {
       scripts.map((script, i) => (
         <DropdownItem
           startContent={<GoPerson className="mb-1" />}
-          key={script.publicURL}
+          key={script.id}
         >
           {script.agentName || `Untitled Assistant ${i}`}
         </DropdownItem>
@@ -74,8 +81,10 @@ const ScriptNav: React.FC<ScriptNavProps> = ({ collapsed, setCollapsed }) => {
             stringify(script).then((gptscript) => {
               navigator.clipboard.writeText(gptscript);
             });
+          } else if (key === 'new') {
+            handleNew();
           } else {
-            window.location.href = `/edit?file=${key}`;
+            window.location.href = `/edit?id=${key}`;
           }
         }}
         disabledKeys={['no-files']}

components/scripts/create.tsx

@@ -1,36 +1,16 @@
 import React from 'react';
 import { Button } from '@nextui-org/react';
 import { GoPersonAdd } from 'react-icons/go';
-import { createScript, getScript } from '@/actions/me/scripts';
-
-const newDefaultAssistant = (name: string): string => {
-  return `
-Name: ${name}
-Chat: true
-
-You are a helpful assistant named ${name}. When you first start, just introduce yourself and wait for the user's next message.
-`;
-};
+import { createDefaultAssistant } from '@/actions/me/scripts';
+import { useRouter } from 'next/navigation';
 
 export default function Create() {
   const [loading, setLoading] = React.useState(false);
+  const router = useRouter();
 
   const handleSubmit = async () => {
-    const defaultName = 'New Assistant';
-    const slug =
-      defaultName.toLowerCase().replaceAll(' ', '-') +
-      '-' +
-      Math.random().toString(36).substring(2, 7);
-    createScript({
-      displayName: defaultName,
-      slug,
-      visibility: 'private',
-      content: newDefaultAssistant(defaultName),
-    }).then((script) => {
-      getScript(`${script.id}`).then(
-        (script) =>
-          (window.location.href = `/edit?file=${script?.publicURL}&id=${script?.id}`)
-      );
+    createDefaultAssistant().then((script) => {
+      router.push(`/edit?id=${script?.id}`);
     });
   };