fixup! fixup! feat: pos-tlaunch qa updates

i-am-bee · Dec 18, 2024 · 2556988 · 2556988
1 parent 697c6eb
commit 2556988
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 59 deletions.
diff --git a/src/layout/shell/CollapsibleGroup.module.scss b/src/layout/shell/CollapsibleGroup.module.scss
@@ -19,7 +19,6 @@
 .root {
   display: flex;
   flex-direction: column;
-  min-block-size: 0;
 }
 
 .header {

diff --git a/src/layout/shell/Navbar.tsx b/src/layout/shell/Navbar.tsx
@@ -74,12 +74,16 @@ export function Navbar({ sidebarId, sidebarOpen }: Props) {
           ]
         );
       case 'chat':
-        return [
-          {
-            title: navbarProps.assistant?.name ?? '',
-            icon: <AssistantIcon assistant={navbarProps.assistant ?? null} />,
-          },
-        ];
+        return navbarProps.assistant
+          ? [
+              {
+                title: navbarProps.assistant.name ?? '',
+                icon: (
+                  <AssistantIcon assistant={navbarProps.assistant ?? null} />
+                ),
+              },
+            ]
+          : undefined;
       default:
         return title ? [{ title }] : undefined;
     }

diff --git a/src/layout/shell/Sidebar.module.scss b/src/layout/shell/Sidebar.module.scss
@@ -75,35 +75,18 @@ $width: var(--sidebar-width);
   }
 }
 
-.content {
-  display: flex;
-  flex-direction: column;
-  row-gap: $spacing-05;
-  flex-grow: 1;
-  min-block-size: 0;
-}
-
-.agents,
-.history {
-  > div {
-    margin-inline: -$padding-x;
-  }
-}
-
-.agents {
-  flex-shrink: 0;
-  max-block-size: calc(50% - $spacing-05);
-}
-
-.history {
-  flex-grow: 1;
-}
-
-.scrollSection {
+.scroll {
   @include scrollbar();
   overflow-y: auto;
+  scrollbar-gutter: stable;
   padding-inline: $padding-x;
-  max-block-size: 100%;
+  margin-inline: -$padding-x;
+  flex-grow: 1;
+  display: flex;
+  flex-direction: column;
+  row-gap: $spacing-05;
+  margin-block-end: -$spacing-05;
+  padding-block-end: $spacing-05;
 }
 
 .userNav {

diff --git a/src/layout/shell/Sidebar.tsx b/src/layout/shell/Sidebar.tsx
@@ -49,25 +49,17 @@ export function Sidebar({ id, isOpen }: SidebarProps) {
       />
 
       <div id={id} aria-hidden={!isOpen} className={classes.panel}>
-        <MainNav />
+        <div className={classes.scroll}>
+          <MainNav />
 
-        <hr />
+          <hr />
 
-        <div className={classes.content}>
-          <div className={classes.agents}>
-            <AssistantsNav
-              className={classes.scrollSection}
-              enableFetch={Boolean(isOpen)}
-            />
-          </div>
+          <AssistantsNav enableFetch={Boolean(isOpen)} />
 
           <hr />
 
-          <CollapsibleGroup heading="Sessions" className={classes.history}>
-            <ThreadsHistory
-              enableFetch={Boolean(isOpen)}
-              className={classes.scrollSection}
-            />
+          <CollapsibleGroup heading="Sessions">
+            <ThreadsHistory enableFetch={Boolean(isOpen)} />
           </CollapsibleGroup>
         </div>
 

diff --git a/src/modules/assistants/AssistantsNav.module.scss b/src/modules/assistants/AssistantsNav.module.scss
@@ -38,18 +38,16 @@
 }
 
 .root {
-  min-block-size: 0;
   display: flex;
   flex-direction: column;
-  max-block-size: 100%;
 }
 
 .header {
   display: flex;
   align-items: center;
   justify-content: space-between;
   column-gap: $spacing-03;
-  padding-inline: $spacing-06;
+  padding-inline: $spacing-03;
   margin-block-end: $spacing-03;
 }
 

diff --git a/src/modules/assistants/AssistantsNav.tsx b/src/modules/assistants/AssistantsNav.tsx
@@ -206,7 +206,7 @@ function NewButton() {
     <IconButton
       kind="tertiary"
       label="New agent"
-      align="right"
+      align="left"
       onClick={() =>
         openModal((props) => (
           <ProjectProvider project={project} organization={organization}>

diff --git a/src/modules/chat/ConversationHeader.tsx b/src/modules/chat/ConversationHeader.tsx
@@ -15,17 +15,10 @@
  */
 
 import { Container } from '@/components/Container/Container';
-import { useAppContext } from '@/layout/providers/AppProvider';
 import { NewSessionButton } from '@/layout/shell/NewSessionButton';
 import classes from './ConversationHeader.module.scss';
-import { useChat } from './providers/ChatProvider';
 
 export function ConversationHeader() {
-  const { assistant: appAssistant } = useAppContext();
-  const { assistant: threadAssistant } = useChat();
-
-  const assistant = threadAssistant.data ?? appAssistant;
-
   return (
     <div className={classes.root}>
       <div className={classes.holder}>

diff --git a/src/modules/chat/ConversationView.tsx b/src/modules/chat/ConversationView.tsx
@@ -59,6 +59,8 @@ export const ConversationView = memo(function ConversationView({
     initialAssistantMessage,
   } = useChat();
 
+  const showTopBar = topBarEnabled && !assistant.isDeleted;
+
   const scrollToBottom = useCallback(() => {
     const scrollElement = scrollRef.current;
 
@@ -100,7 +102,7 @@ export const ConversationView = memo(function ConversationView({
 
   return (
     <div {...(dropzone ? dropzone.getRootProps({ className }) : { className })}>
-      {topBarEnabled && <ConversationHeader />}
+      {showTopBar && <ConversationHeader />}
 
       <div className={classes.content} ref={scrollRef}>
         <div ref={bottomRef} />