Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 2 additions & 28 deletions docs/telemetry-events.md

Large diffs are not rendered by default.

18 changes: 0 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
"onWebviewPanel:gitlens.patchDetails",
"onWebviewPanel:gitlens.settings",
"onWebviewPanel:gitlens.timeline",
"onWebviewPanel:gitlens.welcome",
"onStartupFinished"
],
"capabilities": {
Expand Down Expand Up @@ -4898,13 +4897,6 @@
"title": "General",
"order": 0,
"properties": {
"gitlens.showWelcomeOnInstall": {
"type": "boolean",
"default": true,
"markdownDescription": "Specifies whether to show the Welcome experience on first install",
"scope": "window",
"order": 10
},
"gitlens.showWhatsNewAfterUpgrades": {
"type": "boolean",
"default": true,
Expand Down Expand Up @@ -6075,11 +6067,6 @@
"title": "Show Visual File History View",
"category": "GitLens"
},
{
"command": "gitlens.showWelcomePage",
"title": "Welcome",
"category": "GitLens"
},
{
"command": "gitlens.showWorktreesView",
"title": "Show Worktrees View",
Expand Down Expand Up @@ -13203,11 +13190,6 @@
"when": "extension =~ /^eamodio.gitlens?$/ && extensionStatus == installed",
"group": "9_gitlens@1"
},
{
"command": "gitlens.showWelcomePage",
"when": "extension =~ /^eamodio.gitlens?$/ && extensionStatus == installed",
"group": "9_gitlens@2"
},
{
"command": "gitlens.showSettingsPage",
"when": "extension =~ /^eamodio.gitlens?$/ && extensionStatus == installed",
Expand Down
1 change: 0 additions & 1 deletion src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ export interface Config {
readonly showDetailsView: 'open' | 'selection' | false;
};
readonly remotes: RemotesConfig[] | null;
readonly showWelcomeOnInstall: boolean;
readonly showWhatsNewAfterUpgrades: boolean;
readonly sortBranchesBy: BranchSorting;
readonly sortContributorsBy: ContributorSorting;
Expand Down
1 change: 0 additions & 1 deletion src/constants.commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ export const enum Commands {
ShowTagsView = 'gitlens.showTagsView',
ShowTimelinePage = 'gitlens.showTimelinePage',
ShowTimelineView = 'gitlens.showTimelineView',
ShowWelcomePage = 'gitlens.showWelcomePage',
ShowWorktreesView = 'gitlens.showWorktreesView',
ShowWorkspacesView = 'gitlens.showWorkspacesView',
StashApply = 'gitlens.stashApply',
Expand Down
7 changes: 4 additions & 3 deletions src/constants.storage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ export type IntegrationAuthenticationKeys =
export const enum SyncedStorageKeys {
Version = 'gitlens:synced:version',
PreReleaseVersion = 'gitlens:synced:preVersion',
HomeViewWelcomeVisible = 'gitlens:views:welcome:visible',
}

export type DeprecatedGlobalStorage = {
Expand All @@ -36,6 +35,8 @@ export type DeprecatedGlobalStorage = {
/** @deprecated */
'home:banners:dismissed': string[];
/** @deprecated */
pendingWelcomeOnFocus: boolean;
/** @deprecated */
'plus:discountNotificationShown': boolean;
/** @deprecated */
'plus:migratedAuthentication': boolean;
Expand All @@ -45,6 +46,8 @@ export type DeprecatedGlobalStorage = {
'views:layout': 'gitlens' | 'scm';
/** @deprecated */
'views:commitDetails:dismissed': 'sidebar'[];
/** @deprecated */
'views:welcome:visible': boolean;
} & {
/** @deprecated */
[key in `disallow:connection:${string}`]: any;
Expand All @@ -54,7 +57,6 @@ export type GlobalStorage = {
avatars: [string, StoredAvatar][];
repoVisibility: [string, StoredRepoVisibilityInfo][];
'deepLinks:pending': StoredDeepLinkContext;
pendingWelcomeOnFocus: boolean;
pendingWhatsNewOnFocus: boolean;
// Don't change this key name ('premium`) as its the stored subscription
'premium:subscription': Stored<Subscription & { lastValidatedAt: number | undefined }>;
Expand All @@ -65,7 +67,6 @@ export type GlobalStorage = {
version: string;
// Keep the pre-release version separate from the released version
preVersion: string;
'views:welcome:visible': boolean;
'confirm:draft:storage': boolean;
'home:sections:collapsed': string[];
'home:walkthrough:dismissed': boolean;
Expand Down
1 change: 0 additions & 1 deletion src/constants.telemetry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,6 @@ export type Sources =
| 'scm-input'
| 'subscription'
| 'walkthrough'
| 'welcome'
| 'worktrees';

export type Source = {
Expand Down
2 changes: 1 addition & 1 deletion src/constants.views.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export type GroupableTreeViewTypes = Extract<
>;
export type GroupableTreeViewIds<T extends GroupableTreeViewTypes = GroupableTreeViewTypes> = TreeViewIds<T>;

export type WebviewTypes = 'graph' | 'patchDetails' | 'settings' | 'timeline' | 'welcome';
export type WebviewTypes = 'graph' | 'patchDetails' | 'settings' | 'timeline';
export type WebviewIds = `gitlens.${WebviewTypes}`;

export type WebviewViewTypes = 'commitDetails' | 'graph' | 'graphDetails' | 'home' | 'patchDetails' | 'timeline';
Expand Down
3 changes: 0 additions & 3 deletions src/container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ import { VslsController } from './vsls/vsls';
import { RebaseEditorProvider } from './webviews/rebase/rebaseEditor';
import { registerSettingsWebviewCommands, registerSettingsWebviewPanel } from './webviews/settings/registration';
import { WebviewsController } from './webviews/webviewsController';
import { registerWelcomeWebviewPanel } from './webviews/welcome/registration';

export type Environment = 'dev' | 'staging' | 'production';

Expand Down Expand Up @@ -231,8 +230,6 @@ export class Container {
this._disposables.push(settingsPanels);
this._disposables.push(registerSettingsWebviewCommands(settingsPanels));

this._disposables.push(registerWelcomeWebviewPanel(webviews));

this._disposables.push(new ViewFileDecorationProvider());

const patchDetailsPanels = registerPatchDetailsWebviewPanel(webviews);
Expand Down
38 changes: 4 additions & 34 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,7 @@ export async function activate(context: ExtensionContext): Promise<GitLensApi |

let exitMessage;
if (Logger.enabled('debug')) {
exitMessage = `syncedVersion=${syncedVersion}, localVersion=${localVersion}, previousVersion=${previousVersion}, welcome=${storage.get(
'views:welcome:visible',
)}`;
}

if (previousVersion == null) {
void storage.store('views:welcome:visible', true);
exitMessage = `syncedVersion=${syncedVersion}, localVersion=${localVersion}, previousVersion=${previousVersion}`;
}

Configuration.configure(context);
Expand Down Expand Up @@ -186,7 +180,7 @@ export async function activate(context: ExtensionContext): Promise<GitLensApi |
);
}

void showWelcomeOrWhatsNew(container, gitlensVersion, prerelease, previousVersion);
void showWhatsNew(container, gitlensVersion, prerelease, previousVersion);

void storage.store(prerelease ? 'preVersion' : 'version', gitlensVersion);

Expand Down Expand Up @@ -281,7 +275,7 @@ export function deactivate() {
// }

function setKeysForSync(context: ExtensionContext, ...keys: (SyncedStorageKeys | string)[]) {
context.globalState?.setKeysForSync([...keys, SyncedStorageKeys.Version, SyncedStorageKeys.HomeViewWelcomeVisible]);
context.globalState?.setKeysForSync([...keys, SyncedStorageKeys.Version, SyncedStorageKeys.PreReleaseVersion]);
}

function registerBuiltInActionRunners(container: Container): void {
Expand Down Expand Up @@ -316,7 +310,7 @@ function registerBuiltInActionRunners(container: Container): void {
);
}

async function showWelcomeOrWhatsNew(
async function showWhatsNew(
container: Container,
version: string,
prerelease: boolean,
Expand All @@ -325,30 +319,6 @@ async function showWelcomeOrWhatsNew(
if (previousVersion == null) {
Logger.log(`GitLens first-time install; window.focused=${window.state.focused}`);

if (configuration.get('showWelcomeOnInstall') === false) return;

if (window.state.focused) {
await container.storage.delete('pendingWelcomeOnFocus');
await executeCommand(Commands.ShowWelcomePage);
} else {
// Save pending on window getting focus
await container.storage.store('pendingWelcomeOnFocus', true);
const disposable = window.onDidChangeWindowState(e => {
if (!e.focused) return;

disposable.dispose();

// If the window is now focused and we are pending the welcome, clear the pending state and show the welcome
if (container.storage.get('pendingWelcomeOnFocus') === true) {
void container.storage.delete('pendingWelcomeOnFocus');
if (configuration.get('showWelcomeOnInstall')) {
void executeCommand(Commands.ShowWelcomePage);
}
}
});
container.context.subscriptions.push(disposable);
}

return;
}

Expand Down
1 change: 0 additions & 1 deletion src/telemetry/walkthroughStateProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ export class WalkthroughStateProvider implements Disposable {
private readonly walkthroughByTracking: Partial<Record<TrackedUsageKeys, WalkthroughContextKeys>> = {
[`command:${Commands.PlusStartPreviewTrial}:executed`]: WalkthroughContextKeys.GettingStarted,
[`command:${Commands.PlusReactivateProTrial}:executed`]: WalkthroughContextKeys.GettingStarted,
[`command:${Commands.ShowWelcomePage}:executed`]: WalkthroughContextKeys.GettingStarted,
[`command:${Commands.OpenWalkthrough}:executed`]: WalkthroughContextKeys.GettingStarted,
[`command:${Commands.GetStarted}:executed`]: WalkthroughContextKeys.GettingStarted,

Expand Down
2 changes: 1 addition & 1 deletion src/webviews/apps/settings/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { formatDate, setDefaultDateLocales } from '../shared/date';
import { DOM } from '../shared/dom';
// import { Snow } from '../shared/snow';
import '../shared/components/feature-badge';
import '../welcome/components/gitlens-logo';
import '../shared/components/gitlens-logo';

const topOffset = 83;
const offset = (new Date().getTimezoneOffset() / 60) * 100;
Expand Down
13 changes: 0 additions & 13 deletions src/webviews/apps/shared/styles/properties.scss
Original file line number Diff line number Diff line change
@@ -1,17 +1,4 @@
:root {
--gitlens-gutter-width: 20px;
--gk-action-radius: 0.2rem;
--gk-card-radius: 0.4rem;
}

.vscode-high-contrast,
.vscode-dark {
--gk-card-background: var(--color-background--lighten-05);
--gk-card-hover-background: var(--color-background--lighten-075);
}

.vscode-high-contrast-light,
.vscode-light {
--gk-card-background: var(--color-background--darken-05);
--gk-card-hover-background: var(--color-background--darken-075);
}
71 changes: 0 additions & 71 deletions src/webviews/apps/welcome/components/card.ts

This file was deleted.

Loading
Loading