Add 'Marketplace' issue type to issue reporter, closes #118473

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.55.0",
-  "distro": "2173d6da3776d9f0e894d49e854ba495636e1b5d",
+  "distro": "0357427beb5cd348177cd1ed381cd740082966c4",
   "author": {
     "name": "Microsoft Corporation"
   },

src/vs/code/electron-sandbox/issue/issueReporterMain.ts

@@ -53,6 +53,7 @@ export interface IssueReporterConfiguration extends IWindowConfiguration {
 		commit: string | undefined;
 		date: string | undefined;
 		reportIssueUrl: string | undefined;
+		reportMarketplaceIssueUrl: string | undefined;
 	}
 }
 
@@ -83,6 +84,7 @@ export class IssueReporter extends Disposable {
 		super();
 
 		this.initServices(configuration);
+		console.log(configuration);
 
 		const targetExtension = configuration.data.extensionId ? configuration.data.enabledExtensions.find(extension => extension.id === configuration.data.extensionId) : undefined;
 		this.issueReporterModel = new IssueReporterModel({
@@ -353,7 +355,8 @@ export class IssueReporter extends Disposable {
 		this.addEventListener('issue-title', 'input', (e: Event) => {
 			const title = (<HTMLInputElement>e.target).value;
 			const lengthValidationMessage = this.getElementById('issue-title-length-validation-error');
-			if (title && this.getIssueUrlWithTitle(title).length > MAX_URL_LENGTH) {
+			const issueUrl = this.getIssueUrl();
+			if (title && this.getIssueUrlWithTitle(title, issueUrl).length > MAX_URL_LENGTH) {
 				show(lengthValidationMessage);
 			} else {
 				hide(lengthValidationMessage);
@@ -468,6 +471,10 @@ export class IssueReporter extends Disposable {
 			return true;
 		}
 
+		if (issueType === IssueType.Marketplace) {
+			return true;
+		}
+
 		return false;
 	}
 
@@ -633,11 +640,18 @@ export class IssueReporter extends Disposable {
 
 		const typeSelect = this.getElementById('issue-type')! as HTMLSelectElement;
 		const { issueType } = this.issueReporterModel.getData();
-		reset(typeSelect,
-			makeOption(IssueType.Bug, localize('bugReporter', "Bug Report")),
-			makeOption(IssueType.FeatureRequest, localize('featureRequest', "Feature Request")),
-			makeOption(IssueType.PerformanceIssue, localize('performanceIssue', "Performance Issue"))
-		);
+		this.configuration.product.reportMarketplaceIssueUrl
+			? reset(typeSelect,
+				makeOption(IssueType.Bug, localize('bugReporter', "Bug Report")),
+				makeOption(IssueType.FeatureRequest, localize('featureRequest', "Feature Request")),
+				makeOption(IssueType.PerformanceIssue, localize('performanceIssue', "Performance Issue")),
+				makeOption(IssueType.Marketplace, localize('marketplaceIssue', "Extensions Marketplace Issue"))
+			)
+			: reset(typeSelect,
+				makeOption(IssueType.Bug, localize('bugReporter', "Bug Report")),
+				makeOption(IssueType.FeatureRequest, localize('featureRequest', "Feature Request")),
+				makeOption(IssueType.PerformanceIssue, localize('performanceIssue', "Performance Issue")),
+			);
 
 		typeSelect.value = issueType.toString();
 
@@ -751,6 +765,9 @@ export class IssueReporter extends Disposable {
 			if (fileOnExtension) {
 				show(extensionSelector);
 			}
+		} else if (issueType === IssueType.Marketplace) {
+			reset(descriptionTitle, localize('description', "Description"), $('span.required-input', undefined, '*'));
+			reset(descriptionSubtitle, localize('marketplaceDescription', "Please describe the feature you would like added to the marketplace, or steps to reliably reproduce the problem if you are reporting a bug. We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub."));
 		}
 	}
 
@@ -770,10 +787,14 @@ export class IssueReporter extends Disposable {
 
 	private validateInputs(): boolean {
 		let isValid = true;
-		['issue-title', 'description', 'issue-source'].forEach(elementId => {
+		['issue-title', 'description'].forEach(elementId => {
 			isValid = this.validateInput(elementId) && isValid;
 		});
 
+		if (this.issueReporterModel.getData().issueType !== IssueType.Marketplace) {
+			isValid = this.validateInput('issue-source') && isValid;
+		}
+
 		if (this.issueReporterModel.fileOnExtension()) {
 			isValid = this.validateInput('extension-selector') && isValid;
 		}
@@ -845,13 +866,13 @@ export class IssueReporter extends Disposable {
 		const issueTitle = (<HTMLInputElement>this.getElementById('issue-title')).value;
 		const issueBody = this.issueReporterModel.serialize();
 
-		const issueUrl = this.issueReporterModel.fileOnExtension() ? this.getExtensionGitHubUrl() : this.configuration.product.reportIssueUrl!;
+		const issueUrl = this.getIssueUrl();
 		const gitHubDetails = this.parseGitHubUrl(issueUrl);
 		if (this.configuration.data.githubAccessToken && gitHubDetails) {
 			return this.submitToGitHub(issueTitle, issueBody, gitHubDetails);
 		}
 
-		const baseUrl = this.getIssueUrlWithTitle((<HTMLInputElement>this.getElementById('issue-title')).value);
+		const baseUrl = this.getIssueUrlWithTitle((<HTMLInputElement>this.getElementById('issue-title')).value, issueUrl);
 		let url = baseUrl + `&body=${encodeURIComponent(issueBody)}`;
 
 		if (url.length > MAX_URL_LENGTH) {
@@ -881,6 +902,14 @@ export class IssueReporter extends Disposable {
 		});
 	}
 
+	private getIssueUrl(): string {
+		return this.issueReporterModel.fileOnExtension()
+			? this.getExtensionGitHubUrl()
+			: this.issueReporterModel.getData().issueType === IssueType.Marketplace
+				? this.configuration.product.reportMarketplaceIssueUrl!
+				: this.configuration.product.reportIssueUrl!;
+	}
+
 	private parseGitHubUrl(url: string): undefined | { repositoryName: string, owner: string } {
 		// Assumes a GitHub url to a particular repo, https://github.com/repositoryName/owner.
 		// Repository name and owner cannot contain '/'
@@ -909,16 +938,12 @@ export class IssueReporter extends Disposable {
 		return repositoryUrl;
 	}
 
-	private getIssueUrlWithTitle(issueTitle: string): string {
-		let repositoryUrl = this.configuration.product.reportIssueUrl;
+	private getIssueUrlWithTitle(issueTitle: string, repositoryUrl: string): string {
 		if (this.issueReporterModel.fileOnExtension()) {
-			const extensionGitHubUrl = this.getExtensionGitHubUrl();
-			if (extensionGitHubUrl) {
-				repositoryUrl = extensionGitHubUrl + '/issues/new';
-			}
+			repositoryUrl = repositoryUrl + '/issues/new';
 		}
 
-		const queryStringPrefix = this.configuration.product.reportIssueUrl && this.configuration.product.reportIssueUrl.indexOf('?') === -1 ? '?' : '&';
+		const queryStringPrefix = repositoryUrl.indexOf('?') === -1 ? '?' : '&';
 		return `${repositoryUrl}${queryStringPrefix}title=${encodeURIComponent(issueTitle)}`;
 	}
 

src/vs/platform/issue/common/issue.ts

@@ -17,7 +17,8 @@ export interface WindowData {
 export const enum IssueType {
 	Bug,
 	PerformanceIssue,
-	FeatureRequest
+	FeatureRequest,
+	Marketplace
 }
 
 export interface IssueReporterStyles extends WindowStyles {

src/vs/platform/issue/electron-main/issueMainService.ts

@@ -414,7 +414,8 @@ export class IssueMainService implements ICommonIssueService {
 				version: !!product.darwinUniversalAssetId ? `${product.version} (Universal)` : product.version,
 				commit: product.commit,
 				date: product.date,
-				reportIssueUrl: product.reportIssueUrl
+				reportIssueUrl: product.reportIssueUrl,
+				reportMarketplaceIssueUrl: product.reportMarketplaceIssueUrl
 			}
 		};
 

src/vs/platform/product/common/productService.ts

@@ -107,6 +107,7 @@ export interface IProductConfiguration {
 	readonly twitterUrl?: string;
 	readonly requestFeatureUrl?: string;
 	readonly reportIssueUrl?: string;
+	readonly reportMarketplaceIssueUrl?: string;
 	readonly licenseUrl?: string;
 	readonly privacyStatementUrl?: string;
 	readonly telemetryOptOutUrl?: string;