Refines plan naming for account section

Author: eamodio

README.md

@@ -279,7 +279,7 @@ Use the `Generate Commit Message` command from the Source Control view's context
 
 # Ready for GitLens Pro?
 
-When you're ready to unlock the full potential of GitLens and our [DevEx platform](https://gitkraken.com/devex?utm_source=gitlens-extension&utm_medium=in-app-links) and enjoy all the benefits on your privately-hosted repos, consider upgrading to GitLens Pro. With GitLens Pro, you'll gain access to [Pro features](https://gitkraken.com/gitlens/pro-features?utm_source=gitlens-extension&utm_medium=in-app-links) on privately-hosted repos.
+When you're ready to unlock the full potential of GitLens and the [GitKrakenDevEx platform](https://gitkraken.com/devex?utm_source=gitlens-extension&utm_medium=in-app-links) and enjoy all the benefits on your privately-hosted repos, consider upgrading to GitLens Pro. With GitLens Pro, you'll gain access to [Pro features](https://gitkraken.com/gitlens/pro-features?utm_source=gitlens-extension&utm_medium=in-app-links) on privately-hosted repos.
 
 To learn more about the pricing and the additional features offered with GitLens Pro, visit the [GitLens Pricing page](https://www.gitkraken.com/gitlens/pricing?utm_source=gitlens-extension&utm_medium=in-app-links). Upgrade to GitLens Pro today and take your Git workflow to the next level!
 

src/constants.subscription.ts

@@ -1,30 +1,33 @@
+export const proPreviewLengthInDays = 3;
+export const proTrialLengthInDays = 7;
+
 export type PromoKeys = 'launchpad' | 'launchpad-extended' | 'pro50';
 
 export const enum SubscriptionPlanId {
-	Free = 'free',
-	FreePlus = 'free+',
+	Community = 'community',
+	CommunityWithAccount = 'community-with-account',
 	Pro = 'pro',
 	Teams = 'teams',
 	Enterprise = 'enterprise',
 }
 
-// NOTE: Pay attention to gitlens:plus:state in package.json when modifying this enum
+// NOTE: Pay attention to gitlens:plus:state in the `package.json` when modifying this enum
 // NOTE: This is reported in telemetry so we should NOT change the values
 export const enum SubscriptionState {
 	/** Indicates a user who hasn't verified their email address yet */
 	VerificationRequired = -1,
-	/** Indicates a Free user who hasn't yet started the preview trial */
-	Free = 0,
-	/** Indicates a Free user who is in preview trial */
-	FreeInPreviewTrial = 1,
-	/** Indicates a Free user who's preview has expired trial */
-	FreePreviewTrialExpired = 2,
-	/** Indicates a Free+ user with a completed trial */
-	FreePlusInTrial = 3,
-	/** Indicates a Free+ user who's trial has expired and is not yet eligible for reactivation */
-	FreePlusTrialExpired = 4,
-	/** Indicated a Free+ user who's trial has expired and is eligible for reactivation */
-	FreePlusTrialReactivationEligible = 5,
-	/** Indicates a Paid user */
+	/** Indicates an account-less Community (free) user who hasn't started a Pro preview */
+	Community = 0,
+	/** Indicates an account-less Community (free) user who is in a Pro preview */
+	ProPreview = 1,
+	/** Indicates an account-less Community (free) user who's Pro preview has expired */
+	ProPreviewExpired = 2,
+	/** Indicates a Pro user who is in a Pro trial */
+	ProTrial = 3,
+	/** Indicates a Pro user who's Pro trial has expired, has an account, and is not yet eligible for reactivation */
+	ProTrialExpired = 4,
+	/** Indicated a Pro user who's Pro trial has expired, has an account, and is eligible for reactivation */
+	ProTrialReactivationEligible = 5,
+	/** Indicates a Pro/Teams/Enterprise paid user */
 	Paid = 6,
 }

src/plus/gk/account/__debug__accountDebug.ts

@@ -1,7 +1,7 @@
 import type { Disposable } from 'vscode';
 import { ThemeIcon, window } from 'vscode';
 import { Commands } from '../../../constants.commands';
-import { SubscriptionPlanId, SubscriptionState } from '../../../constants.subscription';
+import { proTrialLengthInDays, SubscriptionPlanId, SubscriptionState } from '../../../constants.subscription';
 import type { Container } from '../../../container';
 import type { QuickPickItemOfT } from '../../../quickpicks/items/common';
 import { createQuickPickSeparator } from '../../../quickpicks/items/common';
@@ -28,13 +28,13 @@ export function registerAccountDebug(container: Container, service: Subscription
 type SimulateQuickPickItem = QuickPickItemOfT<
 	| { state: null; reactivatedTrial?: never; expiredPaid?: never; planId?: never }
 	| {
-			state: Exclude<SubscriptionState, SubscriptionState.FreePlusInTrial | SubscriptionState.Paid>;
+			state: Exclude<SubscriptionState, SubscriptionState.ProTrial | SubscriptionState.Paid>;
 			reactivatedTrial?: never;
 			expiredPaid?: never;
 			planId?: never;
 	  }
 	| {
-			state: SubscriptionState.FreePlusInTrial;
+			state: SubscriptionState.ProTrial;
 			reactivatedTrial?: boolean;
 			expiredPaid?: never;
 			planId?: never;
@@ -69,20 +69,20 @@ class AccountDebug {
 					label: 'Community',
 					description: 'Community, no account',
 					iconPath: new ThemeIcon('blank'),
-					item: { state: SubscriptionState.Free },
+					item: { state: SubscriptionState.Community },
 				},
 				createQuickPickSeparator('Preview'),
 				{
 					label: 'Pro Preview',
 					description: 'Pro, no account',
 					iconPath: new ThemeIcon('blank'),
-					item: { state: SubscriptionState.FreeInPreviewTrial },
+					item: { state: SubscriptionState.ProPreview },
 				},
 				{
 					label: 'Pro Preview (Expired)',
 					description: 'Community, no account',
 					iconPath: new ThemeIcon('blank'),
-					item: { state: SubscriptionState.FreePreviewTrialExpired },
+					item: { state: SubscriptionState.ProPreviewExpired },
 				},
 				createQuickPickSeparator('Account'),
 				{
@@ -96,28 +96,28 @@ class AccountDebug {
 					label: 'Pro Trial',
 					description: 'Pro, account',
 					iconPath: new ThemeIcon('blank'),
-					item: { state: SubscriptionState.FreePlusInTrial },
+					item: { state: SubscriptionState.ProTrial },
 				},
 				{
 					label: 'Pro Trial (Reactivated)',
 					description: 'Pro, account',
 					iconPath: new ThemeIcon('blank'),
 					item: {
-						state: SubscriptionState.FreePlusInTrial,
+						state: SubscriptionState.ProTrial,
 						reactivatedTrial: true,
 					},
 				},
 				{
 					label: 'Pro Trial (Expired)',
 					description: 'Community, account',
 					iconPath: new ThemeIcon('blank'),
-					item: { state: SubscriptionState.FreePlusTrialExpired },
+					item: { state: SubscriptionState.ProTrialExpired },
 				},
 				{
 					label: 'Pro Trial (Reactivation Eligible)',
 					description: 'Community, account',
 					iconPath: new ThemeIcon('blank'),
-					item: { state: SubscriptionState.FreePlusTrialReactivationEligible },
+					item: { state: SubscriptionState.ProTrialReactivationEligible },
 				},
 				createQuickPickSeparator('Paid'),
 				{
@@ -229,15 +229,15 @@ class AccountDebug {
 		const { state, reactivatedTrial, expiredPaid, planId } = item;
 
 		switch (state) {
-			case SubscriptionState.Free:
-			case SubscriptionState.FreeInPreviewTrial:
-			case SubscriptionState.FreePreviewTrialExpired:
+			case SubscriptionState.Community:
+			case SubscriptionState.ProPreview:
+			case SubscriptionState.ProPreviewExpired:
 				this.service.overrideSession(null);
 
 				this.service.changeSubscription(
-					state === SubscriptionState.Free
+					state === SubscriptionState.Community
 						? undefined
-						: getPreviewSubscription(state === SubscriptionState.FreePreviewTrialExpired ? 0 : 3),
+						: getPreviewSubscription(state === SubscriptionState.ProPreviewExpired ? 0 : 3),
 					{ store: false },
 				);
 				return false;
@@ -329,7 +329,7 @@ function getSimulatedTrialLicenseResponse(
 	organizationId?: string,
 	type: GKLicenseType = 'gitkraken_v1-pro',
 	status: 'active-new' | 'active-reactivated' | 'expired' | 'expired-reactivatable' = 'active-new',
-	durationDays: number = 7,
+	durationDays: number = proTrialLengthInDays,
 ): GKLicenses {
 	const tenSeconds = 10 * 1000;
 	const oneDay = 24 * 60 * 60 * 1000;
@@ -380,20 +380,20 @@ function getSimulatedCheckInResponse(
 			: {};
 	let trialLicenseStatus: 'active-new' | 'active-reactivated' | 'expired' | 'expired-reactivatable' = 'active-new';
 	switch (targetSubscriptionState) {
-		case SubscriptionState.FreePlusTrialExpired:
+		case SubscriptionState.ProTrialExpired:
 			trialLicenseStatus = 'expired';
 			break;
-		case SubscriptionState.FreePlusTrialReactivationEligible:
+		case SubscriptionState.ProTrialReactivationEligible:
 			trialLicenseStatus = 'expired-reactivatable';
 			break;
-		case SubscriptionState.FreePlusInTrial:
+		case SubscriptionState.ProTrial:
 			trialLicenseStatus = options?.trial?.reactivatedTrial ? 'active-reactivated' : 'active-new';
 			break;
 	}
 	const trialLicenseData =
-		targetSubscriptionState === SubscriptionState.FreePlusInTrial ||
-		targetSubscriptionState === SubscriptionState.FreePlusTrialExpired ||
-		targetSubscriptionState === SubscriptionState.FreePlusTrialReactivationEligible
+		targetSubscriptionState === SubscriptionState.ProTrial ||
+		targetSubscriptionState === SubscriptionState.ProTrialExpired ||
+		targetSubscriptionState === SubscriptionState.ProTrialReactivationEligible
 			? getSimulatedTrialLicenseResponse(
 					options?.organizationId,
 					targetSubscriptionType,
@@ -408,7 +408,7 @@ function getSimulatedCheckInResponse(
 			effectiveLicenses: trialLicenseData,
 		},
 		nextOptInDate:
-			targetSubscriptionState === SubscriptionState.FreePlusTrialReactivationEligible
+			targetSubscriptionState === SubscriptionState.ProTrialReactivationEligible
 				? tenSecondsAgo.toISOString()
 				: undefined,
 	};

src/plus/gk/account/authenticationConnection.ts

@@ -169,7 +169,7 @@ export class AuthenticationConnection implements Disposable {
 					input.onDidAccept(() => resolve(input.value)),
 				);
 
-				input.title = 'GitKraken Sign In';
+				input.title = 'GitLens Sign In';
 				input.placeholder = 'Please enter the provided authorization code';
 				input.prompt = 'If the auto-redirect fails, paste the authorization code';
 
@@ -239,7 +239,7 @@ export class AuthenticationConnection implements Disposable {
 	private updateStatusBarItem(signingIn?: boolean) {
 		if (signingIn && this._statusBarItem == null) {
 			this._statusBarItem = window.createStatusBarItem('gitlens.plus.signIn', StatusBarAlignment.Left);
-			this._statusBarItem.name = 'GitKraken Sign in';
+			this._statusBarItem.name = 'GitLens Sign in';
 			this._statusBarItem.text = 'Signing in to GitKraken...';
 			this._statusBarItem.show();
 		}

src/plus/gk/account/promos.ts

@@ -18,12 +18,12 @@ const promos: Promo[] = [
 		key: 'launchpad',
 		code: 'GLLAUNCHPAD24',
 		states: [
-			SubscriptionState.Free,
-			SubscriptionState.FreeInPreviewTrial,
-			SubscriptionState.FreePreviewTrialExpired,
-			SubscriptionState.FreePlusInTrial,
-			SubscriptionState.FreePlusTrialExpired,
-			SubscriptionState.FreePlusTrialReactivationEligible,
+			SubscriptionState.Community,
+			SubscriptionState.ProPreview,
+			SubscriptionState.ProPreviewExpired,
+			SubscriptionState.ProTrial,
+			SubscriptionState.ProTrialExpired,
+			SubscriptionState.ProTrialReactivationEligible,
 		],
 		expiresOn: new Date('2024-09-27T06:59:00.000Z').getTime(),
 		commandTooltip: 'Launchpad Sale: Save 75% or more on GitLens Pro',
@@ -32,12 +32,12 @@ const promos: Promo[] = [
 		key: 'launchpad-extended',
 		code: 'GLLAUNCHPAD24',
 		states: [
-			SubscriptionState.Free,
-			SubscriptionState.FreeInPreviewTrial,
-			SubscriptionState.FreePreviewTrialExpired,
-			SubscriptionState.FreePlusInTrial,
-			SubscriptionState.FreePlusTrialExpired,
-			SubscriptionState.FreePlusTrialReactivationEligible,
+			SubscriptionState.Community,
+			SubscriptionState.ProPreview,
+			SubscriptionState.ProPreviewExpired,
+			SubscriptionState.ProTrial,
+			SubscriptionState.ProTrialExpired,
+			SubscriptionState.ProTrialReactivationEligible,
 		],
 		startsOn: new Date('2024-09-27T06:59:00.000Z').getTime(),
 		expiresOn: new Date('2024-10-14T06:59:00.000Z').getTime(),
@@ -46,12 +46,12 @@ const promos: Promo[] = [
 	{
 		key: 'pro50',
 		states: [
-			SubscriptionState.Free,
-			SubscriptionState.FreeInPreviewTrial,
-			SubscriptionState.FreePreviewTrialExpired,
-			SubscriptionState.FreePlusInTrial,
-			SubscriptionState.FreePlusTrialExpired,
-			SubscriptionState.FreePlusTrialReactivationEligible,
+			SubscriptionState.Community,
+			SubscriptionState.ProPreview,
+			SubscriptionState.ProPreviewExpired,
+			SubscriptionState.ProTrial,
+			SubscriptionState.ProTrialExpired,
+			SubscriptionState.ProTrialReactivationEligible,
 		],
 		commandTooltip: 'Limited-Time Sale: Save 33% or more on your 1st seat of Pro. See your special price',
 	},