helper

Julius Marminge committed 8 months ago

Commit 760fe641 parent 93af8512 files · +21 −5Browse files

Unified · Split

2 files

@@ -2,6 +2,17 @@ import type { GitBranch } from "@t3tools/contracts"; · 1 unmodified line
2	2
3	3	export type EnvMode = "local" \| "worktree";
4	4
	5	+export function resolveEffectiveEnvMode(input: {
	6	+ activeWorktreePath: string \| null;
	7	+ hasServerThread: boolean;
	8	+ draftThreadEnvMode: EnvMode \| undefined;
	9	+}): EnvMode {
	10	+ const { activeWorktreePath, hasServerThread, draftThreadEnvMode } = input;
	11	+ return activeWorktreePath \|\| (!hasServerThread && draftThreadEnvMode === "worktree")
	12	+ ? "worktree"
	13	+ : "local";
	14	+}
	15	+
5	16	export function resolveDraftEnvModeAfterBranchChange(input: {
6	17	nextWorktreePath: string \| null;
7	18	currentWorktreePath: string \| null;

@@ -5,7 +5,11 @@ import { newCommandId } from "../lib/utils"; · 4 unmodified lines
5	5	import { readNativeApi } from "../nativeApi";
6	6	import { useComposerDraftStore } from "../composerDraftStore";
7	7	import { useStore } from "../store";
8		−import { EnvMode, resolveDraftEnvModeAfterBranchChange } from "./BranchToolbar.logic";
	8	+import {
	9	+ EnvMode,
	10	+ resolveDraftEnvModeAfterBranchChange,
	11	+ resolveEffectiveEnvMode,
	12	+} from "./BranchToolbar.logic";
9	13	import { BranchToolbarBranchSelector } from "./BranchToolbarBranchSelector";
10	14	import { Button } from "./ui/button";
11	15
@@ -38,10 +42,11 @@ export default function BranchToolbar({ · 26 unmodified lines
38	42	const activeWorktreePath = serverThread?.worktreePath ?? draftThread?.worktreePath ?? null;
39	43	const branchCwd = activeWorktreePath ?? activeProject?.cwd ?? null;
40	44	const hasServerThread = serverThread !== undefined;
41		− const effectiveEnvMode: EnvMode =
42		− activeWorktreePath \|\| (!hasServerThread && draftThread?.envMode === "worktree")
43		− ? "worktree"
44		− : envMode;
	45	+ const effectiveEnvMode = resolveEffectiveEnvMode({
	46	+ activeWorktreePath,
	47	+ hasServerThread,
	48	+ draftThreadEnvMode: draftThread?.envMode,
	49	+ });
45	50
46	51	const setThreadBranch = useCallback(
47	52	(branch: string \| null, worktreePath: string \| null) => {