Fixes view refresh when grouped

Fixes missing welcome views when grouped

Author: eamodio

package.json

@@ -18761,54 +18761,109 @@
 				"view": "gitlens.views.worktrees",
 				"contents": "[Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view-pro) ᴾᴿᴼ — minimize context switching by allowing you to work on multiple branches simultaneously."
 			},
+			{
+				"view": "gitlens.views.grouped",
+				"contents": "[Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view-pro) ᴾᴿᴼ — minimize context switching by allowing you to work on multiple branches simultaneously.",
+				"when": "!gitlens:hasVirtualFolders && gitlens:views:grouped:view == worktrees"
+			},
 			{
 				"view": "gitlens.views.worktrees",
 				"contents": "[Create Worktree...](command:gitlens.views.createWorktree)",
 				"when": "!gitlens:plus:required"
 			},
+			{
+				"view": "gitlens.views.grouped",
+				"contents": "[Create Worktree...](command:gitlens.views.createWorktree)",
+				"when": "!gitlens:plus:required && gitlens:views:grouped:view == worktrees"
+			},
 			{
 				"view": "gitlens.views.worktrees",
 				"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).",
 				"when": "gitlens:plus:state == -1"
 			},
+			{
+				"view": "gitlens.views.grouped",
+				"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).",
+				"when": "gitlens:plus:state == -1 && gitlens:views:grouped:view == worktrees"
+			},
 			{
 				"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.",
 				"when": "gitlens:plus:required && gitlens:plus:state == 0"
 			},
+			{
+				"view": "gitlens.views.grouped",
+				"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.",
+				"when": "gitlens:plus:required && gitlens:plus:state == 0 && gitlens:views:grouped:view == worktrees"
+			},
 			{
 				"view": "gitlens.views.worktrees",
 				"contents": "[Start Pro Trial](command:gitlens.plus.signUp?%7B%22source%22%3A%22worktrees%22%7D)\n\nStart your free 7-day Pro trial to try Worktrees and other Pro features, or [sign in](command:gitlens.plus.login?%7B%22source%22%3A%22worktrees%22%7D).",
 				"when": "gitlens:plus:required && gitlens:plus:state == 2"
 			},
+			{
+				"view": "gitlens.views.grouped",
+				"contents": "[Start Pro Trial](command:gitlens.plus.signUp?%7B%22source%22%3A%22worktrees%22%7D)\n\nStart your free 7-day Pro trial to try Worktrees and other Pro features, or [sign in](command:gitlens.plus.login?%7B%22source%22%3A%22worktrees%22%7D).",
+				"when": "gitlens:plus:required && gitlens:plus:state == 2 && gitlens:views:grouped:view == worktrees"
+			},
 			{
 				"view": "gitlens.views.worktrees",
 				"contents": "[Upgrade to Pro](command:gitlens.plus.upgrade?%7B%22source%22%3A%22worktrees%22%7D)",
 				"when": "gitlens:plus:required && gitlens:plus:state == 4"
 			},
+			{
+				"view": "gitlens.views.grouped",
+				"contents": "[Upgrade to Pro](command:gitlens.plus.upgrade?%7B%22source%22%3A%22worktrees%22%7D)",
+				"when": "gitlens:plus:required && gitlens:plus:state == 4 && gitlens:views:grouped:view == worktrees"
+			},
 			{
 				"view": "gitlens.views.worktrees",
 				"contents": "Limited-time sale: Save 33% or more on your 1st seat of Pro.",
 				"when": "gitlens:plus:required && gitlens:plus:state == 4 && (gitlens:promo == pro50 || !gitlens:promo)"
 			},
+			{
+				"view": "gitlens.views.grouped",
+				"contents": "Limited-time sale: Save 33% or more on your 1st seat of Pro.",
+				"when": "gitlens:plus:required && gitlens:plus:state == 4 && (gitlens:promo == pro50 || !gitlens:promo) && gitlens:views:grouped:view == worktrees"
+			},
 			{
 				"view": "gitlens.views.worktrees",
 				"contents": "Limited-time sale: Save up to 80% on GitLens Pro",
 				"when": "gitlens:plus:required && gitlens:plus:state == 4 && gitlens:promo == devexdays"
 			},
