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	export type EnvMode = "local" \| "worktree";	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	export function resolveDraftEnvModeAfterBranchChange(input: {	16	export function resolveDraftEnvModeAfterBranchChange(input: {
6	nextWorktreePath: string \| null;	17	nextWorktreePath: string \| null;
7	currentWorktreePath: string \| null;	18	currentWorktreePath: string \| null;

 import { readNativeApi } from "../nativeApi";
 import { useComposerDraftStore } from "../composerDraftStore";
 import { useStore } from "../store";
-import { EnvMode, resolveDraftEnvModeAfterBranchChange } from "./BranchToolbar.logic";
+import {
+  EnvMode,
+  resolveDraftEnvModeAfterBranchChange,
+  resolveEffectiveEnvMode,
+} from "./BranchToolbar.logic";
 import { BranchToolbarBranchSelector } from "./BranchToolbarBranchSelector";
 import { Button } from "./ui/button";
   const activeWorktreePath = serverThread?.worktreePath ?? draftThread?.worktreePath ?? null;
   const branchCwd = activeWorktreePath ?? activeProject?.cwd ?? null;
   const hasServerThread = serverThread !== undefined;
-  const effectiveEnvMode: EnvMode =
+  const effectiveEnvMode = resolveEffectiveEnvMode({
-    activeWorktreePath || (!hasServerThread && draftThread?.envMode === "worktree")
+    activeWorktreePath,
-      ? "worktree"
+    hasServerThread,
-      : envMode;
+    draftThreadEnvMode: draftThread?.envMode,
+  });
   const setThreadBranch = useCallback(
     (branch: string | null, worktreePath: string | null) => {