From 45ccaae9fe0a4434a213f7c20bc9c69b85464580 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 13 Jun 2023 20:17:21 -0400 Subject: [PATCH] Changes to "plan" --- .github/ISSUE_TEMPLATE/config.yml | 2 +- package.json | 14 +++++++------- src/commands/quickCommand.steps.ts | 4 ++-- src/errors.ts | 4 ++-- src/git/remotes/richRemoteProvider.ts | 8 ++++---- src/plus/subscription/subscriptionService.ts | 2 +- src/quickpicks/items/directive.ts | 2 +- src/views/nodes/worktreesNode.ts | 2 +- src/webviews/apps/home/home.html | 4 ++-- .../apps/plus/account/components/account-content.ts | 9 +++------ .../apps/plus/shared/components/feature-gate-plus-state.ts | 6 +++--- src/webviews/apps/settings/partials/commit-graph.html | 4 +--- src/webviews/apps/settings/partials/views.worktrees.html | 4 +--- src/webviews/apps/shared/components/feature-gate-badge.ts | 6 +++--- src/webviews/apps/welcome/welcome.html | 8 ++++---- 15 files changed, 36 insertions(+), 43 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 30cfda1..5fe21ad 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -8,4 +8,4 @@ contact_links: about: Read the GitLens support documentation - name: GitKraken Support url: https://gitkraken.com/gitlens-support - about: Get email support for issues and questions on paid features or relating to your GitKraken account or subscription + about: Get email support for issues and questions on paid features or relating to your GitKraken account or plan diff --git a/package.json b/package.json index fc1f878..21a2020 100644 --- a/package.json +++ b/package.json @@ -3937,7 +3937,7 @@ "gitlens.plusFeatures.enabled": { "type": "boolean", "default": true, - "markdownDescription": "Specifies whether to hide or show features that require a trial or paid subscription and are not accessible given the opened repositories and current trial or subscription", + "markdownDescription": "Specifies whether to hide or show features that require a trial or paid plan and are not accessible given the opened repositories and current trial or plan", "scope": "window", "order": 60 }, @@ -14134,12 +14134,12 @@ }, { "view": "gitlens.views.workspaces", - "contents": "[Create Cloud Workspace](command:gitlens.views.workspaces.create)\n\n☁️ Access is based on your subscription, e.g. Free, Pro, etc", + "contents": "[Create Cloud Workspace](command:gitlens.views.workspaces.create)\n\n☁️ Access is based on your plan, e.g. Free, Pro, etc", "when": "gitlens:plus" }, { "view": "gitlens.views.workspaces", - "contents": "[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free 7-day Pro trial to use GitKraken Workspaces, or [sign in](command:gitlens.plus.loginOrSignUp).\n☁️ Requires an account and access is based on your subscription, e.g. Free, Pro, etc", + "contents": "[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n\nStart a free 7-day Pro trial to use GitKraken Workspaces, or [sign in](command:gitlens.plus.loginOrSignUp).\n☁️ Requires an account and access is based on your plan, e.g. Free, Pro, etc", "when": "!gitlens:plus" }, { @@ -14159,17 +14159,17 @@ }, { "view": "gitlens.views.worktrees", - "contents": "[Preview Pro](command:gitlens.plus.startPreviewTrial)\n\nPreview Pro for 3 days, or [sign in](command:gitlens.plus.loginOrSignUp) to start a full 7-day Pro trial.\n✨ A trial or paid subscription is required to use this on privately hosted repos.", + "contents": "[Preview Pro](command:gitlens.plus.startPreviewTrial)\n\nPreview Pro for 3 days, or [sign in](command:gitlens.plus.loginOrSignUp) to start a full 7-day Pro trial.\n✨ A trial or paid plan is required to use this on privately hosted repos.", "when": "gitlens:plus:required && gitlens:plus:state == 0" }, { "view": "gitlens.views.worktrees", - "contents": "Your 3-day Pro preview has ended, start a free Pro trial to get an additional 7 days, or [sign in](command:gitlens.plus.loginOrSignUp).\n\n[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n✨ A trial or paid subscription is required to use this on privately hosted repos.", + "contents": "Your 3-day Pro preview has ended, start a free Pro trial to get an additional 7 days, or [sign in](command:gitlens.plus.loginOrSignUp).\n\n[Start Free Pro Trial](command:gitlens.plus.loginOrSignUp)\n✨ A trial or paid plan is required to use this on privately hosted repos.", "when": "gitlens:plus:required && gitlens:plus:state == 2" }, { "view": "gitlens.views.worktrees", - "contents": "Your Pro trial has ended, please upgrade to continue to use this on privately hosted repos.\n\n[Upgrade to Pro](command:gitlens.plus.purchase)\n✨ A paid subscription is required to use this on privately hosted repos.", + "contents": "Your Pro trial has ended, please upgrade to continue to use this on privately hosted repos.\n\n[Upgrade to Pro](command:gitlens.plus.purchase)\n✨ A paid plan is required to use this on privately hosted repos.", "when": "gitlens:plus:required && gitlens:plus:state == 4" } ], @@ -14434,7 +14434,7 @@ { "id": "gitlens.welcome.trial", "title": "Trialing GitLens Pro", - "description": "During your trial, you have access to ✨ features on privately hosted repos and ☁️ features based on the Pro tier. [Learn more](https://www.gitkraken.com/gitlens/plus-features)\n\n[Upgrade to Pro](command:gitlens.plus.purchase)", + "description": "During your trial, you have access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan. [Learn more](https://www.gitkraken.com/gitlens/plus-features)\n\n[Upgrade to Pro](command:gitlens.plus.purchase)", "media": { "markdown": "walkthroughs/welcome/trial.md" }, diff --git a/src/commands/quickCommand.steps.ts b/src/commands/quickCommand.steps.ts index 5c27ffd..3af8cd2 100644 --- a/src/commands/quickCommand.steps.ts +++ b/src/commands/quickCommand.steps.ts @@ -2425,9 +2425,9 @@ export async function* ensureAccessStep< } else { if (access.subscription.required == null) return undefined; - placeholder = '✨ Requires a trial or paid subscription for use on privately hosted repos'; + placeholder = '✨ Requires a trial or paid plan for use on privately hosted repos'; if (isSubscriptionPaidPlan(access.subscription.required) && access.subscription.current.account != null) { - placeholder = '✨ Requires a paid subscription for use on privately hosted repos'; + placeholder = '✨ Requires a paid plan for use on privately hosted repos'; directives.push(createDirectiveQuickPickItem(Directive.RequiresPaidSubscription, true)); } else if ( access.subscription.current.account == null && diff --git a/src/errors.ts b/src/errors.ts index 7dbbfb3..0e4f72c 100644 --- a/src/errors.ts +++ b/src/errors.ts @@ -12,9 +12,9 @@ export class AccessDeniedError extends Error { if (subscription.account?.verified === false) { message = 'Email verification required'; } else if (required != null && isSubscriptionPaidPlan(required)) { - message = 'Paid subscription required'; + message = 'Paid plan required'; } else { - message = 'Subscription required'; + message = 'Plan required'; } super(message); diff --git a/src/git/remotes/richRemoteProvider.ts b/src/git/remotes/richRemoteProvider.ts index b850e3e..eed17c8 100644 --- a/src/git/remotes/richRemoteProvider.ts +++ b/src/git/remotes/richRemoteProvider.ts @@ -509,7 +509,7 @@ export abstract class RichRemoteProvider extends RemoteProvider { } export async function ensurePaidPlan(providerName: string, container: Container): Promise { - const title = `Connecting to a ${providerName} instance for rich integration features requires a trial or paid subscription.`; + const title = `Connecting to a ${providerName} instance for rich integration features requires a trial or paid plan.`; while (true) { const subscription = await container.subscription.getSubscription(); @@ -539,7 +539,7 @@ export async function ensurePaidPlan(providerName: string, container: Container) const startTrial = { title: 'Preview Pro' }; const cancel = { title: 'Cancel', isCloseAffordance: true }; const result = await window.showWarningMessage( - `${title}\n\nDo you want to preview Pro features for 3 days?`, + `${title}\n\nDo you want to preview ✨ features for 3 days?`, { modal: true }, startTrial, cancel, @@ -553,7 +553,7 @@ export async function ensurePaidPlan(providerName: string, container: Container) const signIn = { title: 'Start Free Pro Trial' }; const cancel = { title: 'Cancel', isCloseAffordance: true }; const result = await window.showWarningMessage( - `${title}\n\nDo you want to continue to use Pro features on privately hosted repos, free for an additional 7 days?`, + `${title}\n\nDo you want to continue to use ✨ features on privately hosted repos, free for an additional 7 days?`, { modal: true }, signIn, cancel, @@ -568,7 +568,7 @@ export async function ensurePaidPlan(providerName: string, container: Container) const upgrade = { title: 'Upgrade to Pro' }; const cancel = { title: 'Cancel', isCloseAffordance: true }; const result = await window.showWarningMessage( - `${title}\n\nDo you want to continue to use Pro features on privately hosted repos?`, + `${title}\n\nDo you want to continue to use ✨ features on privately hosted repos?`, { modal: true }, upgrade, cancel, diff --git a/src/plus/subscription/subscriptionService.ts b/src/plus/subscription/subscriptionService.ts index f2f0352..4d86a3f 100644 --- a/src/plus/subscription/subscriptionService.ts +++ b/src/plus/subscription/subscriptionService.ts @@ -468,7 +468,7 @@ export class SubscriptionService implements Disposable { const confirm: MessageItem = { title: 'Start Free Pro Trial', isCloseAffordance: true }; const cancel: MessageItem = { title: 'Cancel' }; const result = await window.showInformationMessage( - 'Your 3-day Pro preview has ended, start a free Pro trial to get an additional 7 days.\n\n✨ A trial or paid subscription is required to use Pro features on privately hosted repos.', + 'Your 3-day Pro preview has ended, start a free Pro trial to get an additional 7 days.\n\n✨ A trial or paid plan is required to use Pro features on privately hosted repos.', { modal: true }, confirm, cancel, diff --git a/src/quickpicks/items/directive.ts b/src/quickpicks/items/directive.ts index 9c89314..c3b9426 100644 --- a/src/quickpicks/items/directive.ts +++ b/src/quickpicks/items/directive.ts @@ -56,7 +56,7 @@ export function createDirectiveQuickPickItem( break; case Directive.RequiresPaidSubscription: label = 'Upgrade to Pro'; - detail = 'A paid subscription is required to use this on privately hosted repos'; + detail = 'A paid plan is required to use this on privately hosted repos'; break; } } diff --git a/src/views/nodes/worktreesNode.ts b/src/views/nodes/worktreesNode.ts index db35978..8351d98 100644 --- a/src/views/nodes/worktreesNode.ts +++ b/src/views/nodes/worktreesNode.ts @@ -58,7 +58,7 @@ export class WorktreesNode extends ViewNode { item.contextValue = ContextValues.Worktrees; item.description = access.allowed ? undefined - : ` ${GlyphChars.Warning} Requires a trial or paid subscription for use on privately hosted repos`; + : ` ${GlyphChars.Warning} Requires a trial or paid plan for use on privately hosted repos`; // TODO@eamodio `folder` icon won't work here for some reason item.iconPath = new ThemeIcon('folder-opened'); return item; diff --git a/src/webviews/apps/home/home.html b/src/webviews/apps/home/home.html index c4751e6..3bd39d0 100644 --- a/src/webviews/apps/home/home.html +++ b/src/webviews/apps/home/home.html @@ -307,8 +307,8 @@ >

