Skip to content
Merged
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
5 changes: 5 additions & 0 deletions apps/mobile/src/i18n/translations/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@
"4f1ab8a69f4a85e5": "Diese App ist nicht damit verbunden",
"95f18b6ad4a409de": "Deine Sitzung dort kann keine Kopplungscodes erstellen",
"26847ec0357c8600": "Keine Adresse, die ein anderer Rechner erreichen kann",
"ec1a698b0821ec66": "{target} kann nicht zurückverknüpfen: Verknüpfte Umgebungen sind dort aus.",
"6cf74ace5a766699": "{target} kann nicht zurückverknüpfen: Deine Sitzung dort kann keine Verknüpfungen erstellen.",
"a995255a0f303086": "{target} kann nicht zurückverknüpfen: Deine Sitzung auf {source} kann keine Kopplungscodes erstellen.",
"a51c8cdfccb5b4ca": "{target} kann nicht zurückverknüpfen: Diese App kennt keine Adresse, unter der {source} erreichbar ist.",
"cba6d3e3a22f2efe": "Nicht erreichbar",
"0eb1a18deaf06b76": "Kopplungscode abgelehnt",
"7d6fc963ebf9a9c5": "Eine andere Umgebung hat geantwortet",
Expand Down Expand Up @@ -481,6 +485,7 @@
"7eabeed193759388": "Die Routenreihenfolge muss jede gespeicherte Route genau einmal enthalten.",
"18de69e3b6ac3891": "Verbindungsprofil {connectionId} ist keine Bearer-Verbindung.",
"0a84ce2f4fb90d82": "Verbindungsprofil {connectionId} ist keine SSH-Verbindung.",
"468d32c6b30df608": "Tailscale HTTPS",
"4d022ee84149d47f": "Remote-Verbindung",
"0b367ce72b45a911": "Die Verbindung zu {host} ist unerwartet fehlgeschlagen.",
"91ca7e48f40bfa3c": "{host} hat während der Verbindungseinrichtung nicht geantwortet.",
Expand Down
5 changes: 5 additions & 0 deletions apps/mobile/src/i18n/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@
"4f1ab8a69f4a85e5": "This app is not connected to it",
"95f18b6ad4a409de": "Your session there cannot create pairing codes",
"26847ec0357c8600": "No address another machine can reach",
"ec1a698b0821ec66": "{target} cannot link back: Linked environments is off there.",
"6cf74ace5a766699": "{target} cannot link back: your session there cannot create links.",
"a995255a0f303086": "{target} cannot link back: your session on {source} cannot create pairing codes.",
"a51c8cdfccb5b4ca": "{target} cannot link back: this app has no address for {source} it can reach.",
"cba6d3e3a22f2efe": "Unreachable",
"0eb1a18deaf06b76": "Pairing code refused",
"7d6fc963ebf9a9c5": "Another environment answered",
Expand Down Expand Up @@ -481,6 +485,7 @@
"7eabeed193759388": "The route order must list every saved route once.",
"18de69e3b6ac3891": "Connection profile {connectionId} is not a bearer connection.",
"0a84ce2f4fb90d82": "Connection profile {connectionId} is not an SSH connection.",
"468d32c6b30df608": "Tailscale HTTPS",
"4d022ee84149d47f": "Remote link",
"0b367ce72b45a911": "{host} connection failed unexpectedly.",
"91ca7e48f40bfa3c": "{host} did not respond during connection setup.",
Expand Down
5 changes: 5 additions & 0 deletions apps/mobile/src/i18n/translations/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@
"4f1ab8a69f4a85e5": "Esta app no está conectada a ella",
"95f18b6ad4a409de": "Tu sesión allí no puede crear códigos de emparejamiento",
"26847ec0357c8600": "Ninguna dirección a la que pueda llegar otra máquina",
"ec1a698b0821ec66": "{target} no puede vincularse de vuelta: Entornos vinculados está desactivado allí.",
"6cf74ace5a766699": "{target} no puede vincularse de vuelta: tu sesión allí no puede crear vínculos.",
"a995255a0f303086": "{target} no puede vincularse de vuelta: tu sesión en {source} no puede crear códigos de emparejamiento.",
"a51c8cdfccb5b4ca": "{target} no puede vincularse de vuelta: esta app no tiene ninguna dirección en la que pueda alcanzar a {source}.",
"cba6d3e3a22f2efe": "Inaccesible",
"0eb1a18deaf06b76": "Código de emparejamiento rechazado",
"7d6fc963ebf9a9c5": "Respondió otro entorno",
Expand Down Expand Up @@ -481,6 +485,7 @@
"7eabeed193759388": "El orden de rutas debe incluir cada ruta guardada una vez.",
"18de69e3b6ac3891": "El perfil de conexión {connectionId} no es una conexión bearer.",
"0a84ce2f4fb90d82": "El perfil de conexión {connectionId} no es una conexión SSH.",
"468d32c6b30df608": "Tailscale HTTPS",
"4d022ee84149d47f": "Enlace remoto",
"0b367ce72b45a911": "La conexión con {host} falló de forma inesperada.",
"91ca7e48f40bfa3c": "{host} no respondió durante la configuración de la conexión.",
Expand Down
5 changes: 5 additions & 0 deletions apps/mobile/src/i18n/translations/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@
"4f1ab8a69f4a85e5": "Cette app n’y est pas connectée",
"95f18b6ad4a409de": "Votre session là-bas ne peut pas créer de codes d’appairage",
"26847ec0357c8600": "Aucune adresse joignable par une autre machine",
"ec1a698b0821ec66": "{target} ne peut pas s’associer en retour : Environnements associés y est désactivé.",
"6cf74ace5a766699": "{target} ne peut pas s’associer en retour : votre session là-bas ne peut pas créer d’associations.",
"a995255a0f303086": "{target} ne peut pas s’associer en retour : votre session sur {source} ne peut pas créer de codes d’appairage.",
"a51c8cdfccb5b4ca": "{target} ne peut pas s’associer en retour : cette app n’a aucune adresse à laquelle {source} est joignable.",
"cba6d3e3a22f2efe": "Injoignable",
"0eb1a18deaf06b76": "Code d’appairage refusé",
"7d6fc963ebf9a9c5": "Un autre environnement a répondu",
Expand Down Expand Up @@ -481,6 +485,7 @@
"7eabeed193759388": "L’ordre des routes doit lister chaque route enregistrée une seule fois.",
"18de69e3b6ac3891": "Le profil de connexion {connectionId} n’est pas une connexion bearer.",
"0a84ce2f4fb90d82": "Le profil de connexion {connectionId} n’est pas une connexion SSH.",
"468d32c6b30df608": "Tailscale HTTPS",
"4d022ee84149d47f": "Lien distant",
"0b367ce72b45a911": "La connexion à {host} a échoué de manière inattendue.",
"91ca7e48f40bfa3c": "{host} n’a pas répondu pendant la configuration de la connexion.",
Expand Down
5 changes: 5 additions & 0 deletions apps/mobile/src/i18n/translations/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@
"4f1ab8a69f4a85e5": "このアプリはこのマシンに接続していません",
"95f18b6ad4a409de": "そのマシンでのセッションではペアリングコードを作成できません",
"26847ec0357c8600": "他のマシンから到達できるアドレスがありません",
"ec1a698b0821ec66": "{target} からは逆方向にリンクできません: そのマシンではリンクされた環境がオフです。",
"6cf74ace5a766699": "{target} からは逆方向にリンクできません: そのマシンでのセッションではリンクを作成できません。",
"a995255a0f303086": "{target} からは逆方向にリンクできません: {source} でのセッションではペアリングコードを作成できません。",
"a51c8cdfccb5b4ca": "{target} からは逆方向にリンクできません: このアプリには {source} に到達できるアドレスがありません。",
"cba6d3e3a22f2efe": "到達不能",
"0eb1a18deaf06b76": "ペアリングコードが拒否されました",
"7d6fc963ebf9a9c5": "別の環境が応答しました",
Expand Down Expand Up @@ -481,6 +485,7 @@
"7eabeed193759388": "ルートの順序には、保存されたすべてのルートを 1 回ずつ含める必要があります。",
"18de69e3b6ac3891": "接続プロファイル {connectionId} はベアラー接続ではありません。",
"0a84ce2f4fb90d82": "接続プロファイル {connectionId} は SSH 接続ではありません。",
"468d32c6b30df608": "Tailscale HTTPS",
"4d022ee84149d47f": "リモートリンク",
"0b367ce72b45a911": "{host} への接続が予期せず失敗しました。",
"91ca7e48f40bfa3c": "{host} は接続のセットアップ中に応答しませんでした。",
Expand Down
5 changes: 5 additions & 0 deletions apps/mobile/src/i18n/translations/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@
"4f1ab8a69f4a85e5": "이 앱이 해당 머신에 연결되어 있지 않습니다",
"95f18b6ad4a409de": "그곳의 세션으로는 페어링 코드를 만들 수 없습니다",
"26847ec0357c8600": "다른 머신이 접근할 수 있는 주소가 없습니다",
"ec1a698b0821ec66": "{target}에서 반대 방향으로 연결할 수 없습니다. 그곳에서 연결된 환경이 꺼져 있습니다.",
"6cf74ace5a766699": "{target}에서 반대 방향으로 연결할 수 없습니다. 그곳의 세션으로는 링크를 만들 수 없습니다.",
"a995255a0f303086": "{target}에서 반대 방향으로 연결할 수 없습니다. {source}의 세션으로는 페어링 코드를 만들 수 없습니다.",
"a51c8cdfccb5b4ca": "{target}에서 반대 방향으로 연결할 수 없습니다. 이 앱에 {source}에 도달할 수 있는 주소가 없습니다.",
"cba6d3e3a22f2efe": "연결할 수 없음",
"0eb1a18deaf06b76": "페어링 코드가 거부됨",
"7d6fc963ebf9a9c5": "다른 환경이 응답함",
Expand Down Expand Up @@ -481,6 +485,7 @@
"7eabeed193759388": "경로 순서에는 저장된 모든 경로가 한 번씩 있어야 합니다.",
"18de69e3b6ac3891": "연결 프로필 {connectionId}은(는) bearer 연결이 아닙니다.",
"0a84ce2f4fb90d82": "연결 프로필 {connectionId}은(는) SSH 연결이 아닙니다.",
"468d32c6b30df608": "Tailscale HTTPS",
"4d022ee84149d47f": "원격 링크",
"0b367ce72b45a911": "{host} 연결이 예기치 않게 실패했습니다.",
"91ca7e48f40bfa3c": "{host}이(가) 연결 설정 중에 응답하지 않았습니다.",
Expand Down
5 changes: 5 additions & 0 deletions apps/mobile/src/i18n/translations/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@
"4f1ab8a69f4a85e5": "Este app não está conectado a ela",
"95f18b6ad4a409de": "Sua sessão lá não pode criar códigos de pareamento",
"26847ec0357c8600": "Nenhum endereço que outra máquina consiga acessar",
"ec1a698b0821ec66": "{target} não pode vincular de volta: Ambientes vinculados está desativado lá.",
"6cf74ace5a766699": "{target} não pode vincular de volta: sua sessão lá não pode criar vínculos.",
"a995255a0f303086": "{target} não pode vincular de volta: sua sessão em {source} não pode criar códigos de pareamento.",
"a51c8cdfccb5b4ca": "{target} não pode vincular de volta: este app não tem um endereço em que {source} possa ser alcançado.",
"cba6d3e3a22f2efe": "Inacessível",
"0eb1a18deaf06b76": "Código de pareamento recusado",
"7d6fc963ebf9a9c5": "Outro ambiente respondeu",
Expand Down Expand Up @@ -481,6 +485,7 @@
"7eabeed193759388": "A ordem das rotas precisa listar cada rota salva uma vez.",
"18de69e3b6ac3891": "O perfil de conexão {connectionId} não é uma conexão bearer.",
"0a84ce2f4fb90d82": "O perfil de conexão {connectionId} não é uma conexão SSH.",
"468d32c6b30df608": "Tailscale HTTPS",
"4d022ee84149d47f": "Link remoto",
"0b367ce72b45a911": "A conexão com {host} falhou inesperadamente.",
"91ca7e48f40bfa3c": "{host} não respondeu durante a configuração da conexão.",
Expand Down
5 changes: 5 additions & 0 deletions apps/mobile/src/i18n/translations/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@
"4f1ab8a69f4a85e5": "Это приложение к ней не подключено",
"95f18b6ad4a409de": "Ваш сеанс там не может создавать коды сопряжения",
"26847ec0357c8600": "Нет адреса, доступного с другой машины",
"ec1a698b0821ec66": "{target} не может привязаться в ответ: привязанные окружения там выключены.",
"6cf74ace5a766699": "{target} не может привязаться в ответ: ваш сеанс там не может создавать привязки.",
"a995255a0f303086": "{target} не может привязаться в ответ: ваш сеанс на {source} не может создавать коды сопряжения.",
"a51c8cdfccb5b4ca": "{target} не может привязаться в ответ: у этого приложения нет адреса, по которому доступна {source}.",
"cba6d3e3a22f2efe": "Недоступна",
"0eb1a18deaf06b76": "Код сопряжения отклонён",
"7d6fc963ebf9a9c5": "Ответило другое окружение",
Expand Down Expand Up @@ -481,6 +485,7 @@
"7eabeed193759388": "Порядок маршрутов должен содержать каждый сохранённый маршрут ровно один раз.",
"18de69e3b6ac3891": "Профиль подключения {connectionId} не является bearer-подключением.",
"0a84ce2f4fb90d82": "Профиль подключения {connectionId} не является SSH-подключением.",
"468d32c6b30df608": "Tailscale HTTPS",
"4d022ee84149d47f": "Удалённая ссылка",
"0b367ce72b45a911": "Неожиданная ошибка подключения к {host}.",
"91ca7e48f40bfa3c": "{host} не ответил во время настройки подключения.",
Expand Down
5 changes: 5 additions & 0 deletions apps/mobile/src/i18n/translations/sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@
"4f1ab8a69f4a85e5": "Den här appen är inte ansluten till den",
"95f18b6ad4a409de": "Din session där kan inte skapa parkopplingskoder",
"26847ec0357c8600": "Ingen adress som en annan dator kan nå",
"ec1a698b0821ec66": "{target} kan inte länka tillbaka: Länkade miljöer är avstängt där.",
"6cf74ace5a766699": "{target} kan inte länka tillbaka: din session där kan inte skapa länkar.",
"a995255a0f303086": "{target} kan inte länka tillbaka: din session på {source} kan inte skapa parkopplingskoder.",
"a51c8cdfccb5b4ca": "{target} kan inte länka tillbaka: den här appen har ingen adress där {source} kan nås.",
"cba6d3e3a22f2efe": "Inte nåbar",
"0eb1a18deaf06b76": "Parkopplingskoden nekades",
"7d6fc963ebf9a9c5": "En annan miljö svarade",
Expand Down Expand Up @@ -481,6 +485,7 @@
"7eabeed193759388": "Ruttordningen måste ta med varje sparad rutt en gång.",
"18de69e3b6ac3891": "Anslutningsprofilen {connectionId} är ingen bearer-anslutning.",
"0a84ce2f4fb90d82": "Anslutningsprofilen {connectionId} är ingen SSH-anslutning.",
"468d32c6b30df608": "Tailscale HTTPS",
"4d022ee84149d47f": "Fjärrlänk",
"0b367ce72b45a911": "Anslutningen till {host} misslyckades oväntat.",
"91ca7e48f40bfa3c": "{host} svarade inte när anslutningen konfigurerades.",
Expand Down
5 changes: 5 additions & 0 deletions apps/mobile/src/i18n/translations/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@
"4f1ab8a69f4a85e5": "此应用未连接到该机器",
"95f18b6ad4a409de": "你在该机器上的会话无法创建配对码",
"26847ec0357c8600": "没有其他机器可访问的地址",
"ec1a698b0821ec66": "{target} 无法反向关联:该机器上的关联环境已关闭。",
"6cf74ace5a766699": "{target} 无法反向关联:你在该机器上的会话无法创建关联。",
"a995255a0f303086": "{target} 无法反向关联:你在 {source} 上的会话无法创建配对码。",
"a51c8cdfccb5b4ca": "{target} 无法反向关联:此应用没有可访问 {source} 的地址。",
"cba6d3e3a22f2efe": "无法访问",
"0eb1a18deaf06b76": "配对码被拒绝",
"7d6fc963ebf9a9c5": "应答的是另一个环境",
Expand Down Expand Up @@ -481,6 +485,7 @@
"7eabeed193759388": "路由顺序必须包含每条已保存的路由,且不能重复。",
"18de69e3b6ac3891": "连接配置 {connectionId} 不是 Bearer 连接。",
"0a84ce2f4fb90d82": "连接配置 {connectionId} 不是 SSH 连接。",
"468d32c6b30df608": "Tailscale HTTPS",
"4d022ee84149d47f": "远程连接",
"0b367ce72b45a911": "{host} 连接意外失败。",
"91ca7e48f40bfa3c": "{host} 在连接设置期间无响应。",
Expand Down
17 changes: 13 additions & 4 deletions apps/web/src/components/cloud/CloudEnvironmentConnectList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import { environmentCatalog } from "~/connection/catalog";
import { isDesktopLocalConnectionTarget } from "~/connection/desktopLocal";
import { cn } from "~/lib/utils";
import { relayEnvironmentDiscovery } from "~/state/relay";
import { useRelayEnvironmentDiscovery } from "~/state/environments";
import { useRelayEnvironmentDiscovery, useRetainedRelayEnvironments } from "~/state/environments";
import { useAtomCommand } from "~/state/use-atom-command";
import { ConnectionStatusDot } from "../ConnectionStatusDot";
import { EnvironmentMachineIcon } from "../EnvironmentMachineIcon";
Expand Down Expand Up @@ -85,7 +85,10 @@ export function CloudEnvironmentConnectRows({
empty = null,
selection,
onDiscoveryReady,
only,
}: {
/** Show this machine's row alone, for a view that picks one machine at a time. */
readonly only?: EnvironmentId;
readonly primaryEnvironmentId: EnvironmentId | null;
readonly savedEnvironments: ReadonlyArray<SavedCloudEnvironmentConnection>;
readonly showSavedEnvironments?: boolean;
Expand All @@ -101,6 +104,9 @@ export function CloudEnvironmentConnectRows({
const gt = useGT();
const m = useMessages();
const environmentsState = useRelayEnvironmentDiscovery();
const retainedEnvironments = useRetainedRelayEnvironments();
// A single row is a machine the user picked: it stays through a refresh, as it does on the map.
const discovered = only === undefined ? environmentsState.environments : retainedEnvironments;
const registerEnvironment = useAtomCommand(environmentCatalog.register, {
reportFailure: false,
});
Expand Down Expand Up @@ -142,6 +148,8 @@ export function CloudEnvironmentConnectRows({
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- fetches relay discovery when its inputs change, unless hidden polling covers it, and reports readiness
useEffect(() => {
let active = true;
// A single row belongs to a view that already listed the machines; listing again empties it.
if (only !== undefined) return;
if (onDiscoveryReady || !refreshWhileEmpty || document.visibilityState === "visible") {
void refreshRelayEnvironments().then(() => {
if (active) onDiscoveryReady?.();
Expand All @@ -150,7 +158,7 @@ export function CloudEnvironmentConnectRows({
return () => {
active = false;
};
}, [refreshRelayEnvironments, refreshWhileEmpty, onDiscoveryReady]);
}, [refreshRelayEnvironments, refreshWhileEmpty, onDiscoveryReady, only]);

const connectEnvironment = async (environment: RelayClientEnvironmentRecord) => {
if (
Expand Down Expand Up @@ -208,12 +216,13 @@ export function CloudEnvironmentConnectRows({

// Omit machines saved over other routes; onboarding selection must not add a T3 Connect route.
const isVisibleEnvironment = (environmentId: EnvironmentId) =>
(only === undefined || environmentId === only) &&
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
environmentId !== primaryEnvironmentId &&
!desktopLocalIds.has(environmentId) &&
(showSavedEnvironments || !savedById.has(environmentId)) &&
!(selection && savedWithoutRelay.has(environmentId));
const visibleEnvironments = [...environmentsState.environments.values()].filter(
({ environment }) => isVisibleEnvironment(environment.environmentId),
const visibleEnvironments = [...discovered.values()].filter(({ environment }) =>
isVisibleEnvironment(environment.environmentId),
);
const selectNewComputers = useEffectEvent(
(environments: typeof environmentsState.environments) => {
Expand Down
7 changes: 5 additions & 2 deletions apps/web/src/components/settings/AddEnvironmentDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,16 @@ export function AddEnvironmentDialog({
routeTarget,
error,
savedEnvironments,
initialHost = "",
onOpenChange,
onErrorChange,
}: {
readonly open: boolean;
/** A machine the user chose elsewhere to pair with; they supply only the pairing code. */
readonly prefill?: AddEnvironmentPrefill | null;
readonly routeTarget: EnvironmentPresentation | null;
/** An address already known for the machine being added, such as one a link uses. */
readonly initialHost?: string;
readonly error: string | null;
readonly savedEnvironments: ReadonlyArray<EnvironmentPresentation>;
readonly onOpenChange: (open: boolean) => void;
Expand Down Expand Up @@ -123,7 +126,7 @@ export function AddEnvironmentDialog({
return keys;
})();
const [savedBackendMode, setSavedBackendMode] = useState<"remote" | "ssh">("remote");
const [savedBackendHost, setSavedBackendHost] = useState(prefill?.host ?? "");
const [savedBackendHost, setSavedBackendHost] = useState(prefill?.host ?? initialHost);
const [savedBackendPairingCode, setSavedBackendPairingCode] = useState("");
const [savedBackendSshHost, setSavedBackendSshHost] = useState("");
const [savedBackendSshUsername, setSavedBackendSshUsername] = useState("");
Expand Down Expand Up @@ -165,7 +168,7 @@ export function AddEnvironmentDialog({
if (!nextOpen) {
savedBackendSessionRef.current += 1;
setSavedBackendMode("remote");
setSavedBackendHost("");
setSavedBackendHost(initialHost);
setSavedBackendPairingCode("");
setSavedBackendSshHost("");
setSavedBackendSshUsername("");
Expand Down
Loading
Loading