Fix bug causing quick actions to not auto-open the domain

Jackson Kearl · Jackson Kearl · commit e340b535f09a · 2020-05-15T11:49:50.000-07:00
Add notification of the domain that was tried to open when managing trusted domains in the editor Fix microsoft#96855
diff --git a/src/vs/workbench/contrib/url/browser/trustedDomains.ts b/src/vs/workbench/contrib/url/browser/trustedDomains.ts
@@ -15,6 +15,8 @@ import { IAuthenticationService } from 'vs/workbench/services/authentication/bro
 import { IFileService } from 'vs/platform/files/common/files';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 
 const TRUSTED_DOMAINS_URI = URI.parse('trustedDomains:/Trusted Domains');
 
@@ -45,10 +47,13 @@ type ConfigureTrustedDomainsChoiceClassification = {
 export async function configureOpenerTrustedDomainsHandler(
 	trustedDomains: string[],
 	domainToConfigure: string,
+	resource: URI,
 	quickInputService: IQuickInputService,
 	storageService: IStorageService,
 	editorService: IEditorService,
-	telemetryService: ITelemetryService
+	telemetryService: ITelemetryService,
+	notificationService: INotificationService,
+	clipboardService: IClipboardService,
 ) {
 	const parsedDomainToConfigure = URI.parse(domainToConfigure);
 	const toplevelDomainSegements = parsedDomainToConfigure.authority.split('.');
@@ -92,10 +97,12 @@ export async function configureOpenerTrustedDomainsHandler(
 
 		switch (pickedResult.id) {
 			case 'manage':
-				editorService.openEditor({
+				await editorService.openEditor({
 					resource: TRUSTED_DOMAINS_URI,
 					mode: 'jsonc'
 				});
+				notificationService.prompt(Severity.Info, localize('configuringURL', "Configuring trust for: {0}", resource.toString()),
+					[{ label: 'Copy', run: () => clipboardService.writeText(resource.toString()) }]);
 				return trustedDomains;
 			case 'trustDomain':
 			case 'trustSubdomain':
@@ -112,7 +119,7 @@ export async function configureOpenerTrustedDomainsHandler(
 						StorageScope.GLOBAL
 					);
 
-					return [...trustedDomains, pickedResult.id];
+					return [...trustedDomains, itemToTrust];
 				}
 		}
 	}
diff --git a/src/vs/workbench/contrib/url/browser/trustedDomainsValidator.ts b/src/vs/workbench/contrib/url/browser/trustedDomainsValidator.ts
@@ -21,6 +21,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 type TrustedDomainsDialogActionClassification = {
 	action: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
@@ -37,6 +38,7 @@ export class OpenerValidatorContributions implements IWorkbenchContribution {
 		@IClipboardService private readonly _clipboardService: IClipboardService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@INotificationService private readonly _notificationService: INotificationService,
 	) {
 		this._openerService.registerValidator({ shouldOpen: r => this.validateLink(r) });
 	}
@@ -119,10 +121,13 @@ export class OpenerValidatorContributions implements IWorkbenchContribution {
 				const pickedDomains = await configureOpenerTrustedDomainsHandler(
 					trustedDomains,
 					domainToOpen,
+					resource,
 					this._quickInputService,
 					this._storageService,
 					this._editorService,
-					this._telemetryService
+					this._telemetryService,
+					this._notificationService,
+					this._clipboardService,
 				);
 				// Trust all domains
 				if (pickedDomains.indexOf('*') !== -1) {
