Removes deprecated preview trial

Author: eamodio

contributions.json

@@ -3489,10 +3489,6 @@
 			"label": "Simulate Subscription (Debugging)",
 			"commandPalette": "gitlens:enabled && gitlens:debugging"
 		},
-		"gitlens.plus.startPreviewTrial": {
-			"label": "Preview Pro",
-			"commandPalette": "false && !gitlens:plus"
-		},
 		"gitlens.plus.upgrade": {
 			"label": "Upgrade to Pro...",
 			"commandPalette": true
@@ -13994,13 +13990,9 @@
 					"contents": "[Resend Verification Email](command:gitlens.plus.resendVerification?%7B%22source%22%3A%22launchpad-view%22%7D)\n\nYou must verify your email before you can continue or [recheck Status](command:gitlens.plus.validate?%7B%22source%22%3A%22launchpad-view%22%7D).",
 					"when": "gitlens:launchpad:connected && gitlens:plus:state == -1"
 				},
-				{
-					"contents": "[Continue](command:gitlens.plus.startPreviewTrial?%7B%22source%22%3A%22launchpad-view%22%7D)\n\nContinuing gives you 3 days to preview Launchpad and other local Pro features for 3 days. [Start 14-day Pro trial](command:gitlens.plus.signUp?%7B%22source%22%3A%22launchpad-view%22%7D) or [sign in](command:gitlens.plus.login?%7B%22source%22%3A%22launchpad-view%22%7D) for full access to Pro features.",
-					"when": "false && gitlens:launchpad:connected && gitlens:plus:state == 0"
-				},
 				{
 					"contents": "[Try GitLens Pro](command:gitlens.plus.signUp?%7B%22source%22%3A%22launchpad-view%22%7D)\n\nGet 14 days of GitLens Pro for free — no credit card required. Or [sign in](command:gitlens.plus.login?%7B%22source%22%3A%22launchpad-view%22%7D).",
-					"when": "gitlens:launchpad:connected && (gitlens:plus:state == 0 || gitlens:plus:state == 2)"
+					"when": "gitlens:launchpad:connected && gitlens:plus:state == 0"
 				},
 				{
 					"contents": "[Upgrade to Pro](command:gitlens.plus.upgrade?%7B%22source%22%3A%22launchpad-view%22%7D)",
@@ -14101,13 +14093,9 @@
 					"contents": "[Resend Verification Email](command:gitlens.plus.resendVerification?%7B%22source%22%3A%22launchpad-view%22%7D)\n\nYou must verify your email before you can continue or [recheck Status](command:gitlens.plus.validate?%7B%22source%22%3A%22launchpad-view%22%7D).",
 					"when": "gitlens:views:scm:grouped:view == launchpad && gitlens:launchpad:connected && gitlens:plus:state == -1"
 				},
-				{
-					"contents": "[Continue](command:gitlens.plus.startPreviewTrial?%7B%22source%22%3A%22launchpad-view%22%7D)\n\nContinuing gives you 3 days to preview Launchpad and other local Pro features for 3 days. [Start 14-day Pro trial](command:gitlens.plus.signUp?%7B%22source%22%3A%22launchpad-view%22%7D) or [sign in](command:gitlens.plus.login?%7B%22source%22%3A%22launchpad-view%22%7D) for full access to Pro features.",
-					"when": "gitlens:views:scm:grouped:view == launchpad && false && gitlens:launchpad:connected && gitlens:plus:state == 0"
-				},
 				{
 					"contents": "[Try GitLens Pro](command:gitlens.plus.signUp?%7B%22source%22%3A%22launchpad-view%22%7D)\n\nGet 14 days of GitLens Pro for free — no credit card required. Or [sign in](command:gitlens.plus.login?%7B%22source%22%3A%22launchpad-view%22%7D).",
-					"when": "gitlens:views:scm:grouped:view == launchpad && gitlens:launchpad:connected && (gitlens:plus:state == 0 || gitlens:plus:state == 2)"
+					"when": "gitlens:views:scm:grouped:view == launchpad && gitlens:launchpad:connected && gitlens:plus:state == 0"
 				},
 				{
 					"contents": "[Upgrade to Pro](command:gitlens.plus.upgrade?%7B%22source%22%3A%22launchpad-view%22%7D)",
@@ -14153,13 +14141,9 @@
 					"contents": "[Resend Verification Email](command:gitlens.plus.resendVerification?%7B%22source%22%3A%22worktrees%22%7D)\n\nYou must verify your email before you can continue or [recheck Status](command:gitlens.plus.validate?%7B%22source%22%3A%22worktrees%22%7D).",
 					"when": "gitlens:views:scm:grouped:view == worktrees && gitlens:plus:state == -1"
 				},
