Skip to content

Commit d9f2b09

Browse files
refactor(web): share environment icons
1 parent 8f6ec6e commit d9f2b09

6 files changed

Lines changed: 44 additions & 35 deletions

File tree

‎apps/web/src/components/BranchToolbarEnvironmentSelector.tsx‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import type { EnvironmentId } from "@t3tools/contracts";
2-
import { CloudIcon, MonitorIcon } from "lucide-react";
32
import { memo, useMemo } from "react";
43

54
import type { EnvironmentOption } from "./BranchToolbar.logic";
6-
import { LinuxIcon } from "./LinuxIcon";
5+
import { getEnvironmentIcon } from "./Icons";
76
import {
87
Select,
98
SelectGroup,
@@ -32,11 +31,10 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
3231
const activeEnvironment = useMemo(() => {
3332
return availableEnvironments.find((env) => env.environmentId === environmentId) ?? null;
3433
}, [availableEnvironments, environmentId]);
35-
const EnvironmentIcon = activeEnvironment?.isPrimary
36-
? MonitorIcon
37-
: activeEnvironment?.isDesktopLocal
38-
? LinuxIcon
39-
: CloudIcon;
34+
const EnvironmentIcon = getEnvironmentIcon({
35+
isPrimary: activeEnvironment?.isPrimary ?? false,
36+
isDesktopLocal: activeEnvironment?.isDesktopLocal ?? false,
37+
});
4038

4139
const environmentItems = useMemo(
4240
() =>
@@ -104,20 +102,17 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
104102
<SelectPopup>
105103
<SelectGroup>
106104
<SelectGroupLabel>Run on</SelectGroupLabel>
107-
{availableEnvironments.map((env) => (
108-
<SelectItem key={env.environmentId} value={env.environmentId}>
109-
<span className="inline-flex items-center gap-1.5">
110-
{env.isPrimary ? (
111-
<MonitorIcon className="size-3" />
112-
) : env.isDesktopLocal ? (
113-
<LinuxIcon className="size-3" />
114-
) : (
115-
<CloudIcon className="size-3" />
116-
)}
117-
{env.label}
118-
</span>
119-
</SelectItem>
120-
))}
105+
{availableEnvironments.map((env) => {
106+
const EnvironmentOptionIcon = getEnvironmentIcon(env);
107+
return (
108+
<SelectItem key={env.environmentId} value={env.environmentId}>
109+
<span className="inline-flex items-center gap-1.5">
110+
<EnvironmentOptionIcon className="size-3" />
111+
{env.label}
112+
</span>
113+
</SelectItem>
114+
);
115+
})}
121116
</SelectGroup>
122117
</SelectPopup>
123118
</Select>

‎apps/web/src/components/Icons.tsx‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
import React, { type SVGProps, useId } from "react";
2+
import { CloudIcon, MonitorIcon } from "lucide-react";
23
import { cn } from "~/lib/utils";
4+
import { LinuxIcon } from "./LinuxIcon";
5+
6+
export { LinuxIcon };
37

48
export type Icon = React.FC<SVGProps<SVGSVGElement>>;
59

10+
export function getEnvironmentIcon(input: { isPrimary: boolean; isDesktopLocal: boolean }): Icon {
11+
if (input.isPrimary) return MonitorIcon;
12+
if (input.isDesktopLocal) return LinuxIcon;
13+
return CloudIcon;
14+
}
15+
616
export const GitHubIcon: Icon = (props) => (
717
<svg {...props} viewBox="0 0 1024 1024" fill="none">
818
<path

‎apps/web/src/components/LegacySidebar.tsx‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
useLinkedThreadPullRequest,
2323
} from "./ThreadStatusIndicators";
2424
import { ProjectFavicon } from "./ProjectFavicon";
25-
import { LinuxIcon } from "./LinuxIcon";
25+
import { getEnvironmentIcon } from "./Icons";
2626
import { useAtomValue } from "@effect/atom-react";
2727
import { autoAnimate } from "@formkit/auto-animate";
2828
import React, { useCallback, useEffect, memo, useMemo, useRef, useState } from "react";
@@ -397,8 +397,8 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
397397
const remoteEnvLabel = environment?.label ?? null;
398398
// A desktop-local secondary backend (e.g. the WSL backend) shows up as a
399399
// bearer environment whose connection id is prefixed "local:". It runs on the
400-
// user's own machine, so the cloud icon is misleading — label it "Local" and
401-
// suppress the cloud icon (the project header already shows a container icon
400+
// user's own machine, so the cloud icon is misleading, label it "Local" and
401+
// suppress the cloud icon (the project header already shows a Linux icon
402402
// for desktop-local projects, see sidebarProjectGrouping).
403403
const isDesktopLocalThread =
404404
environment !== null && isDesktopLocalConnectionTarget(environment.entry.target);
@@ -1123,6 +1123,10 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
11231123
isManualProjectSorting,
11241124
dragHandleProps,
11251125
} = props;
1126+
const EnvironmentIcon = getEnvironmentIcon({
1127+
isPrimary: false,
1128+
isDesktopLocal: project.allRemoteMembersAreDesktopLocal,
1129+
});
11261130
const threadSortOrder = useClientSettings<SidebarThreadSortOrder>(
11271131
(settings) => settings.sidebarThreadSortOrder,
11281132
);
@@ -2328,7 +2332,7 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
23282332
}
23292333
>
23302334
{project.allRemoteMembersAreDesktopLocal ? (
2331-
<LinuxIcon className="size-3" />
2335+
<EnvironmentIcon className="size-3" />
23322336
) : (
23332337
<CloudIcon className="size-3" />
23342338
)}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import type { SVGProps } from "react";
1+
import type { Icon } from "./Icons";
22