+			{
+				"view": "gitlens.views.grouped",
+				"contents": "Limited-time sale: Save up to 80% on GitLens Pro",
+				"when": "gitlens:plus:required && gitlens:plus:state == 4 && gitlens:promo == devexdays && gitlens:views:grouped:view == worktrees"
+			},
 			{
 				"view": "gitlens.views.worktrees",
 				"contents": "Your Pro trial has ended. Please upgrade for full access to Worktrees and other Pro features.",
 				"when": "gitlens:plus:required && gitlens:plus:state == 4"
 			},
+			{
+				"view": "gitlens.views.grouped",
+				"contents": "Your Pro trial has ended. Please upgrade for full access to Worktrees and other Pro features.",
+				"when": "gitlens:plus:required && gitlens:plus:state == 4 && gitlens:views:grouped:view == worktrees"
+			},
 			{
 				"view": "gitlens.views.worktrees",
 				"contents": "[Continue](command:gitlens.plus.reactivateProTrial?%7B%22source%22%3A%22worktrees%22%7D)\n\nReactivate your Pro trial and experience Worktrees and all the new Pro features — free for another 7 days!",
 				"when": "gitlens:plus:required && gitlens:plus:state == 5"
 			},
+			{
+				"view": "gitlens.views.grouped",
+				"contents": "[Continue](command:gitlens.plus.reactivateProTrial?%7B%22source%22%3A%22worktrees%22%7D)\n\nReactivate your Pro trial and experience Worktrees and all the new Pro features — free for another 7 days!",
+				"when": "gitlens:plus:required && gitlens:plus:state == 5 && gitlens:views:grouped:view == worktrees"
+			},
 			{
 				"view": "gitlens.views.worktrees",
 				"contents": "Pro feature — requires a paid plan for use on privately-hosted repos."
+			},
+			{
+				"view": "gitlens.views.grouped",
+				"contents": "Pro feature — requires a paid plan for use on privately-hosted repos.",
+				"when": "gitlens:views:grouped:view == worktrees"
 			}
 		],
 		"views": {

src/views/groupedView.ts

@@ -1,7 +1,8 @@
 import { Disposable } from 'vscode';
+import type { Commands } from '../constants.commands';
 import type { GroupableTreeViewTypes } from '../constants.views';
 import type { Container } from '../container';
-import { registerCommand } from '../system/vscode/command';
+import { executeCommand, registerCommand } from '../system/vscode/command';
 import { setContext } from '../system/vscode/context';
 import { BranchesView } from './branchesView';
 import { CommitsView } from './commitsView';
@@ -33,7 +34,11 @@ export class GroupedView implements Disposable {
 		private readonly included: GroupableTreeViewTypes[],
 	) {
 		this._disposable = Disposable.from(
-			registerCommand('gitlens.views.grouped.refresh', () => this._view?.refresh()),
+			registerCommand('gitlens.views.grouped.refresh', () => {
+				if (this._view == null) return;
+
+				executeCommand(`gitlens.views.${this._view.type}.refresh` as Commands);
+			}),
 			registerCommand('gitlens.views.grouped.branches', () => this.setView('branches')),
 			registerCommand('gitlens.views.grouped.commits', () => this.setView('commits')),
 			registerCommand('gitlens.views.grouped.contributors', () => this.setView('contributors')),

src/views/viewBase.ts

@@ -270,6 +270,7 @@ export abstract class ViewBase<
 	dispose() {
 		this._nodeState?.dispose();
 		this._nodeState = undefined;
+		this.root?.dispose();
 		Disposable.from(...this.disposables).dispose();
 	}
 
@@ -402,6 +403,7 @@ export abstract class ViewBase<
 
 	protected ensureRoot(force: boolean = false) {
 		if (this.root == null || force) {
+			this.root?.dispose();
 			this.root = this.getRoot();
 		}