-				{
-					"contents": "[Continue](command:gitlens.plus.startPreviewTrial?%7B%22source%22%3A%22worktrees%22%7D)\n\nContinuing gives you 3 days to preview Worktrees and other local Pro features for 3 days. [Start 14-day Pro trial](command:gitlens.plus.signUp?%7B%22source%22%3A%22worktrees%22%7D) or [sign in](command:gitlens.plus.login?%7B%22source%22%3A%22worktrees%22%7D) for full access to Pro features.",
-					"when": "false && gitlens:views:scm:grouped:view == worktrees && gitlens:plus:required && gitlens:plus:state == 0"
-				},
 				{
 					"contents": "[Try GitLens Pro](command:gitlens.plus.signUp?%7B%22source%22%3A%22worktrees%22%7D)\n\nGet 14 days of GitLens Pro for free — no credit card required. Or [sign in](command:gitlens.plus.login?%7B%22source%22%3A%22worktrees%22%7D).",
-					"when": "gitlens:views:scm:grouped:view == worktrees && gitlens:plus:required && (gitlens:plus:state == 0 || gitlens:plus:state == 2)"
+					"when": "gitlens:views:scm:grouped:view == worktrees && gitlens:plus:required && gitlens:plus:state == 0"
 				},
 				{
 					"contents": "[Upgrade to Pro](command:gitlens.plus.upgrade?%7B%22source%22%3A%22worktrees%22%7D)",
@@ -14291,13 +14275,9 @@
 					"contents": "[Resend Verification Email](command:gitlens.plus.resendVerification?%7B%22source%22%3A%22worktrees%22%7D)\n\nYou must verify your email before you can continue or [recheck Status](command:gitlens.plus.validate?%7B%22source%22%3A%22worktrees%22%7D).",
 					"when": "gitlens:plus:state == -1"
 				},
