Cleans up launchpad refs

- Updates references to new launchpad in code/files/folders  from focus -> launchpad
- Cleans out unused commented code
- Removes onWebviewPanel of focus from activation events

Author: axosoft-ramint

package.json

@@ -50,7 +50,6 @@
 	"activationEvents": [
 		"onAuthenticationRequest:gitlens-gitkraken",
 		"onFileSystem:gitlens",
-		"onWebviewPanel:gitlens.focus",
 		"onWebviewPanel:gitlens.graph",
 		"onWebviewPanel:gitlens.patchDetails",
 		"onWebviewPanel:gitlens.settings",

src/commands/gitCommands.ts

@@ -2,7 +2,7 @@ import type { Disposable, InputBox, QuickInputButton, QuickPick, QuickPickItem }
 import { InputBoxValidationSeverity, QuickInputButtons, window } from 'vscode';
 import { Commands } from '../constants.commands';
 import { Container } from '../container';
-import type { FocusCommandArgs } from '../plus/focus/focus';
+import type { LaunchpadCommandArgs } from '../plus/launchpad/launchpad';
 import { Directive, isDirective, isDirectiveQuickPickItem } from '../quickpicks/items/directive';
 import { command } from '../system/command';
 import { configuration } from '../system/configuration';
@@ -64,7 +64,7 @@ export type GitCommandsCommandArgs =
 	| SwitchGitCommandArgs
 	| TagGitCommandArgs
 	| WorktreeGitCommandArgs
-	| FocusCommandArgs;
+	| LaunchpadCommandArgs;
 
 export type GitCommandsCommandArgsWithCompletion = GitCommandsCommandArgs & { completion?: Deferred<void> };
 
@@ -217,7 +217,7 @@ export class GitCommandsCommand extends Command {
 				};
 				break;
 			case Commands.ShowLaunchpad:
-				args = { command: 'focus', ...args };
+				args = { command: 'launchpad', ...args };
 				break;
 		}
 

src/commands/gitCommands.utils.ts

@@ -1,6 +1,6 @@
 import type { StoredRecentUsage } from '../constants.storage';
 import type { Container } from '../container';
-import { FocusCommand } from '../plus/focus/focus';
+import { LaunchpadCommand } from '../plus/launchpad/launchpad';
 import { configuration } from '../system/configuration';
 import { getContext } from '../system/context';
 import { BranchGitCommand } from './git/branch';
@@ -108,8 +108,8 @@ export class PickCommandStep implements QuickPickStep<QuickCommand> {
 		}
 
 		this.hiddenItems = [];
-		if (args?.command === 'focus') {
-			this.hiddenItems.push(new FocusCommand(container, args));
+		if (args?.command === 'launchpad') {
+			this.hiddenItems.push(new LaunchpadCommand(container, args));
 		}
 	}
 

src/commands/quickCommand.steps.ts

@@ -43,9 +43,9 @@ import { sortTags } from '../git/models/tag';
 import type { GitWorktree, WorktreeQuickPickItem } from '../git/models/worktree';
 import { createWorktreeQuickPickItem, getWorktreesByBranch, sortWorktrees } from '../git/models/worktree';
 import { remoteUrlRegex } from '../git/parsers/remoteParser';
-import type { FocusCommandArgs } from '../plus/focus/focus';
 import { getApplicablePromo } from '../plus/gk/account/promos';
 import { isSubscriptionPaidPlan, isSubscriptionPreviewTrialExpired } from '../plus/gk/account/subscription';
