Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions Sources/QuotaBarApp/StatusItemController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,12 @@ final class StatusItemController: NSObject, NSPopoverDelegate, NSMenuItemValidat
private var presentedTab: UsageTab?
/// The Pi tab is a view of the card only: the menu bar gauge keeps the quota provider.
private var showsPi = false
private var selectedTab: UsageTab {
self.showsPi ? .pi : UsageTab(provider: self.settings.menuBarProvider)
private var selectedTab: UsageTab { self.tab(for: self.settings.menuBarProvider) }

/// The tab shown for a quota provider. Callers that are handed a provider must use it rather
/// than the setting: `$menuBarProvider` publishes from `willSet`, before the setting changes.
private func tab(for provider: Provider) -> UsageTab {
self.showsPi ? .pi : UsageTab(provider: provider)
}

init(store: UsageStore, settings: SettingsStore, pricing: PricingTableModel,
Expand Down Expand Up @@ -364,7 +368,8 @@ final class StatusItemController: NSObject, NSPopoverDelegate, NSMenuItemValidat
if let popover = self.popover { return popover }
let provider = self.settings.menuBarProvider
let model = MenuPopoverModel(
card: self.makeCard(provider: provider, display: self.store.displays[provider] ?? ProviderDisplay()),
card: self.makeCard(provider: provider, display: self.store.displays[provider] ?? ProviderDisplay(),
tab: self.tab(for: provider)),
provider: provider
)
model.onRefresh = { [weak self] in self?.refreshClicked() }
Expand All @@ -386,11 +391,11 @@ final class StatusItemController: NSObject, NSPopoverDelegate, NSMenuItemValidat
return popover
}

private func makeCard(provider: Provider, display: ProviderDisplay) -> MenuCardView {
private func makeCard(provider: Provider, display: ProviderDisplay, tab: UsageTab) -> MenuCardView {
MenuCardView(
provider: provider, display: self.showsPi ? self.store.piDisplay : display,
isRefreshing: self.showsPi ? self.store.isScanningPi : self.store.isRefreshing(provider),
tab: self.selectedTab,
tab: tab,
recoveries: self.recoveries[provider] ?? [:],
celebrationTokens: self.celebrationTokens[provider] ?? [:], now: self.now(),
costChartLabelMode: self.settings.costChartLabelMode,
Expand Down Expand Up @@ -442,7 +447,7 @@ final class StatusItemController: NSObject, NSPopoverDelegate, NSMenuItemValidat
#if DEBUG
self.debugCardUpdateCount += 1
#endif
let tab = self.selectedTab
let tab = self.tab(for: provider)
if self.presentedTab != tab {
// Switching providers destroys the old bars. Their claimed events must not arm
// the replacement bars when the user returns during this presentation.
Expand All @@ -455,7 +460,7 @@ final class StatusItemController: NSObject, NSPopoverDelegate, NSMenuItemValidat
let events = self.showsPi ? [:] : self.store.consumeCelebrations(for: provider)
self.recoveries[provider, default: [:]].merge(events) { _, new in new }
for kind in events.keys { self.celebrationTokens[provider, default: [:]][kind, default: 0] += 1 }
let card = self.makeCard(provider: provider, display: display)
let card = self.makeCard(provider: provider, display: display, tab: tab)
presentation.provider = provider
presentation.card = card
presentation.showsRefresh = self.showsPi || !display.isSignedOut
Expand Down Expand Up @@ -712,6 +717,7 @@ final class StatusItemController: NSObject, NSPopoverDelegate, NSMenuItemValidat
func debugClickRefreshRow() { self.refreshClicked() }
func debugSelectTab(_ tab: UsageTab) { self.select(tab) }
var debugSelectedTab: UsageTab { self.selectedTab }
var debugPresentedCardTab: UsageTab? { self.presentation?.card.tab }
func debugRetryLocalUsage() { self.presentation?.card.onRefreshLocalUsage() }
func debugRefreshRowState() -> (title: String, trailingText: String?, isEnabled: Bool)? {
guard let state = self.presentation?.refreshState else { return nil }
Expand Down
31 changes: 31 additions & 0 deletions Sources/QuotaBarTests/MenuLifecycleTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,37 @@ enum MenuLifecycleTests {
try AppCheck.require(quotaScans == 0 && settings.menuBarProvider == .codex && controller.debugSelectedTab == .pi,
"Pi retry scanned a quota provider or changed the gauge")
}
await AppCheck.run("clicking a provider tab moves the open card's selection with it") {
let defaults = EphemeralDefaults.make("QuotaBarTabSwitchTests")
defer { EphemeralDefaults.clear("QuotaBarTabSwitchTests") }
let settings = SettingsStore(defaults: defaults)
settings.menuBarProvider = .codex
settings.refreshFrequency = .manual
let service = CostService(rateCard: RateCard())
let store = UsageStore(
settings: settings, costService: service, clock: { 1_000 },
fetchState: { _, _ in .failed("Offline fixture") },
fetchCost: { _ in nil }, fetchPiCost: { nil },
updateThirdPartyRates: { false }, recoveryDefaults: defaults
)
defer { store.stop() }
// Cooldowns suppress the follow-up refresh whose later publish used to hide the stale tab.
for provider in Provider.allCases { store.debugRecordRefresh(at: 1_000, provider: provider) }
let controller = StatusItemController(store: store, settings: settings, pricing: PricingTableModel(costService: service))
controller.debugBeginPresentation()
defer { controller.debugEndPresentation() }
RunLoopDrain.run()
try AppCheck.require(controller.debugPresentedCardTab == .codex, "the card did not open on Codex")
// `$menuBarProvider` publishes before the setting changes; the card must follow the
// published provider without waiting for another update.
controller.debugSelectTab(.claude)
try AppCheck.require(controller.debugPresentedCardTab == .claude,
"the card kept the Codex tab after Claude was clicked")
controller.debugSelectTab(.pi)
controller.debugSelectTab(.codex)
try AppCheck.require(controller.debugPresentedCardTab == .codex,
"returning from Pi left the card on the wrong tab")
}
await AppCheck.run("menu creation is deferred and closed cards stay idle") {
let defaults = EphemeralDefaults.make(Self.suite)
defer { EphemeralDefaults.clear(Self.suite) }
Expand Down
Loading