Skip to content

Commit 7d22ed5

Browse files
d13eamodio
d13
authored and
eamodio
committed
Adds GitLens Pro naming updates
1 parent 200aa9e commit 7d22ed5

File tree

7 files changed

+112
-109
lines changed

7 files changed

+112
-109
lines changed

‎LICENSE.plus‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GitLens+ License
1+
GitLens Pro License
22

33
Copyright (c) 2021-2025 Axosoft, LLC dba GitKraken ("GitKraken")
44

@@ -13,8 +13,8 @@ with, the GitKraken End User License Agreement, available at
1313
https://gitkraken.com/eula (the "EULA"), or other agreement governing the
1414
use of the Software, as agreed by you and GitKraken, and otherwise have a valid
1515
subscription for the correct number of user seats for the applicable version of
16-
the Software (e.g., GitLens+, GitLens+ Pro, GitLens+ Advanced, GitLens+ Teams,
17-
and GitLens+ Enterprise). Subject to the foregoing sentence, you are free to modify
16+
the Software (e.g., GitLens Pro, GitLens Advanced, GitLens Business,
17+
and GitLens Enterprise). Subject to the foregoing sentence, you are free to modify
1818
this Software and publish patches to the Software. You agree that GitKraken and/or
1919
its licensors (as applicable) retain all right, title and interest in and to all
2020
such modifications and/or patches, and all such modifications and/or patches may
@@ -25,7 +25,7 @@ modifications and/or patches. You are not granted any other rights beyond what
2525
is expressly stated herein. Except as set forth above, it is forbidden to copy,
2626
merge, publish, distribute, sublicense, and/or sell the Software.
2727

28-
The full text of this GitLens+ License shall be included in all copies or
28+
The full text of this GitLens Pro License shall be included in all copies or
2929
substantial portions of the Software.
3030

3131
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

‎src/plus/LICENSE.plus‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GitLens+ License
1+
GitLens Pro License
22

33
Copyright (c) 2021-2025 Axosoft, LLC dba GitKraken ("GitKraken")
44

@@ -13,8 +13,8 @@ with, the GitKraken End User License Agreement, available at
1313
https://gitkraken.com/eula (the "EULA"), or other agreement governing the
1414
use of the Software, as agreed by you and GitKraken, and otherwise have a valid
1515
subscription for the correct number of user seats for the applicable version of
16-
the Software (e.g., GitLens+, GitLens+ Pro, GitLens+ Advanced, GitLens+ Teams,
17-
and GitLens+ Enterprise). Subject to the foregoing sentence, you are free to modify
16+
the Software (e.g., GitLens Pro, GitLens Advanced, GitLens Business,
17+
and GitLens Enterprise). Subject to the foregoing sentence, you are free to modify
1818
this Software and publish patches to the Software. You agree that GitKraken and/or
1919
its licensors (as applicable) retain all right, title and interest in and to all
2020
such modifications and/or patches, and all such modifications and/or patches may
@@ -25,7 +25,7 @@ modifications and/or patches. You are not granted any other rights beyond what
2525
is expressly stated herein. Except as set forth above, it is forbidden to copy,
2626
merge, publish, distribute, sublicense, and/or sell the Software.
2727

28-
The full text of this GitLens+ License shall be included in all copies or
28+
The full text of this GitLens Pro License shall be included in all copies or
2929
substantial portions of the Software.
3030

3131
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

