Changes launchpad view refresh cmd to refresh data

Refreshes launchpad view when data is refreshed
Gates launchpad provider to avoid overlapping calls
Avoids extra refresh on indicator startup if already refreshed

Author: eamodio

src/plus/focus/focusIndicator.ts

@@ -27,6 +27,7 @@ export class FocusIndicator implements Disposable {
 	private _categorizedItems: FocusItem[] | undefined;
 	/** Tracks if this is the first state after startup */
 	private _firstStateAfterStartup: boolean = true;
+	private _hasRefreshed: boolean = false;
 	private _lastDataUpdate: Date | undefined;
 	private _lastRefreshPaused: Date | undefined;
 	private _refreshTimer: ReturnType<typeof setInterval> | undefined;
@@ -119,6 +120,7 @@ export class FocusIndicator implements Disposable {
 	}
 
 	private onFocusRefreshed(e: FocusRefreshEvent) {
+		this._hasRefreshed = true;
 		if (!this.pollingEnabled) {
 			this.updateStatusBarState('idle');
 
@@ -211,7 +213,12 @@ export class FocusIndicator implements Disposable {
 				// If we are loading at startup, wait to give vscode time to settle before querying
 				if (starting) {
 					// Using a wait here, instead using the `startDelay` to avoid case where the timer could be cancelled if the user focused a different windows before the timer fires (because we will cancel the timer)
-					void wait(5000).then(() => this.provider.getCategorizedItems({ force: true }));
+					void wait(5000).then(() => {
+						// If something else has already caused a refresh, don't do another one
+						if (this._hasRefreshed) return;
+
+						void this.provider.getCategorizedItems({ force: true });
+					});
 				} else {
 					void this.provider.getCategorizedItems({ force: true });
 				}

src/plus/focus/focusProvider.ts

@@ -21,6 +21,7 @@ import type { CodeSuggestionCounts, Draft } from '../../gk/models/drafts';
 import { executeCommand, registerCommand } from '../../system/command';
 import { configuration } from '../../system/configuration';
 import { setContext } from '../../system/context';
+import { gate } from '../../system/decorators/gate';
 import { debug, log } from '../../system/decorators/log';
 import { filterMap, groupByMap, map, some } from '../../system/iterable';
 import { Logger } from '../../system/logger';
@@ -630,13 +631,16 @@ export class FocusProvider implements Disposable {
 		return repoRemotes;
 	}
 
+	@gate<FocusProvider['getCategorizedItems']>(o => `${o?.force ?? false}`)
 	@log<FocusProvider['getCategorizedItems']>({ args: { 0: o => `force=${o?.force}`, 1: false } })
 	async getCategorizedItems(
 		options?: { force?: boolean },
 		cancellation?: CancellationToken,
 	): Promise<FocusCategorizedResult> {
 		const scope = getLogScope();
 
+		const fireRefresh = options?.force || this._prs == null;
+
 		const ignoredRepositories = new Set(
 			(configuration.get('launchpad.ignoredRepositories') ?? []).map(r => r.toLowerCase()),
 		);
@@ -812,10 +816,8 @@ export class FocusProvider implements Disposable {
 			return result;
 		} finally {
 			this.updateGroupedIds(result?.items ?? []);
-			if (result != null) {
+			if (result != null && fireRefresh) {
 				this._onDidRefresh.fire(result);
-			} else {
-				debugger;
 			}
 		}
 	}

src/views/launchpadView.ts

@@ -184,8 +184,8 @@ export class LaunchpadView extends ViewBase<'launchpad', LaunchpadViewNode, Laun
 	protected override onVisibilityChanged(e: TreeViewVisibilityChangeEvent): void {
 		if (this._disposable == null) {
 			this._disposable = Disposable.from(
-				this.container.subscription.onDidChange(() => this.refresh(true), this),
-				this.container.integrations.onDidChangeConnectionState(() => this.refresh(true), this),
+				this.container.integrations.onDidChangeConnectionState(() => this.refresh(), this),
+				this.container.focus.onDidRefresh(() => this.refresh(), this),
 			);
 		}
 
@@ -237,7 +237,14 @@ export class LaunchpadView extends ViewBase<'launchpad', LaunchpadViewNode, Laun
 				() => executeCommand(Commands.ViewsCopy, this.activeSelection, this.selection),
 				this,
 			),
-			registerViewCommand(this.getQualifiedCommand('refresh'), () => this.refresh(true), this),
+			registerViewCommand(
+				this.getQualifiedCommand('refresh'),
+				() =>
+					window.withProgress({ location: { viewId: this.id } }, () =>
+						this.container.focus.getCategorizedItems({ force: true }),
+					),
+				this,
+			),
 			registerViewCommand(
 				this.getQualifiedCommand('setFilesLayoutToAuto'),
 				() => this.setFilesLayout('auto'),