Modifies Home View welcome message

Author: nzaytsev

contributions.json

@@ -6845,19 +6845,6 @@
 				]
 			}
 		},
-		"gitlens.views.home.disablePreview": {
-			"label": "Revert to Old Home View",
-			"icon": "$(arrow-left)",
-			"menus": {
-				"view/title": [
-					{
-						"when": "view == gitlens.views.home && config.gitlens.home.preview.enabled",
-						"group": "navigation",
-						"order": 98
-					}
-				]
-			}
-		},
 		"gitlens.views.home.discussions": {
 			"label": "GitHub Discussions",
 			"icon": "$(comment-discussion)",

package.json

@@ -8112,11 +8112,6 @@
 				"command": "gitlens.views.highlightRevisionChanges",
 				"title": "Highlight Changes from this Commit"
 			},
-			{
-				"command": "gitlens.views.home.disablePreview",
-				"title": "Revert to Old Home View",
-				"icon": "$(arrow-left)"
-			},
 			{
 				"command": "gitlens.views.home.discussions",
 				"title": "GitHub Discussions",
@@ -11666,10 +11661,6 @@
 					"command": "gitlens.views.highlightRevisionChanges",
 					"when": "false"
 				},
-				{
-					"command": "gitlens.views.home.disablePreview",
-					"when": "false"
-				},
 				{
 					"command": "gitlens.views.home.discussions",
 					"when": "false"
@@ -17213,11 +17204,6 @@
 					"when": "view == gitlens.views.home",
 					"group": "navigation@97"
 				},
