Infer default from outline

Author: OliverJAsh

apps/lite/ui/src/routes/project/$id/-state/selection.ts

@@ -1,7 +1,7 @@
 import { getCommonBaseCommitId } from "#ui/domain/RefInfo.ts";
 import { type RefInfo, type WorktreeChanges } from "@gitbutler/but-sdk";
 import { Match } from "effect";
-import { changesSectionItem, type Item } from "../workspace/-Item.ts";
+import { type Item } from "../workspace/-Item.ts";
 
 export type WorkspaceSelectionState = {
 	item: Item | null;
@@ -86,16 +86,18 @@ const normalizeSelectedItem = (
 
 export const resolveSelectedWorkspaceItem = ({
 	workspaceSelection,
-	headInfo,
 	worktreeChanges,
+	headInfo,
+	defaultItem,
 }: {
 	workspaceSelection: WorkspaceSelectionState;
-	headInfo: RefInfo;
 	worktreeChanges: WorktreeChanges;
+	headInfo: RefInfo;
+	defaultItem: Item;
 }): Item =>
 	(workspaceSelection.item
 		? normalizeSelectedItem(workspaceSelection.item, headInfo, worktreeChanges)
-		: null) ?? changesSectionItem(null);
+		: null) ?? defaultItem;
 
 export const normalizeSelectedFile = ({
 	paths,

apps/lite/ui/src/routes/project/$id/workspace/-WorkspaceOutline.ts

@@ -1,4 +1,5 @@
 import { Segment, type HunkAssignment, type RefInfo, type TreeChange } from "@gitbutler/but-sdk";
+import { type NonEmptyArray } from "effect/Array";
 import {
 	baseCommitItem,
 	changeItem,
@@ -28,7 +29,7 @@ type WorkspaceSection = {
 	items: Array<Item>;
 };
 
-type WorkspaceOutline = Array<WorkspaceSection>;
+type WorkspaceOutline = NonEmptyArray<WorkspaceSection>;
 
 type BuildWorkspaceOutlineArgs = {
 	headInfo: RefInfo;
@@ -37,7 +38,7 @@ type BuildWorkspaceOutlineArgs = {
 	commonBaseCommitId?: string;
 };
 
-const buildWorkspaceOutline = ({
+export const buildWorkspaceOutline = ({
 	headInfo,
 	changes,
 	assignments,
@@ -96,7 +97,7 @@ export type NavigationIndex = {
 	indexByKey: Map<string, number>;
 };
 
-const fromOutline = (outline: WorkspaceOutline): NavigationIndex => {
+export const buildNavigationIndex = (outline: WorkspaceOutline): NavigationIndex => {
 	const model: NavigationIndex = {
 		items: [],
 		sectionStartIndexes: [],
@@ -121,9 +122,6 @@ const fromOutline = (outline: WorkspaceOutline): NavigationIndex => {
 	return model;
 };
 
-export const buildNavigationIndex = (args: BuildWorkspaceOutlineArgs): NavigationIndex =>
-	fromOutline(buildWorkspaceOutline(args));
-
 export const getAdjacentItem = (
 	index: NavigationIndex,
 	selection: Item | null,

apps/lite/ui/src/routes/project/$id/workspace/route.tsx

@@ -111,7 +111,7 @@ import {
 	type SegmentMode,
 	segmentItem,
 } from "./-Item.ts";
-import { buildNavigationIndex } from "./-WorkspaceOutline.ts";
+import { buildNavigationIndex, buildWorkspaceOutline } from "./-WorkspaceOutline.ts";
 import {
 	renameBranchBindings,
 	handleRenameBranchKeyDown,
@@ -1905,17 +1905,19 @@ const ProjectPage: FC = () => {
 	const { data: worktreeChanges } = useSuspenseQuery(changesInWorktreeQueryOptions(projectId));
 
 	const commonBaseCommitId = getCommonBaseCommitId(headInfo);
-	const navigationIndex = buildNavigationIndex({
+	const workspaceOutline = buildWorkspaceOutline({
 		headInfo,
 		changes: worktreeChanges.changes,
 		assignments: worktreeChanges.assignments,
 		commonBaseCommitId,
 	});
+	const navigationIndex = buildNavigationIndex(workspaceOutline);
 
 	const selectedItem = resolveSelectedWorkspaceItem({
 		workspaceSelection,
 		headInfo,
 		worktreeChanges,
+		defaultItem: workspaceOutline[0].section,
 	});
 	const selectItem = (nextSelectedItem: Item | null) => {
 		dispatchProjectState({ _tag: "SelectItem", item: nextSelectedItem });