‎src/plus/gk/__debug__accountDebug.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,13 @@ class AccountDebug {
140140
createQuickPickSeparator('Trial'),
141141
{
142142
label: 'Pro Trial',
143-
description: 'Pro, account',
143+
description: 'Pro trial (pro plan), account',
144144
iconPath: new ThemeIcon('blank'),
145145
item: { state: SubscriptionState.ProTrial },
146146
},
147147
{
148148
label: 'Pro Trial (Reactivated)',
149-
description: 'Pro, account',
149+
description: 'Pro trial (pro plan), account',
150150
iconPath: new ThemeIcon('blank'),
151151
item: {
152152
state: SubscriptionState.ProTrial,
@@ -155,13 +155,13 @@ class AccountDebug {
155155
},
156156
{
157157
label: 'Pro Trial (Advanced)',
158-
description: 'Advanced, account',
158+
description: 'Pro trial (advanced plan), account',
159159
iconPath: new ThemeIcon('blank'),
160160
item: { state: SubscriptionState.ProTrial, planId: SubscriptionPlanId.Advanced },
161161
},
162162
{
163-
label: 'Pro Trial (Advanced Reactivated)',
164-
description: 'Advanced, account',
163+
label: 'Pro Trial (Advanced, Reactivated)',
164+
description: 'Pro trial (advanced plan), account',
165165
iconPath: new ThemeIcon('blank'),
166166
item: {
167167
state: SubscriptionState.ProTrial,
@@ -190,19 +190,19 @@ class AccountDebug {
190190
},
191191
{
192192
label: 'Advanced',
193-
description: 'Advanced, account',
193+
description: 'Advanced plan, account',
194194
iconPath: new ThemeIcon('blank'),
195195
item: { state: SubscriptionState.Paid, planId: SubscriptionPlanId.Advanced },
196196
},
197197
{
198198
label: 'Teams',
199-
description: 'Teams, account',
199+
description: 'Teams plan, account',
200200
iconPath: new ThemeIcon('blank'),
201201
item: { state: SubscriptionState.Paid, planId: SubscriptionPlanId.Teams },
202202
},
203203
{
204204
label: 'Enterprise',
205-
description: 'Enterprise, no account',
205+
description: 'Enterprise plan, account',
206206
iconPath: new ThemeIcon('blank'),
207207
item: { state: SubscriptionState.Paid, planId: SubscriptionPlanId.Enterprise },
208208
},

‎src/plus/gk/utils/subscription.utils.ts‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,23 @@ export const SubscriptionUpdatedUriPathPrefix = 'did-update-subscription';
88
export function getSubscriptionStateName(
99
state: SubscriptionState,
1010
planId?: SubscriptionPlanId,
11-
effectivePlanId?: SubscriptionPlanId,
11+
_effectivePlanId?: SubscriptionPlanId,
1212
): string {
1313
switch (state) {
1414
case SubscriptionState.Community:
1515
case SubscriptionState.ProPreviewExpired:
1616
return getSubscriptionPlanName(SubscriptionPlanId.Community);
1717
case SubscriptionState.ProPreview:
18-
return `${getSubscriptionPlanName(SubscriptionPlanId.Pro)} (Preview)`;
18+
return `${getSubscriptionPlanName(SubscriptionPlanId.Pro)} Preview`;
1919
case SubscriptionState.ProTrial:
20-
return `${getSubscriptionPlanName(SubscriptionPlanId.Pro)} (${
21-
effectivePlanId != null &&
22-
getSubscriptionPlanPriority(effectivePlanId) > getSubscriptionPlanPriority(SubscriptionPlanId.Pro)
23-
? `${getSubscriptionPlanTier(effectivePlanId)} `
24-
: ''
25-
}Trial)`;
20+
return `${getSubscriptionPlanName(SubscriptionPlanId.Pro)} Trial`;
21+
// return `${getSubscriptionPlanName(
22+
// effectivePlanId != null &&
23+
// getSubscriptionPlanPriority(effectivePlanId) >
24+
// getSubscriptionPlanPriority(planId ?? SubscriptionPlanId.Pro)
25+
// ? effectivePlanId
26+
// : planId ?? SubscriptionPlanId.Pro,
27+
// )} Trial`;
2628
case SubscriptionState.ProTrialExpired:
2729
return getSubscriptionPlanName(SubscriptionPlanId.CommunityWithAccount);
2830
case SubscriptionState.ProTrialReactivationEligible:
@@ -147,8 +149,6 @@ export function getSubscriptionPlanTier(
147149
id: SubscriptionPlanId,
148150
): 'Community' | 'Pro' | 'Advanced' | 'Teams' | 'Enterprise' {
149151
switch (id) {
150-
case SubscriptionPlanId.CommunityWithAccount:
151-
return 'Community';
152152
case SubscriptionPlanId.Pro:
153153
return 'Pro';
154154
case SubscriptionPlanId.Advanced:
@@ -157,7 +157,6 @@ export function getSubscriptionPlanTier(
157157
return 'Teams';
158158
case SubscriptionPlanId.Enterprise:
159159
return 'Enterprise';
160-
case SubscriptionPlanId.Community:
161160
default:
162161
return 'Community';
163162
}

‎src/webviews/apps/plus/LICENSE.plus‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GitLens+ License
1+
GitLens Pro License
22

33
Copyright (c) 2021-2025 Axosoft, LLC dba GitKraken ("GitKraken")
44

@@ -13,8 +13,8 @@ with, the GitKraken End User License Agreement, available at
1313
https://gitkraken.com/eula (the "EULA"), or other agreement governing the
1414
use of the Software, as agreed by you and GitKraken, and otherwise have a valid
1515
subscription for the correct number of user seats for the applicable version of
16-
the Software (e.g., GitLens+, GitLens+ Pro, GitLens+ Advanced, GitLens+ Teams,
17-
and GitLens+ Enterprise). Subject to the foregoing sentence, you are free to modify
16+
the Software (e.g., GitLens Pro, GitLens Advanced, GitLens Business,
17+
and GitLens Enterprise). Subject to the foregoing sentence, you are free to modify
1818
this Software and publish patches to the Software. You agree that GitKraken and/or
1919
its licensors (as applicable) retain all right, title and interest in and to all
2020
such modifications and/or patches, and all such modifications and/or patches may
@@ -25,7 +25,7 @@ modifications and/or patches. You are not granted any other rights beyond what
2525
is expressly stated herein. Except as set forth above, it is forbidden to copy,
2626
merge, publish, distribute, sublicense, and/or sell the Software.
2727

28-
The full text of this GitLens+ License shall be included in all copies or
28+
The full text of this GitLens Pro License shall be included in all copies or
2929
substantial portions of the Software.
3030

3131
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

0 commit comments

Comments
 (0)