-				{
-					"command": "gitlens.views.home.disablePreview",
-					"when": "view == gitlens.views.home && config.gitlens.home.preview.enabled",
-					"group": "navigation@98"
-				},
 				{
 					"command": "gitlens.views.home.refresh",
 					"when": "view == gitlens.views.home",

src/webviews/apps/home/components/preview-banner.ts

@@ -1,9 +1,8 @@
 import { consume } from '@lit/context';
 import { css, html, LitElement, nothing } from 'lit';
 import { customElement, query, state } from 'lit/decorators.js';
-import { when } from 'lit/directives/when.js';
 import type { State } from '../../../home/protocol';
-import { CollapseSectionCommand, TogglePreviewEnabledCommand } from '../../../home/protocol';
+import { CollapseSectionCommand } from '../../../home/protocol';
 import { focusOutline } from '../../shared/components/styles/lit/a11y.css';
 import { linkBase } from '../../shared/components/styles/lit/base.css';
 import { ipcContext } from '../../shared/context';
@@ -24,6 +23,10 @@ export class GlPreviewBanner extends LitElement {
 	static override styles = [
 		linkBase,
 		css`
+			.title {
+				margin-block-end: 0.4em;
+			}
+
 			.text-button {
 				padding: 0.4rem 0.8rem;
 			}
@@ -69,67 +72,25 @@ export class GlPreviewBanner extends LitElement {
 	@query('button')
 	private _button!: HTMLButtonElement;
 
-	get isNewInstall() {
-		return this._state.newInstall;
-	}
-
 	override render() {
-		if (this._state.previewEnabled !== true) {
-			return html`
-				<gl-tooltip placement="bottom">
-					<button class="text-button text-button--end" @click=${() => this.togglePreview()}>
-						New Home View <code-icon icon="arrow-right"></code-icon>
-					</button>
-					<p slot="content">
-						<strong>Switch to the new Home View!</strong><br />
-						We've reimagined GitLens' Home to be a more helpful daily workflow tool. We're continuing to
-						refine this experience and welcome your feedback.
-					</p>
-				</gl-tooltip>
-			`;
-		}
-
+		console.log('test', this.closed, this._state.previewCollapsed);
 		if (this.closed || this._state.previewCollapsed === true) {
 			return nothing;
 		}
 
 		return html`
 			<gl-card>
-				<p><strong>Welcome to the ${this.isNewInstall ? 'GitLens ' : 'new '}Home View!</strong></p>
-				<p>
-					${this.isNewInstall
-						? html`This is a hub for your current, future, and recent work. `
-						: html`We've reimagined GitLens' Home to be a more helpful daily workflow tool. `}We're
-					continuing to refine this experience and welcome your
-					<a class="feedback" href="https://github.com/gitkraken/vscode-gitlens/discussions/3721"
-						><code-icon icon="feedback"></code-icon> feedback</a
-					>.
-				</p>
-				${when(
-					!this.isNewInstall,
-					() => html`
-						<button-container>
-							<gl-button appearance="secondary" @click=${() => this.togglePreview(true)} full
-								><code-icon icon="arrow-left"></code-icon> Revert to Old Home View</gl-button
-							>
-						</button-container>
-					`,
-				)}
+				<h4 class="title">Welcome to the GitLens Home View</h4>
+				Focus, prioritize, and take action on your current work, what’s next, and what you’ve recently worked
+				on.
+				<a class="feedback" href="https://help.gitkraken.com/gitlens/home-view/">Learn more</a>.
 				<gl-button slot="actions" appearance="toolbar" tooltip="Dismiss Welcome" @click=${() => this.onClose()}
 					><code-icon icon="close"></code-icon
 				></gl-button>
 			</gl-card>
 		`;
 	}
 
-	private togglePreview(dismiss = false) {
-		this._ipc.sendCommand(TogglePreviewEnabledCommand);
-
-		if (dismiss) {
-			this.closed = true;
-		}
-	}
-
 	private onClose() {
 		this.closed = true;
 

src/webviews/apps/home/home.ts

@@ -3,7 +3,6 @@ import './home.scss';
 import { provide } from '@lit/context';
 import { html } from 'lit';
 import { customElement, query } from 'lit/decorators.js';
-import { when } from 'lit/directives/when.js';
 import type { State } from '../../home/protocol';
 import { DidFocusAccount } from '../../home/protocol';
 import { OverviewState, overviewStateContext } from '../plus/home/components/overviewState';
@@ -67,19 +66,12 @@ export class GlHomeApp extends GlApp<State> {
 		return html`
 			<div class="home scrollable">
 				<gl-home-header class="home__header"></gl-home-header>
-				${when(!this.state.previewEnabled, () => html`<gl-preview-banner></gl-preview-banner>`)}
 				<gl-repo-alerts class="home__alerts"></gl-repo-alerts>
 				<main class="home__main scrollable" id="main">
-					${when(
-						this.state?.previewEnabled === true,
-						() => html`
-							<gl-preview-banner></gl-preview-banner>
-							<gl-active-work></gl-active-work>
-							<gl-launchpad></gl-launchpad>
-							<gl-overview></gl-overview>
-						`,
-						() => html`<gl-feature-nav .badgeSource=${this.badgeSource}></gl-feature-nav>`,
-					)}
+					<gl-preview-banner></gl-preview-banner>
+					<gl-active-work></gl-active-work>
+					<gl-launchpad></gl-launchpad>
+					<gl-overview></gl-overview>
 				</main>
 			</div>
 		`;

src/webviews/apps/home/stateProvider.ts

@@ -4,7 +4,7 @@ import type { State } from '../../home/protocol';
 import {
 	DidChangeIntegrationsConnections,
 	DidChangeOrgSettings,
-	DidChangePreviewEnabled,
+	DidChangePreview,
 	DidChangeRepositories,
 	DidChangeSubscription,
 	DidChangeWalkthroughProgress,
@@ -73,8 +73,7 @@ export class HomeStateProvider implements Disposable {
 					this.provider.setValue(this.state, true);
 					break;
 
-				case DidChangePreviewEnabled.is(msg):
-					this.state.previewEnabled = msg.params.previewEnabled;
+				case DidChangePreview.is(msg):
 					this.state.previewCollapsed = msg.params.previewCollapsed;
 					this.state.timestamp = Date.now();
 

src/webviews/home/homeWebview.ts

@@ -68,7 +68,7 @@ import {
 	DidChangeLaunchpad,
 	DidChangeOrgSettings,
 	DidChangeOverviewFilter,
-	DidChangePreviewEnabled,
+	DidChangePreview,
 	DidChangeRepositories,
 	DidChangeRepositoryWip,
 	DidChangeSubscription,
@@ -81,7 +81,6 @@ import {
 	GetOverviewFilterState,
 	OpenInGraphCommand,
 	SetOverviewFilter,
-	TogglePreviewEnabledCommand,
 } from './protocol';
 import type { HomeWebviewShowingArgs } from './registration';
 
@@ -130,7 +129,7 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 	getTelemetryContext(): HomeTelemetryContext {
 		return {
 			...this.host.getTelemetryContext(),
-			'context.preview': this.getPreviewEnabled() ? 'v16' : undefined,
+			'context.preview': 'v16',
 		};
 	}
 
@@ -268,7 +267,6 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 			),
 			registerCommand(`${this.host.id}.publishBranch`, this.push, this),
 			registerCommand(`${this.host.id}.refresh`, () => this.host.refresh(true), this),
-			registerCommand(`${this.host.id}.disablePreview`, () => this.onTogglePreviewEnabled(false), this),
 			registerCommand(
 				`${this.host.id}.previewFeedback`,
 				() => openUrl('https://github.com/gitkraken/vscode-gitlens/discussions/3721'),
@@ -325,9 +323,6 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 				await this.onChooseRepository();
 				void this.host.respond(ChangeOverviewRepository, e, undefined);
 				break;
-			case TogglePreviewEnabledCommand.is(e):
-				this.onTogglePreviewEnabled();
-				break;
 			case OpenInGraphCommand.is(e):
 				this.openInGraph(e.params);
 				break;
@@ -413,22 +408,6 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 		});
 	}
 
-	private onTogglePreviewEnabled(isEnabled?: boolean) {
-		if (isEnabled === undefined) {
-			isEnabled = !this.getPreviewEnabled();
-		}
-
-		if (!this.getPreviewCollapsed()) {
-			this.onCollapseSection({
-				section: 'newHomePreview',
-				collapsed: true,
-			});
-		}
-
-		this.container.telemetry.sendEvent('home/preview/toggled', { enabled: isEnabled, version: 'v16' });
-		configuration.updateEffective('home.preview.enabled', isEnabled);
-	}
-
 	private onCollapseSection(params: CollapseSectionParams) {
 		const collapsed = this.container.storage.get('home:sections:collapsed');
 		if (collapsed == null) {
@@ -525,15 +504,9 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 				progress: this.container.walkthrough.progress,
 			},
 			showWalkthroughProgress: !this.getWalkthroughDismissed(),
-			previewEnabled: this.getPreviewEnabled(),
-			newInstall: getContext('gitlens:install:new', false),
 		};
 	}
 
-	private getPreviewEnabled() {
-		return configuration.get('home.preview.enabled');
-	}
-
 	private getRepositoriesState(): DidChangeRepositoriesParams {
 		return {
 			count: this.container.git.repositoryCount,
@@ -840,8 +813,7 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 	}
 
 	private notifyDidChangeConfig() {
-		void this.host.notify(DidChangePreviewEnabled, {
-			previewEnabled: this.getPreviewEnabled(),
+		void this.host.notify(DidChangePreview, {
 			previewCollapsed: this.getPreviewCollapsed(),
 		});
 	}

src/webviews/home/protocol.ts

@@ -27,8 +27,6 @@ export interface State extends WebviewState {
 		progress: number;
 	};
 	showWalkthroughProgress?: boolean;
-	previewEnabled: boolean;
-	newInstall: boolean;
 }
 
 export interface IntegrationState extends IntegrationDescriptor {
@@ -147,8 +145,6 @@ export const ChangeOverviewRepository = new IpcRequest<undefined, undefined>(sco
 
 // COMMANDS
 
-export const TogglePreviewEnabledCommand = new IpcCommand<void>(scope, 'previewEnabled/toggle');
-
 export interface CollapseSectionParams {
 	section: string;
 	collapsed: boolean;
@@ -177,14 +173,10 @@ export const DidCompleteDiscoveringRepositories = new IpcNotification<DidComplet
 	'repositories/didCompleteDiscovering',
 );
 
-export interface DidChangePreviewEnabledParams {
-	previewEnabled: boolean;
+export interface DidChangePreviewParams {
 	previewCollapsed: boolean;
 }
-export const DidChangePreviewEnabled = new IpcNotification<DidChangePreviewEnabledParams>(
-	scope,
-	'previewEnabled/didChange',
-);
+export const DidChangePreview = new IpcNotification<DidChangePreviewParams>(scope, 'previewEnabled/didChange');
 
 export const DidChangeRepositoryWip = new IpcNotification<undefined>(scope, 'repository/wip/didChange');