+import type { LaunchpadCommandArgs } from '../plus/launchpad/launchpad';
 import {
 	CommitApplyFileChangesCommandQuickPickItem,
 	CommitBrowseRepositoryFromHereCommandQuickPickItem,
@@ -981,7 +981,7 @@ export function* pickBranchOrTagStepMultiRepo<
 		label: 'Choose a Pull Request...',
 		iconPath: new ThemeIcon('git-pull-request'),
 		alwaysShow: true,
-		item: createCrossCommandReference<Partial<FocusCommandArgs>>(Commands.ShowLaunchpad, {
+		item: createCrossCommandReference<Partial<LaunchpadCommandArgs>>(Commands.ShowLaunchpad, {
 			source: 'git-commands',
 		}),
 	};
@@ -2665,7 +2665,7 @@ export async function* ensureAccessStep<
 	}
 
 	switch (feature) {
-		case PlusFeatures.Focus:
+		case PlusFeatures.Launchpad:
 			directives.splice(
 				0,
 				0,

src/constants.storage.ts

@@ -68,7 +68,7 @@ export type GlobalStorage = {
 	'views:welcome:visible': boolean;
 	'confirm:draft:storage': boolean;
 	'home:sections:collapsed': string[];
-	'launchpad:groups:collapsed': StoredFocusGroup[];
+	'launchpad:groups:collapsed': StoredLaunchpadGroup[];
 	'launchpad:indicator:hasLoaded': boolean;
 	'launchpad:indicator:hasInteracted': string;
 } & { [key in `confirm:ai:tos:${AIProviders}`]: boolean } & {
@@ -287,7 +287,7 @@ export type StoredSearchAndCompareItems = Record<string, StoredSearchAndCompareI
 export type StoredStarred = Record<string, boolean>;
 export type StoredRecentUsage = Record<string, number>;
 
-export type StoredFocusGroup =
+export type StoredLaunchpadGroup =
 	| 'current-branch'
 	| 'pinned'
 	| 'mergeable'

src/container.ts

@@ -20,9 +20,6 @@ import { GitProviderService } from './git/gitProviderService';
 import { LineHoverController } from './hovers/lineHoverController';
 import type { RepositoryPathMappingProvider } from './pathMapping/repositoryPathMappingProvider';
 import { DraftService } from './plus/drafts/draftsService';
-import { EnrichmentService } from './plus/focus/enrichmentService';
-import { FocusIndicator } from './plus/focus/focusIndicator';
-import { FocusProvider } from './plus/focus/focusProvider';
 import { AccountAuthenticationProvider } from './plus/gk/account/authenticationProvider';
 import { OrganizationService } from './plus/gk/account/organizationService';
 import { SubscriptionService } from './plus/gk/account/subscriptionService';
@@ -32,6 +29,9 @@ import { IntegrationAuthenticationService } from './plus/integrations/authentica
 import { IntegrationService } from './plus/integrations/integrationService';
 import type { GitHubApi } from './plus/integrations/providers/github/github';
 import type { GitLabApi } from './plus/integrations/providers/gitlab/gitlab';
+import { EnrichmentService } from './plus/launchpad/enrichmentService';
+import { LaunchpadIndicator } from './plus/launchpad/launchpadIndicator';
+import { LaunchpadProvider } from './plus/launchpad/launchpadProvider';
 import { RepositoryIdentityService } from './plus/repos/repositoryIdentityService';
 import { registerAccountWebviewView } from './plus/webviews/account/registration';
 import type { GraphWebviewShowingArgs } from './plus/webviews/graph/registration';
@@ -193,7 +193,7 @@ export class Container {
 	private _disposables: Disposable[];
 	private _terminalLinks: GitTerminalLinkProvider | undefined;
 	private _webviews: WebviewsController;
-	private _focusIndicator: FocusIndicator | undefined;
+	private _launchpadIndicator: LaunchpadIndicator | undefined;
 
 	private constructor(
 		context: ExtensionContext,
@@ -234,7 +234,7 @@ export class Container {
 		this._disposables.push((this._keyboard = new Keyboard()));
 		this._disposables.push((this._vsls = new VslsController(this)));
 		this._disposables.push((this._eventBus = new EventBus()));
-		this._disposables.push((this._focusProvider = new FocusProvider(this)));
+		this._disposables.push((this._launchpadProvider = new LaunchpadProvider(this)));
 
 		this._disposables.push((this._fileAnnotationController = new FileAnnotationController(this)));
 		this._disposables.push((this._lineAnnotationController = new LineAnnotationController(this)));
@@ -295,7 +295,7 @@ export class Container {
 		this._disposables.push((this._accountView = registerAccountWebviewView(this._webviews)));
 
 		if (configuration.get('launchpad.indicator.enabled')) {
-			this._disposables.push((this._focusIndicator = new FocusIndicator(this, this._focusProvider)));
+			this._disposables.push((this._launchpadIndicator = new LaunchpadIndicator(this, this._launchpadProvider)));
 		}
 
 		if (configuration.get('terminalLinks.enabled')) {
@@ -313,13 +313,15 @@ export class Container {
 				}
 
 				if (configuration.changed(e, 'launchpad.indicator.enabled')) {
-					this._focusIndicator?.dispose();
-					this._focusIndicator = undefined;
+					this._launchpadIndicator?.dispose();
+					this._launchpadIndicator = undefined;
 
 					this.telemetry.sendEvent('launchpad/indicator/hidden');
 
 					if (configuration.get('launchpad.indicator.enabled')) {
-						this._disposables.push((this._focusIndicator = new FocusIndicator(this, this._focusProvider)));
+						this._disposables.push(
+							(this._launchpadIndicator = new LaunchpadIndicator(this, this._launchpadProvider)),
+						);
 					}
 				}
 			}),
@@ -558,9 +560,9 @@ export class Container {
 		return this._fileHistoryView;
 	}
 
-	private readonly _focusProvider: FocusProvider;
-	get focus(): FocusProvider {
-		return this._focusProvider;
+	private readonly _launchpadProvider: LaunchpadProvider;
+	get launchpad(): LaunchpadProvider {
+		return this._launchpadProvider;
 	}
 
 	private readonly _git: GitProviderService;

src/features.ts

@@ -37,5 +37,5 @@ export const enum PlusFeatures {
 	Timeline = 'timeline',
 	Worktrees = 'worktrees',
 	Graph = 'graph',
-	Focus = 'focus',
+	Launchpad = 'launchpad',
 }

src/git/gitProviderService.ts

@@ -748,7 +748,7 @@ export class GitProviderService implements Disposable {
 			return { allowed: subscription.account?.verified !== false, subscription: { current: subscription } };
 		}
 
-		if (feature === 'focus') {
+		if (feature === 'launchpad') {
 			// If our launchpad graduation promo is active allow access for everyone
 			if (getApplicablePromo(subscription.state, 'launchpad')) {
 				return { allowed: true, subscription: { current: subscription } };

src/plus/drafts/draftsService.ts

@@ -43,13 +43,13 @@ import { Logger } from '../../system/logger';
 import type { LogScope } from '../../system/logger.scope';
 import { getLogScope } from '../../system/logger.scope';
 import { getSettledValue } from '../../system/promise';
-import type { FocusItem } from '../focus/focusProvider';
 import type { OrganizationMember } from '../gk/account/organization';
 import type { SubscriptionAccount } from '../gk/account/subscription';
 import type { ServerConnection } from '../gk/serverConnection';
 import type { IntegrationId } from '../integrations/providers/models';
 import { providersMetadata } from '../integrations/providers/models';
 import { getEntityIdentifierInput } from '../integrations/providers/utils';
+import type { LaunchpadItem } from '../launchpad/launchpadProvider';
 
 export interface ProviderAuth {
 	provider: IntegrationId;
@@ -820,13 +820,13 @@ export class DraftService implements Disposable {
 		options?: { includeArchived?: boolean },
 	): Promise<Draft[]>;
 	async getCodeSuggestions(
-		focusItem: FocusItem,
+		launchpadItem: LaunchpadItem,
 		integrationId: IntegrationId,
 		options?: { includeArchived?: boolean },
 	): Promise<Draft[]>;
 	@log<DraftService['getCodeSuggestions']>({ args: { 0: i => i.id, 1: r => (isRepository(r) ? r.id : r) } })
 	async getCodeSuggestions(
-		item: PullRequest | FocusItem,
+		item: PullRequest | LaunchpadItem,
 		repositoryOrIntegrationId: Repository | IntegrationId,
 		options?: { includeArchived?: boolean },
 	): Promise<Draft[]> {

src/plus/gk/account/subscriptionService.ts

@@ -1577,7 +1577,6 @@ function getTrackingContextFromSource(source: Source | undefined): TrackingConte
 				switch (source.detail.action) {
 					case 'worktree':
 						return 'worktrees';
-					case 'focus':
 					case 'launchpad':
 						return 'launchpad';
 				}