Skip to content

Commit e9f5b51

Browse files
committed
remove 3 day preview trial messages
1 parent ab2255b commit e9f5b51

File tree

2 files changed

+11
-53
lines changed

2 files changed

+11
-53
lines changed

package.json

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -19217,6 +19217,11 @@
1921719217
"view": "gitlens.views.launchpad",
1921819218
"contents": "[Launchpad](command:gitlens.views.launchpad.info \"Learn about Launchpad\") — organizes your pull requests into actionable groups to help you focus and keep your team unblocked."
1921919219
},
19220+
{
19221+
"view": "gitlens.views.launchpad",
19222+
"contents": "Pro feature — requires a paid plan for use on privately-hosted repos.",
19223+
"when": "!gitlens:plus"
19224+
},
1922019225
{
1922119226
"view": "gitlens.views.scm.grouped",
1922219227
"contents": "[Launchpad](command:gitlens.views.launchpad.info \"Learn about Launchpad\") — organizes your pull requests into actionable groups to help you focus and keep your team unblocked.",
@@ -19242,25 +19247,15 @@
1924219247
"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).",
1924319248
"when": "!gitlens:launchpad:connect && gitlens:plus:state == -1 && gitlens:views:scm:grouped:view == launchpad"
1924419249
},
19245-
{
19246-
"view": "gitlens.views.launchpad",
19247-
"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 7-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.",
19248-
"when": "!gitlens:launchpad:connect && gitlens:plus:required && gitlens:plus:state == 0"
19249-
},
19250-
{
19251-
"view": "gitlens.views.scm.grouped",
19252-
"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 7-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.",
19253-
"when": "!gitlens:launchpad:connect && gitlens:plus:required && gitlens:plus:state == 0 && gitlens:views:scm:grouped:view == launchpad"
19254-
},
1925519250
{
1925619251
"view": "gitlens.views.launchpad",
1925719252
"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).",
19258-
"when": "!gitlens:launchpad:connect && gitlens:plus:required && gitlens:plus:state == 2"
19253+
"when": "!gitlens:launchpad:connect && gitlens:plus:required && (gitlens:plus:state == 2 || gitlens:plus:state == 0)"
1925919254
},
1926019255
{
1926119256
"view": "gitlens.views.scm.grouped",
1926219257
"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).",
19263-
"when": "!gitlens:launchpad:connect && gitlens:plus:required && gitlens:plus:state == 2 && gitlens:views:scm:grouped:view == launchpad"
19258+
"when": "!gitlens:launchpad:connect && gitlens:plus:required && (gitlens:plus:state == 0 || gitlens:plus:state == 2) && gitlens:views:scm:grouped:view == launchpad"
1926419259
},
1926519260
{
1926619261
"view": "gitlens.views.launchpad",
@@ -19312,11 +19307,6 @@
1931219307
"contents": "[Continue](command:gitlens.plus.reactivateProTrial?%7B%22source%22%3A%22launchpad-view%22%7D)\n\nReactivate your Pro trial and experience Launchpad and all the new Pro features — free for another 7 days!",
1931319308
"when": "!gitlens:launchpad:connect && gitlens:plus:required && gitlens:plus:state == 5 && gitlens:views:scm:grouped:view == launchpad"
1931419309
},
19315-
{
19316-
"view": "gitlens.views.launchpad",
19317-
"contents": "Pro feature — requires a paid plan for use on privately-hosted repos.",
19318-
"when": "!gitlens:launchpad:connect"
19319-
},
1932019310
{
1932119311
"view": "gitlens.views.scm.grouped",
1932219312
"contents": "Pro feature — requires a paid plan for use on privately-hosted repos.",
@@ -19369,25 +19359,15 @@
1936919359
"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).",
1937019360
"when": "gitlens:plus:state == -1 && gitlens:views:scm:grouped:view == worktrees"
1937119361
},
19372-
{
19373-
"view": "gitlens.views.worktrees",
19374-
"contents": "Use on privately-hosted repos requires [GitLens Pro](https://help.gitkraken.com/gitlens/gitlens-community-vs-gitlens-pro/).\n[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.",
19375-
"when": "gitlens:plus:required && gitlens:plus:state == 0"
19376-
},
19377-
{
19378-
"view": "gitlens.views.scm.grouped",
19379-
"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.",
19380-
"when": "gitlens:plus:required && gitlens:plus:state == 0 && gitlens:views:scm:grouped:view == worktrees"
19381-
},
1938219362
{
1938319363
"view": "gitlens.views.worktrees",
1938419364
"contents": "Use on privately-hosted repos requires [GitLens Pro](https://help.gitkraken.com/gitlens/gitlens-community-vs-gitlens-pro/).\n[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).",
19385-
"when": "gitlens:plus:required && gitlens:plus:state == 2"
19365+
"when": "gitlens:plus:required && (gitlens:plus:state == 2 || gitlens:plus:state == 0)"
1938619366
},
1938719367
{
1938819368
"view": "gitlens.views.scm.grouped",
1938919369
"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).",
19390-
"when": "gitlens:plus:required && gitlens:plus:state == 2 && gitlens:views:scm:grouped:view == worktrees"
19370+
"when": "gitlens:plus:required && (gitlens:plus:state == 0 || gitlens:plus:state == 2) && gitlens:views:scm:grouped:view == worktrees"
1939119371
},
1939219372
{
1939319373
"view": "gitlens.views.worktrees",

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

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -121,43 +121,21 @@ export class GlFeatureGatePlusState extends LitElement {
121121
`;
122122

123123
case SubscriptionState.Community:
124+
case SubscriptionState.ProPreviewExpired:
124125
return html`
125126
${feature !== 'graph'
126127
? html`<p>
127128
Use on privately-hosted repos requires
128129
<a href="${urls.gitlensProVsCommunity}">GitLens Pro</a>.
129130
</p>`
130131
: nothing}
131-
<gl-button
132-
appearance="${appearance}"
133-
href="${generateCommandLink(Commands.PlusStartPreviewTrial, this.source)}"
134-
>Continue</gl-button
135-
>
136-
<p>
137-
Continuing gives you 3 days to preview
138-
${this.featureWithArticleIfNeeded ? `${this.featureWithArticleIfNeeded} and other ` : ''}local
139-
Pro features.<br />
140-
${appearance !== 'alert' ? html`<br />` : ''} For full access to Pro features
141-
<a href="${generateCommandLink(Commands.PlusSignUp, this.source)}"
142-
>start your free ${proTrialLengthInDays}-day Pro trial</a
143-
>
144-
or
145-
<a href="${generateCommandLink(Commands.PlusLogin, this.source)}" title="Sign In">sign in</a>.
146-
</p>
147-
`;
148-
149-
case SubscriptionState.ProPreviewExpired:
150-
return html`
151-
<p>
152-
Use on privately-hosted repos requires <a href="${urls.gitlensProVsCommunity}">GitLens Pro</a>.
153-
</p>
154132
<gl-button
155133
appearance="${appearance}"
156134
href="${generateCommandLink(Commands.PlusSignUp, this.source)}"
157135
>&nbsp;Try GitLens Pro&nbsp;</gl-button
158136
>
159137
<p>
160-
Start your free ${proTrialLengthInDays}-day GitLens Pro trial - no credit card required. Or
138+
Get ${proTrialLengthInDays} days of GitLens Pro for free - no credit card required. Or
161139
<a href="${generateCommandLink(Commands.PlusLogin, this.source)}" title="Sign In">sign in</a>.
162140
</p>
163141
`;

0 commit comments

Comments
 (0)