deprecate current 3 day preview trial & add feature preview trial

Author: sergiolms

package.json

@@ -5733,11 +5733,6 @@
 				"title": "Sign Up for GitKraken...",
 				"category": "GitLens"
 			},
-			{
-				"command": "gitlens.plus.startPreviewTrial",
-				"title": "Preview Pro",
-				"category": "GitLens"
-			},
 			{
 				"command": "gitlens.plus.reactivateProTrial",
 				"title": "Reactivate Pro Trial",
@@ -10220,10 +10215,6 @@
 					"command": "gitlens.plus.signUp",
 					"when": "!gitlens:plus"
 				},
-				{
-					"command": "gitlens.plus.startPreviewTrial",
-					"when": "!gitlens:plus"
-				},
 				{
 					"command": "gitlens.plus.reactivateProTrial",
 					"when": "gitlens:plus:state == 5"
@@ -19372,7 +19363,7 @@
 			},
 			{
 				"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 7-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.",
+				"contents": "[Start 7-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": "gitlens:plus:required && gitlens:plus:state == 0"
 			},
 			{

src/commands/quickCommand.steps.ts

@@ -44,7 +44,7 @@ import type { GitWorktree, WorktreeQuickPickItem } from '../git/models/worktree'
 import { createWorktreeQuickPickItem, getWorktreesByBranch, sortWorktrees } from '../git/models/worktree';
 import { remoteUrlRegex } from '../git/parsers/remoteParser';
 import { getApplicablePromo } from '../plus/gk/account/promos';
-import { isSubscriptionPaidPlan, isSubscriptionPreviewTrialExpired } from '../plus/gk/account/subscription';
+import { isSubscriptionPaidPlan } from '../plus/gk/account/subscription';
 import type { LaunchpadCommandArgs } from '../plus/launchpad/launchpad';
 import {
 	CommitApplyFileChangesCommandQuickPickItem,
@@ -2645,7 +2645,7 @@ export async function* ensureAccessStep<
 				createQuickPickSeparator(),
 				createDirectiveQuickPickItem(Directive.Cancel),
 			);
-		} else if (
+		} /*else if (
 			access.subscription.current.account == null &&
 			!isSubscriptionPreviewTrialExpired(access.subscription.current)
 		) {
@@ -2654,7 +2654,7 @@ export async function* ensureAccessStep<
 				createQuickPickSeparator(),
 				createDirectiveQuickPickItem(Directive.Cancel),
 			);
-		} else {
+		}*/ else {
 			directives.push(
 				createDirectiveQuickPickItem(Directive.StartProTrial, true),
 				createDirectiveQuickPickItem(Directive.SignIn),

src/commands/quickWizard.base.ts

@@ -704,6 +704,7 @@ export abstract class QuickWizardCommandBase extends Command {
 										return;
 									}
 
+									/*
 									case Directive.StartPreview:
 										await Container.instance.subscription.startPreviewTrial({
 											source: 'quick-wizard',
@@ -714,7 +715,7 @@ export abstract class QuickWizardCommandBase extends Command {
 										});
 										resolve(await rootStep.command?.retry());
 										return;
-
+									*/
 									case Directive.RequiresVerification: {
 										const result = await Container.instance.subscription.resendVerification({
 											source: 'quick-wizard',

src/constants.commands.ts

@@ -150,6 +150,7 @@ export const enum Commands {
 	PlusShowPlans = 'gitlens.plus.showPlans',
 	PlusSignUp = 'gitlens.plus.signUp',
 	PlusStartPreviewTrial = 'gitlens.plus.startPreviewTrial',
+	PlusStartFeaturePreviewTrial = 'gitlens.plus.startFeaturePreviewTrial',
 	PlusUpgrade = 'gitlens.plus.upgrade',
 	PlusValidate = 'gitlens.plus.validate',
 	PlusSimulateSubscription = 'gitlens.plus.simulateSubscription',

src/plus/gk/account/subscriptionService.ts

@@ -242,6 +242,9 @@ export class SubscriptionService implements Disposable {
 			registerCommand(Commands.PlusManage, (src?: Source) => this.manage(src)),
 			registerCommand(Commands.PlusShowPlans, (src?: Source) => this.showPlans(src)),
 			registerCommand(Commands.PlusStartPreviewTrial, (src?: Source) => this.startPreviewTrial(src)),
+			registerCommand(Commands.PlusStartFeaturePreviewTrial, (src?: Source) =>
+				this.startFeaturePreviewTrial(src),
+			),
 			registerCommand(Commands.PlusReactivateProTrial, (src?: Source) => this.reactivateProTrial(src)),
 			registerCommand(Commands.PlusResendVerification, (src?: Source) => this.resendVerification(src)),
 			registerCommand(Commands.PlusUpgrade, (src?: Source) => this.upgrade(src)),
@@ -727,6 +730,10 @@ export class SubscriptionService implements Disposable {
 		}, 1);
 	}
 
+	@gate(() => '')
+	@log()
+	async startFeaturePreviewTrial(_: Source | undefined): Promise<void> {}
+
 	@log()
 	async upgrade(source: Source | undefined): Promise<void> {
 		const scope = getLogScope();

src/plus/utils.ts

@@ -5,13 +5,13 @@ import { proTrialLengthInDays } from '../constants.subscription';
 import type { Source } from '../constants.telemetry';
 import type { Container } from '../container';
 import { openUrl } from '../system/vscode/utils';
-import { isSubscriptionPaidPlan, isSubscriptionPreviewTrialExpired } from './gk/account/subscription';
+import { isSubscriptionPaidPlan } from './gk/account/subscription';
 
 export async function ensurePaidPlan(
 	container: Container,
 	title: string,
 	source: Source,
-	options?: { allowPreview?: boolean },
+	_?: { allowPreview?: boolean },
 ): Promise<boolean> {
 	while (true) {
 		const subscription = await container.subscription.getSubscription();
@@ -37,7 +37,7 @@ export async function ensurePaidPlan(
 		const plan = subscription.plan.effective.id;
 		if (isSubscriptionPaidPlan(plan)) break;
 
-		if (options?.allowPreview && subscription.account == null && !isSubscriptionPreviewTrialExpired(subscription)) {
+		/*if (options?.allowPreview && subscription.account == null && !isSubscriptionPreviewTrialExpired(subscription)) {
 			const startTrial = { title: 'Continue' };
 			const cancel = { title: 'Cancel', isCloseAffordance: true };
 			const result = await window.showWarningMessage(
@@ -51,7 +51,8 @@ export async function ensurePaidPlan(
 
 			void container.subscription.startPreviewTrial(source);
 			break;
-		} else if (subscription.account == null) {
+		} else */
+		if (subscription.account == null) {
 			const signUp = { title: 'Start Pro Trial' };
 			const signIn = { title: 'Sign In' };
 			const cancel = { title: 'Cancel', isCloseAffordance: true };

src/webviews/apps/plus/graph/GraphWrapper.tsx

@@ -1530,6 +1530,7 @@ export function GraphWrapper({
 			</header>
 			<GlFeatureGate
 				className="graph-app__gate"
+				allowFeaturePreviewTrial={true}
 				appearance="alert"
 				featureWithArticleIfNeeded="the Commit Graph"
 				source={{ source: 'graph', detail: 'gate' }}

src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts

@@ -1,7 +1,7 @@
 import { css, html, LitElement, nothing } from 'lit';
 import { customElement, property, query } from 'lit/decorators.js';
 import { Commands } from '../../../../../constants.commands';
-import { proTrialLengthInDays, SubscriptionState } from '../../../../../constants.subscription';
+import { proPreviewLengthInDays, proTrialLengthInDays, SubscriptionState } from '../../../../../constants.subscription';
 import type { Source } from '../../../../../constants.telemetry';
 import type { Promo } from '../../../../../plus/gk/account/promos';
 import { getApplicablePromo } from '../../../../../plus/gk/account/promos';
@@ -69,6 +69,9 @@ export class GlFeatureGatePlusState extends LitElement {
 	@query('gl-button')
 	private readonly button!: GlButton;
 
+	@property({ type: Boolean })
+	allowFeaturePreviewTrial?: boolean;
+
 	@property({ type: String })
 	appearance?: 'alert' | 'welcome';
 
@@ -96,6 +99,8 @@ export class GlFeatureGatePlusState extends LitElement {
 		this.hidden = false;
 		const appearance = (this.appearance ?? 'alert') === 'alert' ? 'alert' : nothing;
 		const promo = this.state ? getApplicablePromo(this.state, 'gate') : undefined;
+		const consumedDays = 0;
+		//this.container.storage.get(`plus:featurePreviewTrial:${this.source?.source}:consumedDays`) ?? 0;
 
 		switch (this.state) {
 			case SubscriptionState.VerificationRequired:
@@ -118,15 +123,40 @@ export class GlFeatureGatePlusState extends LitElement {
 				`;
 
 			case SubscriptionState.Community:
+				if (this.allowFeaturePreviewTrial) {
+					return html`
+						<gl-button
+							appearance="${appearance}"
+							href="${generateCommandLink(Commands.PlusStartFeaturePreviewTrial, this.source)}"
+							>Continue</gl-button
+						>
+						<p>
+							Continuing gives you ${proPreviewLengthInDays - consumedDays}
+							day${proPreviewLengthInDays - consumedDays !== 1 ? 's' : ''} to preview
+							${this.featureWithArticleIfNeeded
+								? `${this.featureWithArticleIfNeeded}  and other `
+								: ''}local
+							Pro features.<br />
+							${appearance !== 'alert' ? html`<br />` : ''} For full access to Pro features
+							<a href="${generateCommandLink(Commands.PlusSignUp, this.source)}"
+								>start your free ${proTrialLengthInDays}-day Pro trial</a
+							>
+							or
+							<a href="${generateCommandLink(Commands.PlusLogin, this.source)}" title="Sign In">sign in</a
+							>.
+						</p>
+					`;
+				}
+
 				return html`
 					<gl-button
 						appearance="${appearance}"
-						href="${generateCommandLink(Commands.PlusStartPreviewTrial, this.source)}"
+						href="${generateCommandLink(Commands.PlusSignUp, this.source)}"
 						>Continue</gl-button
 					>
 					<p>
-						Continuing gives you 3 days to preview
-						${this.featureWithArticleIfNeeded ? `${this.featureWithArticleIfNeeded}  and other ` : ''}local
+						Continuing gives you ${proTrialLengthInDays} days to preview
+						${this.featureWithArticleIfNeeded ? `${this.featureWithArticleIfNeeded} and other ` : ''}local
 						Pro features.<br />
 						${appearance !== 'alert' ? html`<br />` : ''} For full access to Pro features
 						<a href="${generateCommandLink(Commands.PlusSignUp, this.source)}"

src/webviews/apps/shared/components/feature-gate.ts

@@ -90,6 +90,9 @@ export class GlFeatureGate extends LitElement {
 		}
 	`;
 
+	@property({ type: Boolean })
+	allowFeaturePreviewTrial?: boolean;
+
 	@property({ reflect: true })
 	appearance?: 'alert' | 'welcome';
 
@@ -126,6 +129,7 @@ export class GlFeatureGate extends LitElement {
 					.featureWithArticleIfNeeded=${this.featureWithArticleIfNeeded}
 					.source=${this.source}
 					.state=${this.state}
+					.allowFeaturePreviewTrial=${this.allowFeaturePreviewTrial}
 				></gl-feature-gate-plus-state>
 			</section>
 		`;