Skip to content

Open-source AI teammates in Slack, Teams, Discord, Telegram and Mattermost. Self-host it, with any agent harness and any model.

Rooms: a card's menu says Archive, and asks before archiving

Simon Flackc20a514ca983
diff --git a/console/apps/switch-console-desktop/src/renderer/features/switch-servers/room-card.tsx b/console/apps/switch-console-desktop/src/renderer/features/switch-servers/room-card.tsx
index 8852fa92e..c31fff7d8 100644
--- a/console/apps/switch-console-desktop/src/renderer/features/switch-servers/room-card.tsx
+++ b/console/apps/switch-console-desktop/src/renderer/features/switch-servers/room-card.tsx
@@ -142,8 +142,7 @@ export function RoomCard({
) : (
<Archive className="size-4" />
)}
- {/* The room is hidden for everyone, not just you. */}
- {card.archived ? 'Unarchive' : 'Archive for everyone'}
+ {card.archived ? 'Unarchive' : 'Archive'}
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
diff --git a/console/apps/switch-console-desktop/src/renderer/features/switch-servers/server-rooms-view.tsx b/console/apps/switch-console-desktop/src/renderer/features/switch-servers/server-rooms-view.tsx
index 1a07fae73..e7822d5e4 100644
--- a/console/apps/switch-console-desktop/src/renderer/features/switch-servers/server-rooms-view.tsx
+++ b/console/apps/switch-console-desktop/src/renderer/features/switch-servers/server-rooms-view.tsx
@@ -5,6 +5,7 @@ import { useEffect, useState } from 'react';
import type { GuardResult, ViewDefinition } from '@renderer/app/view-registry';
import { chatsStore } from '@renderer/features/chats/stores/chats';
import { refreshSidebarRoomState } from '@renderer/features/sidebar/sidebar-tree-data';
+import { useArchiveRoomConfirm } from '@renderer/features/switch-rooms/archive-room-confirm';
import { openRoom } from '@renderer/features/switch-rooms/open-room';
import { workspacesStore } from '@renderer/features/workspaces/workspaces-store';
import { LIST_PAGE_WIDTH, ListToolbar } from '@renderer/lib/components/list-toolbar';
@@ -78,6 +79,7 @@ const ServerRoomsPanel = observer(function ServerRoomsPanel() {
const [scope, setScope] = useState<Scope>('mine');
const [state, setState] = useState<State>('active');
const [picked, setFilter] = useState<RoomsFilter>(NO_FILTER);
+ const confirmArchive = useArchiveRoomConfirm();
useEffect(() => {
void refreshSidebarRoomState(false);
@@ -282,12 +284,20 @@ const ServerRoomsPanel = observer(function ServerRoomsPanel() {
card={card}
showYours={scope === 'all'}
onOpen={() => void openRoom(card.id)}
- onArchive={mayArchive(card) ? () => void setArchived(card) : null}
+ onArchive={
+ mayArchive(card)
+ ? () =>
+ card.archived
+ ? void setArchived(card)
+ : confirmArchive.request(card.name, () => void setArchived(card))
+ : null
+ }
/>
</div>
))}
</div>
)}
+ {confirmArchive.dialog}
</div>
)}
</ServerPage>
diff --git a/console/apps/switch-console-desktop/src/renderer/tests/browser/your-rooms-view.test.tsx b/console/apps/switch-console-desktop/src/renderer/tests/browser/your-rooms-view.test.tsx
index 1ed02833f..35e391ab2 100644
--- a/console/apps/switch-console-desktop/src/renderer/tests/browser/your-rooms-view.test.tsx
+++ b/console/apps/switch-console-desktop/src/renderer/tests/browser/your-rooms-view.test.tsx
@@ -288,3 +288,30 @@ it('says so when the archived chats cannot be listed', async () => {
await act(async () => toggle('Archived')!.click());
expect(container.textContent).toContain('Your archived chats could not be listed.');
});
+
+it('archives a room from its menu only once you confirm', async () => {
+ await render();
+ await act(async () =>
+ cardFor('yaml-room')
+ .querySelector<HTMLButtonElement>('[aria-label="yaml-room actions"]')!
+ .click()
+ );
+ await settle();
+ const item = [...document.querySelectorAll<HTMLElement>('[role="menuitem"]')].find(
+ (each) => each.textContent === 'Archive'
+ )!;
+ await act(async () => item.click());
+ await settle();
+ expect(setRoomArchived).not.toHaveBeenCalled();
+ const dialog = document.querySelector<HTMLElement>('[role="dialog"]')!;
+ expect(dialog.textContent).toContain('Archive yaml-room?');
+ const confirm = [...dialog.querySelectorAll('button')].find(
+ (b) => b.textContent?.trim() === 'Archive'
+ )!;
+ await act(async () => confirm.click());
+ expect(setRoomArchived).toHaveBeenCalledWith({
+ workspaceId: 'ws',
+ roomId: 'yaml-room',
+ archived: true,
+ });
+});