Skip to content

Commit ffaa1db

Browse files
t3dotggclaude
andauthored
feat: pin favorite projects and archive old ones (#26154)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 85bd3f2 commit ffaa1db

68 files changed

Lines changed: 1367 additions & 256 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/mobile/src/features/home/HomeRouteScreen.tsx‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ import { useMemo, useState } from "react";
1010
import { Platform, useWindowDimensions } from "react-native";
1111

1212
import type { EnvironmentThreadShell } from "@t3tools/client-runtime/state/shell";
13-
import { resolveScratchProjectScopeKey } from "@t3tools/client-runtime/state/project-grouping";
13+
import {
14+
pickableProjectGroups,
15+
resolveScratchProjectScopeKey,
16+
} from "@t3tools/client-runtime/state/project-grouping";
1417

1518
import { NativeStackScreenOptions } from "../../native/StackHeader";
1619
import { useProjects } from "../../state/entities";
@@ -138,11 +141,13 @@ export function HomeRouteScreen() {
138141
);
139142
const projectFilterOptions = useMemo(
140143
() =>
141-
buildHomeProjectScopes({
142-
projects,
143-
environmentId: selectedEnvironmentId,
144-
projectGroupingMode: listOptions.projectGroupingMode,
145-
}).map((scope) => ({
144+
pickableProjectGroups(
145+
buildHomeProjectScopes({
146+
projects,
147+
environmentId: selectedEnvironmentId,
148+
projectGroupingMode: listOptions.projectGroupingMode,
149+
}),
150+
).map((scope) => ({
146151
key: scope.key,
147152
label: scope.title,
148153
})),

‎apps/mobile/src/features/home/HomeScreen.tsx‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
type EnvironmentProject,
1010
type EnvironmentThreadShell,
1111
} from "@t3tools/client-runtime/state/shell";
12+
import { pickableProjectGroups } from "@t3tools/client-runtime/state/project-grouping";
1213
import { threadSearchMatchKey } from "@t3tools/client-runtime/state/thread-search";
1314
import { type EnvironmentId, type SidebarProjectGroupingMode } from "@t3tools/contracts";
1415
import { useAtomValue } from "@effect/atom-react";
@@ -376,7 +377,11 @@ export function HomeScreen(props: HomeScreenProps) {
376377
})();
377378

378379
const v2ProjectScopeKey = props.selectedProjectKey;
379-
const v2ScopedProjectGroup = findHomeProjectScope(projectScopes, v2ProjectScopeKey);
380+
// An archived project's filter reads as all projects, matching the filter menu.
381+
const v2ScopedProjectGroup = findHomeProjectScope(
382+
pickableProjectGroups(projectScopes),
383+
v2ProjectScopeKey,
384+
);
380385
const threadSearch = useThreadSearch(
381386
searchEnvironmentIds,
382387
props.searchQuery,
@@ -711,7 +716,10 @@ export function HomeScreen(props: HomeScreenProps) {
711716
<ThreadListFilters
712717
gutter={primaryColumn ? 8 : 0}
713718
environments={props.environments}
714-
projects={projectScopes.map((scope) => ({ key: scope.key, label: scope.title }))}
719+
projects={pickableProjectGroups(projectScopes).map((scope) => ({
720+
key: scope.key,
721+
label: scope.title,
722+
}))}
715723
selectedEnvironmentId={props.selectedEnvironmentId}
716724
selectedProjectKey={props.selectedProjectKey}
717725
onEnvironmentChange={props.onEnvironmentChange}

‎apps/mobile/src/features/home/homeThreadList.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ export interface HomeProjectScope {
2727
readonly representative: EnvironmentProject;
2828
readonly projects: ReadonlyArray<EnvironmentProject>;
2929
readonly projectRefs: ReadonlyArray<ScopedProjectRef>;
30+
readonly pinned: boolean;
31+
readonly archived: boolean;
3032
}
3133

3234
function getProjectSortTimestamp(
@@ -62,6 +64,8 @@ export function buildHomeProjectScopes(input: {
6264
representative: group.representative,
6365
projects: group.members.map((member) => member.project),
6466
projectRefs: group.memberProjectRefs,
67+
pinned: group.pinned,
68+
archived: group.archived,
6569
};
6670
});
6771
}

‎apps/mobile/src/features/keyboard/CommandPalette.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,11 @@ export function CommandPalette(props: {
401401
})),
402402
);
403403
}
404-
const projectItems: CommandPaletteItem[] = projects.map((project) => ({
404+
const openProjects = projects.filter((project) => project.archivedAt == null);
405+
const projectItems: CommandPaletteItem[] = [
406+
...openProjects.filter((project) => project.pinnedAt != null),
407+
...openProjects.filter((project) => project.pinnedAt == null),
408+
].map((project) => ({
405409
key: `project:${scopedProjectKey(project.environmentId, project.id)}`,
406410
kind: "project",
407411
project,

‎apps/mobile/src/features/projects/AddProjectScreen.tsx‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,9 @@ function useCreateProject(environment: EnvironmentOption | null) {
713713
const openNewTaskDraft = useOpenNewTaskDraft();
714714
const navigation = useNavigation();
715715
const createProject = useAtomCommand(projectEnvironment.create, { reportFailure: false });
716+
const updateProject = useAtomCommand(projectEnvironment.update, {
717+
label: "project unarchive",
718+
});
716719
const projects = useProjects();
717720

718721
return async (workspaceRoot: string, originRoute = getActiveRoute(navigation)) => {
@@ -734,7 +737,19 @@ function useCreateProject(environment: EnvironmentOption | null) {
734737
path: workspaceRoot,
735738
});
736739
if (existing) {
737-
Dialog.alert("Project already exists", existing.title);
740+
// Adding an archived project's folder again brings the project back.
741+
const unarchived =
742+
existing.archivedAt == null ||
743+
(
744+
await updateProject({
745+
environmentId: existing.environmentId,
746+
input: { projectId: existing.id, archived: false },
747+
})
748+
)._tag === "Success";
749+
Dialog.alert(
750+
"Project already exists",
751+
unarchived ? existing.title : `${existing.title} is still archived. Try again later.`,
752+
);
738753
openNewTaskDraft(
739754
{
740755
environmentId: existing.environmentId,

‎apps/mobile/src/features/settings/SettingsProjectOverviewRouteScreen.tsx‎

Lines changed: 88 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ import {
99
isAtomCommandInterrupted,
1010
squashAtomCommandFailure,
1111
} from "@t3tools/client-runtime/state/runtime";
12-
import { deriveProjectGroupLabel } from "@t3tools/client-runtime/state/project-grouping";
12+
import {
13+
deriveProjectGroupLabel,
14+
type ProjectGroup,
15+
} from "@t3tools/client-runtime/state/project-grouping";
1316
import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell";
1417
import { useNavigation } from "@react-navigation/native";
1518
import { useRef, useState } from "react";
@@ -34,6 +37,7 @@ import { useAtomCommand } from "../../state/use-atom-command";
3437
import { SettingsScreen } from "./components/SettingsScreen";
3538
import { SettingsSection } from "./components/SettingsSection";
3639
import { ListActionRow as SettingsActionRow } from "../../components/ui/ListActionRow";
40+
import { SettingsSwitchRow } from "./components/SettingsSwitchRow";
3741
import {
3842
AndroidSettingsEnvironmentFilter,
3943
SettingsEnvironmentFilterHeader,
@@ -59,6 +63,7 @@ export function SettingsProjectOverviewRouteScreen() {
5963
};
6064
const navigation = useNavigation();
6165
const {
66+
availableTargets,
6267
selectedTargets,
6368
projectGroups,
6469
selectedProjectKey,
@@ -95,7 +100,7 @@ export function SettingsProjectOverviewRouteScreen() {
95100
<Text className="px-2 text-base text-foreground-muted">
96101
Choose a project with the filter above to manage its name, checkouts and removal.
97102
</Text>
98-
) : members.length === 0 ? (
103+
) : !group || members.length === 0 ? (
99104
<Text className="px-2 text-base text-foreground-muted">
100105
This project has no checkout on the selected connected environments. Change the filter
101106
above.
@@ -104,6 +109,8 @@ export function SettingsProjectOverviewRouteScreen() {
104109
<ProjectOverviewContent
105110
key={`${selectedProjectKey}:${members.map((member) => member.id).join(",")}`}
106111
members={members}
112+
group={group}
113+
connectedTargets={availableTargets}
107114
environments={selectedTargets}
108115
hasOtherMembers={members.length < (group?.members.length ?? 0)}
109116
isRemoving={isRemoving}
@@ -122,6 +129,9 @@ export function SettingsProjectOverviewRouteScreen() {
122129

123130
function ProjectOverviewContent(props: {
124131
readonly members: readonly EnvironmentProject[];
132+
/** Pin and archive belong to the whole project, even when the filter picks one machine. */
133+
readonly group: ProjectGroup;
134+
readonly connectedTargets: readonly SettingsTarget[];
125135
readonly environments: readonly SettingsTarget[];
126136
readonly hasOtherMembers: boolean;
127137
readonly isRemoving: boolean;
@@ -137,10 +147,8 @@ function ProjectOverviewContent(props: {
137147
const [draftName, setDraftName] = useState<string | null>(null);
138148
const [isSaving, setIsSaving] = useState(false);
139149
const threads = useThreadShells();
140-
const removableEnvironments = useEnvironmentsWithScope(
141-
props.members,
142-
AuthOrchestrationOperateScope,
143-
);
150+
const allMembers = props.group.members.map((member) => member.project);
151+
const removableEnvironments = useEnvironmentsWithScope(allMembers, AuthOrchestrationOperateScope);
144152
const canRemoveGroup = props.members.every((member) =>
145153
removableEnvironments.has(member.environmentId),
146154
);
@@ -149,6 +157,52 @@ function ProjectOverviewContent(props: {
149157
label: "project name update",
150158
reportFailure: true,
151159
});
160+
const organizeProject = useAtomCommand(projectEnvironment.update, {
161+
label: "project update",
162+
reportFailure: true,
163+
});
164+
const [isOrganizing, setIsOrganizing] = useState(false);
165+
const memberTargets = allMembers.map((member) =>
166+
props.connectedTargets.find((entry) => entry.environmentId === member.environmentId),
167+
);
168+
const offline = memberTargets.some((target) => target === undefined);
169+
// Older servers drop pin and archive, so their projects do not offer them.
170+
// Offline members are checked when the write runs, so their reason can show.
171+
const canOrganize =
172+
allMembers.every(
173+
(member, index) =>
174+
memberTargets[index] === undefined || removableEnvironments.has(member.environmentId),
175+
) &&
176+
memberTargets.every(
177+
(target) =>
178+
target === undefined ||
179+
target.serverConfig.environment.capabilities.projectOrganization === true,
180+
);
181+
// One machine at a time, stopping at the first failure, as web does.
182+
const organize = async (input: { readonly pinned?: boolean; readonly archived?: boolean }) => {
183+
setIsOrganizing(true);
184+
for (const member of allMembers) {
185+
if (!readEnvironmentScope(member.environmentId, AuthOrchestrationOperateScope)) {
186+
Dialog.alert("Failed to update project", "This connection can no longer change it.");
187+
break;
188+
}
189+
const result = await organizeProject({
190+
environmentId: member.environmentId,
191+
input: { projectId: member.id, ...input },
192+
});
193+
if (result._tag === "Failure") {
194+
if (!isAtomCommandInterrupted(result)) {
195+
const error = squashAtomCommandFailure(result);
196+
Dialog.alert(
197+
`Failed to update "${member.title}"`,
198+
error instanceof Error ? error.message : "An error occurred.",
199+
);
200+
}
201+
break;
202+
}
203+
}
204+
setIsOrganizing(false);
205+
};
152206
const nextName = (draftName ?? displayName).trim();
153207
const canSave = !isSaving && nextName.length > 0 && nextName !== displayName;
154208

@@ -295,6 +349,34 @@ function ProjectOverviewContent(props: {
295349
</View>
296350
</SettingsSection>
297351

352+
{canOrganize ? (
353+
<SettingsSection title="Organize">
354+
<SettingsSwitchRow
355+
icon="pin"
356+
label="Pin"
357+
subtitle={
358+
offline
359+
? "Connect every machine with this project to change this."
360+
: "Pinned projects come first in project pickers."
361+
}
362+
value={props.group.pinned}
363+
disabled={isOrganizing || offline}
364+
onValueChange={(pinned) => void organize({ pinned })}
365+
/>
366+
<SettingsActionRow
367+
icon="archivebox"
368+
label={props.group.archived ? "Unarchive project" : "Archive project"}
369+
description={
370+
props.group.archived
371+
? "Hidden from project pickers. Threads and files are kept."
372+
: "Hides the project from project pickers. Threads and files are kept."
373+
}
374+
disabled={isOrganizing || offline}
375+
onPress={() => void organize({ archived: !props.group.archived })}
376+
/>
377+
</SettingsSection>
378+
) : null}
379+
298380
<SettingsSection title="Checkouts">
299381
{props.members.map((member, index) => {
300382
const environment = props.environments.find(

‎apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.tsx‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,16 @@ function TaskForm({
666666
const tasks = useEnvironmentQuery(
667667
serverEnvironment.scheduledTasksLive({ environmentId, input: {} }),
668668
);
669-
const projects = useProjects().filter((project) => project.environmentId === environmentId);
669+
// Pinned first. The chosen project stays listed after it is archived.
670+
const projects = useProjects()
671+
.filter(
672+
(project) =>
673+
project.environmentId === environmentId &&
674+
(project.archivedAt == null ||
675+
project.id === draft.projectId ||
676+
project.id === draft.task?.projectId),
677+
)
678+
.sort((left, right) => Number(right.pinnedAt != null) - Number(left.pinnedAt != null));
670679
const config = useEnvironmentServerConfig(environmentId);
671680
const modelOptions = buildModelOptions(config, null, undefined, draft.projectId);
672681
const canOperate = useAtomValue(

‎apps/mobile/src/features/settings/components/SettingsEnvironmentFilterHeader.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export function SettingsEnvironmentFilterHeader(props: {
100100
},
101101
...selectableProjectGroups.map((group) => ({
102102
type: "action" as const,
103-
label: group.label,
103+
label: projectMenuLabel(group),
104104
state: selectedProjectKey === group.key ? ("on" as const) : undefined,
105105
onPress: () => selectProject(group.key),
106106
})),
@@ -160,7 +160,7 @@ export function AndroidSettingsEnvironmentFilter() {
160160
},
161161
...selectableProjectGroups.map((group) => ({
162162
id: `project:${group.key}`,
163-
title: `Project · ${group.label}`,
163+
title: `Project · ${projectMenuLabel(group)}`,
164164
state: selectedProjectKey === group.key ? ("on" as const) : ("off" as const),
165165
})),
166166
]}
@@ -190,3 +190,6 @@ export function AndroidSettingsEnvironmentFilter() {
190190
</Menu>
191191
);
192192
}
193+
194+
const projectMenuLabel = (group: { readonly label: string; readonly archived: boolean }) =>
195+
group.archived ? `${group.label} · Archived` : group.label;

‎apps/mobile/src/features/settings/scheduled-task-editor.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@ export function useScheduledTaskEditor() {
3737
(member) =>
3838
member.project.environmentId === environmentId && member.project.id === project.id,
3939
),
40-
) ?? environmentProjects[0];
40+
) ??
41+
environmentProjects.find(
42+
(project) => project.pinnedAt != null && project.archivedAt == null,
43+
) ??
44+
environmentProjects.find((project) => project.archivedAt == null);
4145
return createDraft(
4246
project?.id ?? null,
4347
scheduledTaskDefaultModel(configs.get(environmentId) ?? null, project ?? null),

‎apps/mobile/src/features/threads/NewTaskDraftScreen.tsx‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import * as Dialog from "../../components/ui/Dialog";
1818
import { useAtomValue } from "@effect/atom-react";
1919
import * as Cause from "effect/Cause";
2020
import { AsyncResult } from "effect/reactivity";
21+
import { pickableProjectGroups } from "@t3tools/client-runtime/state/project-grouping";
2122
import { settlePromise, squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime";
2223
import {
2324
CommonActions,
@@ -458,10 +459,15 @@ export function NewTaskDraftScreen(props: {
458459
return;
459460
}
460461

461-
const selection = resolveDraftProjectSelection(selectedProjectKey, projects, projectScopes, {
462-
incomingShareId: props.incomingShareId,
463-
pickerClosed: initialPickerRef.current === "open" && isFocused,
464-
});
462+
const selection = resolveDraftProjectSelection(
463+
selectedProjectKey,
464+
projects,
465+
pickableProjectGroups(projectScopes),
466+
{
467+
incomingShareId: props.incomingShareId,
468+
pickerClosed: initialPickerRef.current === "open" && isFocused,
469+
},
470+
);
465471
if (selection.kind === "preserve") {
466472
initialPickerRef.current = null;
467473
return;

0 commit comments

Comments
 (0)