Notifications: Go or No Go (#6967)

Fixes #6750

Author: alexr00

package.json

@@ -465,11 +465,6 @@
 					"markdownDescription": "%githubPullRequests.experimental.chat.description%",
 					"default": false
 				},
-				"githubPullRequests.experimental.notificationsView": {
-					"type": "boolean",
-					"markdownDescription": "%githubPullRequests.experimental.notificationsView.description%",
-					"default": false
-				},
 				"githubPullRequests.experimental.notificationsMarkPullRequests": {
 					"type": "string",
 					"markdownDescription": "%githubPullRequests.experimental.notificationsMarkPullRequests.description%",
@@ -717,7 +712,8 @@
 					"name": "%view.notifications.github.name%",
 					"when": "ReposManagerStateContext != NeedsAuthentication && !github:resolvingConflicts && config.githubPullRequests.experimental.notificationsView && (remoteName != codespaces || !isWeb)",
 					"icon": "$(bell)",
-					"accessibilityHelpContent": "%view.pr.github.accessibilityHelpContent%"
+					"accessibilityHelpContent": "%view.pr.github.accessibilityHelpContent%",
+					"visibility": "collapsed"
 				},
 				{
 					"id": "github:conflictResolution",
@@ -732,20 +728,23 @@
 					"type": "webview",
 					"name": "%view.github.create.pull.request.name%",
 					"when": "github:createPullRequest || github:revertPullRequest",
+					"icon": "$(git-pull-request-create)",
 					"visibility": "visible",
 					"initialSize": 2
 				},
 				{
 					"id": "github:compareChangesFiles",
 					"name": "%view.github.compare.changes.name%",
 					"when": "github:createPullRequest",
+					"icon": "$(git-compare)",
 					"visibility": "visible",
 					"initialSize": 1
 				},
 				{
 					"id": "github:compareChangesCommits",
 					"name": "%view.github.compare.changesCommits.name%",
 					"when": "github:createPullRequest",
+					"icon": "$(git-compare)",
 					"visibility": "visible",
 					"initialSize": 1
 				},
@@ -762,12 +761,14 @@
 					"type": "webview",
 					"name": "%view.github.active.pull.request.name%",
 					"when": "github:inReviewMode && github:focusedReview && !github:createPullRequest && !github:revertPullRequest && github:activePRCount <= 1",
+					"icon": "$(git-pull-request)",
 					"initialSize": 2
 				},
 				{
 					"id": "github:activePullRequest:welcome",
 					"name": "%view.github.active.pull.request.welcome.name%",
-					"when": "!github:stateValidated && github:focusedReview"
+					"when": "!github:stateValidated && github:focusedReview",
+					"icon": "$(git-pull-request)"
 				}
 			]
 		},

src/common/settingKeys.ts

@@ -54,7 +54,6 @@ export const ALLOW_FETCH = 'allowFetch';
 export const ALWAYS_PROMPT_FOR_NEW_ISSUE_REPO = 'alwaysPromptForNewIssueRepo';
 export const EXPERIMENTAL_CHAT = 'experimental.chat';
 export const EXPERIMENTAL_USE_QUICK_CHAT = 'experimental.useQuickChat';
-export const EXPERIMENTAL_NOTIFICATIONS = 'experimental.notificationsView';
 export const EXPERIMENTAL_NOTIFICATIONS_PAGE_SIZE = 'experimental.notificationsViewPageSize';
 export const EXPERIMENTAL_NOTIFICATIONS_SCORE = 'experimental.notificationsScore';
 export const WEBVIEW_REFRESH_INTERVAL = 'webviewRefreshInterval';

src/extension.ts

@@ -15,7 +15,7 @@ import Logger from './common/logger';
 import * as PersistentState from './common/persistentState';
 import { parseRepositoryRemotes } from './common/remote';
 import { Resource } from './common/resources';
-import { BRANCH_PUBLISH, EXPERIMENTAL_CHAT, EXPERIMENTAL_NOTIFICATIONS, FILE_LIST_LAYOUT, GIT, OPEN_DIFF_ON_CLICK, PR_SETTINGS_NAMESPACE, SHOW_INLINE_OPEN_FILE_ACTION } from './common/settingKeys';
+import { BRANCH_PUBLISH, EXPERIMENTAL_CHAT, FILE_LIST_LAYOUT, GIT, OPEN_DIFF_ON_CLICK, PR_SETTINGS_NAMESPACE, SHOW_INLINE_OPEN_FILE_ACTION } from './common/settingKeys';
 import { initBasedOnSettingChange } from './common/settingsUtils';
 import { TemporaryState } from './common/temporaryState';
 import { Schemes } from './common/uri';
@@ -222,16 +222,8 @@ async function init(
 	context.subscriptions.push(issuesFeatures);
 	await issuesFeatures.initialize();
 
-	const notificationsViewEnabled = () => vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<boolean>(EXPERIMENTAL_NOTIFICATIONS, false);
-	const initNotifications = () => {
-		const notificationsFeatures = new NotificationsFeatureRegister(credentialStore, reposManager, telemetry);
-		context.subscriptions.push(notificationsFeatures);
-	};
-	if (notificationsViewEnabled()) {
-		initNotifications();
-	} else {
-		initBasedOnSettingChange(PR_SETTINGS_NAMESPACE, EXPERIMENTAL_NOTIFICATIONS, notificationsViewEnabled, initNotifications, context.subscriptions);
-	}
+	const notificationsFeatures = new NotificationsFeatureRegister(credentialStore, reposManager, telemetry);
+	context.subscriptions.push(notificationsFeatures);
 
 	context.subscriptions.push(new GitLensIntegration());