-				{
-					"contents": "[Continue](command:gitlens.plus.startPreviewTrial?%7B%22source%22%3A%22worktrees%22%7D)\n\nContinuing gives you 3 days to preview Worktrees and other local Pro features for 3 days. [Start 14-day Pro trial](command:gitlens.plus.signUp?%7B%22source%22%3A%22worktrees%22%7D) or [sign in](command:gitlens.plus.login?%7B%22source%22%3A%22worktrees%22%7D) for full access to Pro features.",
-					"when": "false && gitlens:plus:required && gitlens:plus:state == 0"
-				},
 				{
 					"contents": "[Try GitLens Pro](command:gitlens.plus.signUp?%7B%22source%22%3A%22worktrees%22%7D)\n\nGet 14 days of GitLens Pro for free — no credit card required. Or [sign in](command:gitlens.plus.login?%7B%22source%22%3A%22worktrees%22%7D).",
-					"when": "gitlens:plus:required && (gitlens:plus:state == 0 || gitlens:plus:state == 2)"
+					"when": "gitlens:plus:required && gitlens:plus:state == 0"
 				},
 				{
 					"contents": "[Upgrade to Pro](command:gitlens.plus.upgrade?%7B%22source%22%3A%22worktrees%22%7D)",

docs/telemetry-events.md

@@ -67,14 +67,12 @@
   [`global.subscription.featurePreviews.graph.day.${number}.startedOn`]: string,
   'global.subscription.featurePreviews.graph.startedOn': string,
   'global.subscription.featurePreviews.graph.status': 'eligible' | 'active' | 'expired',
-  'global.subscription.previewTrial.expiresOn': string,
-  'global.subscription.previewTrial.startedOn': string,
   // Promo discount code associated with the upgrade
   'global.subscription.promo.code': string,
   // Promo key (identifier) associated with the upgrade
   'global.subscription.promo.key': string,
-  'global.subscription.state': -1 | 0 | 1 | 2 | 3 | 4 | 5 | 6,
-  'global.subscription.stateString': 'verification' | 'free' | 'preview' | 'preview-expired' | 'trial' | 'trial-expired' | 'trial-reactivation-eligible' | 'paid' | 'unknown',
+  'global.subscription.state': -1 | 0 | 3 | 4 | 5 | 6,
+  'global.subscription.stateString': 'verification' | 'free' | 'trial' | 'trial-expired' | 'trial-reactivation-eligible' | 'paid' | 'unknown',
   'global.upgrade': boolean,
   'global.upgradedFrom': string,
   'global.workspace.isTrusted': boolean
@@ -1918,14 +1916,12 @@ void
   [`subscription.featurePreviews.graph.day.${number}.startedOn`]: string,
   'subscription.featurePreviews.graph.startedOn': string,
   'subscription.featurePreviews.graph.status': 'eligible' | 'active' | 'expired',
-  'subscription.previewTrial.expiresOn': string,
-  'subscription.previewTrial.startedOn': string,
   // Promo discount code associated with the upgrade
   'subscription.promo.code': string,
   // Promo key (identifier) associated with the upgrade
   'subscription.promo.key': string,
-  'subscription.state': -1 | 0 | 1 | 2 | 3 | 4 | 5 | 6,
-  'subscription.stateString': 'verification' | 'free' | 'preview' | 'preview-expired' | 'trial' | 'trial-expired' | 'trial-reactivation-eligible' | 'paid' | 'unknown'
+  'subscription.state': -1 | 0 | 3 | 4 | 5 | 6,
+  'subscription.stateString': 'verification' | 'free' | 'trial' | 'trial-expired' | 'trial-reactivation-eligible' | 'paid' | 'unknown'
 }
 ```
 
@@ -2003,8 +1999,6 @@ or
   'previous.subscription.effective.organizationId': string,
   'previous.subscription.effective.startedOn': string,
   'previous.subscription.effective.trialReactivationCount': number,
-  'previous.subscription.previewTrial.expiresOn': string,
-  'previous.subscription.previewTrial.startedOn': string,
   'subscription.actual.bundle': boolean,
   'subscription.actual.cancelled': boolean,
   'subscription.actual.expiresOn': string,
@@ -2025,14 +2019,12 @@ or
   [`subscription.featurePreviews.graph.day.${number}.startedOn`]: string,
   'subscription.featurePreviews.graph.startedOn': string,
   'subscription.featurePreviews.graph.status': 'eligible' | 'active' | 'expired',
-  'subscription.previewTrial.expiresOn': string,
-  'subscription.previewTrial.startedOn': string,
   // Promo discount code associated with the upgrade
   'subscription.promo.code': string,
   // Promo key (identifier) associated with the upgrade
   'subscription.promo.key': string,
-  'subscription.state': -1 | 0 | 1 | 2 | 3 | 4 | 5 | 6,
-  'subscription.stateString': 'verification' | 'free' | 'preview' | 'preview-expired' | 'trial' | 'trial-expired' | 'trial-reactivation-eligible' | 'paid' | 'unknown'
+  'subscription.state': -1 | 0 | 3 | 4 | 5 | 6,
+  'subscription.stateString': 'verification' | 'free' | 'trial' | 'trial-expired' | 'trial-reactivation-eligible' | 'paid' | 'unknown'
 }
 ```
 

package.json

