(null)
@@ -333,14 +315,6 @@ export const Sidebar = memo(function Sidebar({
- {/* Secondary area: Changes + Pulse */}
-
- {modifiedCount > 0 && (
- onSelect({ kind: 'filter', filter: 'changes' })} compact />
- )}
- onSelect({ kind: 'filter', filter: 'pulse' }) : undefined} compact />
-
-
{ closeContextMenu(); setCustomizeTarget(type) }} onStartRename={handleStartRename} />
diff --git a/src/components/StatusBar.test.tsx b/src/components/StatusBar.test.tsx
index bc6d32cc..0b73ebe6 100644
--- a/src/components/StatusBar.test.tsx
+++ b/src/components/StatusBar.test.tsx
@@ -182,18 +182,19 @@ describe('StatusBar', () => {
expect(screen.getByText('Connect GitHub repo')).toBeInTheDocument()
})
- it('shows modified count when modifiedCount is > 0', () => {
+ it('shows Changes badge with count when modifiedCount is > 0', () => {
render()
expect(screen.getByTestId('status-modified-count')).toBeInTheDocument()
- expect(screen.getByText('3 pending')).toBeInTheDocument()
+ expect(screen.getByText('Changes')).toBeInTheDocument()
+ expect(screen.getByText('3')).toBeInTheDocument()
})
- it('does not show modified count when modifiedCount is 0', () => {
+ it('does not show Changes badge when modifiedCount is 0', () => {
render()
expect(screen.queryByTestId('status-modified-count')).not.toBeInTheDocument()
})
- it('does not show modified count when modifiedCount is not provided', () => {
+ it('does not show Changes badge when modifiedCount is not provided', () => {
render()
expect(screen.queryByTestId('status-modified-count')).not.toBeInTheDocument()
})
@@ -313,4 +314,37 @@ describe('StatusBar', () => {
expect(screen.getByText(/1 behind/)).toBeInTheDocument()
})
+ it('shows Pulse badge in status bar', () => {
+ render()
+ expect(screen.getByTestId('status-pulse')).toBeInTheDocument()
+ expect(screen.getByText('Pulse')).toBeInTheDocument()
+ })
+
+ it('calls onClickPulse when clicking Pulse badge', () => {
+ const onClickPulse = vi.fn()
+ render()
+ fireEvent.click(screen.getByTestId('status-pulse'))
+ expect(onClickPulse).toHaveBeenCalledOnce()
+ })
+
+ it('disables Pulse badge when isGitVault is false', () => {
+ const onClickPulse = vi.fn()
+ render()
+ fireEvent.click(screen.getByTestId('status-pulse'))
+ expect(onClickPulse).not.toHaveBeenCalled()
+ })
+
+ it('shows Commit & Push button next to Changes badge', () => {
+ const onCommitPush = vi.fn()
+ render()
+ expect(screen.getByTestId('status-commit-push')).toBeInTheDocument()
+ fireEvent.click(screen.getByTestId('status-commit-push'))
+ expect(onCommitPush).toHaveBeenCalledOnce()
+ })
+
+ it('hides Commit & Push button when no modified files', () => {
+ render()
+ expect(screen.queryByTestId('status-commit-push')).not.toBeInTheDocument()
+ })
+
})
diff --git a/src/components/StatusBar.tsx b/src/components/StatusBar.tsx
index 23b5946e..82697604 100644
--- a/src/components/StatusBar.tsx
+++ b/src/components/StatusBar.tsx
@@ -1,5 +1,6 @@
import { useState, useRef, useEffect } from 'react'
-import { Package, RefreshCw, FileText, Bell, Settings, FolderOpen, Check, Github, CircleDot, AlertTriangle, Loader2, GitCommitHorizontal, X, Cpu, ArrowDown, GitBranch } from 'lucide-react'
+import { Package, RefreshCw, FileText, Bell, Settings, FolderOpen, Check, Github, AlertTriangle, Loader2, GitCommitHorizontal, X, Cpu, ArrowDown, GitBranch } from 'lucide-react'
+import { GitDiff, Pulse } from '@phosphor-icons/react'
import type { GitRemoteStatus, LastCommitInfo, SyncStatus } from '../types'
import type { McpStatus } from '../hooks/useMcpStatus'
import { openExternalUrl } from '../utils/url'
@@ -20,6 +21,9 @@ interface StatusBarProps {
onOpenLocalFolder?: () => void
onConnectGitHub?: () => void
onClickPending?: () => void
+ onClickPulse?: () => void
+ onCommitPush?: () => void
+ isGitVault?: boolean
hasGitHub?: boolean
syncStatus?: SyncStatus
lastSyncTime?: number | null
@@ -328,7 +332,7 @@ function ConflictBadge({ count, onClick }: { count: number; onClick?: () => void
)
}
-function PendingBadge({ count, onClick }: { count: number; onClick?: () => void }) {
+function ChangesBadge({ count, onClick, onCommitPush }: { count: number; onClick?: () => void; onCommitPush?: () => void }) {
if (count <= 0) return null
return (
<>
@@ -341,7 +345,50 @@ function PendingBadge({ count, onClick }: { count: number; onClick?: () => void
onMouseEnter={e => { e.currentTarget.style.background = 'var(--hover)' }}
onMouseLeave={e => { e.currentTarget.style.background = 'transparent' }}
data-testid="status-modified-count"
- >{count} pending
+ >
+
+ {count}
+ Changes
+
+ {onCommitPush && (
+ { e.currentTarget.style.background = 'var(--hover)' }}
+ onMouseLeave={e => { e.currentTarget.style.background = 'transparent' }}
+ data-testid="status-commit-push"
+ >
+
+
+ )}
+
+ )
+}
+
+function PulseBadge({ onClick, disabled }: { onClick?: () => void; disabled?: boolean }) {
+ return (
+ <>
+ |
+ { e.currentTarget.style.background = 'var(--hover)' }}
+ onMouseLeave={disabled ? undefined : (e) => { e.currentTarget.style.background = 'transparent' }}
+ data-testid="status-pulse"
+ >
+ Pulse
+
)
}
@@ -381,7 +428,7 @@ function McpBadge({ status, onInstall }: { status: McpStatus; onInstall?: () =>
)
}
-export function StatusBar({ noteCount, modifiedCount = 0, vaultPath, vaults, onSwitchVault, onOpenSettings, onOpenLocalFolder, onConnectGitHub, onClickPending, hasGitHub, syncStatus = 'idle', lastSyncTime = null, conflictCount = 0, lastCommitInfo, remoteStatus, onTriggerSync, onPullAndPush, onOpenConflictResolver, zoomLevel = 100, onZoomReset, buildNumber, onCheckForUpdates, onRemoveVault, mcpStatus, onInstallMcp }: StatusBarProps) {
+export function StatusBar({ noteCount, modifiedCount = 0, vaultPath, vaults, onSwitchVault, onOpenSettings, onOpenLocalFolder, onConnectGitHub, onClickPending, onClickPulse, onCommitPush, isGitVault = false, hasGitHub, syncStatus = 'idle', lastSyncTime = null, conflictCount = 0, lastCommitInfo, remoteStatus, onTriggerSync, onPullAndPush, onOpenConflictResolver, zoomLevel = 100, onZoomReset, buildNumber, onCheckForUpdates, onRemoveVault, mcpStatus, onInstallMcp }: StatusBarProps) {
const [, setTick] = useState(0)
useEffect(() => {
const id = setInterval(() => setTick((t) => t + 1), 30_000)
@@ -406,7 +453,8 @@ export function StatusBar({ noteCount, modifiedCount = 0, vaultPath, vaults, onS
{lastCommitInfo && }
-
+
+
{mcpStatus && }