From 910a531c8742f11ed4ec41d3d166cb6c9c299b1f Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Thu, 13 Aug 2026 05:59:18 +0000 Subject: [PATCH 1/2] feat(dashboard): Mark private sidebar conversations Co-Authored-By: David Cramer --- .../junior-dashboard/e2e/conversations.spec.ts | 14 +++++++++++++- .../conversations/ConversationSidebar.tsx | 18 +++++++++++++++--- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/packages/junior-dashboard/e2e/conversations.spec.ts b/packages/junior-dashboard/e2e/conversations.spec.ts index 7625ff68c..f70e39de8 100644 --- a/packages/junior-dashboard/e2e/conversations.spec.ts +++ b/packages/junior-dashboard/e2e/conversations.spec.ts @@ -108,7 +108,19 @@ test("opens a conversation in the built dashboard", async ({ page }) => { await expect( page.getByRole("heading", { name: "Conversations" }), ).toBeVisible(); - await page.getByRole("link", { name: /Checkout latency triage/ }).click(); + const publicConversationLink = page.getByRole("link", { + name: /Checkout latency triage/, + }); + const privateConversationLink = page.getByRole("link", { + name: /Direct Message/, + }); + await expect( + privateConversationLink.getByLabel("Private conversation"), + ).toBeVisible(); + await expect( + publicConversationLink.getByLabel("Private conversation"), + ).toHaveCount(0); + await publicConversationLink.click(); await expect(page).toHaveURL( `${server.baseURL}/conversations/${encodeURIComponent("slack:CQA123:1770000000.000100")}`, ); diff --git a/packages/junior-dashboard/src/client/conversations/ConversationSidebar.tsx b/packages/junior-dashboard/src/client/conversations/ConversationSidebar.tsx index 39db7ea7e..1b11f844d 100644 --- a/packages/junior-dashboard/src/client/conversations/ConversationSidebar.tsx +++ b/packages/junior-dashboard/src/client/conversations/ConversationSidebar.tsx @@ -1,5 +1,11 @@ import { useCallback, useEffect, useState } from "react"; -import { Archive, ArchiveRestore, CircleAlert, SquarePen } from "lucide-react"; +import { + Archive, + ArchiveRestore, + CircleAlert, + LockKeyhole, + SquarePen, +} from "lucide-react"; import { Link } from "react-router"; import { useArchiveConversation } from "./queries"; @@ -206,8 +212,14 @@ function ConversationSidebarRow(props: { )} /> )} -
- {title} +
+ {props.conversation.visibility === "private" ? ( + + ) : null} + {title}
{location ? ( From 5ff88a4a394320888b59e9c2a2f748f18075437e Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Thu, 13 Aug 2026 06:07:15 +0000 Subject: [PATCH 2/2] fix(dashboard): Move private lock to metadata Co-Authored-By: David Cramer --- .../client/conversations/ConversationSidebar.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/junior-dashboard/src/client/conversations/ConversationSidebar.tsx b/packages/junior-dashboard/src/client/conversations/ConversationSidebar.tsx index 1b11f844d..b97a18d13 100644 --- a/packages/junior-dashboard/src/client/conversations/ConversationSidebar.tsx +++ b/packages/junior-dashboard/src/client/conversations/ConversationSidebar.tsx @@ -212,19 +212,19 @@ function ConversationSidebarRow(props: { )} /> )} -
+
+ {title} +
+
+ {location || props.conversation.visibility === "private" ? ( +
{props.conversation.visibility === "private" ? ( ) : null} - {title} -
- - {location ? ( -
- {location} + {location ? {location} : null}
) : null}