@@ -7485,11 +7485,6 @@
 				"title": "Simulate Subscription (Debugging)",
 				"category": "GitLens"
 			},
-			{
-				"command": "gitlens.plus.startPreviewTrial",
-				"title": "Preview Pro",
-				"category": "GitLens"
-			},
 			{
 				"command": "gitlens.plus.upgrade",
 				"title": "Upgrade to Pro...",
@@ -11576,10 +11571,6 @@
 					"command": "gitlens.plus.simulateSubscription",
 					"when": "gitlens:enabled && gitlens:debugging"
 				},
-				{
-					"command": "gitlens.plus.startPreviewTrial",
-					"when": "false && !gitlens:plus"
-				},
 				{
 					"command": "gitlens.pullRepositories",
 					"when": "gitlens:repos:withRemotes && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders"
@@ -21220,15 +21211,10 @@
 				"contents": "[Resend Verification Email](command:gitlens.plus.resendVerification?%7B%22source%22%3A%22launchpad-view%22%7D)\n\nYou must verify your email before you can continue or [recheck Status](command:gitlens.plus.validate?%7B%22source%22%3A%22launchpad-view%22%7D).",
 				"when": "gitlens:launchpad:connected && gitlens:plus:state == -1"
 			},
-			{
-				"view": "gitlens.views.launchpad",
-				"contents": "[Continue](command:gitlens.plus.startPreviewTrial?%7B%22source%22%3A%22launchpad-view%22%7D)\n\nContinuing gives you 3 days to preview Launchpad and other local Pro features for 3 days. [Start 14-day Pro trial](command:gitlens.plus.signUp?%7B%22source%22%3A%22launchpad-view%22%7D) or [sign in](command:gitlens.plus.login?%7B%22source%22%3A%22launchpad-view%22%7D) for full access to Pro features.",
-				"when": "false && gitlens:launchpad:connected && gitlens:plus:state == 0"
-			},
 			{
 				"view": "gitlens.views.launchpad",
 				"contents": "[Try GitLens Pro](command:gitlens.plus.signUp?%7B%22source%22%3A%22launchpad-view%22%7D)\n\nGet 14 days of GitLens Pro for free — no credit card required. Or [sign in](command:gitlens.plus.login?%7B%22source%22%3A%22launchpad-view%22%7D).",
-				"when": "gitlens:launchpad:connected && (gitlens:plus:state == 0 || gitlens:plus:state == 2)"
+				"when": "gitlens:launchpad:connected && gitlens:plus:state == 0"
 			},
 			{
 				"view": "gitlens.views.launchpad",
@@ -21280,15 +21266,10 @@
 				"contents": "[Resend Verification Email](command:gitlens.plus.resendVerification?%7B%22source%22%3A%22launchpad-view%22%7D)\n\nYou must verify your email before you can continue or [recheck Status](command:gitlens.plus.validate?%7B%22source%22%3A%22launchpad-view%22%7D).",
 				"when": "gitlens:views:scm:grouped:view == launchpad && gitlens:launchpad:connected && gitlens:plus:state == -1"
 			},
