Clean up previous walkthrough

gitkraken · Oct 28, 2024 · a83c128 · a83c128
1 parent 5b4fbd3
commit a83c128
Show file tree

Hide file tree

Showing 27 changed files with 30 additions and 1,146 deletions.
diff --git a/package.json b/package.json
diff --git a/src/constants.telemetry.ts b/src/constants.telemetry.ts
@@ -1,4 +1,5 @@
 import type { Config, GraphBranchesVisibility, GraphConfig } from './config';
+import type { WalkthroughSteps } from './constants';
 import type { AIModels, AIProviders } from './constants.ai';
 import type { Commands } from './constants.commands';
 import type { IntegrationId, SupportedCloudIntegrationIds } from './constants.integrations';
@@ -388,19 +389,7 @@ export type TelemetryEvents = {
 
 	/** Sent when the walkthrough is opened */
 	walkthrough: {
-		step?:
-			| 'get-started'
-			| 'core-features'
-			| 'pro-features'
-			| 'pro-trial'
-			| 'pro-upgrade'
-			| 'pro-reactivate'
-			| 'pro-paid'
-			| 'visualize'
-			| 'launchpad'
-			| 'code-collab'
-			| 'integrations'
-			| 'more';
+		step?: WalkthroughSteps;
 	};
 } & Record<`${WebviewTypes | WebviewViewTypes}/showAborted`, WebviewShownEventData> &
 	Record<

diff --git a/src/constants.ts b/src/constants.ts
@@ -173,15 +173,11 @@ export const urls = Object.freeze({
 });
 
 export type WalkthroughSteps =
-	| 'get-started'
-	| 'core-features'
-	| 'pro-features'
-	| 'pro-trial'
-	| 'pro-upgrade'
-	| 'pro-reactivate'
-	| 'pro-paid'
-	| 'visualize'
-	| 'launchpad'
-	| 'code-collab'
-	| 'integrations'
-	| 'more';
+	| 'welcome-in-trial'
+	| 'welcome-paid'
+	| 'welcome-in-trial-expired'
+	| 'get-started-community'
+	| 'visualize-code-history'
+	| 'accelerate-pr-reviews'
+	| 'streamline-collaboration'
+	| 'improve-workflows-with-integrations';
diff --git a/src/plus/gk/account/subscriptionService.ts b/src/plus/gk/account/subscriptionService.ts
@@ -280,35 +280,30 @@ export class SubscriptionService implements Disposable {
 		switch (subscription.state) {
 			case SubscriptionState.VerificationRequired:
 			case SubscriptionState.Community:
-			case SubscriptionState.ProPreview:
-			case SubscriptionState.ProPreviewExpired:
 				void executeCommand<OpenWalkthroughCommandArgs>(Commands.OpenWalkthrough, {
 					...source,
-					step: 'pro-features',
+					step: 'get-started-community',
 				});
 				break;
 			case SubscriptionState.ProTrial:
+			case SubscriptionState.ProPreview:
 				void executeCommand<OpenWalkthroughCommandArgs>(Commands.OpenWalkthrough, {
 					...source,
-					step: 'pro-trial',
-				});
-				break;
-			case SubscriptionState.ProTrialExpired:
-				void executeCommand<OpenWalkthroughCommandArgs>(Commands.OpenWalkthrough, {
-					...source,
-					step: 'pro-upgrade',
+					step: 'welcome-in-trial',
 				});
 				break;
 			case SubscriptionState.ProTrialReactivationEligible:
+			case SubscriptionState.ProTrialExpired:
+			case SubscriptionState.ProPreviewExpired:
 				void executeCommand<OpenWalkthroughCommandArgs>(Commands.OpenWalkthrough, {
 					...source,
-					step: 'pro-reactivate',
+					step: 'welcome-in-trial-expired',
 				});
 				break;
 			case SubscriptionState.Paid:
 				void executeCommand<OpenWalkthroughCommandArgs>(Commands.OpenWalkthrough, {
 					...source,
-					step: 'pro-paid',
+					step: 'welcome-paid',
 				});
 				break;
 		}

diff --git a/src/plus/launchpad/launchpad.ts b/src/plus/launchpad/launchpad.ts
@@ -832,7 +832,7 @@ export class LaunchpadCommand extends QuickCommand<State> {
 				iconPath: new ThemeIcon('rocket'),
 				onDidSelect: () =>
 					void executeCommand<OpenWalkthroughCommandArgs>(Commands.OpenWalkthrough, {
-						step: 'launchpad',
+						step: 'accelerate-pr-reviews',
 						source: 'launchpad',
 						detail: 'info',
 					}),

diff --git a/src/plus/launchpad/launchpadIndicator.ts b/src/plus/launchpad/launchpadIndicator.ts
@@ -541,7 +541,7 @@ export class LaunchpadIndicator implements Disposable {
 				switch (action) {
 					case 'info': {
 						void executeCommand<OpenWalkthroughCommandArgs>(Commands.OpenWalkthrough, {
-							step: 'launchpad',
+							step: 'accelerate-pr-reviews',
 							source: 'launchpad-indicator',
 							detail: 'info',
 						});

diff --git a/src/views/draftsView.ts b/src/views/draftsView.ts
@@ -122,7 +122,7 @@ export class DraftsView extends ViewBase<'drafts', DraftsViewNode, DraftsViewCon
 				this.getQualifiedCommand('info'),
 				() =>
 					executeCommand<OpenWalkthroughCommandArgs>(Commands.OpenWalkthrough, {
-						step: 'code-collab',
+						step: 'streamline-collaboration',
 						source: 'cloud-patches',
 						detail: 'info',
 					}),

diff --git a/src/views/launchpadView.ts b/src/views/launchpadView.ts
@@ -238,7 +238,7 @@ export class LaunchpadView extends ViewBase<'launchpad', LaunchpadViewNode, Laun
 				this.getQualifiedCommand('info'),
 				() =>
 					executeCommand<OpenWalkthroughCommandArgs>(Commands.OpenWalkthrough, {
-						step: 'launchpad',
+						step: 'accelerate-pr-reviews',
 						source: 'launchpad-view',
 						detail: 'info',
 					}),

diff --git a/src/webviews/home/homeWebview.ts b/src/webviews/home/homeWebview.ts
@@ -205,8 +205,7 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 				doneCount: this.container.walkthrough.doneCount,
 				progress: this.container.walkthrough.progress,
 			},
-			showWalkthroughProgress:
-				!this.getWalkthroughDismissed() && configuration.getAny('gitlens.test.newWalkthrough'),
+			showWalkthroughProgress: !this.getWalkthroughDismissed(),
 		};
 	}
 

diff --git a/walkthroughs/welcome/code-collab.png b/walkthroughs/welcome/code-collab.png
diff --git a/walkthroughs/welcome/commit-graph.svg b/walkthroughs/welcome/commit-graph.svg