3-
export function LinuxIcon(props: SVGProps<SVGSVGElement>) {
3+
export const LinuxIcon: Icon = (props) => {
44
return (
55
<svg {...props} viewBox="0 0 24 24" fill="currentColor">
66
<path d="M12.504 0c-.155 0-.315.008-.48.021-4.226.333-3.105 4.807-3.17 6.298-.076 1.092-.3 1.953-1.05 3.02-.885 1.051-2.127 2.75-2.716 4.521-.278.832-.41 1.684-.287 2.489a.424.424 0 00-.11.135c-.26.268-.45.6-.663.839-.199.199-.485.267-.797.4-.313.136-.658.269-.864.68-.09.189-.136.394-.132.602 0 .199.027.4.055.536.058.399.116.728.04.97-.249.68-.28 1.145-.106 1.484.174.334.535.47.94.601.81.2 1.91.135 2.774.6.926.466 1.866.67 2.616.47.526-.116.97-.464 1.208-.946.587-.003 1.23-.269 2.26-.334.699-.058 1.574.267 2.577.2.025.134.063.198.114.333l.003.003c.391.778 1.113 1.132 1.884 1.071.771-.06 1.592-.536 2.257-1.306.631-.765 1.683-1.084 2.378-1.503.348-.199.629-.469.649-.853.023-.4-.2-.811-.714-1.376v-.097l-.003-.003c-.17-.2-.25-.535-.338-.926-.085-.401-.182-.786-.492-1.046h-.003c-.059-.054-.123-.067-.188-.135a.357.357 0 00-.19-.064c.431-1.278.264-2.55-.173-3.694-.533-1.41-1.465-2.638-2.175-3.483-.796-1.005-1.576-1.957-1.56-3.368.026-2.152.236-6.133-3.544-6.139zm.529 3.405h.013c.213 0 .396.062.584.198.19.135.33.332.438.533.105.259.158.459.166.724 0-.02.006-.04.006-.06v.105a.086.086 0 01-.004-.021l-.004-.024a1.807 1.807 0 01-.15.706.953.953 0 01-.213.335.71.71 0 00-.088-.042c-.104-.045-.198-.064-.284-.133a1.312 1.312 0 00-.22-.066c.05-.06.146-.133.183-.198.053-.128.082-.264.088-.402v-.02a1.21 1.21 0 00-.061-.4c-.045-.134-.101-.2-.183-.333-.084-.066-.167-.132-.267-.132h-.016c-.093 0-.176.03-.262.132a.8.8 0 00-.205.334 1.18 1.18 0 00-.09.4v.019c.002.089.008.179.02.267-.193-.067-.438-.135-.607-.202a1.635 1.635 0 01-.018-.2v-.02a1.772 1.772 0 01.15-.768c.082-.22.232-.406.43-.533a.985.985 0 01.594-.2zm-2.962.059h.036c.142 0 .27.048.399.135.146.129.264.288.344.465.09.199.14.4.153.667v.004c.007.134.006.2-.002.266v.08c-.03.007-.056.018-.083.024-.152.055-.274.135-.393.2.012-.09.013-.18.003-.267v-.015c-.012-.133-.04-.2-.082-.333a.613.613 0 00-.166-.267.248.248 0 00-.183-.064h-.021c-.071.006-.13.04-.186.132a.552.552 0 00-.12.27.944.944 0 00-.023.33v.015c.012.135.037.2.08.334.046.134.098.2.166.268.01.009.02.018.034.024-.07.057-.117.07-.176.136a.304.304 0 01-.131.068 2.62 2.62 0 01-.275-.402 1.772 1.772 0 01-.155-.667 1.759 1.759 0 01.08-.668 1.43 1.43 0 01.283-.535c.128-.133.26-.2.418-.2zm1.37 1.706c.332 0 .733.065 1.216.399.293.2.523.269 1.052.468h.003c.255.136.405.266.478.399v-.131a.571.571 0 01.016.47c-.123.31-.516.643-1.063.842v.002c-.268.135-.501.333-.775.465-.276.135-.588.292-1.012.267a1.139 1.139 0 01-.448-.067 3.566 3.566 0 01-.322-.198c-.195-.135-.363-.332-.612-.465v-.005h-.005c-.4-.246-.616-.512-.686-.71-.07-.268-.005-.47.193-.6.224-.135.38-.271.483-.336.104-.074.143-.102.176-.131h.002v-.003c.169-.202.436-.47.839-.601.139-.036.294-.065.466-.065zm2.8 2.142c.358 1.417 1.196 3.475 1.735 4.473.286.534.855 1.659 1.102 3.024.156-.005.33.018.513.064.646-1.671-.546-3.467-1.089-3.966-.22-.2-.232-.335-.123-.335.59.534 1.365 1.572 1.646 2.757.13.535.16 1.104.021 1.67.067.028.135.06.205.067 1.032.534 1.413.938 1.23 1.537v-.043c-.06-.003-.12 0-.18 0h-.016c.151-.467-.182-.825-1.065-1.224-.915-.4-1.646-.336-1.77.465-.008.043-.013.066-.018.135-.068.023-.139.053-.209.064-.43.268-.662.669-.793 1.187-.13.533-.17 1.156-.205 1.869v.003c-.02.334-.17.838-.319 1.35-1.5 1.072-3.58 1.538-5.348.334a2.645 2.645 0 00-.402-.533 1.45 1.45 0 00-.275-.333c.182 0 .338-.03.465-.067a.615.615 0 00.314-.334c.108-.267 0-.697-.345-1.163-.345-.467-.931-.995-1.788-1.521-.63-.4-.986-.87-1.15-1.396-.165-.534-.143-1.085-.015-1.645.245-1.07.873-2.11 1.274-2.763.107-.065.037.135-.408.974-.396.751-1.14 2.497-.122 3.854a8.123 8.123 0 01.647-2.876c.564-1.278 1.743-3.504 1.836-5.268.048.036.217.135.289.202.218.133.38.333.59.465.21.201.477.335.876.335.039.003.075.006.11.006.412 0 .73-.134.997-.268.29-.134.52-.334.74-.4h.005c.467-.135.835-.402 1.044-.7zm2.185 8.958c.037.6.343 1.245.882 1.377.588.134 1.434-.333 1.791-.765l.211-.01c.315-.007.577.01.847.268l.003.003c.208.199.305.53.391.876.085.4.154.78.409 1.066.486.527.645.906.636 1.14l.003-.007v.018l-.003-.012c-.015.262-.185.396-.498.595-.63.401-1.746.712-2.457 1.57-.618.737-1.37 1.14-2.036 1.191-.664.053-1.237-.2-1.574-.898l-.005-.003c-.21-.4-.12-1.025.056-1.69.176-.668.428-1.344.463-1.897.037-.714.076-1.335.195-1.814.12-.465.308-.797.641-.984l.045-.022zm-10.814.049h.01c.053 0 .105.005.157.014.376.055.706.333 1.023.752l.91 1.664.003.003c.243.533.754 1.064 1.189 1.637.434.598.77 1.131.729 1.57v.006c-.057.744-.48 1.148-1.125 1.294-.645.135-1.52.002-2.395-.464-.968-.536-2.118-.469-2.857-.602-.369-.066-.61-.2-.723-.4-.11-.2-.113-.602.123-1.23v-.004l.002-.003c.117-.334.03-.752-.027-1.118-.055-.401-.083-.71.043-.94.16-.334.396-.4.69-.533.294-.135.64-.202.915-.47h.002v-.002c.256-.268.445-.601.668-.838.19-.201.38-.336.663-.336zm7.159-9.074c-.435.201-.945.535-1.488.535-.542 0-.97-.267-1.28-.466-.154-.134-.28-.268-.373-.335-.164-.134-.144-.333-.074-.333.109.016.129.134.199.2.096.066.215.2.36.333.292.2.68.467 1.167.467.485 0 1.053-.267 1.398-.466.195-.135.445-.334.648-.467.156-.136.149-.267.279-.267.128.016.034.134-.147.332a8.097 8.097 0 01-.69.468zm-1.082-1.583V5.64c-.006-.02.013-.042.029-.05.074-.043.18-.027.26.004.063 0 .16.067.15.135-.006.049-.085.066-.135.066-.055 0-.092-.043-.141-.068-.052-.018-.146-.008-.163-.065zm-.551 0c-.02.058-.113.049-.166.066-.047.025-.086.068-.14.068-.05 0-.13-.02-.136-.068-.01-.066.088-.133.15-.133.08-.031.184-.047.259-.005.019.009.036.03.03.05v.02h.003z" />
77
</svg>
88
);
9-
}
9+
};