-			{
-				"view": "gitlens.views.scm.grouped",
-				"contents": "[Continue](command:gitlens.plus.startPreviewTrial?%7B%22source%22%3A%22launchpad-view%22%7D)\n\nContinuing gives you 3 days to preview Launchpad and other local Pro features for 3 days. [Start 14-day Pro trial](command:gitlens.plus.signUp?%7B%22source%22%3A%22launchpad-view%22%7D) or [sign in](command:gitlens.plus.login?%7B%22source%22%3A%22launchpad-view%22%7D) for full access to Pro features.",
-				"when": "gitlens:views:scm:grouped:view == launchpad && false && gitlens:launchpad:connected && gitlens:plus:state == 0"
-			},
 			{
 				"view": "gitlens.views.scm.grouped",
 				"contents": "[Try GitLens Pro](command:gitlens.plus.signUp?%7B%22source%22%3A%22launchpad-view%22%7D)\n\nGet 14 days of GitLens Pro for free — no credit card required. Or [sign in](command:gitlens.plus.login?%7B%22source%22%3A%22launchpad-view%22%7D).",
-				"when": "gitlens:views:scm:grouped:view == launchpad && gitlens:launchpad:connected && (gitlens:plus:state == 0 || gitlens:plus:state == 2)"
+				"when": "gitlens:views:scm:grouped:view == launchpad && gitlens:launchpad:connected && gitlens:plus:state == 0"
 			},
 			{
 				"view": "gitlens.views.scm.grouped",
@@ -21345,15 +21326,10 @@
 				"contents": "[Resend Verification Email](command:gitlens.plus.resendVerification?%7B%22source%22%3A%22worktrees%22%7D)\n\nYou must verify your email before you can continue or [recheck Status](command:gitlens.plus.validate?%7B%22source%22%3A%22worktrees%22%7D).",
 				"when": "gitlens:views:scm:grouped:view == worktrees && gitlens:plus:state == -1"
 			},
-			{
-				"view": "gitlens.views.scm.grouped",
-				"contents": "[Continue](command:gitlens.plus.startPreviewTrial?%7B%22source%22%3A%22worktrees%22%7D)\n\nContinuing gives you 3 days to preview Worktrees and other local Pro features for 3 days. [Start 14-day Pro trial](command:gitlens.plus.signUp?%7B%22source%22%3A%22worktrees%22%7D) or [sign in](command:gitlens.plus.login?%7B%22source%22%3A%22worktrees%22%7D) for full access to Pro features.",
-				"when": "false && gitlens:views:scm:grouped:view == worktrees && gitlens:plus:required && gitlens:plus:state == 0"
-			},
 			{
 				"view": "gitlens.views.scm.grouped",
 				"contents": "[Try GitLens Pro](command:gitlens.plus.signUp?%7B%22source%22%3A%22worktrees%22%7D)\n\nGet 14 days of GitLens Pro for free — no credit card required. Or [sign in](command:gitlens.plus.login?%7B%22source%22%3A%22worktrees%22%7D).",
-				"when": "gitlens:views:scm:grouped:view == worktrees && gitlens:plus:required && (gitlens:plus:state == 0 || gitlens:plus:state == 2)"
+				"when": "gitlens:views:scm:grouped:view == worktrees && gitlens:plus:required && gitlens:plus:state == 0"
 			},
 			{
 				"view": "gitlens.views.scm.grouped",
@@ -21438,15 +21414,10 @@
 				"contents": "[Resend Verification Email](command:gitlens.plus.resendVerification?%7B%22source%22%3A%22worktrees%22%7D)\n\nYou must verify your email before you can continue or [recheck Status](command:gitlens.plus.validate?%7B%22source%22%3A%22worktrees%22%7D).",
 				"when": "gitlens:plus:state == -1"
 			},
