Skip to content

Commit dea011f

Browse files
eamodioeamodio
committed
Adds "grouped" welcome & removes enablement config
1 parent 763bca2 commit dea011f

File tree

6 files changed

+68
-43
lines changed

6 files changed

+68
-43
lines changed

‎package.json‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1429,13 +1429,6 @@
14291429
"title": "Views",
14301430
"order": 100,
14311431
"properties": {
1432-
"gitlens.views.scm.grouped.enabled": {
1433-
"type": "boolean",
1434-
"default": false,
1435-
"markdownDescription": "Specifies whether to enable a grouped GitLens view on the Source Control side bar",
1436-
"scope": "window",
1437-
"order": 1
1438-
},
14391432
"gitlens.views.scm.grouped.default": {
14401433
"type": "string",
14411434
"default": "commits",
@@ -13604,7 +13597,7 @@
1360413597
},
1360513598
{
1360613599
"command": "gitlens.views.branches.regroup",
13607-
"when": "view == gitlens.views.branches && config.gitlens.views.scm.grouped.enabled",
13600+
"when": "view == gitlens.views.branches",
1360813601
"group": "navigation@99"
1360913602
},
1361013603
{
@@ -13689,7 +13682,7 @@
1368913682
},
1369013683
{
1369113684
"command": "gitlens.views.commits.regroup",
13692-
"when": "view == gitlens.views.commits && config.gitlens.views.scm.grouped.enabled",
13685+
"when": "view == gitlens.views.commits",
1369313686
"group": "navigation@99"
1369413687
},
1369513688
{
@@ -13794,7 +13787,7 @@
1379413787
},
1379513788
{
1379613789
"command": "gitlens.views.contributors.regroup",
13797-
"when": "view == gitlens.views.contributors && config.gitlens.views.scm.grouped.enabled",
13790+
"when": "view == gitlens.views.contributors",
1379813791
"group": "navigation@99"
1379913792
},
1380013793
{
@@ -14139,7 +14132,7 @@
1413914132
},
1414014133
{
1414114134
"command": "gitlens.views.launchpad.regroup",
14142-
"when": "view == gitlens.views.launchpad && config.gitlens.views.scm.grouped.enabled",
14135+
"when": "view == gitlens.views.launchpad",
1414314136
"group": "navigation@99"
1414414137
},
1414514138
{
@@ -14264,7 +14257,7 @@
1426414257
},
1426514258
{
1426614259
"command": "gitlens.views.remotes.regroup",
14267-
"when": "view == gitlens.views.remotes && config.gitlens.views.scm.grouped.enabled",
14260+
"when": "view == gitlens.views.remotes",
1426814261
"group": "navigation@99"
1426914262
},
1427014263
{
@@ -14324,7 +14317,7 @@
1432414317
},
1432514318
{
1432614319
"command": "gitlens.views.repositories.regroup",
14327-
"when": "view == gitlens.views.repositories && config.gitlens.views.scm.grouped.enabled",
14320+
"when": "view == gitlens.views.repositories",
1432814321
"group": "navigation@99"
1432914322
},
1433014323
{
@@ -14384,7 +14377,7 @@
1438414377
},
1438514378
{
1438614379
"command": "gitlens.views.searchAndCompare.regroup",
14387-
"when": "view == gitlens.views.searchAndCompare && config.gitlens.views.scm.grouped.enabled",
14380+
"when": "view == gitlens.views.searchAndCompare",
1438814381
"group": "navigation@99"
1438914382
},
1439014383
{
@@ -14444,7 +14437,7 @@
1444414437
},
1444514438
{
1444614439
"command": "gitlens.views.stashes.regroup",
14447-
"when": "view == gitlens.views.stashes && config.gitlens.views.scm.grouped.enabled",
14440+
"when": "view == gitlens.views.stashes",
1444814441
"group": "navigation@99"
1444914442
},
1445014443
{
@@ -14469,7 +14462,7 @@
1446914462
},
1447014463
{
1447114464
"command": "gitlens.views.tags.regroup",
14472-
"when": "view == gitlens.views.tags && config.gitlens.views.scm.grouped.enabled",
14465+
"when": "view == gitlens.views.tags",
1447314466
"group": "navigation@99"
1447414467
},
1447514468
{
@@ -14529,7 +14522,7 @@
1452914522
},
1453014523
{
1453114524
"command": "gitlens.views.worktrees.regroup",
14532-
"when": "view == gitlens.views.worktrees && config.gitlens.views.scm.grouped.enabled",
14525+
"when": "view == gitlens.views.worktrees",
1453314526
"group": "navigation@99"
1453414527
},
1453514528
{
@@ -19448,6 +19441,16 @@
1944819441
"view": "gitlens.views.scm.grouped",
1944919442
"contents": "Pro feature — requires a paid plan for use on privately-hosted repos.",
1945019443
"when": "gitlens:views:scm:grouped:view == worktrees"
19444+
},
19445+
{
19446+
"view": "gitlens.views.scm.grouped",
19447+
"contents": "GitLens views—Commits, Branches, Stashes, etc—are grouped together for easier view management.\nUse the tabs above to navigate, or detach the views you want to keep separated. Once detached, you can regroup them anytime using the 'x' in the view's header.\n\n[Continue](command:gitlens.views.scm.grouped.welcome.dismiss)",
19448+
"when": "!gitlens:views:scm:grouped:welcome:dismissed && gitlens:newInstall"
19449+
},
19450+
{
19451+
"view": "gitlens.views.scm.grouped",
19452+
"contents": "In GitLens 16, we've grouped many views—Commits, Branches, Stashes, etc—together here for easier view management.\nUse the tabs above to navigate, or detach the views you want to keep separated. Once detached, you can regroup them anytime using the 'x' in the view's header.\n\n[Continue](command:gitlens.views.scm.grouped.welcome.dismiss)\n\nPrefer them separate? [Restore views to previous locations](command:gitlens.views.scm.grouped.welcome.restore)",
19453+
"when": "!gitlens:views:scm:grouped:welcome:dismissed && !gitlens:newInstall"
1945119454
}
1945219455
],
1945319456
"views": {
@@ -19464,7 +19467,7 @@
1946419467
{
1946519468
"id": "gitlens.views.launchpad",
1946619469
"name": "Launchpad",
19467-
"when": "!(config.gitlens.views.scm.grouped.enabled && gitlens:views:scm:grouped:view == launchpad) && !gitlens:views:scm:grouped:refresh",
19470+
"when": "!config.gitlens.views.scm.grouped.views.launchpad && !gitlens:views:scm:grouped:refresh",
1946819471
"contextualTitle": "GitLens",
1946919472
"icon": "$(gitlens-launchpad-view)",
1947019473
"initialSize": 2,
@@ -19540,7 +19543,7 @@
1954019543
{
1954119544
"id": "gitlens.views.searchAndCompare",
1954219545
"name": "Search & Compare",
19543-
"when": "!gitlens:disabled && !(config.gitlens.views.scm.grouped.enabled && config.gitlens.views.scm.grouped.views.searchAndCompare) && !gitlens:views:scm:grouped:refresh",
19546+
"when": "!gitlens:disabled && !config.gitlens.views.scm.grouped.views.searchAndCompare && !gitlens:views:scm:grouped:refresh",
1954419547
"contextualTitle": "GitLens",
1954519548
"icon": "$(gitlens-search-view)",
1954619549
"initialSize": 2,
@@ -19584,71 +19587,71 @@
1958419587
{
1958519588
"id": "gitlens.views.repositories",
1958619589
"name": "Repositories",
19587-
"when": "!gitlens:disabled && !(config.gitlens.views.scm.grouped.enabled && config.gitlens.views.scm.grouped.views.repositories) && !gitlens:views:scm:grouped:refresh",
19590+
"when": "!gitlens:disabled && !config.gitlens.views.scm.grouped.views.repositories && !gitlens:views:scm:grouped:refresh",
1958819591
"contextualTitle": "GitLens",
1958919592
"icon": "$(gitlens-repositories-view)",
1959019593
"visibility": "hidden"
1959119594
},
1959219595
{
1959319596
"id": "gitlens.views.commits",
1959419597
"name": "Commits",
19595-
"when": "!gitlens:disabled && !(config.gitlens.views.scm.grouped.enabled && config.gitlens.views.scm.grouped.views.commits) && !gitlens:views:scm:grouped:refresh",
19598+
"when": "!gitlens:disabled && !config.gitlens.views.scm.grouped.views.commits && !gitlens:views:scm:grouped:refresh",
1959619599
"contextualTitle": "GitLens",
1959719600
"icon": "$(gitlens-commits-view)",
1959819601
"visibility": "visible"
1959919602
},
1960019603
{
1960119604
"id": "gitlens.views.branches",
1960219605
"name": "Branches",
19603-
"when": "!gitlens:disabled && !(config.gitlens.views.scm.grouped.enabled && config.gitlens.views.scm.grouped.views.branches) && !gitlens:views:scm:grouped:refresh",
19606+
"when": "!gitlens:disabled && !config.gitlens.views.scm.grouped.views.branches && !gitlens:views:scm:grouped:refresh",
1960419607
"contextualTitle": "GitLens",
1960519608
"icon": "$(gitlens-branches-view)",
1960619609
"visibility": "collapsed"
1960719610
},
1960819611
{
1960919612
"id": "gitlens.views.remotes",
1961019613
"name": "Remotes",
19611-
"when": "!gitlens:disabled && !(config.gitlens.views.scm.grouped.enabled && config.gitlens.views.scm.grouped.views.remotes) && !gitlens:views:scm:grouped:refresh",
19614+
"when": "!gitlens:disabled && !config.gitlens.views.scm.grouped.views.remotes && !gitlens:views:scm:grouped:refresh",
1961219615
"contextualTitle": "GitLens",
1961319616
"icon": "$(gitlens-remotes-view)",
1961419617
"visibility": "collapsed"
1961519618
},
1961619619
{
1961719620
"id": "gitlens.views.stashes",
1961819621
"name": "Stashes",
19619-
"when": "!gitlens:disabled && !gitlens:hasVirtualFolders && !(config.gitlens.views.scm.grouped.enabled && config.gitlens.views.scm.grouped.views.stashes) && !gitlens:views:scm:grouped:refresh",
19622+
"when": "!gitlens:disabled && !gitlens:hasVirtualFolders && !config.gitlens.views.scm.grouped.views.stashes && !gitlens:views:scm:grouped:refresh",
1962019623
"contextualTitle": "GitLens",
1962119624
"icon": "$(gitlens-stashes-view)",
1962219625
"visibility": "collapsed"
1962319626
},
1962419627
{
1962519628
"id": "gitlens.views.tags",
1962619629
"name": "Tags",
19627-
"when": "!gitlens:disabled && !(config.gitlens.views.scm.grouped.enabled && config.gitlens.views.scm.grouped.views.tags) && !gitlens:views:scm:grouped:refresh",
19630+
"when": "!gitlens:disabled && !config.gitlens.views.scm.grouped.views.tags && !gitlens:views:scm:grouped:refresh",
1962819631
"contextualTitle": "GitLens",
1962919632
"icon": "$(gitlens-tags-view)",
1963019633
"visibility": "collapsed"
1963119634
},
1963219635
{
1963319636
"id": "gitlens.views.worktrees",
1963419637
"name": "Worktrees",
19635-
"when": "!gitlens:disabled && !gitlens:hasVirtualFolders && gitlens:plus:enabled && !(config.gitlens.views.scm.grouped.enabled && config.gitlens.views.scm.grouped.views.worktrees) && !gitlens:views:scm:grouped:refresh",
19638+
"when": "!gitlens:disabled && !gitlens:hasVirtualFolders && gitlens:plus:enabled && !config.gitlens.views.scm.grouped.views.worktrees && !gitlens:views:scm:grouped:refresh",
1963619639
"contextualTitle": "GitLens",
1963719640
"icon": "$(gitlens-worktrees-view)",
1963819641
"visibility": "collapsed"
1963919642
},
1964019643
{
1964119644
"id": "gitlens.views.contributors",
1964219645
"name": "Contributors",
19643-
"when": "!gitlens:disabled && !(config.gitlens.views.scm.grouped.enabled && config.gitlens.views.scm.grouped.views.contributors) && !gitlens:views:scm:grouped:refresh",
19646+
"when": "!gitlens:disabled && !config.gitlens.views.scm.grouped.views.contributors && !gitlens:views:scm:grouped:refresh",
1964419647
"contextualTitle": "GitLens",
1964519648
"icon": "$(gitlens-contributors-view)",
1964619649
"visibility": "collapsed"
1964719650
},
1964819651
{
1964919652
"id": "gitlens.views.scm.grouped",
1965019653
"name": "GitLens",
19651-
"when": "!gitlens:disabled && config.gitlens.views.scm.grouped.enabled && (config.gitlens.views.scm.grouped.views.branches || config.gitlens.views.scm.grouped.views.commits || config.gitlens.views.scm.grouped.views.contributors || config.gitlens.views.scm.grouped.views.launchpad || config.gitlens.views.scm.grouped.views.remotes || config.gitlens.views.scm.grouped.views.repositories || config.gitlens.views.scm.grouped.views.searchAndCompare || config.gitlens.views.scm.grouped.views.stashes || config.gitlens.views.scm.grouped.views.tags || config.gitlens.views.scm.grouped.views.worktrees) && !gitlens:views:scm:grouped:refresh",
19654+
"when": "!gitlens:disabled && (config.gitlens.views.scm.grouped.views.branches || config.gitlens.views.scm.grouped.views.commits || config.gitlens.views.scm.grouped.views.contributors || config.gitlens.views.scm.grouped.views.launchpad || config.gitlens.views.scm.grouped.views.remotes || config.gitlens.views.scm.grouped.views.repositories || config.gitlens.views.scm.grouped.views.searchAndCompare || config.gitlens.views.scm.grouped.views.stashes || config.gitlens.views.scm.grouped.views.tags || config.gitlens.views.scm.grouped.views.worktrees) && !gitlens:views:scm:grouped:refresh",
1965219655
"contextualTitle": "GitLens",
1965319656
"icon": "$(gitlens-gitlens)",
1965419657
"visibility": "visible"

‎src/config.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,6 @@ export interface ViewsCommonConfig {
626626
};
627627
readonly scm: {
628628
grouped: {
629-
readonly enabled: boolean;
630629
readonly default: GroupableTreeViewTypes;
631630
readonly views: Record<GroupableTreeViewTypes, boolean>;
632631
};

‎src/constants.context.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export type ContextKeys = {
1515
'gitlens:gk:organization:drafts:enabled': boolean;
1616
'gitlens:hasVirtualFolders': boolean;
1717
'gitlens:launchpad:connect': boolean;
18+
'gitlens:newInstall': boolean;
1819
'gitlens:plus': SubscriptionPlanId;
1920
'gitlens:plus:disallowedRepos': string[];
2021
'gitlens:plus:enabled': boolean;
@@ -46,6 +47,7 @@ export type ContextKeys = {
4647
'gitlens:views:repositories:autoRefresh': boolean;
4748
'gitlens:views:scm:grouped:refresh': boolean;
4849
'gitlens:views:scm:grouped:view': GroupableTreeViewTypes;
50+
'gitlens:views:scm:grouped:welcome:dismissed': boolean;
4951
'gitlens:vsls': boolean | 'host' | 'guest';
5052
'gitlens:window:annotated': AnnotationStatus;
5153
} & Record<`gitlens:action:${string}`, number> &

‎src/constants.storage.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ export type GlobalStorage = {
7676
'launchpad:indicator:hasInteracted': string;
7777
'launchpadView:groups:expanded': StoredLaunchpadGroup[];
7878
'graph:searchMode': StoredGraphSearchMode;
79+
'views:scm:grouped:welcome:dismissed': boolean;
7980
} & { [key in `confirm:ai:tos:${AIProviders}`]: boolean } & {
8081
[key in `provider:authentication:skip:${string}`]: boolean;
8182
} & { [key in `gk:${string}:checkin`]: Stored<StoredGKCheckInResponse> } & {

‎src/extension.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,10 @@ export async function activate(context: ExtensionContext): Promise<GitLensApi |
147147
previousVersion = localVersion;
148148
}
149149

150+
if (previousVersion == null) {
151+
void setContext('gitlens:newInstall', true);
152+
}
153+
150154
let exitMessage;
151155
if (Logger.enabled('debug')) {
152156
exitMessage = `syncedVersion=${syncedVersion}, localVersion=${localVersion}, previousVersion=${previousVersion}`;

0 commit comments

Comments
 (0)