Add change template icon button next to Description when using template setting

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

Author: Copilot

common/views.ts

@@ -130,6 +130,7 @@ export interface CreateParamsNew {
 
 	creating: boolean;
 	reviewing: boolean;
+	usingTemplate: boolean;
 }
 
 export interface ChooseRemoteAndBranchArgs {

package.json

@@ -145,14 +145,12 @@
 					"type": "string",
 					"enum": [
 						"template",
-						"templatePrompt",
 						"commit",
 						"none",
 						"Copilot"
 					],
 					"enumDescriptions": [
 						"%githubPullRequests.pullRequestDescription.template%",
-						"%githubPullRequests.pullRequestDescription.templatePrompt%",
 						"%githubPullRequests.pullRequestDescription.commit%",
 						"%githubPullRequests.pullRequestDescription.none%",
 						"%githubPullRequests.pullRequestDescription.copilot%"

package.nls.json

@@ -3,7 +3,6 @@
 	"description": "Pull Request and Issue Provider for GitHub",
 	"githubPullRequests.pullRequestDescription.description": "The description used when creating pull requests.",
 	"githubPullRequests.pullRequestDescription.template": "Use a pull request template and commit description, or just use the commit description if no templates were found",
-	"githubPullRequests.pullRequestDescription.templatePrompt": "Prompt to select from available pull request templates when multiple templates exist, otherwise use the first template",
 	"githubPullRequests.pullRequestDescription.commit": "Use the latest commit message only",
 	"githubPullRequests.pullRequestDescription.none": "Do not have a default description",
 	"githubPullRequests.pullRequestDescription.copilot": "Generate a pull request title and description from GitHub Copilot. Requires that the GitHub Copilot extension is installed and authenticated. Will fall back to `commit` if Copilot is not set up.",

src/github/createPRViewProvider.ts

@@ -219,6 +219,7 @@ export abstract class BaseCreatePullRequestViewProvider<T extends BasePullReques
 		commands.setContext(contexts.CREATE_PR_PERMISSIONS, viewerPermission);
 
 		const useCopilot: boolean = !!this.getTitleAndDescriptionProvider('Copilot') && (vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<'commit' | 'template' | 'none' | 'Copilot'>(PULL_REQUEST_DESCRIPTION) === 'Copilot');
+		const usingTemplate: boolean = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<'commit' | 'template' | 'none' | 'Copilot'>(PULL_REQUEST_DESCRIPTION) === 'template';
 		const defaultTitleAndDescriptionProvider = this.getTitleAndDescriptionProvider()?.title;
 		if (defaultTitleAndDescriptionProvider) {
 			/* __GDPR__
@@ -255,7 +256,8 @@ export abstract class BaseCreatePullRequestViewProvider<T extends BasePullReques
 			initializeWithGeneratedTitleAndDescription: useCopilot,
 			preReviewState: PreReviewState.None,
 			preReviewer: preReviewer?.title,
-			reviewing: false
+			reviewing: false,
+			usingTemplate
 		};
 
 		return params;
@@ -682,7 +684,7 @@ export class CreatePullRequestViewProvider extends BaseCreatePullRequestViewProv
 	protected async getTitleAndDescription(compareBranch: Branch, baseBranch: string): Promise<{ title: string, description: string }> {
 		let title: string = '';
 		let description: string = '';
-		const descrptionSource = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<'commit' | 'template' | 'templatePrompt' | 'none' | 'Copilot'>(PULL_REQUEST_DESCRIPTION);
+		const descrptionSource = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<'commit' | 'template' | 'none' | 'Copilot'>(PULL_REQUEST_DESCRIPTION);
 		if (descrptionSource === 'none') {
 			return { title, description };
 		}
@@ -699,7 +701,7 @@ export class CreatePullRequestViewProvider extends BaseCreatePullRequestViewProv
 			const [totalCommits, lastCommit, pullRequestTemplate] = await Promise.all([
 				this.getTotalGitHubCommits(compareBranch, baseBranch),
 				name ? titleAndBodyFrom(promiseWithTimeout(this._folderRepositoryManager.getTipCommitMessage(name), 5000)) : undefined,
-				descrptionSource === 'template' ? this._folderRepositoryManager.getPullRequestTemplateBody(this.model.baseOwner) : (descrptionSource === 'templatePrompt' ? this.getPullRequestTemplate() : undefined)
+				descrptionSource === 'template' ? this.getPullRequestTemplate() : undefined
 			]);
 			const totalNonMergeCommits = totalCommits?.filter(commit => commit.parents.length < 2);
 
@@ -757,14 +759,20 @@ export class CreatePullRequestViewProvider extends BaseCreatePullRequestViewProv
 	}
 
 	private async getPullRequestTemplate(): Promise<string | undefined> {
+		return this._folderRepositoryManager.getPullRequestTemplateBody(this.model.baseOwner);
+	}
+
+	private async changeTemplate(message: IRequestMessage<any>): Promise<void> {
 		const templates = await this._folderRepositoryManager.getAllPullRequestTemplates(this.model.baseOwner);
 
 		if (!templates || templates.length === 0) {
-			return undefined;
+			vscode.window.showInformationMessage(vscode.l10n.t('No pull request templates found'));
+			return this._replyMessage(message, undefined);
 		}
 
 		if (templates.length === 1) {
-			return templates[0];
+			vscode.window.showInformationMessage(vscode.l10n.t('Only one template is available'));
+			return this._replyMessage(message, undefined);
 		}
 
 		// Multiple templates exist - show quick pick
@@ -785,7 +793,10 @@ export class CreatePullRequestViewProvider extends BaseCreatePullRequestViewProv
 			}
 		);
 
-		return selectedTemplate?.template;
+		if (selectedTemplate) {
+			return this._replyMessage(message, { description: selectedTemplate.template });
+		}
+		return this._replyMessage(message, undefined);
 	}
 
 	protected async detectBaseMetadata(defaultCompareBranch: Branch): Promise<BaseBranchMetadata | undefined> {
@@ -1359,6 +1370,9 @@ export class CreatePullRequestViewProvider extends BaseCreatePullRequestViewProv
 			case 'pr.cancelGenerateTitleAndDescription':
 				return this.cancelGenerateTitleAndDescription();
 
+			case 'pr.changeTemplate':
+				return this.changeTemplate(message);
+
 			case 'pr.preReview':
 				return this.preReview(message);
 

webviews/common/createContextNew.ts

@@ -34,7 +34,8 @@ const defaultCreateParams: CreateParamsNew = {
 	baseHasMergeQueue: false,
 	preReviewState: PreReviewState.None,
 	preReviewer: undefined,
-	reviewing: false
+	reviewing: false,
+	usingTemplate: false
 };
 
 export class CreatePRContextNew {

webviews/createPullRequestViewNew/app.tsx

@@ -12,7 +12,7 @@ import PullRequestContextNew from '../common/createContextNew';
 import { ErrorBoundary } from '../common/errorBoundary';
 import { LabelCreate } from '../common/label';
 import { ContextDropdown } from '../components/contextDropdown';
-import { accountIcon, feedbackIcon, gitCompareIcon, milestoneIcon, prMergeIcon, projectIcon, sparkleIcon, stopCircleIcon, tagIcon } from '../components/icon';
+import { accountIcon, editIcon, feedbackIcon, gitCompareIcon, milestoneIcon, prMergeIcon, projectIcon, sparkleIcon, stopCircleIcon, tagIcon } from '../components/icon';
 import { Avatar } from '../components/user';
 
 type CreateMethod = 'create-draft' | 'create' | 'create-automerge-squash' | 'create-automerge-rebase' | 'create-automerge-merge';
@@ -178,6 +178,13 @@ export function main() {
 					setGeneratingTitle(false);
 				}
 
+				async function changeTemplate() {
+					const result = await ctx.postMessage({ command: 'pr.changeTemplate' });
+					if (result && result.description) {
+						ctx.updateState({ pendingDescription: result.description });
+					}
+				}
+
 
 				if (!ctx.initialized) {
 					ctx.initialize();
@@ -325,7 +332,11 @@ export function main() {
 							: null}
 					</div>
 
-					<label htmlFor='description' className='input-title'>Description</label>
+					<div className='group-title'>
+						<label htmlFor='description' className='input-title'>Description</label>
+						{ctx.createParams.usingTemplate ?
+							<a title='Change template' className={`title-action icon-button${isBusy || !ctx.initialized ? ' disabled' : ''}`} onClick={() => changeTemplate()} tabIndex={0}>{editIcon}</a> : null}
+					</div>
 					<div className='group-description'>
 						<textarea
 							id='description'