Closed
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
21 changes: 19 additions & 2 deletions apps/mobile/src/features/home/HomeRouteScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,17 +83,33 @@ export function HomeRouteScreen() {
} = useHomeListOptions(availableEnvironmentIds);
const selectedEnvironmentId = listOptions.selectedEnvironmentId;
const [selectedProjectKey, setSelectedProjectKey] = useState<string | null>(null);
const environmentLabelById = useMemo(
() =>
new Map(environments.map((environment) => [environment.environmentId, environment.label])),
[environments],
);
const projectFilterOptions = useMemo(
() =>
buildHomeProjectScopes({
projects,
environmentId: selectedEnvironmentId,
projectGroupingMode: listOptions.projectGroupingMode,
environmentGroupingEnabled:
listOptions.environmentGroupingEnabled && selectedEnvironmentId === null,
}).map((scope) => ({
key: scope.key,
label: scope.title,
label:
listOptions.environmentGroupingEnabled && selectedEnvironmentId === null
? `${scope.title} · ${environmentLabelById.get(scope.representative.environmentId) ?? "Unknown environment"}`
: scope.title,
})),
[listOptions.projectGroupingMode, projects, selectedEnvironmentId],
[
environmentLabelById,
listOptions.environmentGroupingEnabled,
listOptions.projectGroupingMode,
projects,
selectedEnvironmentId,
],
);
useEffect(() => {
if (
Expand DownExpand Up@@ -228,6 +244,7 @@ export function HomeRouteScreen() {
onThreadSortOrderChange={setThreadSortOrder}
pendingTasks={pendingTasks}
projectGroupingMode={listOptions.projectGroupingMode}
environmentGroupingEnabled={listOptions.environmentGroupingEnabled}
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
projects={projects}
projectSortOrder={listOptions.projectSortOrder}
savedConnectionsById={savedConnectionsById}
Expand Down
38 changes: 36 additions & 2 deletions apps/mobile/src/features/home/HomeScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ interface HomeScreenProps {
readonly projectSortOrder: HomeProjectSortOrder;
readonly threadSortOrder: SidebarThreadSortOrder;
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
readonly onSearchQueryChange: (query: string) => void;
readonly onEnvironmentChange: (environmentId: EnvironmentId | null) => void;
readonly onProjectChange: (projectKey: string | null) => void;
Expand DownExpand Up@@ -307,8 +308,15 @@ export function HomeScreen(props: HomeScreenProps) {
projects: props.projects,
environmentId: props.selectedEnvironmentId,
projectGroupingMode: props.projectGroupingMode,
environmentGroupingEnabled:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null,
}),
[props.projectGroupingMode, props.projects, props.selectedEnvironmentId],
[
props.environmentGroupingEnabled,
props.projectGroupingMode,
props.projects,
props.selectedEnvironmentId,
],
);
const selectedProjectScope = useMemo(
() =>
Expand DownExpand Up@@ -378,9 +386,12 @@ export function HomeScreen(props: HomeScreenProps) {
projectSortOrder: props.projectSortOrder,
threadSortOrder: props.threadSortOrder,
projectGroupingMode: props.projectGroupingMode,
environmentGroupingEnabled:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null,
}),
[
props.projectGroupingMode,
props.environmentGroupingEnabled,
props.projectSortOrder,
props.searchQuery,
props.selectedEnvironmentId,
Expand All@@ -399,8 +410,24 @@ export function HomeScreen(props: HomeScreenProps) {
groups: projectGroups,
displayStates: effectiveGroupDisplayStates,
showAllThreads: hasSearchQuery,
environmentLabelById:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null
? new Map(
props.environments.map((environment) => [
String(environment.environmentId),
environment.label,
]),
)
: undefined,
}),
[projectGroups, effectiveGroupDisplayStates, hasSearchQuery],
[
effectiveGroupDisplayStates,
hasSearchQuery,
projectGroups,
props.environmentGroupingEnabled,
props.environments,
props.selectedEnvironmentId,
],
);

const projectCwdByKey = useMemo(() => {
Expand DownExpand Up@@ -910,6 +937,13 @@ export function HomeScreen(props: HomeScreenProps) {
const renderItem = useCallback(
({ item }: LegendListRenderItemProps<HomeListItem>) => {
switch (item.type) {
case "environment-header":
return (
<View className="mx-4 mt-4 flex-row items-center gap-2">
<Text className="text-xs font-t3-medium text-foreground-muted">{item.label}</Text>
<View className="h-px flex-1 bg-border-subtle" />
</View>
);
case "header":
return (
<ThreadListGroupHeader
Expand Down
9 changes: 7 additions & 2 deletions apps/mobile/src/features/home/home-list-options.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export interface HomeListOptions {

export interface ResolvedHomeListOptions extends HomeListOptions {
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}

export const PROJECT_SORT_OPTIONS: ReadonlyArray<{
Expand DownExpand Up@@ -62,6 +63,7 @@ interface HomeListOptionsContextValue {
readonly options: HomeListOptions;
readonly setOptions: Dispatch<SetStateAction<HomeListOptions>>;
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}

const HomeListOptionsContext = createContext<HomeListOptionsContextValue | null>(null);
Expand All@@ -70,13 +72,15 @@ const HomeListOptionsContext = createContext<HomeListOptionsContextValue | null>
export function HomeListOptionsProvider({
children,
projectGroupingMode,
environmentGroupingEnabled,
}: PropsWithChildren<{
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}>) {
const [options, setOptions] = useState<HomeListOptions>(defaultHomeListOptions);
const value = useMemo(
() => ({ options, setOptions, projectGroupingMode }),
[options, projectGroupingMode],
() => ({ options, setOptions, projectGroupingMode, environmentGroupingEnabled }),
[environmentGroupingEnabled, options, projectGroupingMode],
);
return createElement(HomeListOptionsContext, { value }, children);
}
Expand DownExpand Up@@ -115,6 +119,7 @@ export function useHomeListOptions(availableEnvironmentIds: ReadonlySet<Environm
const resolvedOptions: ResolvedHomeListOptions = {
...availableOptions,
projectGroupingMode: shared?.projectGroupingMode ?? "repository",
environmentGroupingEnabled: shared?.environmentGroupingEnabled ?? false,
};

const setSelectedEnvironmentId = useCallback((value: EnvironmentId | null) => {
Expand Down
37 changes: 37 additions & 0 deletions apps/mobile/src/features/home/homeListItems.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,43 @@ function displayStates(
}

describe("buildHomeListLayout", () => {
it("adds an environment header before each environment's project groups", () => {
const local = makeGroup("local", 1);
const remoteEnvironmentId = EnvironmentId.make("environment-2");
const remoteProject = {
...makeProject("remote", "remote"),
environmentId: remoteEnvironmentId,
};
const remote = {
...makeGroup("remote", 1),
representative: remoteProject,
projects: [remoteProject],
newThreadTarget: remoteProject,
};

const layout = buildHomeListLayout({
groups: [local, remote],
displayStates: displayStates({}),
environmentLabelById: new Map([
[String(environmentId), "MacBook Pro"],
[String(remoteEnvironmentId), "Linux VM"],
]),
});

expect(layout.items.filter((item) => item.type === "environment-header")).toEqual([
{
type: "environment-header",
key: `environment-header:${environmentId}`,
label: "MacBook Pro",
},
{
type: "environment-header",
key: `environment-header:${remoteEnvironmentId}`,
label: "Linux VM",
},
]);
});

it("renders a header plus all threads for a small group without a show-more row", () => {
const layout = buildHomeListLayout({
groups: [makeGroup("alpha", 3)],
Expand Down
24 changes: 23 additions & 1 deletion apps/mobile/src/features/home/homeListItems.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,12 @@ export interface HomeHeaderListItem {
readonly isFirst: boolean;
}

export interface HomeEnvironmentHeaderListItem {
readonly type: "environment-header";
readonly key: string;
readonly label: string;
}

export interface HomeThreadListItem {
readonly type: "thread";
readonly key: string;
Expand All@@ -52,6 +58,7 @@ export interface HomeShowMoreListItem {
}

export type HomeListItem =
| HomeEnvironmentHeaderListItem
| HomeHeaderListItem
| HomePendingTaskListItem
| HomeThreadListItem
Expand DownExpand Up@@ -87,6 +94,8 @@ export function nextGroupDisplayState(
*/
export function homeListItemsAreEqual(previous: HomeListItem, item: HomeListItem): boolean {
switch (item.type) {
case "environment-header":
return previous.type === "environment-header" && previous.label === item.label;
case "header":
return (
previous.type === "header" &&
Expand DownExpand Up@@ -123,11 +132,24 @@ export function buildHomeListLayout(input: {
* When searching, pagination is suspended so every match stays visible.
*/
readonly showAllThreads?: boolean;
readonly environmentLabelById?: ReadonlyMap<string, string>;
}): HomeListLayout {
const items: HomeListItem[] = [];
const stickyHeaderIndices: number[] = [];

let previousEnvironmentId: string | null = null;
for (const [groupIndex, group] of input.groups.entries()) {
const environmentId = String(group.representative.environmentId);
const environmentLabel = input.environmentLabelById?.get(environmentId);
const startsEnvironment = Boolean(environmentLabel && environmentId !== previousEnvironmentId);
if (environmentLabel && startsEnvironment) {
items.push({
type: "environment-header",
key: `environment-header:${environmentId}`,
label: environmentLabel,
});
previousEnvironmentId = environmentId;
}
const display = input.displayStates.get(group.key) ?? DEFAULT_GROUP_DISPLAY_STATE;
const collapsed = display.collapsed && input.showAllThreads !== true;

Expand All@@ -137,7 +159,7 @@ export function buildHomeListLayout(input: {
key: `header:${group.key}`,
group,
collapsed,
isFirst: groupIndex === 0,
isFirst: groupIndex === 0 || startsEnvironment,
});

if (collapsed) {
Expand Down
38 changes: 38 additions & 0 deletions apps/mobile/src/features/home/homeThreadList.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,44 @@ describe("buildHomeThreadGroups", () => {
);
});

it("keeps matching repositories in separate environment sections", () => {
const localEnvironmentId = EnvironmentId.make("environment-local");
const remoteEnvironmentId = EnvironmentId.make("environment-remote");
const repositoryIdentity = {
canonicalKey: "github.com/pingdotgg/t3code",
locator: {
source: "git-remote" as const,
remoteName: "origin",
remoteUrl: "git@github.com:pingdotgg/t3code.git",
},
};
const projects = [
makeProject({
environmentId: localEnvironmentId,
id: ProjectId.make("project-local"),
title: "t3code",
repositoryIdentity,
}),
makeProject({
environmentId: remoteEnvironmentId,
id: ProjectId.make("project-remote"),
title: "t3code",
repositoryIdentity,
}),
];

const scopes = buildHomeProjectScopes({
projects,
environmentId: null,
projectGroupingMode: "repository",
environmentGroupingEnabled: true,
});

expect(scopes).toHaveLength(2);
expect(scopes.map((scope) => scope.projects)).toEqual([[projects[0]], [projects[1]]]);
expect(new Set(scopes.map((scope) => scope.key)).size).toBe(2);
});

it("routes stale duplicate project refs through the canonical repository group", () => {
const localEnvironmentId = EnvironmentId.make("environment-local");
const remoteEnvironmentId = EnvironmentId.make("environment-remote");
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Closed
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
21 changes: 19 additions & 2 deletions apps/mobile/src/features/home/HomeRouteScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,17 +83,33 @@ export function HomeRouteScreen() {
} = useHomeListOptions(availableEnvironmentIds);
const selectedEnvironmentId = listOptions.selectedEnvironmentId;
const [selectedProjectKey, setSelectedProjectKey] = useState<string | null>(null);
const environmentLabelById = useMemo(
() =>
new Map(environments.map((environment) => [environment.environmentId, environment.label])),
[environments],
);
const projectFilterOptions = useMemo(
() =>
buildHomeProjectScopes({
projects,
environmentId: selectedEnvironmentId,
projectGroupingMode: listOptions.projectGroupingMode,
environmentGroupingEnabled:
listOptions.environmentGroupingEnabled && selectedEnvironmentId === null,
}).map((scope) => ({
key: scope.key,
label: scope.title,
label:
listOptions.environmentGroupingEnabled && selectedEnvironmentId === null
? `${scope.title} · ${environmentLabelById.get(scope.representative.environmentId) ?? "Unknown environment"}`
: scope.title,
})),
[listOptions.projectGroupingMode, projects, selectedEnvironmentId],
[
environmentLabelById,
listOptions.environmentGroupingEnabled,
listOptions.projectGroupingMode,
projects,
selectedEnvironmentId,
],
);
useEffect(() => {
if (
Expand DownExpand Up@@ -228,6 +244,7 @@ export function HomeRouteScreen() {
onThreadSortOrderChange={setThreadSortOrder}
pendingTasks={pendingTasks}
projectGroupingMode={listOptions.projectGroupingMode}
environmentGroupingEnabled={listOptions.environmentGroupingEnabled}
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
projects={projects}
projectSortOrder={listOptions.projectSortOrder}
savedConnectionsById={savedConnectionsById}
Expand Down
38 changes: 36 additions & 2 deletions apps/mobile/src/features/home/HomeScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ interface HomeScreenProps {
readonly projectSortOrder: HomeProjectSortOrder;
readonly threadSortOrder: SidebarThreadSortOrder;
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
readonly onSearchQueryChange: (query: string) => void;
readonly onEnvironmentChange: (environmentId: EnvironmentId | null) => void;
readonly onProjectChange: (projectKey: string | null) => void;
Expand DownExpand Up@@ -307,8 +308,15 @@ export function HomeScreen(props: HomeScreenProps) {
projects: props.projects,
environmentId: props.selectedEnvironmentId,
projectGroupingMode: props.projectGroupingMode,
environmentGroupingEnabled:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null,
}),
[props.projectGroupingMode, props.projects, props.selectedEnvironmentId],
[
props.environmentGroupingEnabled,
props.projectGroupingMode,
props.projects,
props.selectedEnvironmentId,
],
);
const selectedProjectScope = useMemo(
() =>
Expand DownExpand Up@@ -378,9 +386,12 @@ export function HomeScreen(props: HomeScreenProps) {
projectSortOrder: props.projectSortOrder,
threadSortOrder: props.threadSortOrder,
projectGroupingMode: props.projectGroupingMode,
environmentGroupingEnabled:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null,
}),
[
props.projectGroupingMode,
props.environmentGroupingEnabled,
props.projectSortOrder,
props.searchQuery,
props.selectedEnvironmentId,
Expand All@@ -399,8 +410,24 @@ export function HomeScreen(props: HomeScreenProps) {
groups: projectGroups,
displayStates: effectiveGroupDisplayStates,
showAllThreads: hasSearchQuery,
environmentLabelById:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null
? new Map(
props.environments.map((environment) => [
String(environment.environmentId),
environment.label,
]),
)
: undefined,
}),
[projectGroups, effectiveGroupDisplayStates, hasSearchQuery],
[
effectiveGroupDisplayStates,
hasSearchQuery,
projectGroups,
props.environmentGroupingEnabled,
props.environments,
props.selectedEnvironmentId,
],
);

const projectCwdByKey = useMemo(() => {
Expand DownExpand Up@@ -910,6 +937,13 @@ export function HomeScreen(props: HomeScreenProps) {
const renderItem = useCallback(
({ item }: LegendListRenderItemProps<HomeListItem>) => {
switch (item.type) {
case "environment-header":
return (
<View className="mx-4 mt-4 flex-row items-center gap-2">
<Text className="text-xs font-t3-medium text-foreground-muted">{item.label}</Text>
<View className="h-px flex-1 bg-border-subtle" />
</View>
);
case "header":
return (
<ThreadListGroupHeader
Expand Down
9 changes: 7 additions & 2 deletions apps/mobile/src/features/home/home-list-options.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export interface HomeListOptions {

export interface ResolvedHomeListOptions extends HomeListOptions {
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}

export const PROJECT_SORT_OPTIONS: ReadonlyArray<{
Expand DownExpand Up@@ -62,6 +63,7 @@ interface HomeListOptionsContextValue {
readonly options: HomeListOptions;
readonly setOptions: Dispatch<SetStateAction<HomeListOptions>>;
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}

const HomeListOptionsContext = createContext<HomeListOptionsContextValue | null>(null);
Expand All@@ -70,13 +72,15 @@ const HomeListOptionsContext = createContext<HomeListOptionsContextValue | null>
export function HomeListOptionsProvider({
children,
projectGroupingMode,
environmentGroupingEnabled,
}: PropsWithChildren<{
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}>) {
const [options, setOptions] = useState<HomeListOptions>(defaultHomeListOptions);
const value = useMemo(
() => ({ options, setOptions, projectGroupingMode }),
[options, projectGroupingMode],
() => ({ options, setOptions, projectGroupingMode, environmentGroupingEnabled }),
[environmentGroupingEnabled, options, projectGroupingMode],
);
return createElement(HomeListOptionsContext, { value }, children);
}
Expand DownExpand Up@@ -115,6 +119,7 @@ export function useHomeListOptions(availableEnvironmentIds: ReadonlySet<Environm
const resolvedOptions: ResolvedHomeListOptions = {
...availableOptions,
projectGroupingMode: shared?.projectGroupingMode ?? "repository",
environmentGroupingEnabled: shared?.environmentGroupingEnabled ?? false,
};

const setSelectedEnvironmentId = useCallback((value: EnvironmentId | null) => {
Expand Down
37 changes: 37 additions & 0 deletions apps/mobile/src/features/home/homeListItems.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,43 @@ function displayStates(
}

describe("buildHomeListLayout", () => {
it("adds an environment header before each environment's project groups", () => {
const local = makeGroup("local", 1);
const remoteEnvironmentId = EnvironmentId.make("environment-2");
const remoteProject = {
...makeProject("remote", "remote"),
environmentId: remoteEnvironmentId,
};
const remote = {
...makeGroup("remote", 1),
representative: remoteProject,
projects: [remoteProject],
newThreadTarget: remoteProject,
};

const layout = buildHomeListLayout({
groups: [local, remote],
displayStates: displayStates({}),
environmentLabelById: new Map([
[String(environmentId), "MacBook Pro"],
[String(remoteEnvironmentId), "Linux VM"],
]),
});

expect(layout.items.filter((item) => item.type === "environment-header")).toEqual([
{
type: "environment-header",
key: `environment-header:${environmentId}`,
label: "MacBook Pro",
},
{
type: "environment-header",
key: `environment-header:${remoteEnvironmentId}`,
label: "Linux VM",
},
]);
});

it("renders a header plus all threads for a small group without a show-more row", () => {
const layout = buildHomeListLayout({
groups: [makeGroup("alpha", 3)],
Expand Down
24 changes: 23 additions & 1 deletion apps/mobile/src/features/home/homeListItems.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,12 @@ export interface HomeHeaderListItem {
readonly isFirst: boolean;
}

export interface HomeEnvironmentHeaderListItem {
readonly type: "environment-header";
readonly key: string;
readonly label: string;
}

export interface HomeThreadListItem {
readonly type: "thread";
readonly key: string;
Expand All@@ -52,6 +58,7 @@ export interface HomeShowMoreListItem {
}

export type HomeListItem =
| HomeEnvironmentHeaderListItem
| HomeHeaderListItem
| HomePendingTaskListItem
| HomeThreadListItem
Expand DownExpand Up@@ -87,6 +94,8 @@ export function nextGroupDisplayState(
*/
export function homeListItemsAreEqual(previous: HomeListItem, item: HomeListItem): boolean {
switch (item.type) {
case "environment-header":
return previous.type === "environment-header" && previous.label === item.label;
case "header":
return (
previous.type === "header" &&
Expand DownExpand Up@@ -123,11 +132,24 @@ export function buildHomeListLayout(input: {
* When searching, pagination is suspended so every match stays visible.
*/
readonly showAllThreads?: boolean;
readonly environmentLabelById?: ReadonlyMap<string, string>;
}): HomeListLayout {
const items: HomeListItem[] = [];
const stickyHeaderIndices: number[] = [];

let previousEnvironmentId: string | null = null;
for (const [groupIndex, group] of input.groups.entries()) {
const environmentId = String(group.representative.environmentId);
const environmentLabel = input.environmentLabelById?.get(environmentId);
const startsEnvironment = Boolean(environmentLabel && environmentId !== previousEnvironmentId);
if (environmentLabel && startsEnvironment) {
items.push({
type: "environment-header",
key: `environment-header:${environmentId}`,
label: environmentLabel,
});
previousEnvironmentId = environmentId;
}
const display = input.displayStates.get(group.key) ?? DEFAULT_GROUP_DISPLAY_STATE;
const collapsed = display.collapsed && input.showAllThreads !== true;

Expand All@@ -137,7 +159,7 @@ export function buildHomeListLayout(input: {
key: `header:${group.key}`,
group,
collapsed,
isFirst: groupIndex === 0,
isFirst: groupIndex === 0 || startsEnvironment,
});

if (collapsed) {
Expand Down
38 changes: 38 additions & 0 deletions apps/mobile/src/features/home/homeThreadList.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,44 @@ describe("buildHomeThreadGroups", () => {
);
});

it("keeps matching repositories in separate environment sections", () => {
const localEnvironmentId = EnvironmentId.make("environment-local");
const remoteEnvironmentId = EnvironmentId.make("environment-remote");
const repositoryIdentity = {
canonicalKey: "github.com/pingdotgg/t3code",
locator: {
source: "git-remote" as const,
remoteName: "origin",
remoteUrl: "git@github.com:pingdotgg/t3code.git",
},
};
const projects = [
makeProject({
environmentId: localEnvironmentId,
id: ProjectId.make("project-local"),
title: "t3code",
repositoryIdentity,
}),
makeProject({
environmentId: remoteEnvironmentId,
id: ProjectId.make("project-remote"),
title: "t3code",
repositoryIdentity,
}),
];

const scopes = buildHomeProjectScopes({
projects,
environmentId: null,
projectGroupingMode: "repository",
environmentGroupingEnabled: true,
});

expect(scopes).toHaveLength(2);
expect(scopes.map((scope) => scope.projects)).toEqual([[projects[0]], [projects[1]]]);
expect(new Set(scopes.map((scope) => scope.key)).size).toBe(2);
});

it("routes stale duplicate project refs through the canonical repository group", () => {
const localEnvironmentId = EnvironmentId.make("environment-local");
const remoteEnvironmentId = EnvironmentId.make("environment-remote");
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
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
21 changes: 19 additions & 2 deletions apps/mobile/src/features/home/HomeRouteScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,17 +83,33 @@ export function HomeRouteScreen() {
} = useHomeListOptions(availableEnvironmentIds);
const selectedEnvironmentId = listOptions.selectedEnvironmentId;
const [selectedProjectKey, setSelectedProjectKey] = useState<string | null>(null);
const environmentLabelById = useMemo(
() =>
new Map(environments.map((environment) => [environment.environmentId, environment.label])),
[environments],
);
const projectFilterOptions = useMemo(
() =>
buildHomeProjectScopes({
projects,
environmentId: selectedEnvironmentId,
projectGroupingMode: listOptions.projectGroupingMode,
environmentGroupingEnabled:
listOptions.environmentGroupingEnabled && selectedEnvironmentId === null,
}).map((scope) => ({
key: scope.key,
label: scope.title,
label:
listOptions.environmentGroupingEnabled && selectedEnvironmentId === null
? `${scope.title} · ${environmentLabelById.get(scope.representative.environmentId) ?? "Unknown environment"}`
: scope.title,
})),
[listOptions.projectGroupingMode, projects, selectedEnvironmentId],
[
environmentLabelById,
listOptions.environmentGroupingEnabled,
listOptions.projectGroupingMode,
projects,
selectedEnvironmentId,
],
);
useEffect(() => {
if (
Expand DownExpand Up@@ -228,6 +244,7 @@ export function HomeRouteScreen() {
onThreadSortOrderChange={setThreadSortOrder}
pendingTasks={pendingTasks}
projectGroupingMode={listOptions.projectGroupingMode}
environmentGroupingEnabled={listOptions.environmentGroupingEnabled}
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
projects={projects}
projectSortOrder={listOptions.projectSortOrder}
savedConnectionsById={savedConnectionsById}
Expand Down
38 changes: 36 additions & 2 deletions apps/mobile/src/features/home/HomeScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ interface HomeScreenProps {
readonly projectSortOrder: HomeProjectSortOrder;
readonly threadSortOrder: SidebarThreadSortOrder;
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
readonly onSearchQueryChange: (query: string) => void;
readonly onEnvironmentChange: (environmentId: EnvironmentId | null) => void;
readonly onProjectChange: (projectKey: string | null) => void;
Expand DownExpand Up@@ -307,8 +308,15 @@ export function HomeScreen(props: HomeScreenProps) {
projects: props.projects,
environmentId: props.selectedEnvironmentId,
projectGroupingMode: props.projectGroupingMode,
environmentGroupingEnabled:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null,
}),
[props.projectGroupingMode, props.projects, props.selectedEnvironmentId],
[
props.environmentGroupingEnabled,
props.projectGroupingMode,
props.projects,
props.selectedEnvironmentId,
],
);
const selectedProjectScope = useMemo(
() =>
Expand DownExpand Up@@ -378,9 +386,12 @@ export function HomeScreen(props: HomeScreenProps) {
projectSortOrder: props.projectSortOrder,
threadSortOrder: props.threadSortOrder,
projectGroupingMode: props.projectGroupingMode,
environmentGroupingEnabled:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null,
}),
[
props.projectGroupingMode,
props.environmentGroupingEnabled,
props.projectSortOrder,
props.searchQuery,
props.selectedEnvironmentId,
Expand All@@ -399,8 +410,24 @@ export function HomeScreen(props: HomeScreenProps) {
groups: projectGroups,
displayStates: effectiveGroupDisplayStates,
showAllThreads: hasSearchQuery,
environmentLabelById:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null
? new Map(
props.environments.map((environment) => [
String(environment.environmentId),
environment.label,
]),
)
: undefined,
}),
[projectGroups, effectiveGroupDisplayStates, hasSearchQuery],
[
effectiveGroupDisplayStates,
hasSearchQuery,
projectGroups,
props.environmentGroupingEnabled,
props.environments,
props.selectedEnvironmentId,
],
);

const projectCwdByKey = useMemo(() => {
Expand DownExpand Up@@ -910,6 +937,13 @@ export function HomeScreen(props: HomeScreenProps) {
const renderItem = useCallback(
({ item }: LegendListRenderItemProps<HomeListItem>) => {
switch (item.type) {
case "environment-header":
return (
<View className="mx-4 mt-4 flex-row items-center gap-2">
<Text className="text-xs font-t3-medium text-foreground-muted">{item.label}</Text>
<View className="h-px flex-1 bg-border-subtle" />
</View>
);
case "header":
return (
<ThreadListGroupHeader
Expand Down
9 changes: 7 additions & 2 deletions apps/mobile/src/features/home/home-list-options.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export interface HomeListOptions {

export interface ResolvedHomeListOptions extends HomeListOptions {
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}

export const PROJECT_SORT_OPTIONS: ReadonlyArray<{
Expand DownExpand Up@@ -62,6 +63,7 @@ interface HomeListOptionsContextValue {
readonly options: HomeListOptions;
readonly setOptions: Dispatch<SetStateAction<HomeListOptions>>;
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}

const HomeListOptionsContext = createContext<HomeListOptionsContextValue | null>(null);
Expand All@@ -70,13 +72,15 @@ const HomeListOptionsContext = createContext<HomeListOptionsContextValue | null>
export function HomeListOptionsProvider({
children,
projectGroupingMode,
environmentGroupingEnabled,
}: PropsWithChildren<{
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}>) {
const [options, setOptions] = useState<HomeListOptions>(defaultHomeListOptions);
const value = useMemo(
() => ({ options, setOptions, projectGroupingMode }),
[options, projectGroupingMode],
() => ({ options, setOptions, projectGroupingMode, environmentGroupingEnabled }),
[environmentGroupingEnabled, options, projectGroupingMode],
);
return createElement(HomeListOptionsContext, { value }, children);
}
Expand DownExpand Up@@ -115,6 +119,7 @@ export function useHomeListOptions(availableEnvironmentIds: ReadonlySet<Environm
const resolvedOptions: ResolvedHomeListOptions = {
...availableOptions,
projectGroupingMode: shared?.projectGroupingMode ?? "repository",
environmentGroupingEnabled: shared?.environmentGroupingEnabled ?? false,
};

const setSelectedEnvironmentId = useCallback((value: EnvironmentId | null) => {
Expand Down
37 changes: 37 additions & 0 deletions apps/mobile/src/features/home/homeListItems.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,43 @@ function displayStates(
}

describe("buildHomeListLayout", () => {
it("adds an environment header before each environment's project groups", () => {
const local = makeGroup("local", 1);
const remoteEnvironmentId = EnvironmentId.make("environment-2");
const remoteProject = {
...makeProject("remote", "remote"),
environmentId: remoteEnvironmentId,
};
const remote = {
...makeGroup("remote", 1),
representative: remoteProject,
projects: [remoteProject],
newThreadTarget: remoteProject,
};

const layout = buildHomeListLayout({
groups: [local, remote],
displayStates: displayStates({}),
environmentLabelById: new Map([
[String(environmentId), "MacBook Pro"],
[String(remoteEnvironmentId), "Linux VM"],
]),
});

expect(layout.items.filter((item) => item.type === "environment-header")).toEqual([
{
type: "environment-header",
key: `environment-header:${environmentId}`,
label: "MacBook Pro",
},
{
type: "environment-header",
key: `environment-header:${remoteEnvironmentId}`,
label: "Linux VM",
},
]);
});

it("renders a header plus all threads for a small group without a show-more row", () => {
const layout = buildHomeListLayout({
groups: [makeGroup("alpha", 3)],
Expand Down
24 changes: 23 additions & 1 deletion apps/mobile/src/features/home/homeListItems.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,12 @@ export interface HomeHeaderListItem {
readonly isFirst: boolean;
}

export interface HomeEnvironmentHeaderListItem {
readonly type: "environment-header";
readonly key: string;
readonly label: string;
}

export interface HomeThreadListItem {
readonly type: "thread";
readonly key: string;
Expand All@@ -52,6 +58,7 @@ export interface HomeShowMoreListItem {
}

export type HomeListItem =
| HomeEnvironmentHeaderListItem
| HomeHeaderListItem
| HomePendingTaskListItem
| HomeThreadListItem
Expand DownExpand Up@@ -87,6 +94,8 @@ export function nextGroupDisplayState(
*/
export function homeListItemsAreEqual(previous: HomeListItem, item: HomeListItem): boolean {
switch (item.type) {
case "environment-header":
return previous.type === "environment-header" && previous.label === item.label;
case "header":
return (
previous.type === "header" &&
Expand DownExpand Up@@ -123,11 +132,24 @@ export function buildHomeListLayout(input: {
* When searching, pagination is suspended so every match stays visible.
*/
readonly showAllThreads?: boolean;
readonly environmentLabelById?: ReadonlyMap<string, string>;
}): HomeListLayout {
const items: HomeListItem[] = [];
const stickyHeaderIndices: number[] = [];

let previousEnvironmentId: string | null = null;
for (const [groupIndex, group] of input.groups.entries()) {
const environmentId = String(group.representative.environmentId);
const environmentLabel = input.environmentLabelById?.get(environmentId);
const startsEnvironment = Boolean(environmentLabel && environmentId !== previousEnvironmentId);
if (environmentLabel && startsEnvironment) {
items.push({
type: "environment-header",
key: `environment-header:${environmentId}`,
label: environmentLabel,
});
previousEnvironmentId = environmentId;
}
const display = input.displayStates.get(group.key) ?? DEFAULT_GROUP_DISPLAY_STATE;
const collapsed = display.collapsed && input.showAllThreads !== true;

Expand All@@ -137,7 +159,7 @@ export function buildHomeListLayout(input: {
key: `header:${group.key}`,
group,
collapsed,
isFirst: groupIndex === 0,
isFirst: groupIndex === 0 || startsEnvironment,
});

if (collapsed) {
Expand Down
38 changes: 38 additions & 0 deletions apps/mobile/src/features/home/homeThreadList.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,44 @@ describe("buildHomeThreadGroups", () => {
);
});

it("keeps matching repositories in separate environment sections", () => {
const localEnvironmentId = EnvironmentId.make("environment-local");
const remoteEnvironmentId = EnvironmentId.make("environment-remote");
const repositoryIdentity = {
canonicalKey: "github.com/pingdotgg/t3code",
locator: {
source: "git-remote" as const,
remoteName: "origin",
remoteUrl: "git@github.com:pingdotgg/t3code.git",
},
};
const projects = [
makeProject({
environmentId: localEnvironmentId,
id: ProjectId.make("project-local"),
title: "t3code",
repositoryIdentity,
}),
makeProject({
environmentId: remoteEnvironmentId,
id: ProjectId.make("project-remote"),
title: "t3code",
repositoryIdentity,
}),
];

const scopes = buildHomeProjectScopes({
projects,
environmentId: null,
projectGroupingMode: "repository",
environmentGroupingEnabled: true,
});

expect(scopes).toHaveLength(2);
expect(scopes.map((scope) => scope.projects)).toEqual([[projects[0]], [projects[1]]]);
expect(new Set(scopes.map((scope) => scope.key)).size).toBe(2);
});

it("routes stale duplicate project refs through the canonical repository group", () => {
const localEnvironmentId = EnvironmentId.make("environment-local");
const remoteEnvironmentId = EnvironmentId.make("environment-remote");
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
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
21 changes: 19 additions & 2 deletions apps/mobile/src/features/home/HomeRouteScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,17 +83,33 @@ export function HomeRouteScreen() {
} = useHomeListOptions(availableEnvironmentIds);
const selectedEnvironmentId = listOptions.selectedEnvironmentId;
const [selectedProjectKey, setSelectedProjectKey] = useState<string | null>(null);
const environmentLabelById = useMemo(
() =>
new Map(environments.map((environment) => [environment.environmentId, environment.label])),
[environments],
);
const projectFilterOptions = useMemo(
() =>
buildHomeProjectScopes({
projects,
environmentId: selectedEnvironmentId,
projectGroupingMode: listOptions.projectGroupingMode,
environmentGroupingEnabled:
listOptions.environmentGroupingEnabled && selectedEnvironmentId === null,
}).map((scope) => ({
key: scope.key,
label: scope.title,
label:
listOptions.environmentGroupingEnabled && selectedEnvironmentId === null
? `${scope.title} · ${environmentLabelById.get(scope.representative.environmentId) ?? "Unknown environment"}`
: scope.title,
})),
[listOptions.projectGroupingMode, projects, selectedEnvironmentId],
[
environmentLabelById,
listOptions.environmentGroupingEnabled,
listOptions.projectGroupingMode,
projects,
selectedEnvironmentId,
],
);
useEffect(() => {
if (
Expand DownExpand Up@@ -228,6 +244,7 @@ export function HomeRouteScreen() {
onThreadSortOrderChange={setThreadSortOrder}
pendingTasks={pendingTasks}
projectGroupingMode={listOptions.projectGroupingMode}
environmentGroupingEnabled={listOptions.environmentGroupingEnabled}
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
projects={projects}
projectSortOrder={listOptions.projectSortOrder}
savedConnectionsById={savedConnectionsById}
Expand Down
38 changes: 36 additions & 2 deletions apps/mobile/src/features/home/HomeScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ interface HomeScreenProps {
readonly projectSortOrder: HomeProjectSortOrder;
readonly threadSortOrder: SidebarThreadSortOrder;
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
readonly onSearchQueryChange: (query: string) => void;
readonly onEnvironmentChange: (environmentId: EnvironmentId | null) => void;
readonly onProjectChange: (projectKey: string | null) => void;
Expand DownExpand Up@@ -307,8 +308,15 @@ export function HomeScreen(props: HomeScreenProps) {
projects: props.projects,
environmentId: props.selectedEnvironmentId,
projectGroupingMode: props.projectGroupingMode,
environmentGroupingEnabled:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null,
}),
[props.projectGroupingMode, props.projects, props.selectedEnvironmentId],
[
props.environmentGroupingEnabled,
props.projectGroupingMode,
props.projects,
props.selectedEnvironmentId,
],
);
const selectedProjectScope = useMemo(
() =>
Expand DownExpand Up@@ -378,9 +386,12 @@ export function HomeScreen(props: HomeScreenProps) {
projectSortOrder: props.projectSortOrder,
threadSortOrder: props.threadSortOrder,
projectGroupingMode: props.projectGroupingMode,
environmentGroupingEnabled:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null,
}),
[
props.projectGroupingMode,
props.environmentGroupingEnabled,
props.projectSortOrder,
props.searchQuery,
props.selectedEnvironmentId,
Expand All@@ -399,8 +410,24 @@ export function HomeScreen(props: HomeScreenProps) {
groups: projectGroups,
displayStates: effectiveGroupDisplayStates,
showAllThreads: hasSearchQuery,
environmentLabelById:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null
? new Map(
props.environments.map((environment) => [
String(environment.environmentId),
environment.label,
]),
)
: undefined,
}),
[projectGroups, effectiveGroupDisplayStates, hasSearchQuery],
[
effectiveGroupDisplayStates,
hasSearchQuery,
projectGroups,
props.environmentGroupingEnabled,
props.environments,
props.selectedEnvironmentId,
],
);

const projectCwdByKey = useMemo(() => {
Expand DownExpand Up@@ -910,6 +937,13 @@ export function HomeScreen(props: HomeScreenProps) {
const renderItem = useCallback(
({ item }: LegendListRenderItemProps<HomeListItem>) => {
switch (item.type) {
case "environment-header":
return (
<View className="mx-4 mt-4 flex-row items-center gap-2">
<Text className="text-xs font-t3-medium text-foreground-muted">{item.label}</Text>
<View className="h-px flex-1 bg-border-subtle" />
</View>
);
case "header":
return (
<ThreadListGroupHeader
Expand Down
9 changes: 7 additions & 2 deletions apps/mobile/src/features/home/home-list-options.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export interface HomeListOptions {

export interface ResolvedHomeListOptions extends HomeListOptions {
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}

export const PROJECT_SORT_OPTIONS: ReadonlyArray<{
Expand DownExpand Up@@ -62,6 +63,7 @@ interface HomeListOptionsContextValue {
readonly options: HomeListOptions;
readonly setOptions: Dispatch<SetStateAction<HomeListOptions>>;
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}

const HomeListOptionsContext = createContext<HomeListOptionsContextValue | null>(null);
Expand All@@ -70,13 +72,15 @@ const HomeListOptionsContext = createContext<HomeListOptionsContextValue | null>
export function HomeListOptionsProvider({
children,
projectGroupingMode,
environmentGroupingEnabled,
}: PropsWithChildren<{
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}>) {
const [options, setOptions] = useState<HomeListOptions>(defaultHomeListOptions);
const value = useMemo(
() => ({ options, setOptions, projectGroupingMode }),
[options, projectGroupingMode],
() => ({ options, setOptions, projectGroupingMode, environmentGroupingEnabled }),
[environmentGroupingEnabled, options, projectGroupingMode],
);
return createElement(HomeListOptionsContext, { value }, children);
}
Expand DownExpand Up@@ -115,6 +119,7 @@ export function useHomeListOptions(availableEnvironmentIds: ReadonlySet<Environm
const resolvedOptions: ResolvedHomeListOptions = {
...availableOptions,
projectGroupingMode: shared?.projectGroupingMode ?? "repository",
environmentGroupingEnabled: shared?.environmentGroupingEnabled ?? false,
};

const setSelectedEnvironmentId = useCallback((value: EnvironmentId | null) => {
Expand Down
37 changes: 37 additions & 0 deletions apps/mobile/src/features/home/homeListItems.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,43 @@ function displayStates(
}

describe("buildHomeListLayout", () => {
it("adds an environment header before each environment's project groups", () => {
const local = makeGroup("local", 1);
const remoteEnvironmentId = EnvironmentId.make("environment-2");
const remoteProject = {
...makeProject("remote", "remote"),
environmentId: remoteEnvironmentId,
};
const remote = {
...makeGroup("remote", 1),
representative: remoteProject,
projects: [remoteProject],
newThreadTarget: remoteProject,
};

const layout = buildHomeListLayout({
groups: [local, remote],
displayStates: displayStates({}),
environmentLabelById: new Map([
[String(environmentId), "MacBook Pro"],
[String(remoteEnvironmentId), "Linux VM"],
]),
});

expect(layout.items.filter((item) => item.type === "environment-header")).toEqual([
{
type: "environment-header",
key: `environment-header:${environmentId}`,
label: "MacBook Pro",
},
{
type: "environment-header",
key: `environment-header:${remoteEnvironmentId}`,
label: "Linux VM",
},
]);
});

it("renders a header plus all threads for a small group without a show-more row", () => {
const layout = buildHomeListLayout({
groups: [makeGroup("alpha", 3)],
Expand Down
24 changes: 23 additions & 1 deletion apps/mobile/src/features/home/homeListItems.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,12 @@ export interface HomeHeaderListItem {
readonly isFirst: boolean;
}

export interface HomeEnvironmentHeaderListItem {
readonly type: "environment-header";
readonly key: string;
readonly label: string;
}

export interface HomeThreadListItem {
readonly type: "thread";
readonly key: string;
Expand All@@ -52,6 +58,7 @@ export interface HomeShowMoreListItem {
}

export type HomeListItem =
| HomeEnvironmentHeaderListItem
| HomeHeaderListItem
| HomePendingTaskListItem
| HomeThreadListItem
Expand DownExpand Up@@ -87,6 +94,8 @@ export function nextGroupDisplayState(
*/
export function homeListItemsAreEqual(previous: HomeListItem, item: HomeListItem): boolean {
switch (item.type) {
case "environment-header":
return previous.type === "environment-header" && previous.label === item.label;
case "header":
return (
previous.type === "header" &&
Expand DownExpand Up@@ -123,11 +132,24 @@ export function buildHomeListLayout(input: {
* When searching, pagination is suspended so every match stays visible.
*/
readonly showAllThreads?: boolean;
readonly environmentLabelById?: ReadonlyMap<string, string>;
}): HomeListLayout {
const items: HomeListItem[] = [];
const stickyHeaderIndices: number[] = [];

let previousEnvironmentId: string | null = null;
for (const [groupIndex, group] of input.groups.entries()) {
const environmentId = String(group.representative.environmentId);
const environmentLabel = input.environmentLabelById?.get(environmentId);
const startsEnvironment = Boolean(environmentLabel && environmentId !== previousEnvironmentId);
if (environmentLabel && startsEnvironment) {
items.push({
type: "environment-header",
key: `environment-header:${environmentId}`,
label: environmentLabel,
});
previousEnvironmentId = environmentId;
}
const display = input.displayStates.get(group.key) ?? DEFAULT_GROUP_DISPLAY_STATE;
const collapsed = display.collapsed && input.showAllThreads !== true;

Expand All@@ -137,7 +159,7 @@ export function buildHomeListLayout(input: {
key: `header:${group.key}`,
group,
collapsed,
isFirst: groupIndex === 0,
isFirst: groupIndex === 0 || startsEnvironment,
});

if (collapsed) {
Expand Down
38 changes: 38 additions & 0 deletions apps/mobile/src/features/home/homeThreadList.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,44 @@ describe("buildHomeThreadGroups", () => {
);
});

it("keeps matching repositories in separate environment sections", () => {
const localEnvironmentId = EnvironmentId.make("environment-local");
const remoteEnvironmentId = EnvironmentId.make("environment-remote");
const repositoryIdentity = {
canonicalKey: "github.com/pingdotgg/t3code",
locator: {
source: "git-remote" as const,
remoteName: "origin",
remoteUrl: "git@github.com:pingdotgg/t3code.git",
},
};
const projects = [
makeProject({
environmentId: localEnvironmentId,
id: ProjectId.make("project-local"),
title: "t3code",
repositoryIdentity,
}),
makeProject({
environmentId: remoteEnvironmentId,
id: ProjectId.make("project-remote"),
title: "t3code",
repositoryIdentity,
}),
];

const scopes = buildHomeProjectScopes({
projects,
environmentId: null,
projectGroupingMode: "repository",
environmentGroupingEnabled: true,
});

expect(scopes).toHaveLength(2);
expect(scopes.map((scope) => scope.projects)).toEqual([[projects[0]], [projects[1]]]);
expect(new Set(scopes.map((scope) => scope.key)).size).toBe(2);
});

it("routes stale duplicate project refs through the canonical repository group", () => {
const localEnvironmentId = EnvironmentId.make("environment-local");
const remoteEnvironmentId = EnvironmentId.make("environment-remote");
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Closed
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
21 changes: 19 additions & 2 deletions apps/mobile/src/features/home/HomeRouteScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,17 +83,33 @@ export function HomeRouteScreen() {
} = useHomeListOptions(availableEnvironmentIds);
const selectedEnvironmentId = listOptions.selectedEnvironmentId;
const [selectedProjectKey, setSelectedProjectKey] = useState<string | null>(null);
const environmentLabelById = useMemo(
() =>
new Map(environments.map((environment) => [environment.environmentId, environment.label])),
[environments],
);
const projectFilterOptions = useMemo(
() =>
buildHomeProjectScopes({
projects,
environmentId: selectedEnvironmentId,
projectGroupingMode: listOptions.projectGroupingMode,
environmentGroupingEnabled:
listOptions.environmentGroupingEnabled && selectedEnvironmentId === null,
}).map((scope) => ({
key: scope.key,
label: scope.title,
label:
listOptions.environmentGroupingEnabled && selectedEnvironmentId === null
? `${scope.title} · ${environmentLabelById.get(scope.representative.environmentId) ?? "Unknown environment"}`
: scope.title,
})),
[listOptions.projectGroupingMode, projects, selectedEnvironmentId],
[
environmentLabelById,
listOptions.environmentGroupingEnabled,
listOptions.projectGroupingMode,
projects,
selectedEnvironmentId,
],
);
useEffect(() => {
if (
Expand DownExpand Up@@ -228,6 +244,7 @@ export function HomeRouteScreen() {
onThreadSortOrderChange={setThreadSortOrder}
pendingTasks={pendingTasks}
projectGroupingMode={listOptions.projectGroupingMode}
environmentGroupingEnabled={listOptions.environmentGroupingEnabled}
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
projects={projects}
projectSortOrder={listOptions.projectSortOrder}
savedConnectionsById={savedConnectionsById}
Expand Down
38 changes: 36 additions & 2 deletions apps/mobile/src/features/home/HomeScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ interface HomeScreenProps {
readonly projectSortOrder: HomeProjectSortOrder;
readonly threadSortOrder: SidebarThreadSortOrder;
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
readonly onSearchQueryChange: (query: string) => void;
readonly onEnvironmentChange: (environmentId: EnvironmentId | null) => void;
readonly onProjectChange: (projectKey: string | null) => void;
Expand DownExpand Up@@ -307,8 +308,15 @@ export function HomeScreen(props: HomeScreenProps) {
projects: props.projects,
environmentId: props.selectedEnvironmentId,
projectGroupingMode: props.projectGroupingMode,
environmentGroupingEnabled:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null,
}),
[props.projectGroupingMode, props.projects, props.selectedEnvironmentId],
[
props.environmentGroupingEnabled,
props.projectGroupingMode,
props.projects,
props.selectedEnvironmentId,
],
);
const selectedProjectScope = useMemo(
() =>
Expand DownExpand Up@@ -378,9 +386,12 @@ export function HomeScreen(props: HomeScreenProps) {
projectSortOrder: props.projectSortOrder,
threadSortOrder: props.threadSortOrder,
projectGroupingMode: props.projectGroupingMode,
environmentGroupingEnabled:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null,
}),
[
props.projectGroupingMode,
props.environmentGroupingEnabled,
props.projectSortOrder,
props.searchQuery,
props.selectedEnvironmentId,
Expand All@@ -399,8 +410,24 @@ export function HomeScreen(props: HomeScreenProps) {
groups: projectGroups,
displayStates: effectiveGroupDisplayStates,
showAllThreads: hasSearchQuery,
environmentLabelById:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null
? new Map(
props.environments.map((environment) => [
String(environment.environmentId),
environment.label,
]),
)
: undefined,
}),
[projectGroups, effectiveGroupDisplayStates, hasSearchQuery],
[
effectiveGroupDisplayStates,
hasSearchQuery,
projectGroups,
props.environmentGroupingEnabled,
props.environments,
props.selectedEnvironmentId,
],
);

const projectCwdByKey = useMemo(() => {
Expand DownExpand Up@@ -910,6 +937,13 @@ export function HomeScreen(props: HomeScreenProps) {
const renderItem = useCallback(
({ item }: LegendListRenderItemProps<HomeListItem>) => {
switch (item.type) {
case "environment-header":
return (
<View className="mx-4 mt-4 flex-row items-center gap-2">
<Text className="text-xs font-t3-medium text-foreground-muted">{item.label}</Text>
<View className="h-px flex-1 bg-border-subtle" />
</View>
);
case "header":
return (
<ThreadListGroupHeader
Expand Down
9 changes: 7 additions & 2 deletions apps/mobile/src/features/home/home-list-options.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export interface HomeListOptions {

export interface ResolvedHomeListOptions extends HomeListOptions {
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}

export const PROJECT_SORT_OPTIONS: ReadonlyArray<{
Expand DownExpand Up@@ -62,6 +63,7 @@ interface HomeListOptionsContextValue {
readonly options: HomeListOptions;
readonly setOptions: Dispatch<SetStateAction<HomeListOptions>>;
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}

const HomeListOptionsContext = createContext<HomeListOptionsContextValue | null>(null);
Expand All@@ -70,13 +72,15 @@ const HomeListOptionsContext = createContext<HomeListOptionsContextValue | null>
export function HomeListOptionsProvider({
children,
projectGroupingMode,
environmentGroupingEnabled,
}: PropsWithChildren<{
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}>) {
const [options, setOptions] = useState<HomeListOptions>(defaultHomeListOptions);
const value = useMemo(
() => ({ options, setOptions, projectGroupingMode }),
[options, projectGroupingMode],
() => ({ options, setOptions, projectGroupingMode, environmentGroupingEnabled }),
[environmentGroupingEnabled, options, projectGroupingMode],
);
return createElement(HomeListOptionsContext, { value }, children);
}
Expand DownExpand Up@@ -115,6 +119,7 @@ export function useHomeListOptions(availableEnvironmentIds: ReadonlySet<Environm
const resolvedOptions: ResolvedHomeListOptions = {
...availableOptions,
projectGroupingMode: shared?.projectGroupingMode ?? "repository",
environmentGroupingEnabled: shared?.environmentGroupingEnabled ?? false,
};

const setSelectedEnvironmentId = useCallback((value: EnvironmentId | null) => {
Expand Down
37 changes: 37 additions & 0 deletions apps/mobile/src/features/home/homeListItems.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,43 @@ function displayStates(
}

describe("buildHomeListLayout", () => {
it("adds an environment header before each environment's project groups", () => {
const local = makeGroup("local", 1);
const remoteEnvironmentId = EnvironmentId.make("environment-2");
const remoteProject = {
...makeProject("remote", "remote"),
environmentId: remoteEnvironmentId,
};
const remote = {
...makeGroup("remote", 1),
representative: remoteProject,
projects: [remoteProject],
newThreadTarget: remoteProject,
};

const layout = buildHomeListLayout({
groups: [local, remote],
displayStates: displayStates({}),
environmentLabelById: new Map([
[String(environmentId), "MacBook Pro"],
[String(remoteEnvironmentId), "Linux VM"],
]),
});

expect(layout.items.filter((item) => item.type === "environment-header")).toEqual([
{
type: "environment-header",
key: `environment-header:${environmentId}`,
label: "MacBook Pro",
},
{
type: "environment-header",
key: `environment-header:${remoteEnvironmentId}`,
label: "Linux VM",
},
]);
});

it("renders a header plus all threads for a small group without a show-more row", () => {
const layout = buildHomeListLayout({
groups: [makeGroup("alpha", 3)],
Expand Down
24 changes: 23 additions & 1 deletion apps/mobile/src/features/home/homeListItems.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,12 @@ export interface HomeHeaderListItem {
readonly isFirst: boolean;
}

export interface HomeEnvironmentHeaderListItem {
readonly type: "environment-header";
readonly key: string;
readonly label: string;
}

export interface HomeThreadListItem {
readonly type: "thread";
readonly key: string;
Expand All@@ -52,6 +58,7 @@ export interface HomeShowMoreListItem {
}

export type HomeListItem =
| HomeEnvironmentHeaderListItem
| HomeHeaderListItem
| HomePendingTaskListItem
| HomeThreadListItem
Expand DownExpand Up@@ -87,6 +94,8 @@ export function nextGroupDisplayState(
*/
export function homeListItemsAreEqual(previous: HomeListItem, item: HomeListItem): boolean {
switch (item.type) {
case "environment-header":
return previous.type === "environment-header" && previous.label === item.label;
case "header":
return (
previous.type === "header" &&
Expand DownExpand Up@@ -123,11 +132,24 @@ export function buildHomeListLayout(input: {
* When searching, pagination is suspended so every match stays visible.
*/
readonly showAllThreads?: boolean;
readonly environmentLabelById?: ReadonlyMap<string, string>;
}): HomeListLayout {
const items: HomeListItem[] = [];
const stickyHeaderIndices: number[] = [];

let previousEnvironmentId: string | null = null;
for (const [groupIndex, group] of input.groups.entries()) {
const environmentId = String(group.representative.environmentId);
const environmentLabel = input.environmentLabelById?.get(environmentId);
const startsEnvironment = Boolean(environmentLabel && environmentId !== previousEnvironmentId);
if (environmentLabel && startsEnvironment) {
items.push({
type: "environment-header",
key: `environment-header:${environmentId}`,
label: environmentLabel,
});
previousEnvironmentId = environmentId;
}
const display = input.displayStates.get(group.key) ?? DEFAULT_GROUP_DISPLAY_STATE;
const collapsed = display.collapsed && input.showAllThreads !== true;

Expand All@@ -137,7 +159,7 @@ export function buildHomeListLayout(input: {
key: `header:${group.key}`,
group,
collapsed,
isFirst: groupIndex === 0,
isFirst: groupIndex === 0 || startsEnvironment,
});

if (collapsed) {
Expand Down
38 changes: 38 additions & 0 deletions apps/mobile/src/features/home/homeThreadList.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,44 @@ describe("buildHomeThreadGroups", () => {
);
});

it("keeps matching repositories in separate environment sections", () => {
const localEnvironmentId = EnvironmentId.make("environment-local");
const remoteEnvironmentId = EnvironmentId.make("environment-remote");
const repositoryIdentity = {
canonicalKey: "github.com/pingdotgg/t3code",
locator: {
source: "git-remote" as const,
remoteName: "origin",
remoteUrl: "git@github.com:pingdotgg/t3code.git",
},
};
const projects = [
makeProject({
environmentId: localEnvironmentId,
id: ProjectId.make("project-local"),
title: "t3code",
repositoryIdentity,
}),
makeProject({
environmentId: remoteEnvironmentId,
id: ProjectId.make("project-remote"),
title: "t3code",
repositoryIdentity,
}),
];

const scopes = buildHomeProjectScopes({
projects,
environmentId: null,
projectGroupingMode: "repository",
environmentGroupingEnabled: true,
});

expect(scopes).toHaveLength(2);
expect(scopes.map((scope) => scope.projects)).toEqual([[projects[0]], [projects[1]]]);
expect(new Set(scopes.map((scope) => scope.key)).size).toBe(2);
});

it("routes stale duplicate project refs through the canonical repository group", () => {
const localEnvironmentId = EnvironmentId.make("environment-local");
const remoteEnvironmentId = EnvironmentId.make("environment-remote");
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
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
21 changes: 19 additions & 2 deletions apps/mobile/src/features/home/HomeRouteScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,17 +83,33 @@ export function HomeRouteScreen() {
} = useHomeListOptions(availableEnvironmentIds);
const selectedEnvironmentId = listOptions.selectedEnvironmentId;
const [selectedProjectKey, setSelectedProjectKey] = useState<string | null>(null);
const environmentLabelById = useMemo(
() =>
new Map(environments.map((environment) => [environment.environmentId, environment.label])),
[environments],
);
const projectFilterOptions = useMemo(
() =>
buildHomeProjectScopes({
projects,
environmentId: selectedEnvironmentId,
projectGroupingMode: listOptions.projectGroupingMode,
environmentGroupingEnabled:
listOptions.environmentGroupingEnabled && selectedEnvironmentId === null,
}).map((scope) => ({
key: scope.key,
label: scope.title,
label:
listOptions.environmentGroupingEnabled && selectedEnvironmentId === null
? `${scope.title} · ${environmentLabelById.get(scope.representative.environmentId) ?? "Unknown environment"}`
: scope.title,
})),
[listOptions.projectGroupingMode, projects, selectedEnvironmentId],
[
environmentLabelById,
listOptions.environmentGroupingEnabled,
listOptions.projectGroupingMode,
projects,
selectedEnvironmentId,
],
);
useEffect(() => {
if (
Expand DownExpand Up@@ -228,6 +244,7 @@ export function HomeRouteScreen() {
onThreadSortOrderChange={setThreadSortOrder}
pendingTasks={pendingTasks}
projectGroupingMode={listOptions.projectGroupingMode}
environmentGroupingEnabled={listOptions.environmentGroupingEnabled}
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
projects={projects}
projectSortOrder={listOptions.projectSortOrder}
savedConnectionsById={savedConnectionsById}
Expand Down
38 changes: 36 additions & 2 deletions apps/mobile/src/features/home/HomeScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ interface HomeScreenProps {
readonly projectSortOrder: HomeProjectSortOrder;
readonly threadSortOrder: SidebarThreadSortOrder;
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
readonly onSearchQueryChange: (query: string) => void;
readonly onEnvironmentChange: (environmentId: EnvironmentId | null) => void;
readonly onProjectChange: (projectKey: string | null) => void;
Expand DownExpand Up@@ -307,8 +308,15 @@ export function HomeScreen(props: HomeScreenProps) {
projects: props.projects,
environmentId: props.selectedEnvironmentId,
projectGroupingMode: props.projectGroupingMode,
environmentGroupingEnabled:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null,
}),
[props.projectGroupingMode, props.projects, props.selectedEnvironmentId],
[
props.environmentGroupingEnabled,
props.projectGroupingMode,
props.projects,
props.selectedEnvironmentId,
],
);
const selectedProjectScope = useMemo(
() =>
Expand DownExpand Up@@ -378,9 +386,12 @@ export function HomeScreen(props: HomeScreenProps) {
projectSortOrder: props.projectSortOrder,
threadSortOrder: props.threadSortOrder,
projectGroupingMode: props.projectGroupingMode,
environmentGroupingEnabled:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null,
}),
[
props.projectGroupingMode,
props.environmentGroupingEnabled,
props.projectSortOrder,
props.searchQuery,
props.selectedEnvironmentId,
Expand All@@ -399,8 +410,24 @@ export function HomeScreen(props: HomeScreenProps) {
groups: projectGroups,
displayStates: effectiveGroupDisplayStates,
showAllThreads: hasSearchQuery,
environmentLabelById:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null
? new Map(
props.environments.map((environment) => [
String(environment.environmentId),
environment.label,
]),
)
: undefined,
}),
[projectGroups, effectiveGroupDisplayStates, hasSearchQuery],
[
effectiveGroupDisplayStates,
hasSearchQuery,
projectGroups,
props.environmentGroupingEnabled,
props.environments,
props.selectedEnvironmentId,
],
);

const projectCwdByKey = useMemo(() => {
Expand DownExpand Up@@ -910,6 +937,13 @@ export function HomeScreen(props: HomeScreenProps) {
const renderItem = useCallback(
({ item }: LegendListRenderItemProps<HomeListItem>) => {
switch (item.type) {
case "environment-header":
return (
<View className="mx-4 mt-4 flex-row items-center gap-2">
<Text className="text-xs font-t3-medium text-foreground-muted">{item.label}</Text>
<View className="h-px flex-1 bg-border-subtle" />
</View>
);
case "header":
return (
<ThreadListGroupHeader
Expand Down
9 changes: 7 additions & 2 deletions apps/mobile/src/features/home/home-list-options.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export interface HomeListOptions {

export interface ResolvedHomeListOptions extends HomeListOptions {
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}

export const PROJECT_SORT_OPTIONS: ReadonlyArray<{
Expand DownExpand Up@@ -62,6 +63,7 @@ interface HomeListOptionsContextValue {
readonly options: HomeListOptions;
readonly setOptions: Dispatch<SetStateAction<HomeListOptions>>;
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}

const HomeListOptionsContext = createContext<HomeListOptionsContextValue | null>(null);
Expand All@@ -70,13 +72,15 @@ const HomeListOptionsContext = createContext<HomeListOptionsContextValue | null>
export function HomeListOptionsProvider({
children,
projectGroupingMode,
environmentGroupingEnabled,
}: PropsWithChildren<{
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}>) {
const [options, setOptions] = useState<HomeListOptions>(defaultHomeListOptions);
const value = useMemo(
() => ({ options, setOptions, projectGroupingMode }),
[options, projectGroupingMode],
() => ({ options, setOptions, projectGroupingMode, environmentGroupingEnabled }),
[environmentGroupingEnabled, options, projectGroupingMode],
);
return createElement(HomeListOptionsContext, { value }, children);
}
Expand DownExpand Up@@ -115,6 +119,7 @@ export function useHomeListOptions(availableEnvironmentIds: ReadonlySet<Environm
const resolvedOptions: ResolvedHomeListOptions = {
...availableOptions,
projectGroupingMode: shared?.projectGroupingMode ?? "repository",
environmentGroupingEnabled: shared?.environmentGroupingEnabled ?? false,
};

const setSelectedEnvironmentId = useCallback((value: EnvironmentId | null) => {
Expand Down
37 changes: 37 additions & 0 deletions apps/mobile/src/features/home/homeListItems.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,43 @@ function displayStates(
}

describe("buildHomeListLayout", () => {
it("adds an environment header before each environment's project groups", () => {
const local = makeGroup("local", 1);
const remoteEnvironmentId = EnvironmentId.make("environment-2");
const remoteProject = {
...makeProject("remote", "remote"),
environmentId: remoteEnvironmentId,
};
const remote = {
...makeGroup("remote", 1),
representative: remoteProject,
projects: [remoteProject],
newThreadTarget: remoteProject,
};

const layout = buildHomeListLayout({
groups: [local, remote],
displayStates: displayStates({}),
environmentLabelById: new Map([
[String(environmentId), "MacBook Pro"],
[String(remoteEnvironmentId), "Linux VM"],
]),
});

expect(layout.items.filter((item) => item.type === "environment-header")).toEqual([
{
type: "environment-header",
key: `environment-header:${environmentId}`,
label: "MacBook Pro",
},
{
type: "environment-header",
key: `environment-header:${remoteEnvironmentId}`,
label: "Linux VM",
},
]);
});

it("renders a header plus all threads for a small group without a show-more row", () => {
const layout = buildHomeListLayout({
groups: [makeGroup("alpha", 3)],
Expand Down
24 changes: 23 additions & 1 deletion apps/mobile/src/features/home/homeListItems.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,12 @@ export interface HomeHeaderListItem {
readonly isFirst: boolean;
}

export interface HomeEnvironmentHeaderListItem {
readonly type: "environment-header";
readonly key: string;
readonly label: string;
}

export interface HomeThreadListItem {
readonly type: "thread";
readonly key: string;
Expand All@@ -52,6 +58,7 @@ export interface HomeShowMoreListItem {
}

export type HomeListItem =
| HomeEnvironmentHeaderListItem
| HomeHeaderListItem
| HomePendingTaskListItem
| HomeThreadListItem
Expand DownExpand Up@@ -87,6 +94,8 @@ export function nextGroupDisplayState(
*/
export function homeListItemsAreEqual(previous: HomeListItem, item: HomeListItem): boolean {
switch (item.type) {
case "environment-header":
return previous.type === "environment-header" && previous.label === item.label;
case "header":
return (
previous.type === "header" &&
Expand DownExpand Up@@ -123,11 +132,24 @@ export function buildHomeListLayout(input: {
* When searching, pagination is suspended so every match stays visible.
*/
readonly showAllThreads?: boolean;
readonly environmentLabelById?: ReadonlyMap<string, string>;
}): HomeListLayout {
const items: HomeListItem[] = [];
const stickyHeaderIndices: number[] = [];

let previousEnvironmentId: string | null = null;
for (const [groupIndex, group] of input.groups.entries()) {
const environmentId = String(group.representative.environmentId);
const environmentLabel = input.environmentLabelById?.get(environmentId);
const startsEnvironment = Boolean(environmentLabel && environmentId !== previousEnvironmentId);
if (environmentLabel && startsEnvironment) {
items.push({
type: "environment-header",
key: `environment-header:${environmentId}`,
label: environmentLabel,
});
previousEnvironmentId = environmentId;
}
const display = input.displayStates.get(group.key) ?? DEFAULT_GROUP_DISPLAY_STATE;
const collapsed = display.collapsed && input.showAllThreads !== true;

Expand All@@ -137,7 +159,7 @@ export function buildHomeListLayout(input: {
key: `header:${group.key}`,
group,
collapsed,
isFirst: groupIndex === 0,
isFirst: groupIndex === 0 || startsEnvironment,
});

if (collapsed) {
Expand Down
38 changes: 38 additions & 0 deletions apps/mobile/src/features/home/homeThreadList.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,44 @@ describe("buildHomeThreadGroups", () => {
);
});

it("keeps matching repositories in separate environment sections", () => {
const localEnvironmentId = EnvironmentId.make("environment-local");
const remoteEnvironmentId = EnvironmentId.make("environment-remote");
const repositoryIdentity = {
canonicalKey: "github.com/pingdotgg/t3code",
locator: {
source: "git-remote" as const,
remoteName: "origin",
remoteUrl: "git@github.com:pingdotgg/t3code.git",
},
};
const projects = [
makeProject({
environmentId: localEnvironmentId,
id: ProjectId.make("project-local"),
title: "t3code",
repositoryIdentity,
}),
makeProject({
environmentId: remoteEnvironmentId,
id: ProjectId.make("project-remote"),
title: "t3code",
repositoryIdentity,
}),
];

const scopes = buildHomeProjectScopes({
projects,
environmentId: null,
projectGroupingMode: "repository",
environmentGroupingEnabled: true,
});

expect(scopes).toHaveLength(2);
expect(scopes.map((scope) => scope.projects)).toEqual([[projects[0]], [projects[1]]]);
expect(new Set(scopes.map((scope) => scope.key)).size).toBe(2);
});

it("routes stale duplicate project refs through the canonical repository group", () => {
const localEnvironmentId = EnvironmentId.make("environment-local");
const remoteEnvironmentId = EnvironmentId.make("environment-remote");
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
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
21 changes: 19 additions & 2 deletions apps/mobile/src/features/home/HomeRouteScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,17 +83,33 @@ export function HomeRouteScreen() {
} = useHomeListOptions(availableEnvironmentIds);
const selectedEnvironmentId = listOptions.selectedEnvironmentId;
const [selectedProjectKey, setSelectedProjectKey] = useState<string | null>(null);
const environmentLabelById = useMemo(
() =>
new Map(environments.map((environment) => [environment.environmentId, environment.label])),
[environments],
);
const projectFilterOptions = useMemo(
() =>
buildHomeProjectScopes({
projects,
environmentId: selectedEnvironmentId,
projectGroupingMode: listOptions.projectGroupingMode,
environmentGroupingEnabled:
listOptions.environmentGroupingEnabled && selectedEnvironmentId === null,
}).map((scope) => ({
key: scope.key,
label: scope.title,
label:
listOptions.environmentGroupingEnabled && selectedEnvironmentId === null
? `${scope.title} · ${environmentLabelById.get(scope.representative.environmentId) ?? "Unknown environment"}`
: scope.title,
})),
[listOptions.projectGroupingMode, projects, selectedEnvironmentId],
[
environmentLabelById,
listOptions.environmentGroupingEnabled,
listOptions.projectGroupingMode,
projects,
selectedEnvironmentId,
],
);
useEffect(() => {
if (
Expand DownExpand Up@@ -228,6 +244,7 @@ export function HomeRouteScreen() {
onThreadSortOrderChange={setThreadSortOrder}
pendingTasks={pendingTasks}
projectGroupingMode={listOptions.projectGroupingMode}
environmentGroupingEnabled={listOptions.environmentGroupingEnabled}
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
projects={projects}
projectSortOrder={listOptions.projectSortOrder}
savedConnectionsById={savedConnectionsById}
Expand Down
38 changes: 36 additions & 2 deletions apps/mobile/src/features/home/HomeScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ interface HomeScreenProps {
readonly projectSortOrder: HomeProjectSortOrder;
readonly threadSortOrder: SidebarThreadSortOrder;
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
readonly onSearchQueryChange: (query: string) => void;
readonly onEnvironmentChange: (environmentId: EnvironmentId | null) => void;
readonly onProjectChange: (projectKey: string | null) => void;
Expand DownExpand Up@@ -307,8 +308,15 @@ export function HomeScreen(props: HomeScreenProps) {
projects: props.projects,
environmentId: props.selectedEnvironmentId,
projectGroupingMode: props.projectGroupingMode,
environmentGroupingEnabled:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null,
}),
[props.projectGroupingMode, props.projects, props.selectedEnvironmentId],
[
props.environmentGroupingEnabled,
props.projectGroupingMode,
props.projects,
props.selectedEnvironmentId,
],
);
const selectedProjectScope = useMemo(
() =>
Expand DownExpand Up@@ -378,9 +386,12 @@ export function HomeScreen(props: HomeScreenProps) {
projectSortOrder: props.projectSortOrder,
threadSortOrder: props.threadSortOrder,
projectGroupingMode: props.projectGroupingMode,
environmentGroupingEnabled:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null,
}),
[
props.projectGroupingMode,
props.environmentGroupingEnabled,
props.projectSortOrder,
props.searchQuery,
props.selectedEnvironmentId,
Expand All@@ -399,8 +410,24 @@ export function HomeScreen(props: HomeScreenProps) {
groups: projectGroups,
displayStates: effectiveGroupDisplayStates,
showAllThreads: hasSearchQuery,
environmentLabelById:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null
? new Map(
props.environments.map((environment) => [
String(environment.environmentId),
environment.label,
]),
)
: undefined,
}),
[projectGroups, effectiveGroupDisplayStates, hasSearchQuery],
[
effectiveGroupDisplayStates,
hasSearchQuery,
projectGroups,
props.environmentGroupingEnabled,
props.environments,
props.selectedEnvironmentId,
],
);

const projectCwdByKey = useMemo(() => {
Expand DownExpand Up@@ -910,6 +937,13 @@ export function HomeScreen(props: HomeScreenProps) {
const renderItem = useCallback(
({ item }: LegendListRenderItemProps<HomeListItem>) => {
switch (item.type) {
case "environment-header":
return (
<View className="mx-4 mt-4 flex-row items-center gap-2">
<Text className="text-xs font-t3-medium text-foreground-muted">{item.label}</Text>
<View className="h-px flex-1 bg-border-subtle" />
</View>
);
case "header":
return (
<ThreadListGroupHeader
Expand Down
9 changes: 7 additions & 2 deletions apps/mobile/src/features/home/home-list-options.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export interface HomeListOptions {

export interface ResolvedHomeListOptions extends HomeListOptions {
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}

export const PROJECT_SORT_OPTIONS: ReadonlyArray<{
Expand DownExpand Up@@ -62,6 +63,7 @@ interface HomeListOptionsContextValue {
readonly options: HomeListOptions;
readonly setOptions: Dispatch<SetStateAction<HomeListOptions>>;
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}

const HomeListOptionsContext = createContext<HomeListOptionsContextValue | null>(null);
Expand All@@ -70,13 +72,15 @@ const HomeListOptionsContext = createContext<HomeListOptionsContextValue | null>
export function HomeListOptionsProvider({
children,
projectGroupingMode,
environmentGroupingEnabled,
}: PropsWithChildren<{
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}>) {
const [options, setOptions] = useState<HomeListOptions>(defaultHomeListOptions);
const value = useMemo(
() => ({ options, setOptions, projectGroupingMode }),
[options, projectGroupingMode],
() => ({ options, setOptions, projectGroupingMode, environmentGroupingEnabled }),
[environmentGroupingEnabled, options, projectGroupingMode],
);
return createElement(HomeListOptionsContext, { value }, children);
}
Expand DownExpand Up@@ -115,6 +119,7 @@ export function useHomeListOptions(availableEnvironmentIds: ReadonlySet<Environm
const resolvedOptions: ResolvedHomeListOptions = {
...availableOptions,
projectGroupingMode: shared?.projectGroupingMode ?? "repository",
environmentGroupingEnabled: shared?.environmentGroupingEnabled ?? false,
};

const setSelectedEnvironmentId = useCallback((value: EnvironmentId | null) => {
Expand Down
37 changes: 37 additions & 0 deletions apps/mobile/src/features/home/homeListItems.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,43 @@ function displayStates(
}

describe("buildHomeListLayout", () => {
it("adds an environment header before each environment's project groups", () => {
const local = makeGroup("local", 1);
const remoteEnvironmentId = EnvironmentId.make("environment-2");
const remoteProject = {
...makeProject("remote", "remote"),
environmentId: remoteEnvironmentId,
};
const remote = {
...makeGroup("remote", 1),
representative: remoteProject,
projects: [remoteProject],
newThreadTarget: remoteProject,
};

const layout = buildHomeListLayout({
groups: [local, remote],
displayStates: displayStates({}),
environmentLabelById: new Map([
[String(environmentId), "MacBook Pro"],
[String(remoteEnvironmentId), "Linux VM"],
]),
});

expect(layout.items.filter((item) => item.type === "environment-header")).toEqual([
{
type: "environment-header",
key: `environment-header:${environmentId}`,
label: "MacBook Pro",
},
{
type: "environment-header",
key: `environment-header:${remoteEnvironmentId}`,
label: "Linux VM",
},
]);
});

it("renders a header plus all threads for a small group without a show-more row", () => {
const layout = buildHomeListLayout({
groups: [makeGroup("alpha", 3)],
Expand Down
24 changes: 23 additions & 1 deletion apps/mobile/src/features/home/homeListItems.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,12 @@ export interface HomeHeaderListItem {
readonly isFirst: boolean;
}

export interface HomeEnvironmentHeaderListItem {
readonly type: "environment-header";
readonly key: string;
readonly label: string;
}

export interface HomeThreadListItem {
readonly type: "thread";
readonly key: string;
Expand All@@ -52,6 +58,7 @@ export interface HomeShowMoreListItem {
}

export type HomeListItem =
| HomeEnvironmentHeaderListItem
| HomeHeaderListItem
| HomePendingTaskListItem
| HomeThreadListItem
Expand DownExpand Up@@ -87,6 +94,8 @@ export function nextGroupDisplayState(
*/
export function homeListItemsAreEqual(previous: HomeListItem, item: HomeListItem): boolean {
switch (item.type) {
case "environment-header":
return previous.type === "environment-header" && previous.label === item.label;
case "header":
return (
previous.type === "header" &&
Expand DownExpand Up@@ -123,11 +132,24 @@ export function buildHomeListLayout(input: {
* When searching, pagination is suspended so every match stays visible.
*/
readonly showAllThreads?: boolean;
readonly environmentLabelById?: ReadonlyMap<string, string>;
}): HomeListLayout {
const items: HomeListItem[] = [];
const stickyHeaderIndices: number[] = [];

let previousEnvironmentId: string | null = null;
for (const [groupIndex, group] of input.groups.entries()) {
const environmentId = String(group.representative.environmentId);
const environmentLabel = input.environmentLabelById?.get(environmentId);
const startsEnvironment = Boolean(environmentLabel && environmentId !== previousEnvironmentId);
if (environmentLabel && startsEnvironment) {
items.push({
type: "environment-header",
key: `environment-header:${environmentId}`,
label: environmentLabel,
});
previousEnvironmentId = environmentId;
}
const display = input.displayStates.get(group.key) ?? DEFAULT_GROUP_DISPLAY_STATE;
const collapsed = display.collapsed && input.showAllThreads !== true;

Expand All@@ -137,7 +159,7 @@ export function buildHomeListLayout(input: {
key: `header:${group.key}`,
group,
collapsed,
isFirst: groupIndex === 0,
isFirst: groupIndex === 0 || startsEnvironment,
});

if (collapsed) {
Expand Down
38 changes: 38 additions & 0 deletions apps/mobile/src/features/home/homeThreadList.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,44 @@ describe("buildHomeThreadGroups", () => {
);
});

it("keeps matching repositories in separate environment sections", () => {
const localEnvironmentId = EnvironmentId.make("environment-local");
const remoteEnvironmentId = EnvironmentId.make("environment-remote");
const repositoryIdentity = {
canonicalKey: "github.com/pingdotgg/t3code",
locator: {
source: "git-remote" as const,
remoteName: "origin",
remoteUrl: "git@github.com:pingdotgg/t3code.git",
},
};
const projects = [
makeProject({
environmentId: localEnvironmentId,
id: ProjectId.make("project-local"),
title: "t3code",
repositoryIdentity,
}),
makeProject({
environmentId: remoteEnvironmentId,
id: ProjectId.make("project-remote"),
title: "t3code",
repositoryIdentity,
}),
];

const scopes = buildHomeProjectScopes({
projects,
environmentId: null,
projectGroupingMode: "repository",
environmentGroupingEnabled: true,
});

expect(scopes).toHaveLength(2);
expect(scopes.map((scope) => scope.projects)).toEqual([[projects[0]], [projects[1]]]);
expect(new Set(scopes.map((scope) => scope.key)).size).toBe(2);
});

it("routes stale duplicate project refs through the canonical repository group", () => {
const localEnvironmentId = EnvironmentId.make("environment-local");
const remoteEnvironmentId = EnvironmentId.make("environment-remote");
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Closed
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
21 changes: 19 additions & 2 deletions apps/mobile/src/features/home/HomeRouteScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,17 +83,33 @@ export function HomeRouteScreen() {
} = useHomeListOptions(availableEnvironmentIds);
const selectedEnvironmentId = listOptions.selectedEnvironmentId;
const [selectedProjectKey, setSelectedProjectKey] = useState<string | null>(null);
const environmentLabelById = useMemo(
() =>
new Map(environments.map((environment) => [environment.environmentId, environment.label])),
[environments],
);
const projectFilterOptions = useMemo(
() =>
buildHomeProjectScopes({
projects,
environmentId: selectedEnvironmentId,
projectGroupingMode: listOptions.projectGroupingMode,
environmentGroupingEnabled:
listOptions.environmentGroupingEnabled && selectedEnvironmentId === null,
}).map((scope) => ({
key: scope.key,
label: scope.title,
label:
listOptions.environmentGroupingEnabled && selectedEnvironmentId === null
? `${scope.title} · ${environmentLabelById.get(scope.representative.environmentId) ?? "Unknown environment"}`
: scope.title,
})),
[listOptions.projectGroupingMode, projects, selectedEnvironmentId],
[
environmentLabelById,
listOptions.environmentGroupingEnabled,
listOptions.projectGroupingMode,
projects,
selectedEnvironmentId,
],
);
useEffect(() => {
if (
Expand DownExpand Up@@ -228,6 +244,7 @@ export function HomeRouteScreen() {
onThreadSortOrderChange={setThreadSortOrder}
pendingTasks={pendingTasks}
projectGroupingMode={listOptions.projectGroupingMode}
environmentGroupingEnabled={listOptions.environmentGroupingEnabled}
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
projects={projects}
projectSortOrder={listOptions.projectSortOrder}
savedConnectionsById={savedConnectionsById}
Expand Down
38 changes: 36 additions & 2 deletions apps/mobile/src/features/home/HomeScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ interface HomeScreenProps {
readonly projectSortOrder: HomeProjectSortOrder;
readonly threadSortOrder: SidebarThreadSortOrder;
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
readonly onSearchQueryChange: (query: string) => void;
readonly onEnvironmentChange: (environmentId: EnvironmentId | null) => void;
readonly onProjectChange: (projectKey: string | null) => void;
Expand DownExpand Up@@ -307,8 +308,15 @@ export function HomeScreen(props: HomeScreenProps) {
projects: props.projects,
environmentId: props.selectedEnvironmentId,
projectGroupingMode: props.projectGroupingMode,
environmentGroupingEnabled:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null,
}),
[props.projectGroupingMode, props.projects, props.selectedEnvironmentId],
[
props.environmentGroupingEnabled,
props.projectGroupingMode,
props.projects,
props.selectedEnvironmentId,
],
);
const selectedProjectScope = useMemo(
() =>
Expand DownExpand Up@@ -378,9 +386,12 @@ export function HomeScreen(props: HomeScreenProps) {
projectSortOrder: props.projectSortOrder,
threadSortOrder: props.threadSortOrder,
projectGroupingMode: props.projectGroupingMode,
environmentGroupingEnabled:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null,
}),
[
props.projectGroupingMode,
props.environmentGroupingEnabled,
props.projectSortOrder,
props.searchQuery,
props.selectedEnvironmentId,
Expand All@@ -399,8 +410,24 @@ export function HomeScreen(props: HomeScreenProps) {
groups: projectGroups,
displayStates: effectiveGroupDisplayStates,
showAllThreads: hasSearchQuery,
environmentLabelById:
props.environmentGroupingEnabled && props.selectedEnvironmentId === null
? new Map(
props.environments.map((environment) => [
String(environment.environmentId),
environment.label,
]),
)
: undefined,
}),
[projectGroups, effectiveGroupDisplayStates, hasSearchQuery],
[
effectiveGroupDisplayStates,
hasSearchQuery,
projectGroups,
props.environmentGroupingEnabled,
props.environments,
props.selectedEnvironmentId,
],
);

const projectCwdByKey = useMemo(() => {
Expand DownExpand Up@@ -910,6 +937,13 @@ export function HomeScreen(props: HomeScreenProps) {
const renderItem = useCallback(
({ item }: LegendListRenderItemProps<HomeListItem>) => {
switch (item.type) {
case "environment-header":
return (
<View className="mx-4 mt-4 flex-row items-center gap-2">
<Text className="text-xs font-t3-medium text-foreground-muted">{item.label}</Text>
<View className="h-px flex-1 bg-border-subtle" />
</View>
);
case "header":
return (
<ThreadListGroupHeader
Expand Down
9 changes: 7 additions & 2 deletions apps/mobile/src/features/home/home-list-options.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export interface HomeListOptions {

export interface ResolvedHomeListOptions extends HomeListOptions {
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}

export const PROJECT_SORT_OPTIONS: ReadonlyArray<{
Expand DownExpand Up@@ -62,6 +63,7 @@ interface HomeListOptionsContextValue {
readonly options: HomeListOptions;
readonly setOptions: Dispatch<SetStateAction<HomeListOptions>>;
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}

const HomeListOptionsContext = createContext<HomeListOptionsContextValue | null>(null);
Expand All@@ -70,13 +72,15 @@ const HomeListOptionsContext = createContext<HomeListOptionsContextValue | null>
export function HomeListOptionsProvider({
children,
projectGroupingMode,
environmentGroupingEnabled,
}: PropsWithChildren<{
readonly projectGroupingMode: SidebarProjectGroupingMode;
readonly environmentGroupingEnabled: boolean;
}>) {
const [options, setOptions] = useState<HomeListOptions>(defaultHomeListOptions);
const value = useMemo(
() => ({ options, setOptions, projectGroupingMode }),
[options, projectGroupingMode],
() => ({ options, setOptions, projectGroupingMode, environmentGroupingEnabled }),
[environmentGroupingEnabled, options, projectGroupingMode],
);
return createElement(HomeListOptionsContext, { value }, children);
}
Expand DownExpand Up@@ -115,6 +119,7 @@ export function useHomeListOptions(availableEnvironmentIds: ReadonlySet<Environm
const resolvedOptions: ResolvedHomeListOptions = {
...availableOptions,
projectGroupingMode: shared?.projectGroupingMode ?? "repository",
environmentGroupingEnabled: shared?.environmentGroupingEnabled ?? false,
};

const setSelectedEnvironmentId = useCallback((value: EnvironmentId | null) => {
Expand Down
37 changes: 37 additions & 0 deletions apps/mobile/src/features/home/homeListItems.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,43 @@ function displayStates(
}

describe("buildHomeListLayout", () => {
it("adds an environment header before each environment's project groups", () => {
const local = makeGroup("local", 1);
const remoteEnvironmentId = EnvironmentId.make("environment-2");
const remoteProject = {
...makeProject("remote", "remote"),
environmentId: remoteEnvironmentId,
};
const remote = {
...makeGroup("remote", 1),
representative: remoteProject,
projects: [remoteProject],
newThreadTarget: remoteProject,
};

const layout = buildHomeListLayout({
groups: [local, remote],
displayStates: displayStates({}),
environmentLabelById: new Map([
[String(environmentId), "MacBook Pro"],
[String(remoteEnvironmentId), "Linux VM"],
]),
});

expect(layout.items.filter((item) => item.type === "environment-header")).toEqual([
{
type: "environment-header",
key: `environment-header:${environmentId}`,
label: "MacBook Pro",
},
{
type: "environment-header",
key: `environment-header:${remoteEnvironmentId}`,
label: "Linux VM",
},
]);
});

it("renders a header plus all threads for a small group without a show-more row", () => {
const layout = buildHomeListLayout({
groups: [makeGroup("alpha", 3)],
Expand Down
24 changes: 23 additions & 1 deletion apps/mobile/src/features/home/homeListItems.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,12 @@ export interface HomeHeaderListItem {
readonly isFirst: boolean;
}

export interface HomeEnvironmentHeaderListItem {
readonly type: "environment-header";
readonly key: string;
readonly label: string;
}

export interface HomeThreadListItem {
readonly type: "thread";
readonly key: string;
Expand All@@ -52,6 +58,7 @@ export interface HomeShowMoreListItem {
}

export type HomeListItem =
| HomeEnvironmentHeaderListItem
| HomeHeaderListItem
| HomePendingTaskListItem
| HomeThreadListItem
Expand DownExpand Up@@ -87,6 +94,8 @@ export function nextGroupDisplayState(
*/
export function homeListItemsAreEqual(previous: HomeListItem, item: HomeListItem): boolean {
switch (item.type) {
case "environment-header":
return previous.type === "environment-header" && previous.label === item.label;
case "header":
return (
previous.type === "header" &&
Expand DownExpand Up@@ -123,11 +132,24 @@ export function buildHomeListLayout(input: {
* When searching, pagination is suspended so every match stays visible.
*/
readonly showAllThreads?: boolean;
readonly environmentLabelById?: ReadonlyMap<string, string>;
}): HomeListLayout {
const items: HomeListItem[] = [];
const stickyHeaderIndices: number[] = [];

let previousEnvironmentId: string | null = null;
for (const [groupIndex, group] of input.groups.entries()) {
const environmentId = String(group.representative.environmentId);
const environmentLabel = input.environmentLabelById?.get(environmentId);
const startsEnvironment = Boolean(environmentLabel && environmentId !== previousEnvironmentId);
if (environmentLabel && startsEnvironment) {
items.push({
type: "environment-header",
key: `environment-header:${environmentId}`,
label: environmentLabel,
});
previousEnvironmentId = environmentId;
}
const display = input.displayStates.get(group.key) ?? DEFAULT_GROUP_DISPLAY_STATE;
const collapsed = display.collapsed && input.showAllThreads !== true;

Expand All@@ -137,7 +159,7 @@ export function buildHomeListLayout(input: {
key: `header:${group.key}`,
group,
collapsed,
isFirst: groupIndex === 0,
isFirst: groupIndex === 0 || startsEnvironment,
});

if (collapsed) {
Expand Down
38 changes: 38 additions & 0 deletions apps/mobile/src/features/home/homeThreadList.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,44 @@ describe("buildHomeThreadGroups", () => {
);
});

it("keeps matching repositories in separate environment sections", () => {
const localEnvironmentId = EnvironmentId.make("environment-local");
const remoteEnvironmentId = EnvironmentId.make("environment-remote");
const repositoryIdentity = {
canonicalKey: "github.com/pingdotgg/t3code",
locator: {
source: "git-remote" as const,
remoteName: "origin",
remoteUrl: "git@github.com:pingdotgg/t3code.git",
},
};
const projects = [
makeProject({
environmentId: localEnvironmentId,
id: ProjectId.make("project-local"),
title: "t3code",
repositoryIdentity,
}),
makeProject({
environmentId: remoteEnvironmentId,
id: ProjectId.make("project-remote"),
title: "t3code",
repositoryIdentity,
}),
];

const scopes = buildHomeProjectScopes({
projects,
environmentId: null,
projectGroupingMode: "repository",
environmentGroupingEnabled: true,
});

expect(scopes).toHaveLength(2);
expect(scopes.map((scope) => scope.projects)).toEqual([[projects[0]], [projects[1]]]);
expect(new Set(scopes.map((scope) => scope.key)).size).toBe(2);
});

it("routes stale duplicate project refs through the canonical repository group", () => {
const localEnvironmentId = EnvironmentId.make("environment-local");
const remoteEnvironmentId = EnvironmentId.make("environment-remote");
Expand Down
Loading
Loading