- ✨ Requires a trial or paid subscription to use this on privately hosted repos.
- ☁️ Requires an account and access is based on your subscription, e.g. Free, Pro, etc + ✨ Requires a trial or paid plan to use this on privately hosted repos.
+ ☁️ Requires an account and access is based on your plan, e.g. Free, Pro, etc

diff --git a/src/webviews/apps/plus/account/components/account-content.ts b/src/webviews/apps/plus/account/components/account-content.ts index c59067d..18ff9ba 100644 --- a/src/webviews/apps/plus/account/components/account-content.ts +++ b/src/webviews/apps/plus/account/components/account-content.ts @@ -185,7 +185,7 @@ export class AccountContent extends LitElement {

You only have access to ✨ features on local and publicly hosted repos and ☁️ features based on - your subscription, e.g. Free, Pro, etc. + your plan, e.g. Free, Pro, etc.

`; @@ -199,7 +199,7 @@ export class AccountContent extends LitElement { Upgrade to Pro

- You have access to ✨ features on privately hosted repos and ☁️ features based on the Pro tier + You have access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan during your trial.

`; @@ -211,10 +211,7 @@ export class AccountContent extends LitElement { >Manage Account -

- You have access to ✨ features on privately hosted repos and ☁️ features based on your - subscription. -

+

You have access to ✨ features on privately hosted repos and ☁️ features based on your plan.

`; } diff --git a/src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts b/src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts index 4f78eac..69c25ef 100644 --- a/src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts +++ b/src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts @@ -78,7 +78,7 @@ export class FeatureGatePlusState extends LitElement { Preview Pro for 3 days, or sign in to start a full 7-day Pro trial.

-

✨ A trial or paid subscription is required to use this on privately hosted repos.

+

✨ A trial or paid plan is required to use this on privately hosted repos.

`; case SubscriptionState.FreePreviewTrialExpired: @@ -90,7 +90,7 @@ export class FeatureGatePlusState extends LitElement { Start Free Pro Trial -

✨ A trial or paid subscription is required to use this on privately hosted repos.

+

✨ A trial or paid plan is required to use this on privately hosted repos.

`; case SubscriptionState.FreePlusTrialExpired: @@ -99,7 +99,7 @@ export class FeatureGatePlusState extends LitElement { Upgrade to Pro -

✨ A paid subscription is required to use this on privately hosted repos.

+

✨ A paid plan is required to use this on privately hosted repos.

`; } diff --git a/src/webviews/apps/settings/partials/commit-graph.html b/src/webviews/apps/settings/partials/commit-graph.html index bc6c488..8da5004 100644 --- a/src/webviews/apps/settings/partials/commit-graph.html +++ b/src/webviews/apps/settings/partials/commit-graph.html @@ -1,9 +1,7 @@

- Commit Graph ✨ + Commit Graph ✨

- Worktrees view ✨ + Worktrees view ✨ ✨ Requires a trial or paid subscription for use on privately hosted repos.✨ Requires a trial or paid plan for use on privately hosted repos.`; case SubscriptionState.FreePlusTrialExpired: case SubscriptionState.FreeInPreviewTrial: case SubscriptionState.FreePlusInTrial: return html`✨ Requires a paid subscription for use on privately hosted repos.✨ Requires a paid plan for use on privately hosted repos.`; case SubscriptionState.Paid: /* prettier-ignore */ return html`You have access to ✨ features on privately hosted repos and ☁️ features based on your subscription.You have access to ✨ features on privately hosted repos and ☁️ features based on your plan.`; default: return nothing; diff --git a/src/webviews/apps/welcome/welcome.html b/src/webviews/apps/welcome/welcome.html index 7a40466..a276efe 100644 --- a/src/webviews/apps/welcome/welcome.html +++ b/src/webviews/apps/welcome/welcome.html @@ -62,11 +62,11 @@

✨ require a trial or paid subscriptiontrial or paid plan for use on privately hosted repos
- ☁️ require an account and access is based on your subscription, e.g. Free, Pro, etc + ☁️ require an account and access is based on your plan, e.g. Free, Pro, etc

@@ -542,9 +542,9 @@ #{endOfBody}