Skip to content

Commit a61a108

Browse files
beNativebeNative
committed
Route branch selection status through status bar
1 parent 909b1b4 commit a61a108

3 files changed

Lines changed: 90 additions & 38 deletions

File tree

‎App.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import TaskLogPanel from './components/TaskLogPanel';
1313
import DebugPanel from './components/DebugPanel';
1414
import { IconContext } from './contexts/IconContext';
1515
import CommandPalette from './components/CommandPalette';
16-
import StatusBar from './components/StatusBar';
16+
import StatusBar, { StatusBarMessage } from './components/StatusBar';
1717
import DirtyRepoModal from './components/modals/DirtyRepoModal';
1818
import TaskSelectionModal from './components/modals/TaskSelectionModal';
1919
import LaunchSelectionModal from './components/modals/LaunchSelectionModal';
@@ -174,6 +174,7 @@ const App: React.FC = () => {
174174
const [isCommandPaletteOpen, setCommandPaletteOpen] = useState(false);
175175
const [isDebugPanelOpen, setIsDebugPanelOpen] = useState(false);
176176
const [isAboutModalOpen, setIsAboutModalOpen] = useState(false);
177+
const [statusBarMessage, setStatusBarMessage] = useState<StatusBarMessage | null>(null);
177178
const [localPathStates, setLocalPathStates] = useState<Record<string, LocalPathState>>({});
178179
const [localPathRefreshing, setLocalPathRefreshing] = useState<Record<string, boolean>>({});
179180
const [detectedExecutables, setDetectedExecutables] = useState<Record<string, string[]>>({});
@@ -1739,6 +1740,7 @@ const App: React.FC = () => {
17391740
onCancel={handleCloseRepoForm}
17401741
onRefreshState={refreshRepoState}
17411742
setToast={setToast}
1743+
setStatusBarMessage={setStatusBarMessage}
17421744
confirmAction={confirmAction}
17431745
defaultCategoryId={repoFormState.defaultCategoryId}
17441746
onOpenWeblink={handleOpenWeblink}
@@ -1827,6 +1829,7 @@ const App: React.FC = () => {
18271829
processingCount={isProcessing.size}
18281830
isSimulationMode={settings.simulationMode}
18291831
latestLog={latestLog}
1832+
statusMessage={statusBarMessage}
18301833
appVersion={appVersion}
18311834
onToggleDebugPanel={() => setIsDebugPanelOpen(p => !p)}
18321835
onOpenAboutModal={() => setIsAboutModalOpen(true)}

‎components/StatusBar.tsx‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,24 @@ import { KeyboardIcon } from './icons/KeyboardIcon';
77
import { BugAntIcon } from './icons/BugAntIcon';
88
import { useTooltip } from '../hooks/useTooltip';
99

10+
export type StatusBarMessage = {
11+
text: string;
12+
tone?: 'default' | 'info' | 'success' | 'warning' | 'danger';
13+
};
14+
1015
interface StatusBarProps {
1116
repoCount: number;
1217
processingCount: number;
1318
isSimulationMode: boolean;
1419
latestLog: LogEntry | null;
20+
statusMessage?: StatusBarMessage | null;
1521
appVersion: string;
1622
onToggleDebugPanel: () => void;
1723
onOpenAboutModal: () => void;
1824
commandPaletteShortcut: string;
1925
}
2026

21-
const StatusBar: React.FC<StatusBarProps> = ({ repoCount, processingCount, isSimulationMode, latestLog, appVersion, onToggleDebugPanel, onOpenAboutModal, commandPaletteShortcut }) => {
27+
const StatusBar: React.FC<StatusBarProps> = ({ repoCount, processingCount, isSimulationMode, latestLog, statusMessage, appVersion, onToggleDebugPanel, onOpenAboutModal, commandPaletteShortcut }) => {
2228
const LOG_LEVEL_COLOR_CLASSES: Record<string, string> = {
2329
info: 'text-gray-500 dark:text-gray-400',
2430
command: 'text-blue-500 dark:text-blue-400',
@@ -27,12 +33,20 @@ const StatusBar: React.FC<StatusBarProps> = ({ repoCount, processingCount, isSim
2733
warn: 'text-yellow-500 dark:text-yellow-400',
2834
};
2935

36+
const STATUS_MESSAGE_COLORS: Record<NonNullable<StatusBarMessage['tone']>, string> = {
37+
default: 'text-gray-600 dark:text-gray-300',
38+
info: 'text-blue-600 dark:text-blue-400',
39+
success: 'text-green-600 dark:text-green-400',
40+
warning: 'text-amber-600 dark:text-amber-400',
41+
danger: 'text-red-600 dark:text-red-400',
42+
};
43+
3044
const repoCountTooltip = useTooltip('Total Repositories');
3145
const processingTooltip = useTooltip(`${processingCount} tasks running`);
3246
const simModeTooltip = useTooltip('Simulation mode is active. No real commands will be run.');
3347
const commandPaletteTooltip = useTooltip(`Command Palette (${commandPaletteShortcut || 'Ctrl+K'})`);
3448
const debugPanelTooltip = useTooltip('Toggle Debug Panel (Ctrl+D)');
35-
const latestLogTooltip = useTooltip(latestLog?.message || '');
49+
const centerTooltip = useTooltip(statusMessage?.text || latestLog?.message || '');
3650
const aboutTooltip = useTooltip('About this application');
3751

3852
return (
@@ -58,12 +72,16 @@ const StatusBar: React.FC<StatusBarProps> = ({ repoCount, processingCount, isSim
5872

5973
{/* Center Section */}
6074
<div
61-
{...latestLogTooltip} className="flex-1 text-center truncate px-4">
62-
{latestLog && (
75+
{...centerTooltip} className="flex-1 text-center truncate px-4">
76+
{statusMessage ? (
77+
<span className={STATUS_MESSAGE_COLORS[statusMessage.tone || 'default']}>
78+
{statusMessage.text}
79+
</span>
80+
) : latestLog ? (
6381
<span className={LOG_LEVEL_COLOR_CLASSES[latestLog.level] || 'text-gray-400'}>
6482
[{new Date(latestLog.timestamp).toLocaleTimeString()}] {latestLog.message}
6583
</span>
66-
)}
84+
) : null}
6785
</div>
6886

6987
{/* Right Section */}

‎components/modals/RepoFormModal.tsx‎

Lines changed: 63 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,15 @@ import ReactMarkdown from 'react-markdown';
3838
import remarkGfm from 'remark-gfm';
3939
import { PencilIcon } from '../icons/PencilIcon';
4040
import { ArrowPathIcon } from '../icons/ArrowPathIcon';
41+
import type { StatusBarMessage } from '../StatusBar';
4142

4243
interface RepoEditViewProps {
4344
onSave: (repository: Repository, categoryId?: string) => void;
4445
onCancel: () => void;
4546
repository: Repository | null;
4647
onRefreshState: (repoId: string) => Promise<void>;
4748
setToast: (toast: { message: string; type: 'success' | 'error' | 'info' } | null) => void;
49+
setStatusBarMessage?: (message: StatusBarMessage | null) => void;
4850
confirmAction: (options: {
4951
title: string;
5052
message: React.ReactNode;
@@ -1869,7 +1871,7 @@ const CommitListItem: React.FC<CommitListItemProps> = ({ commit, highlight }) =>
18691871
);
18701872
};
18711873

1872-
const RepoEditView: React.FC<RepoEditViewProps> = ({ onSave, onCancel, repository, onRefreshState, setToast, confirmAction, defaultCategoryId, onOpenWeblink, detectedExecutables }) => {
1874+
const RepoEditView: React.FC<RepoEditViewProps> = ({ onSave, onCancel, repository, onRefreshState, setToast, setStatusBarMessage, confirmAction, defaultCategoryId, onOpenWeblink, detectedExecutables }) => {
18731875
const logger = useLogger();
18741876
const [formData, setFormData] = useState<Repository | Omit<Repository, 'id'>>(() => repository || NEW_REPO_TEMPLATE);
18751877

@@ -1967,6 +1969,43 @@ const RepoEditView: React.FC<RepoEditViewProps> = ({ onSave, onCancel, repositor
19671969
return keySet;
19681970
}, [selectedBranches]);
19691971

1972+
const branchSelectionStats = useMemo(() => {
1973+
const selectedBranchCount = selectedBranches.length;
1974+
let selectedLocalCount = 0;
1975+
selectedBranches.forEach(selection => {
1976+
if (selection.scope === 'local') {
1977+
selectedLocalCount += 1;
1978+
}
1979+
});
1980+
const selectedRemoteCount = selectedBranchCount - selectedLocalCount;
1981+
const isCurrentSelection = Boolean(
1982+
selectedBranchCount === 1 &&
1983+
primarySelectedBranch?.scope === 'local' &&
1984+
branchInfo?.current &&
1985+
primarySelectedBranch.name === branchInfo.current
1986+
);
1987+
1988+
let selectionDescription: string | null = null;
1989+
if (!selectedBranchCount) {
1990+
selectionDescription = 'Select a branch to checkout.';
1991+
} else if (selectedBranchCount === 1 && primarySelectedBranch) {
1992+
if (!(primarySelectedBranch.scope === 'local' && branchInfo?.current === primarySelectedBranch.name)) {
1993+
selectionDescription = `${primarySelectedBranch.scope === 'remote' ? 'Remote' : 'Local'} branch: ${primarySelectedBranch.name}`;
1994+
}
1995+
} else {
1996+
const parts: string[] = [];
1997+
if (selectedLocalCount) {
1998+
parts.push(`${selectedLocalCount} local`);
1999+
}
2000+
if (selectedRemoteCount) {
2001+
parts.push(`${selectedRemoteCount} remote`);
2002+
}
2003+
selectionDescription = `${selectedBranchCount} branches selected (${parts.join(', ')})`;
2004+
}
2005+
2006+
return { selectedBranchCount, selectedLocalCount, selectedRemoteCount, isCurrentSelection, selectionDescription };
2007+
}, [selectedBranches, primarySelectedBranch, branchInfo?.current]);
2008+
19702009
// State for Releases Tab
19712010
const [releases, setReleases] = useState<ReleaseInfo[] | null>(null);
19722011
const [releasesLoading, setReleasesLoading] = useState(false);
@@ -2035,6 +2074,23 @@ const RepoEditView: React.FC<RepoEditViewProps> = ({ onSave, onCancel, repositor
20352074
});
20362075
}, [filteredLocalBranches, filteredRemoteBranches, branchInfo?.current]);
20372076

2077+
useEffect(() => {
2078+
if (!setStatusBarMessage) {
2079+
return;
2080+
}
2081+
if (activeTab === 'branches' && branchSelectionStats.selectionDescription) {
2082+
setStatusBarMessage({ text: branchSelectionStats.selectionDescription, tone: 'info' });
2083+
} else {
2084+
setStatusBarMessage(null);
2085+
}
2086+
}, [activeTab, branchSelectionStats.selectionDescription, setStatusBarMessage]);
2087+
2088+
useEffect(() => {
2089+
return () => {
2090+
setStatusBarMessage?.(null);
2091+
};
2092+
}, [setStatusBarMessage]);
2093+
20382094
useEffect(() => {
20392095
if (!branchInfo) {
20402096
return;
@@ -3500,35 +3556,13 @@ const RepoEditView: React.FC<RepoEditViewProps> = ({ onSave, onCancel, repositor
35003556
if (!supportsBranchTab) {
35013557
return <div className="p-2 text-center text-gray-500">Branch management is only available for Git or SVN repositories.</div>;
35023558
}
3503-
const selectedBranchCount = selectedBranches.length;
3504-
const selectedLocalCount = selectedBranches.filter(selection => selection.scope === 'local').length;
3505-
const selectedRemoteCount = selectedBranchCount - selectedLocalCount;
3506-
const isCurrentSelection = Boolean(
3507-
selectedBranchCount === 1 &&
3508-
primarySelectedBranch?.scope === 'local' &&
3509-
branchInfo?.current &&
3510-
primarySelectedBranch.name === branchInfo.current
3511-
);
3559+
const {
3560+
selectedBranchCount,
3561+
selectedLocalCount,
3562+
selectedRemoteCount,
3563+
isCurrentSelection,
3564+
} = branchSelectionStats;
35123565
const checkoutDisabled = selectedBranchCount !== 1 || isCheckoutLoading || branchesLoading || isCurrentSelection;
3513-
const selectionDescription = (() => {
3514-
if (!selectedBranchCount) {
3515-
return 'Select a branch to checkout.';
3516-
}
3517-
if (selectedBranchCount === 1 && primarySelectedBranch) {
3518-
if (primarySelectedBranch.scope === 'local' && branchInfo?.current === primarySelectedBranch.name) {
3519-
return undefined;
3520-
}
3521-
return `${primarySelectedBranch.scope === 'remote' ? 'Remote' : 'Local'} branch: ${primarySelectedBranch.name}`;
3522-
}
3523-
const parts: string[] = [];
3524-
if (selectedLocalCount) {
3525-
parts.push(`${selectedLocalCount} local`);
3526-
}
3527-
if (selectedRemoteCount) {
3528-
parts.push(`${selectedRemoteCount} remote`);
3529-
}
3530-
return `${selectedBranchCount} branches selected (${parts.join(', ')})`;
3531-
})();
35323566
const hasProtectedSelection = selectedBranches.some(selection => isProtectedBranch(selection.name, selection.scope));
35333567
const hasCurrentBranchSelected = selectedBranches.some(selection => selection.scope === 'local' && branchInfo?.current && selection.name === branchInfo.current);
35343568
const hasDeletableSelection = selectedBranches.some(selection => {
@@ -3720,9 +3754,6 @@ const RepoEditView: React.FC<RepoEditViewProps> = ({ onSave, onCancel, repositor
37203754
</div>
37213755
</div>
37223756
<div className="pt-4 mt-2 border-t border-gray-200 dark:border-gray-700 flex flex-col gap-4 flex-shrink-0">
3723-
{selectionDescription && (
3724-
<p className="text-sm text-gray-600 dark:text-gray-300">{selectionDescription}</p>
3725-
)}
37263757
{isSvnRepo && (
37273758
<p className="text-xs text-gray-500 dark:text-gray-400">
37283759
Branch creation, deletion, and merging are currently only available for Git repositories.

0 commit comments

Comments
 (0)