Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions apps/web/src/components/settings/SettingsPanels.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ import { Button } from "../ui/button";
import { DraftInput } from "../ui/draft-input";
import { Input } from "../ui/input";
import { Select, SelectItem, SelectPopup, SelectTrigger, SelectValue } from "../ui/select";
import {
isSidebarProjectSortOrder,
SIDEBAR_PROJECT_SORT_ORDER_LABELS,
} from "../sidebar/SidebarThreadHeader";
import { Switch } from "../ui/switch";
import { ScopedSwitch } from "./ScopedSwitch";
import { stackedThreadToast, toastManager } from "../ui/toast";
Expand Down Expand Up @@ -142,13 +146,6 @@ const RESPONSE_STREAMING_MODE_DESCRIPTIONS: Record<ResponseStreamingMode, string
paragraph: msg("Each paragraph or code block appears as soon as it is complete."),
};

const SIDEBAR_PROJECT_SORT_ORDER_LABELS: Record<SidebarProjectSortOrder, string> = {
updated_at: msg("Last user message"),
created_at: msg("Created at"),
manual: msg("Manual"),
};
const isSidebarProjectSortOrder = Schema.is(SidebarProjectSortOrder);

const TIMESTAMP_FORMAT_LABELS = {
locale: msg("System default"),
"12-hour": msg("12-hour"),
Expand Down
98 changes: 96 additions & 2 deletions apps/web/src/components/sidebar/SidebarThreadHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { useGT } from "gt-react";
import { FolderPlusIcon, SearchIcon, SquarePenIcon, XIcon } from "lucide-react";
import { SidebarProjectSortOrder } from "@t3tools/contracts/settings";
import * as Schema from "effect/Schema";
import { msg, useGT, useMessages } from "gt-react";
import { ArrowDownUpIcon, FolderPlusIcon, SearchIcon, SquarePenIcon, XIcon } from "lucide-react";
import {
type ComponentProps,
type KeyboardEvent as ReactKeyboardEvent,
Expand All @@ -8,11 +10,31 @@ import {
type RefObject,
} from "react";

import { updateClientSettings, useClientSettings } from "~/hooks/useSettings";
import { cn } from "~/lib/utils";
import { Button } from "../ui/button";
import {
Menu,
MenuCheckboxItem,
MenuGroup,
MenuGroupLabel,
MenuPopup,
MenuRadioGroup,
MenuRadioItem,
MenuRadioItemIndicator,
MenuSeparator,
MenuTrigger,
} from "../ui/menu";
import { SidebarInput, SidebarMenuButton } from "../ui/sidebar";
import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";

export const SIDEBAR_PROJECT_SORT_ORDER_LABELS: Record<SidebarProjectSortOrder, string> = {
updated_at: msg("Last user message"),
created_at: msg("Created at"),
manual: msg("Manual"),
};
export const isSidebarProjectSortOrder = Schema.is(SidebarProjectSortOrder);

export interface SidebarThreadHeaderProps {
hasProjects: boolean;
projectScope: ReactNode;
Expand Down Expand Up @@ -102,6 +124,7 @@ export function SidebarThreadHeader({
{hasProjects ? (
<>
{projectScope}
<SidebarViewMenu />
<SidebarHeaderIconButton label={gt("Add project")} onClick={onNewProject}>
<FolderPlusIcon />
</SidebarHeaderIconButton>
Expand Down Expand Up @@ -135,6 +158,77 @@ export function SidebarThreadHeader({
);
}

function SidebarViewMenu() {
const gt = useGT();
const m = useMessages();
const groupByProject = useClientSettings((settings) => settings.boringSidebarEnabled);
const projectSortOrder = useClientSettings((settings) => settings.sidebarProjectSortOrder);
const workingShelfEnabled = useClientSettings((settings) => settings.sidebarWorkingShelfEnabled);
const multilineRows = useClientSettings((settings) => settings.boringSidebarMultilineRows);

return (
<Menu>
<MenuTrigger render={<SidebarHeaderIconButton label={gt("View options")} />}>
<ArrowDownUpIcon className="size-4" />
</MenuTrigger>
{/* Refocusing the trigger after a pointer close shows its focus ring and opens its tooltip. */}
<MenuPopup align="end" finalFocus={(closeType) => closeType === "keyboard"}>
<MenuCheckboxItem
variant="switch"
checked={groupByProject}
onCheckedChange={(checked) =>
void updateClientSettings({ boringSidebarEnabled: checked })
}
>
{gt("Group by project")}
</MenuCheckboxItem>
{groupByProject ? (
<MenuCheckboxItem
variant="switch"
checked={multilineRows}
onCheckedChange={(checked) =>
void updateClientSettings({ boringSidebarMultilineRows: checked })
}
>
{gt("Two-line rows")}
</MenuCheckboxItem>
) : (
<MenuCheckboxItem
variant="switch"
checked={workingShelfEnabled}
onCheckedChange={(checked) =>
void updateClientSettings({ sidebarWorkingShelfEnabled: checked })
}
>
{gt("Working section")}
</MenuCheckboxItem>
)}
<MenuSeparator />
<MenuGroup>
<MenuGroupLabel>{gt("Sort projects")}</MenuGroupLabel>
<MenuRadioGroup
value={projectSortOrder}
onValueChange={(value) => {
if (isSidebarProjectSortOrder(value)) {
void updateClientSettings({ sidebarProjectSortOrder: value });
}
}}
>
{SidebarProjectSortOrder.literals.map((sortOrder) => (
<MenuRadioItem key={sortOrder} value={sortOrder}>
<span className="flex items-center justify-between gap-2">
{m(SIDEBAR_PROJECT_SORT_ORDER_LABELS[sortOrder])}
<MenuRadioItemIndicator />
</span>
</MenuRadioItem>
))}
</MenuRadioGroup>
</MenuGroup>
</MenuPopup>
</Menu>
);
}

export function SidebarHeaderIconButton({
label,
tooltip = label,
Expand Down
10 changes: 7 additions & 3 deletions apps/web/src/i18n/translations/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -9630,9 +9630,6 @@
"47cae2671170e30a": "Fertige Absätze anzeigen",
"995c40e36789a516": "Der Text erscheint, sobald der Agent seine Runde beendet hat.",
"99ed1c4d021ae372": "Jeder Absatz oder Codeblock erscheint, sobald er vollständig ist.",
"c0b0406e0cafa1d1": "Letzte eigene Nachricht",
"cb0775162a9b6419": "Erstellungsdatum",
"62570d4bfe4ab517": "Manuell",
"7fa9414ef5e9dd6c": "12-Stunden-Format",
"2f42917064c97f09": "24-Stunden-Format",
"dcc08eacff8bd0bc": "Untereinander",
Expand Down Expand Up @@ -11614,11 +11611,18 @@
"ef436cc0f1cee213": ", arbeitet",
"2c3bb8ccf6c38078": "Hinweis zum Anbieter-Update schließen",
"3cef7762c22f5fb1": "Ausblenden, bis sich der Anbieterstatus ändert",
"c0b0406e0cafa1d1": "Letzte eigene Nachricht",
"cb0775162a9b6419": "Erstellungsdatum",
"62570d4bfe4ab517": "Manuell",
"0f90824868d6c3af": "Neuer Thread ({shortcut})",
"a1dbe20d209982b6": "Suchen",
"201317aac48d4d9f": "Thread-Suche leeren",
"bcda2ccaa871dc46": "Neuer Thread im aktuellen Projekt: Shift+Klick ({shortcut})",
"aa5c379423baace1": "Neuer Thread im aktuellen Projekt: Shift+Klick",
"46edecc2189d4076": "Ansichtsoptionen",
"61f64b04cef40a97": "Nach Projekt gruppieren",
"54a53ad6f47d2593": "Zweizeilige Zeilen",
"aedb1f9e51f8848c": "Projekte sortieren",
"9d9d32b401d2931a": "{count, plural, one {{count} Terminal-Prozess läuft} other {{count} Terminal-Prozesse laufen}}",
"ade06f6723949b39": "Fehler aufgetreten",
"021fe65858278fe9": "Thread zurückstellen",
Expand Down
10 changes: 7 additions & 3 deletions apps/web/src/i18n/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -9639,9 +9639,6 @@
"47cae2671170e30a": "Show finished paragraphs",
"995c40e36789a516": "Text appears once the agent finishes its turn.",
"99ed1c4d021ae372": "Each paragraph or code block appears as soon as it is complete.",
"c0b0406e0cafa1d1": "Last user message",
"cb0775162a9b6419": "Created at",
"62570d4bfe4ab517": "Manual",
"7fa9414ef5e9dd6c": "12-hour",
"2f42917064c97f09": "24-hour",
"dcc08eacff8bd0bc": "Stacked",
Expand Down Expand Up @@ -11622,11 +11619,18 @@
"ef436cc0f1cee213": ", working",
"2c3bb8ccf6c38078": "Dismiss provider update notice",
"3cef7762c22f5fb1": "Dismiss until provider status changes",
"c0b0406e0cafa1d1": "Last user message",
"cb0775162a9b6419": "Created at",
"62570d4bfe4ab517": "Manual",
"0f90824868d6c3af": "New thread ({shortcut})",
"a1dbe20d209982b6": "Search",
"201317aac48d4d9f": "Clear thread search",
"bcda2ccaa871dc46": "New thread in current project: Shift+click ({shortcut})",
"aa5c379423baace1": "New thread in current project: Shift+click",
"46edecc2189d4076": "View options",
"61f64b04cef40a97": "Group by project",
"54a53ad6f47d2593": "Two-line rows",
"aedb1f9e51f8848c": "Sort projects",
"9d9d32b401d2931a": "{count, plural, one {{count} terminal process running} other {{count} terminal processes running}}",
"ade06f6723949b39": "Error occurred",
"021fe65858278fe9": "Snooze thread",
Expand Down
10 changes: 7 additions & 3 deletions apps/web/src/i18n/translations/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -9627,9 +9627,6 @@
"47cae2671170e30a": "Mostrar párrafos terminados",
"995c40e36789a516": "El texto aparece cuando el agente termina su turno.",
"99ed1c4d021ae372": "Cada párrafo o bloque de código aparece en cuanto está completo.",
"c0b0406e0cafa1d1": "Último mensaje",
"cb0775162a9b6419": "Fecha de creación",
"62570d4bfe4ab517": "Manual",
"7fa9414ef5e9dd6c": "12 horas",
"2f42917064c97f09": "24 horas",
"dcc08eacff8bd0bc": "Apilado",
Expand Down Expand Up @@ -11607,11 +11604,18 @@
"ef436cc0f1cee213": ", en curso",
"2c3bb8ccf6c38078": "Descartar aviso de actualización del proveedor",
"3cef7762c22f5fb1": "Descartar hasta que cambie el estado del proveedor",
"c0b0406e0cafa1d1": "Último mensaje",
"cb0775162a9b6419": "Fecha de creación",
"62570d4bfe4ab517": "Manual",
"0f90824868d6c3af": "Nuevo hilo ({shortcut})",
"a1dbe20d209982b6": "Buscar",
"201317aac48d4d9f": "Borrar búsqueda de hilos",
"bcda2ccaa871dc46": "Nuevo hilo en el proyecto actual: Shift+clic ({shortcut})",
"aa5c379423baace1": "Nuevo hilo en el proyecto actual: Shift+clic",
"46edecc2189d4076": "Opciones de vista",
"61f64b04cef40a97": "Agrupar por proyecto",
"54a53ad6f47d2593": "Filas de dos líneas",
"aedb1f9e51f8848c": "Ordenar proyectos",
"9d9d32b401d2931a": "{count, plural, one {{count} proceso de terminal en ejecución} other {{count} procesos de terminal en ejecución}}",
"ade06f6723949b39": "Se produjo un error",
"021fe65858278fe9": "Posponer hilo",
Expand Down
10 changes: 7 additions & 3 deletions apps/web/src/i18n/translations/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -9629,9 +9629,6 @@
"47cae2671170e30a": "Afficher les paragraphes terminés",
"995c40e36789a516": "Le texte apparaît quand l’agent a terminé son tour.",
"99ed1c4d021ae372": "Chaque paragraphe ou bloc de code apparaît dès qu’il est complet.",
"c0b0406e0cafa1d1": "Dernier message envoyé",
"cb0775162a9b6419": "Date de création",
"62570d4bfe4ab517": "Manuel",
"7fa9414ef5e9dd6c": "12 heures",
"2f42917064c97f09": "24 heures",
"dcc08eacff8bd0bc": "Empilé",
Expand Down Expand Up @@ -11612,11 +11609,18 @@
"ef436cc0f1cee213": ", en cours",
"2c3bb8ccf6c38078": "Ignorer l’avis de mise à jour du fournisseur",
"3cef7762c22f5fb1": "Ignorer jusqu’au prochain changement de statut du fournisseur",
"c0b0406e0cafa1d1": "Dernier message envoyé",
"cb0775162a9b6419": "Date de création",
"62570d4bfe4ab517": "Manuel",
"0f90824868d6c3af": "Nouveau fil ({shortcut})",
"a1dbe20d209982b6": "Rechercher",
"201317aac48d4d9f": "Effacer la recherche de fils",
"bcda2ccaa871dc46": "Nouveau fil dans le projet actuel : Shift+clic ({shortcut})",
"aa5c379423baace1": "Nouveau fil dans le projet actuel : Shift+clic",
"46edecc2189d4076": "Options d’affichage",
"61f64b04cef40a97": "Grouper par projet",
"54a53ad6f47d2593": "Lignes sur deux lignes",
"aedb1f9e51f8848c": "Trier les projets",
"9d9d32b401d2931a": "{count, plural, one {{count} processus de terminal en cours} other {{count} processus de terminal en cours}}",
"ade06f6723949b39": "Une erreur s’est produite",
"021fe65858278fe9": "Reporter le fil",
Expand Down
10 changes: 7 additions & 3 deletions apps/web/src/i18n/translations/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -9581,9 +9581,6 @@
"47cae2671170e30a": "完成した段落を表示",
"995c40e36789a516": "エージェントがターンを終えた時点でテキストが表示されます。",
"99ed1c4d021ae372": "段落やコードブロックが完成するたびに表示されます。",
"c0b0406e0cafa1d1": "ユーザーの最終メッセージ日時",
"cb0775162a9b6419": "作成日時",
"62570d4bfe4ab517": "手動",
"7fa9414ef5e9dd6c": "12 時間制",
"2f42917064c97f09": "24 時間制",
"dcc08eacff8bd0bc": "縦に並べる",
Expand Down Expand Up @@ -11562,11 +11559,18 @@
"ef436cc0f1cee213": "、作業中",
"2c3bb8ccf6c38078": "プロバイダーの更新通知を閉じる",
"3cef7762c22f5fb1": "プロバイダーのステータスが変わるまで非表示",
"c0b0406e0cafa1d1": "ユーザーの最終メッセージ日時",
"cb0775162a9b6419": "作成日時",
"62570d4bfe4ab517": "手動",
"0f90824868d6c3af": "新しいスレッド ({shortcut})",
"a1dbe20d209982b6": "検索",
"201317aac48d4d9f": "スレッドの検索をクリア",
"bcda2ccaa871dc46": "現在のプロジェクトで新しいスレッド: Shift+クリック ({shortcut})",
"aa5c379423baace1": "現在のプロジェクトで新しいスレッド: Shift+クリック",
"46edecc2189d4076": "表示オプション",
"61f64b04cef40a97": "プロジェクト別にグループ化",
"54a53ad6f47d2593": "2行表示",
"aedb1f9e51f8848c": "プロジェクトの並び順",
"9d9d32b401d2931a": "{count, plural, other {{count} 個のターミナルプロセスが実行中}}",
"ade06f6723949b39": "エラーが発生しました",
"021fe65858278fe9": "スレッドをスヌーズ",
Expand Down
10 changes: 7 additions & 3 deletions apps/web/src/i18n/translations/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -9584,9 +9584,6 @@
"47cae2671170e30a": "완성된 단락 표시",
"995c40e36789a516": "에이전트가 턴을 마치면 텍스트가 표시됩니다.",
"99ed1c4d021ae372": "각 단락이나 코드 블록이 완성되는 즉시 표시됩니다.",
"c0b0406e0cafa1d1": "마지막 사용자 메시지",
"cb0775162a9b6419": "생성일",
"62570d4bfe4ab517": "수동",
"7fa9414ef5e9dd6c": "12시간제",
"2f42917064c97f09": "24시간제",
"dcc08eacff8bd0bc": "위아래",
Expand Down Expand Up @@ -11559,11 +11556,18 @@
"ef436cc0f1cee213": ", 작업 중",
"2c3bb8ccf6c38078": "제공자 업데이트 알림 닫기",
"3cef7762c22f5fb1": "제공자 상태가 바뀔 때까지 닫기",
"c0b0406e0cafa1d1": "마지막 사용자 메시지",
"cb0775162a9b6419": "생성일",
"62570d4bfe4ab517": "수동",
"0f90824868d6c3af": "새 스레드({shortcut})",
"a1dbe20d209982b6": "검색",
"201317aac48d4d9f": "스레드 검색어 지우기",
"bcda2ccaa871dc46": "현재 프로젝트에서 새 스레드: Shift+클릭({shortcut})",
"aa5c379423baace1": "현재 프로젝트에서 새 스레드: Shift+클릭",
"46edecc2189d4076": "보기 옵션",
"61f64b04cef40a97": "프로젝트별 그룹화",
"54a53ad6f47d2593": "두 줄 행",
"aedb1f9e51f8848c": "프로젝트 정렬",
"9d9d32b401d2931a": "{count, plural, other {터미널 프로세스 {count}개 실행 중}}",
"ade06f6723949b39": "오류가 발생했습니다",
"021fe65858278fe9": "스레드 다시 알림",
Expand Down
10 changes: 7 additions & 3 deletions apps/web/src/i18n/translations/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -9628,9 +9628,6 @@
"47cae2671170e30a": "Mostrar parágrafos concluídos",
"995c40e36789a516": "O texto aparece quando o agente termina o turno.",
"99ed1c4d021ae372": "Cada parágrafo ou bloco de código aparece assim que é concluído.",
"c0b0406e0cafa1d1": "Última mensagem do usuário",
"cb0775162a9b6419": "Data de criação",
"62570d4bfe4ab517": "Manual",
"7fa9414ef5e9dd6c": "12 horas",
"2f42917064c97f09": "24 horas",
"dcc08eacff8bd0bc": "Empilhado",
Expand Down Expand Up @@ -11611,11 +11608,18 @@
"ef436cc0f1cee213": ", trabalhando",
"2c3bb8ccf6c38078": "Dispensar aviso de atualização do provedor",
"3cef7762c22f5fb1": "Dispensar até o status do provedor mudar",
"c0b0406e0cafa1d1": "Última mensagem do usuário",
"cb0775162a9b6419": "Data de criação",
"62570d4bfe4ab517": "Manual",
"0f90824868d6c3af": "Nova thread ({shortcut})",
"a1dbe20d209982b6": "Pesquisar",
"201317aac48d4d9f": "Limpar pesquisa de threads",
"bcda2ccaa871dc46": "Nova thread no projeto atual: Shift+clique ({shortcut})",
"aa5c379423baace1": "Nova thread no projeto atual: Shift+clique",
"46edecc2189d4076": "Opções de visualização",
"61f64b04cef40a97": "Agrupar por projeto",
"54a53ad6f47d2593": "Linhas de duas linhas",
"aedb1f9e51f8848c": "Ordenar projetos",
"9d9d32b401d2931a": "{count, plural, one {{count} processo de terminal em execução} other {{count} processos de terminal em execução}}",
"ade06f6723949b39": "Ocorreu um erro",
"021fe65858278fe9": "Adiar thread",
Expand Down
10 changes: 7 additions & 3 deletions apps/web/src/i18n/translations/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -9631,9 +9631,6 @@
"47cae2671170e30a": "Показывать готовые абзацы",
"995c40e36789a516": "Текст появляется, когда агент завершает ход.",
"99ed1c4d021ae372": "Каждый абзац или блок кода появляется, как только он готов.",
"c0b0406e0cafa1d1": "Последнее сообщение",
"cb0775162a9b6419": "Дата создания",
"62570d4bfe4ab517": "Вручную",
"7fa9414ef5e9dd6c": "12-часовой",
"2f42917064c97f09": "24-часовой",
"dcc08eacff8bd0bc": "Друг под другом",
Expand Down Expand Up @@ -11612,11 +11609,18 @@
"ef436cc0f1cee213": ", в работе",
"2c3bb8ccf6c38078": "Скрыть уведомление об обновлении провайдера",
"3cef7762c22f5fb1": "Скрыть до изменения статуса провайдера",
"c0b0406e0cafa1d1": "Последнее сообщение",
"cb0775162a9b6419": "Дата создания",
"62570d4bfe4ab517": "Вручную",
"0f90824868d6c3af": "Новый тред ({shortcut})",
"a1dbe20d209982b6": "Поиск",
"201317aac48d4d9f": "Очистить поиск тредов",
"bcda2ccaa871dc46": "Новый тред в текущем проекте: Shift+клик ({shortcut})",
"aa5c379423baace1": "Новый тред в текущем проекте: Shift+клик",
"46edecc2189d4076": "Параметры отображения",
"61f64b04cef40a97": "Группировать по проектам",
"54a53ad6f47d2593": "Двухстрочные элементы",
"aedb1f9e51f8848c": "Сортировка проектов",
"9d9d32b401d2931a": "{count, plural, one {Запущен {count} процесс терминала} few {Запущено {count} процесса терминала} many {Запущено {count} процессов терминала} other {Запущено {count} процесса терминала}}",
"ade06f6723949b39": "Произошла ошибка",
"021fe65858278fe9": "Отложить тред",
Expand Down
Loading
Loading