‎apps/web/src/components/Sidebar.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ import {
167167
type SnoozePreset,
168168
} from "./Sidebar.snooze";
169169
import { ProjectFavicon } from "./ProjectFavicon";
170-
import { LinuxIcon } from "./LinuxIcon";
170+
import { getEnvironmentIcon } from "./Icons";
171171
import { ProviderInstanceIcon } from "./chat/ProviderInstanceIcon";
172172
import { getTriggerDisplayModelLabel } from "./chat/providerIconUtils";
173173
import {
@@ -780,6 +780,10 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
780780
[thread.environmentId, thread.id],
781781
);
782782
const threadKey = scopedThreadKey(threadRef);
783+
const EnvironmentIcon = getEnvironmentIcon({
784+
isPrimary: false,
785+
isDesktopLocal: props.isDesktopLocalEnvironment,
786+
});
783787
const isRegeneratingTitle = thread.titleRegeneration != null;
784788
const lastVisitedAt = useUiStateStore((state) => state.threadLastVisitedAtById[threadKey]);
785789
const isSelected = useThreadSelectionStore((state) => state.selectedThreadKeys.has(threadKey));
@@ -1577,11 +1581,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
15771581
>
15781582
{isRemote ? (
15791583
<span className="inline-flex shrink-0 items-center text-sidebar-muted-foreground/70">
1580-
{props.isDesktopLocalEnvironment ? (
1581-
<LinuxIcon aria-hidden className="size-3.5" />
1582-
) : (
1583-
<ServerIcon aria-hidden className="size-3.5" />
1584-
)}
1584+
<EnvironmentIcon aria-hidden className="size-3.5" />
15851585
</span>
15861586
) : null}
15871587
{driverKind ? (

‎apps/web/src/sidebarProjectGrouping.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export interface SidebarProjectSnapshot extends Project {
1818
// desktopLocal env (today: the WSL backend). The sidebar uses this
1919
// to differentiate "lives on this machine but in a sandbox" from
2020
// "lives on a real remote" so the project header can pick a
21-
// container icon instead of the generic cloud icon.
21+
// Linux icon instead of the generic cloud icon.
2222
allRemoteMembersAreDesktopLocal: boolean;
2323
memberProjects: readonly SidebarProjectGroupMember[];
2424
memberProjectRefs: readonly ScopedProjectRef[];

0 commit comments

Comments
 (0)