From 835578e43c7165e5ec7923dc7346c359c63cff91 Mon Sep 17 00:00:00 2001 From: lucaronin Date: Tue, 3 Mar 2026 02:48:10 +0100 Subject: [PATCH] fix: add useIndexing import and hook call, wire indexingProgress and onRemoveVault to StatusBar --- src/App.tsx | 5 ++++- src/components/StatusBar.tsx | 2 +- src/hooks/useCommandRegistry.ts | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 5d1ad95c..acba944b 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -29,6 +29,7 @@ import { useUpdater } from './hooks/useUpdater' import { useNavigationHistory } from './hooks/useNavigationHistory' import { useAutoSync } from './hooks/useAutoSync' import { useConflictResolver } from './hooks/useConflictResolver' +import { useIndexing } from './hooks/useIndexing' import { useZoom } from './hooks/useZoom' import { useBuildNumber } from './hooks/useBuildNumber' import { useOnboarding } from './hooks/useOnboarding' @@ -145,6 +146,8 @@ function App() { // Ref bridges for conflict resolution callbacks (notes declared below) const openConflictFileRef = useRef<(relativePath: string) => void>(() => {}) + const indexing = useIndexing(resolvedPath) + const conflictResolver = useConflictResolver({ vaultPath: resolvedPath, onResolved: () => { @@ -502,7 +505,7 @@ function App() { - setSelection({ kind: 'filter', filter: 'changes' })} hasGitHub={!!settings.github_token} syncStatus={autoSync.syncStatus} lastSyncTime={autoSync.lastSyncTime} conflictCount={autoSync.conflictFiles.length} lastCommitInfo={autoSync.lastCommitInfo} onTriggerSync={autoSync.triggerSync} onOpenConflictResolver={handleOpenConflictResolver} zoomLevel={zoom.zoomLevel} onZoomReset={zoom.zoomReset} buildNumber={buildNumber} /> + setSelection({ kind: 'filter', filter: 'changes' })} hasGitHub={!!settings.github_token} syncStatus={autoSync.syncStatus} lastSyncTime={autoSync.lastSyncTime} conflictCount={autoSync.conflictFiles.length} lastCommitInfo={autoSync.lastCommitInfo} onTriggerSync={autoSync.triggerSync} onOpenConflictResolver={handleOpenConflictResolver} zoomLevel={zoom.zoomLevel} onZoomReset={zoom.zoomReset} buildNumber={buildNumber} indexingProgress={indexing.progress} onRemoveVault={vaultSwitcher.removeVault} /> setToastMessage(null)} /> diff --git a/src/components/StatusBar.tsx b/src/components/StatusBar.tsx index cdd5db11..94b2d644 100644 --- a/src/components/StatusBar.tsx +++ b/src/components/StatusBar.tsx @@ -281,7 +281,7 @@ function PendingBadge({ count, onClick }: { count: number; onClick?: () => void ) } -export function StatusBar({ noteCount, modifiedCount = 0, vaultPath, vaults, onSwitchVault, onOpenSettings, onOpenLocalFolder, onConnectGitHub, onClickPending, hasGitHub, syncStatus = 'idle', lastSyncTime = null, conflictCount = 0, lastCommitInfo, onTriggerSync, onOpenConflictResolver, zoomLevel = 100, onZoomReset, buildNumber }: StatusBarProps) { +export function StatusBar({ noteCount, modifiedCount = 0, vaultPath, vaults, onSwitchVault, onOpenSettings, onOpenLocalFolder, onConnectGitHub, onClickPending, hasGitHub, syncStatus = 'idle', lastSyncTime = null, conflictCount = 0, lastCommitInfo, onTriggerSync, onOpenConflictResolver, zoomLevel = 100, onZoomReset, buildNumber, indexingProgress, onRemoveVault }: StatusBarProps) { const [, setTick] = useState(0) useEffect(() => { const id = setInterval(() => setTick((t) => t + 1), 30_000) diff --git a/src/hooks/useCommandRegistry.ts b/src/hooks/useCommandRegistry.ts index 44744f7c..1c8f9944 100644 --- a/src/hooks/useCommandRegistry.ts +++ b/src/hooks/useCommandRegistry.ts @@ -269,5 +269,6 @@ export function useCommandRegistry(config: CommandRegistryConfig): CommandAction onSelect, onOpenDailyNote, onCloseTab, onGoBack, onGoForward, canGoBack, canGoForward, vaultTypes, themes, activeThemeId, onSwitchTheme, onCreateTheme, onOpenTheme, + onRemoveActiveVault, onRestoreGettingStarted, isGettingStartedHidden, vaultCount, ]) }