fix(organizations): preserve chat context during pagination

Author: waleedlatif1

apps/sim/app/o/[organizationId]/components/organization-sidebar/components/chats-section/chats-section.test.tsx

@@ -122,6 +122,36 @@ describe('ChatsSection', () => {
     expect(other?.className).not.toContain('surface-active')
   })
 
+  it('keeps a bookmarked chat visible when collapsing expanded history', async () => {
+    await render({ pathname: CHATS[5].href })
+    expect(container.querySelectorAll('a[href^="/o/org-1/chat/"]')).toHaveLength(6)
+    expect(container.querySelector(`a[href="${CHATS[5].href}"]`)?.className).toContain(
+      'surface-active'
+    )
+    const more = Array.from(container.querySelectorAll('button')).find(
+      (button) => button.textContent === 'See more'
+    )!
+    await act(async () => more.click())
+    expect(container.querySelectorAll('a[href^="/o/org-1/chat/"]')).toHaveLength(8)
+    const less = Array.from(container.querySelectorAll('button')).find(
+      (button) => button.textContent === 'See less'
+    )!
+    await act(async () => less.click())
+    expect(container.querySelectorAll('a[href^="/o/org-1/chat/"]')).toHaveLength(6)
+    expect(container.querySelector(`a[href="${CHATS[5].href}"]`)).not.toBeNull()
+  })
+
+  it('derives the visible range from the route without retaining automatic expansion', async () => {
+    await render({ pathname: CHATS[7].href })
+    expect(container.querySelectorAll('a[href^="/o/org-1/chat/"]')).toHaveLength(8)
+    expect(container.textContent).not.toContain('See more')
+    expect(container.textContent).not.toContain('See less')
+
+    await render({ pathname: null })
+    expect(container.querySelectorAll('a[href^="/o/org-1/chat/"]')).toHaveLength(5)
+    expect(container.textContent).toContain('See more')
+  })
+
   it.each([false, true])('renames via the options menu with collapsed=%s', async (isCollapsed) => {
     hoverState.isOpen = isCollapsed
     await render({ isCollapsed })

apps/sim/app/o/[organizationId]/components/organization-sidebar/components/chats-section/chats-section.tsx

@@ -128,7 +128,10 @@ export function ChatsSection({
 }: ChatsSectionProps) {
   const actions = useOrganizationChatActions({ organizationId, chats })
   const { menu, hover, rename, selectedChat } = actions
-  const [visibleCount, setVisibleCount] = useState(PAGE_SIZE)
+  const [requestedCount, setRequestedCount] = useState(PAGE_SIZE)
+  const minimumCount = Math.max(PAGE_SIZE, chats.findIndex((chat) => chat.href === pathname) + 1)
+  const visibleCount = Math.min(chats.length, Math.max(requestedCount, minimumCount))
+  const hasMore = chats.length > visibleCount
   const menuOpenChatId = menu.isOpen ? selectedChat?.id : null
   const saveRename = () => {
     void rename.saveRename()
@@ -217,16 +220,14 @@ export function ChatsSection({
                       />
                     )
                   )}
-                {chats.length > PAGE_SIZE && (
+                {(hasMore || visibleCount > minimumCount) && (
                   <Chip
                     fullWidth
                     onClick={() =>
-                      setVisibleCount(
-                        chats.length > visibleCount ? visibleCount + PAGE_SIZE : PAGE_SIZE
-                      )
+                      setRequestedCount(hasMore ? visibleCount + PAGE_SIZE : PAGE_SIZE)
                     }
                   >
-                    {chats.length > visibleCount ? 'See more' : 'See less'}
+                    {hasMore ? 'See more' : 'See less'}
                   </Chip>
                 )}
               </>

apps/sim/app/o/[organizationId]/components/organization-sidebar/organization-sidebar.tsx

@@ -266,6 +266,7 @@ export const OrganizationSidebar = memo(function OrganizationSidebar() {
                   />
                   {searchAccess.memberScoped && (
                     <OrganizationChats
+                      key={organization.id}
                       organizationId={organization.id}
                       isCollapsed={isCollapsed}
                       pathname={pathname}