-			{
-				"view": "gitlens.views.worktrees",
-				"contents": "[Continue](command:gitlens.plus.startPreviewTrial?%7B%22source%22%3A%22worktrees%22%7D)\n\nContinuing gives you 3 days to preview Worktrees and other local Pro features for 3 days. [Start 14-day Pro trial](command:gitlens.plus.signUp?%7B%22source%22%3A%22worktrees%22%7D) or [sign in](command:gitlens.plus.login?%7B%22source%22%3A%22worktrees%22%7D) for full access to Pro features.",
-				"when": "false && gitlens:plus:required && gitlens:plus:state == 0"
-			},
 			{
 				"view": "gitlens.views.worktrees",
 				"contents": "[Try GitLens Pro](command:gitlens.plus.signUp?%7B%22source%22%3A%22worktrees%22%7D)\n\nGet 14 days of GitLens Pro for free — no credit card required. Or [sign in](command:gitlens.plus.login?%7B%22source%22%3A%22worktrees%22%7D).",
-				"when": "gitlens:plus:required && (gitlens:plus:state == 0 || gitlens:plus:state == 2)"
+				"when": "gitlens:plus:required && gitlens:plus:state == 0"
 			},
 			{
 				"view": "gitlens.views.worktrees",

src/commands/quickCommand.steps.ts

@@ -43,7 +43,7 @@ import {
 } from '../git/utils/reference.utils';
 import { getHighlanderProviderName } from '../git/utils/remote.utils';
 import { createRevisionRange, isRevisionRange } from '../git/utils/revision.utils';
-import { isSubscriptionPaidPlan, isSubscriptionPreviewTrialExpired } from '../plus/gk/utils/subscription.utils';
+import { isSubscriptionPaidPlan } from '../plus/gk/utils/subscription.utils';
 import type { LaunchpadCommandArgs } from '../plus/launchpad/launchpad';
 import {
 	CommitApplyFileChangesCommandQuickPickItem,
@@ -2782,15 +2782,6 @@ export async function* ensureAccessStep<
 				createQuickPickSeparator(),
 				createDirectiveQuickPickItem(Directive.Cancel),
 			);
-		} else if (
-			access.subscription.current.account == null &&
-			!isSubscriptionPreviewTrialExpired(access.subscription.current)
-		) {
-			directives.push(
-				createDirectiveQuickPickItem(Directive.StartPreview, true),
-				createQuickPickSeparator(),
-				createDirectiveQuickPickItem(Directive.Cancel),
-			);
 		} else {
 			directives.push(
 				createDirectiveQuickPickItem(Directive.StartProTrial, true),

src/commands/quickWizard.base.ts

@@ -711,17 +711,6 @@ export abstract class QuickWizardCommandBase extends GlCommandBase {
 										return;
 									}
 
-									case Directive.StartPreview:
-										await Container.instance.subscription.startPreviewTrial({
-											source: 'quick-wizard',
-											detail: {
-												action: rootStep.command?.key,
-												'step.title': step.title,
-											},
-										});
-										resolve(await rootStep.command?.retry());
-										return;
-
 									case Directive.RequiresVerification: {
 										const result = await Container.instance.subscription.resendVerification({
 											source: 'quick-wizard',

src/constants.commands.generated.ts

@@ -747,7 +747,6 @@ export type ContributedPaletteCommands =
 	| 'gitlens.plus.restore'
 	| 'gitlens.plus.signUp'
 	| 'gitlens.plus.simulateSubscription'
-	| 'gitlens.plus.startPreviewTrial'
 	| 'gitlens.plus.upgrade'
 	| 'gitlens.pullRepositories'
 	| 'gitlens.pushRepositories'

src/constants.subscription.ts

@@ -1,6 +1,5 @@
 export const proFeaturePreviewUsages = 3;
 export const proFeaturePreviewUsageDurationInDays = 1;
-export const proPreviewLengthInDays = 0;
 export const proTrialLengthInDays = 14;
 
 export const enum SubscriptionPlanId {
@@ -17,11 +16,11 @@ export const enum SubscriptionPlanId {
 export const enum SubscriptionState {
 	/** Indicates a user who hasn't verified their email address yet */
 	VerificationRequired = -1,
-	/** Indicates an account-less Community (free) user who hasn't started a Pro preview */
+	/** Indicates an account-less Community (free) user */
 	Community = 0,
-	/** Indicates an account-less Community (free) user who is in a Pro preview */
+	/** @deprecated DO NOT USE */
 	ProPreview = 1,
-	/** Indicates an account-less Community (free) user who's Pro preview has expired */
+	/** @deprecated DO NOT USE */
 	ProPreviewExpired = 2,
 	/** Indicates a Pro user who is in a Pro trial */
 	ProTrial = 3,
@@ -36,8 +35,6 @@ export const enum SubscriptionState {
 export type SubscriptionStateString =
 	| 'verification'
 	| 'free'
-	| 'preview'
-	| 'preview-expired'
 	| 'trial'
 	| 'trial-expired'
 	| 'trial-reactivation-eligible'