Fix chat history (#346)

Author: crspeller

conversations/conversations.go

@@ -30,11 +30,12 @@ const AnalysisTypeProp = "prompt_type"
 
 // AIThread represents a user's conversation with an AI
 type AIThread struct {
-	ID        string `json:"id"`
-	Title     string `json:"title"`
-	ChannelID string `json:"channel_id"`
-	BotID     string `json:"bot_id"`
-	UpdatedAt int64  `json:"updated_at"`
+	ID         string `json:"id"`
+	Message    string `json:"message"`
+	Title      string `json:"title"`
+	ChannelID  string `json:"channel_id"`
+	ReplyCount int    `json:"reply_count"`
+	UpdateAt   int64  `json:"update_at"`
 }
 
 type Conversations struct {

conversations/store.go

@@ -30,18 +30,8 @@ func (c *Conversations) SaveTitle(threadID, title string) error {
 	return err
 }
 
-// This is a different AIThread struct than the one in conversations.go, used for database queries
-type aiThreadData struct {
-	ID         string
-	Message    string
-	ChannelID  string
-	Title      string
-	ReplyCount int
-	UpdateAt   int64
-}
-
 func (c *Conversations) getAIThreads(dmChannelIDs []string) ([]AIThread, error) {
-	var dbPosts []aiThreadData
+	var dbPosts []AIThread
 	if err := c.db.DoQuery(&dbPosts, c.db.Builder().
 		Select(
 			"p.Id",
@@ -63,17 +53,5 @@ func (c *Conversations) getAIThreads(dmChannelIDs []string) ([]AIThread, error)
 		return nil, fmt.Errorf("failed to get posts for bot DM: %w", err)
 	}
 
-	// Convert from internal type to public AIThread type
-	result := make([]AIThread, len(dbPosts))
-	for i, post := range dbPosts {
-		result[i] = AIThread{
-			ID:        post.ID,
-			Title:     post.Title,
-			ChannelID: post.ChannelID,
-			BotID:     "", // We don't have this info in the query
-			UpdatedAt: post.UpdateAt,
-		}
-	}
-
-	return result, nil
+	return dbPosts, nil
 }

e2e/helpers/ai-plugin.ts

@@ -6,6 +6,8 @@ export class AIPlugin {
   readonly rhsPostTextarea: Locator;
   readonly rhsSendButton: Locator;
   readonly regenerateButton: Locator;
+  readonly chatHistoryButton: Locator;
+  readonly threadsListContainer: Locator;
   readonly promptTemplates: {
     [key: string]: Locator;
   };
@@ -16,6 +18,8 @@ export class AIPlugin {
     this.rhsPostTextarea = page.getByTestId('rhs-new-tab-create-post').locator('textarea');
     this.rhsSendButton = page.locator('#rhsContainer').getByTestId('SendMessageButton');
     this.regenerateButton = page.getByRole('button', { name: 'Regenerate' });
+    this.chatHistoryButton = page.getByTestId('chat-history');
+    this.threadsListContainer = page.getByTestId('rhs-threads-list');
     this.promptTemplates = {
       'brainstorm': page.getByRole('button', { name: 'Brainstorm ideas' }),
       'todo': page.getByRole('button', { name: 'To-do list' }),
@@ -54,4 +58,19 @@ export class AIPlugin {
   async expectTextInTextarea(text: string) {
     await expect(this.rhsPostTextarea).toHaveText(text);
   }
+
+  async openChatHistory() {
+    await this.chatHistoryButton.click();
+    await expect(this.threadsListContainer).toBeVisible();
+  }
+
+  async expectChatHistoryVisible() {
+    await expect(this.threadsListContainer).toBeVisible();
+  }
+
+  async clickChatHistoryItem(index: number = 0) {
+    const threadItems = this.threadsListContainer.locator('div').first();
+    await threadItems.nth(index).click();
+  }
+
 }

e2e/tests/basic.spec.ts

@@ -131,3 +131,69 @@ test.describe('Error Handling', () => {
     await expect(page.getByText(/An error occurred/i)).toBeVisible();
   });
 });
+
+test.describe('Chat History', () => {
+  test('can view chat history after creating conversations', async ({ page }) => {
+    const { aiPlugin } = await setupTestPage(page);
+    await aiPlugin.openRHS();
+
+    // Create first conversation
+    await openAIMock.addCompletionMock(responseTest);
+    await aiPlugin.sendMessage('First conversation message');
+    await aiPlugin.waitForBotResponse(responseTestText);
+
+    // Create second conversation by starting new chat
+    await page.getByTestId('new-chat').click();
+    await openAIMock.addCompletionMock(responseTest2);
+    await aiPlugin.sendMessage('Second conversation message');
+    await aiPlugin.waitForBotResponse(responseTest2Text);
+
+    // Open chat history
+    await aiPlugin.openChatHistory();
+    await aiPlugin.expectChatHistoryVisible();
+
+    // Verify we can see conversation entries
+    await expect(aiPlugin.threadsListContainer.locator('div').first()).toBeVisible();
+  });
+
+  test('can click on chat history items without errors', async ({ page }) => {
+    const { aiPlugin } = await setupTestPage(page);
+    await aiPlugin.openRHS();
+
+    // Create a conversation first
+    await openAIMock.addCompletionMock(responseTest);
+    await aiPlugin.sendMessage('Test conversation');
+    await aiPlugin.waitForBotResponse(responseTestText);
+
+    // Open chat history
+    await aiPlugin.openChatHistory();
+    await aiPlugin.expectChatHistoryVisible();
+
+    // Click on the first history item
+    await aiPlugin.clickChatHistoryItem(0);
+    
+    // Verify we can see the conversation content we created
+    await expect(page.getByText('Test conversation')).toBeVisible();
+    await expect(page.getByText(responseTestText)).toBeVisible();
+  });
+
+  test('chat history button is visible and functional', async ({ page }) => {
+    const { aiPlugin } = await setupTestPage(page);
+    await aiPlugin.openRHS();
+
+    // Create a conversation first so we have content in the history
+    await openAIMock.addCompletionMock(responseTest);
+    await aiPlugin.sendMessage('Test for history button');
+    await aiPlugin.waitForBotResponse(responseTestText);
+
+    // Chat history button should be visible
+    await expect(aiPlugin.chatHistoryButton).toBeVisible();
+
+    // Should be clickable
+    await aiPlugin.chatHistoryButton.click();
+    
+    // Should show threads list with content
+    await expect(aiPlugin.threadsListContainer).toBeVisible();
+    await expect(aiPlugin.threadsListContainer.locator('div').first()).toBeVisible();
+  });
+});

webapp/src/components/rhs/rhs.tsx

@@ -52,12 +52,12 @@ const RHSBullet = styled.li`
 `;
 
 export interface AIThread {
-    ID: string;
-    Message: string;
-    ChannelID: string;
-    Title: string;
-    ReplyCount: number;
-    UpdateAt: number;
+    id: string;
+    message: string;
+    channel_id: string;
+    title: string;
+    reply_count: number;
+    update_at: number;
 }
 
 const twentyFourHoursInMS = 24 * 60 * 60 * 1000;
@@ -142,15 +142,15 @@ export default function RHS() {
                 >
                     {threads.map((p) => (
                         <ThreadItem
-                            key={p.ID}
-                            postTitle={p.Title}
-                            postMessage={p.Message}
-                            repliesCount={p.ReplyCount}
-                            lastActivityDate={p.UpdateAt}
-                            label={bots.find((bot) => bot.dmChannelID === p.ChannelID)?.displayName ?? ''}
+                            key={p.id}
+                            postTitle={p.title}
+                            postMessage={p.message}
+                            repliesCount={p.reply_count}
+                            lastActivityDate={p.update_at}
+                            label={bots.find((bot) => bot.dmChannelID === p.channel_id)?.displayName ?? ''}
                             onClick={() => {
                                 setCurrentTab('thread');
-                                selectPost(p.ID);
+                                selectPost(p.id);
                             }}
                         />))}
                 </ThreadsList>