💄

Author: alexr00

resources/icons/codicons/notebook-template.svg

@@ -18,7 +18,6 @@ export const NEVER_IGNORE_DEFAULT_BRANCH = 'neverIgnoreDefaultBranch';
 export const OVERRIDE_DEFAULT_BRANCH = 'overrideDefaultBranch';
 export const PULL_BRANCH = 'pullBranch';
 export const PULL_REQUEST_DESCRIPTION = 'pullRequestDescription';
-export const CREATE_FROM_TEMPLATE = 'createFromTemplate';
 export const NOTIFICATION_SETTING = 'notifications';
 export type NotificationVariants = 'off' | 'pullRequests';
 export const POST_CREATE = 'postCreate';

src/common/settingKeys.ts

@@ -17,7 +17,7 @@ import { PullRequestModel } from './pullRequestModel';
 import { getDefaultMergeMethod } from './pullRequestOverview';
 import { getAssigneesQuickPickItems, getLabelOptions, getMilestoneFromQuickPick, getProjectFromQuickPick, reviewersQuickPick } from './quickPicks';
 import { getIssueNumberLabelFromParsed, ISSUE_EXPRESSION, ISSUE_OR_URL_EXPRESSION, parseIssueExpressionOutput, variableSubstitution } from './utils';
-import { DisplayLabel, PreReviewState } from './views';
+import { ChangeTemplateReply, DisplayLabel, PreReviewState } from './views';
 import { RemoteInfo } from '../../common/types';
 import { ChooseBaseRemoteAndBranchResult, ChooseCompareRemoteAndBranchResult, ChooseRemoteAndBranchArgs, CreateParamsNew, CreatePullRequestNew, TitleAndDescriptionArgs } from '../../common/views';
 import type { Branch, Ref } from '../api/api';
@@ -794,7 +794,10 @@ export class CreatePullRequestViewProvider extends BaseCreatePullRequestViewProv
 		);
 
 		if (selectedTemplate) {
-			return this._replyMessage(message, { description: selectedTemplate.template });
+			const reply: ChangeTemplateReply = {
+				description: selectedTemplate.template
+			};
+			return this._replyMessage(message, reply);
 		}
 		return this._replyMessage(message, undefined);
 	}

src/github/createPRViewProvider.ts

@@ -158,6 +158,10 @@ export enum PreReviewState {
 	ReviewedWithoutComments
 }
 
+export interface ChangeTemplateReply {
+	description: string;
+}
+
 export interface CancelCodingAgentReply {
 	events: TimelineEvent[];
 }

src/github/views.ts

@@ -176,6 +176,7 @@ body img.avatar {
 .section .icon-button:hover,
 .section .icon-button:focus {
 	background-color: var(--vscode-toolbar-hoverBackground);
+	cursor: pointer;
 }
 
 .icon-button:focus,

webviews/common/common.css

@@ -34,6 +34,7 @@ export const gitPullRequestIcon = <Icon src={require('../../resources/icons/codi
 export const issuescon = <Icon src={require('../../resources/icons/codicons/issues.svg')} />;
 export const loadingIcon = <Icon className='loading' src={require('../../resources/icons/codicons/loading.svg')} />;
 export const milestoneIcon = <Icon src={require('../../resources/icons/codicons/milestone.svg')} />;
+export const notebookTemplate = <Icon src={require('../../resources/icons/codicons/notebook-template.svg')} />;
 export const passIcon = <Icon src={require('../../resources/icons/codicons/pass.svg')} />;
 export const projectIcon = <Icon src={require('../../resources/icons/codicons/github-project.svg')} />;
 export const quoteIcon = <Icon src={require('../../resources/icons/codicons/quote.svg')} />;

webviews/components/icon.tsx

@@ -8,11 +8,12 @@ import { render } from 'react-dom';
 import { RemoteInfo } from '../../common/types';
 import { CreateParamsNew } from '../../common/views';
 import { isITeam, MergeMethod } from '../../src/github/interface';
+import { ChangeTemplateReply } from '../../src/github/views';
 import PullRequestContextNew from '../common/createContextNew';
 import { ErrorBoundary } from '../common/errorBoundary';
 import { LabelCreate } from '../common/label';
 import { ContextDropdown } from '../components/contextDropdown';
-import { accountIcon, editIcon, feedbackIcon, gitCompareIcon, milestoneIcon, prMergeIcon, projectIcon, sparkleIcon, stopCircleIcon, tagIcon } from '../components/icon';
+import { accountIcon, feedbackIcon, gitCompareIcon, milestoneIcon, notebookTemplate, 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';
@@ -179,7 +180,7 @@ export function main() {
 				}
 
 				async function changeTemplate() {
-					const result = await ctx.postMessage({ command: 'pr.changeTemplate' });
+					const result: ChangeTemplateReply = await ctx.postMessage({ command: 'pr.changeTemplate' });
 					if (result && result.description) {
 						ctx.updateState({ pendingDescription: result.description });
 					}
@@ -332,10 +333,10 @@ export function main() {
 							: null}
 					</div>
 
-					<div className='group-title'>
+					<div className='description-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}
+							<a title='Change template' className={`title-action icon-button${isBusy || !ctx.initialized ? ' disabled' : ''}`} onClick={() => changeTemplate()} tabIndex={0}>{notebookTemplate}</a> : null}
 					</div>
 					<div className='group-description'>
 						<textarea

webviews/createPullRequestViewNew/app.tsx

@@ -98,6 +98,12 @@ button.input-box {
 	text-overflow: ellipsis;
 }
 
+.description-title {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
 .group-title {
 	position: relative;
 	display: flex;