notifications - review visibility handling (microsoft#252031)

Author: bpasero

src/vs/workbench/api/browser/mainThreadMessageService.ts

@@ -9,7 +9,7 @@ import { IAction, toAction } from '../../../base/common/actions.js';
 import { MainThreadMessageServiceShape, MainContext, MainThreadMessageOptions } from '../common/extHost.protocol.js';
 import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 import { IDialogService, IPromptButton } from '../../../platform/dialogs/common/dialogs.js';
-import { INotificationService, INotificationSource } from '../../../platform/notification/common/notification.js';
+import { INotificationService, INotificationSource, NotificationPriority } from '../../../platform/notification/common/notification.js';
 import { Event } from '../../../base/common/event.js';
 import { ICommandService } from '../../../platform/commands/common/commands.js';
 import { IExtensionService } from '../../services/extensions/common/extensions.js';
@@ -20,6 +20,11 @@ export class MainThreadMessageService implements MainThreadMessageServiceShape {
 
 	private extensionsListener: IDisposable;
 
+	private static readonly URGENT_NOTIFICATION_SOURCES = [
+		'vscode.github-authentication',
+		'vscode.microsoft-authentication'
+	];
+
 	constructor(
 		extHostContext: IExtHostContext,
 		@INotificationService private readonly _notificationService: INotificationService,
@@ -61,11 +66,13 @@ export class MainThreadMessageService implements MainThreadMessageServiceShape {
 			}));
 
 			let source: string | INotificationSource | undefined;
+			let sourceIsUrgent = false;
 			if (options.source) {
 				source = {
 					label: options.source.label,
 					id: options.source.identifier.value
 				};
+				sourceIsUrgent = MainThreadMessageService.URGENT_NOTIFICATION_SOURCES.includes(source.id);
 			}
 
 			if (!source) {
@@ -87,7 +94,9 @@ export class MainThreadMessageService implements MainThreadMessageServiceShape {
 				severity,
 				message,
 				actions: { primary: primaryActions, secondary: secondaryActions },
-				source
+				source,
+				priority: sourceIsUrgent ? NotificationPriority.URGENT : NotificationPriority.DEFAULT,
+				sticky: sourceIsUrgent
 			});
 
 			// if promise has not been resolved yet, now is the time to ensure a return value

src/vs/workbench/api/browser/mainThreadProgress.ts

@@ -10,10 +10,16 @@ import { ICommandService } from '../../../platform/commands/common/commands.js';
 import { localize } from '../../../nls.js';
 import { onUnexpectedExternalError } from '../../../base/common/errors.js';
 import { toAction } from '../../../base/common/actions.js';
+import { NotificationPriority } from '../../../platform/notification/common/notification.js';
 
 @extHostNamedCustomer(MainContext.MainThreadProgress)
 export class MainThreadProgress implements MainThreadProgressShape {
 
+	private static readonly URGENT_PROGRESS_SOURCES = [
+		'vscode.github-authentication',
+		'vscode.microsoft-authentication'
+	];
+
 	private readonly _progressService: IProgressService;
 	private _progress = new Map<number, { resolve: () => void; progress: IProgress<IProgressStep> }>();
 	private readonly _proxy: ExtHostProgressShape;
@@ -36,8 +42,10 @@ export class MainThreadProgress implements MainThreadProgressShape {
 		const task = this._createTask(handle);
 
 		if (options.location === ProgressLocation.Notification && extensionId) {
+			const sourceIsUrgent = MainThreadProgress.URGENT_PROGRESS_SOURCES.includes(extensionId);
 			const notificationOptions: IProgressNotificationOptions = {
 				...options,
+				priority: sourceIsUrgent ? NotificationPriority.URGENT : NotificationPriority.DEFAULT,
 				location: ProgressLocation.Notification,
 				secondaryActions: [toAction({
 					id: extensionId,

src/vs/workbench/browser/parts/notifications/notificationsToasts.ts

@@ -46,9 +46,9 @@ export class NotificationsToasts extends Themable implements INotificationsToast
 	private static readonly MAX_NOTIFICATIONS = 3;
 
 	private static readonly PURGE_TIMEOUT: { [severity: number]: number } = {
-		[Severity.Info]: 15000,
-		[Severity.Warning]: 18000,
-		[Severity.Error]: 20000
+		[Severity.Info]: 10000,
+		[Severity.Warning]: 12000,
+		[Severity.Error]: 15000
 	};
 
 	private static readonly SPAM_PROTECTION = {

src/vs/workbench/contrib/surveys/browser/languageSurveys.contribution.ts

@@ -119,7 +119,7 @@ class LanguageSurvey extends Disposable {
 					storageService.store(SKIP_VERSION_KEY, productService.version, StorageScope.APPLICATION, StorageTarget.USER);
 				}
 			}],
-			{ sticky: true, priority: NotificationPriority.OPTIONAL }
+			{ priority: NotificationPriority.OPTIONAL }
 		);
 	}
 }

src/vs/workbench/contrib/surveys/browser/nps.contribution.ts

@@ -87,7 +87,7 @@ class NPSContribution implements IWorkbenchContribution {
 					storageService.store(SKIP_VERSION_KEY, productService.version, StorageScope.APPLICATION, StorageTarget.USER);
 				}
 			}],
-			{ sticky: true, priority: NotificationPriority.URGENT }
+			{ priority: NotificationPriority.URGENT }
 		);
 	}
 }

src/vs/workbench/contrib/terminalContrib/wslRecommendation/browser/terminal.wslRecommendation.contribution.ts

@@ -66,7 +66,6 @@ export class TerminalWslRecommendationContribution extends Disposable implements
 					}
 				],
 				{
-					sticky: true,
 					priority: NotificationPriority.OPTIONAL,
 					neverShowAgain: { id: 'terminalConfigHelper/launchRecommendationsIgnore', scope: NeverShowAgainScope.APPLICATION },
 					onCancel: () => { }

src/vs/workbench/services/progress/browser/progressService.ts

@@ -338,6 +338,7 @@ export class ProgressService extends Disposable implements IProgressService {
 			// shows again.
 			let windowProgressDisposable: IDisposable | undefined = undefined;
 			const onVisibilityChange = (visible: boolean) => {
+
 				// Clear any previous running window progress
 				dispose(windowProgressDisposable);