AXON-1499: save and show pre selected issue type

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Improvements
 
 - Added support for Rovo Dev /usage command
+- Add saving of last chosen issue type
 
 ### Bug Fixes
 

package.json

@@ -1329,9 +1329,9 @@
                     "description": "Shows active Jira issue key in the status bar",
                     "scope": "window"
                 },
-                "atlascode.jira.lastCreateSiteAndProject": {
+                "atlascode.jira.lastCreatePreSelectedValues": {
                     "type": "object",
-                    "description": "the last used site id and project key for create issue",
+                    "description": "the last used site id, project key, and issue type id for create issue",
                     "scope": "window",
                     "properties": {
                         "siteId": {
@@ -1341,6 +1341,10 @@
                         "projectKey": {
                             "type": "string",
                             "default": ""
+                        },
+                        "issueTypeId": {
+                            "type": "string",
+                            "default": ""
                         }
                     }
                 },

src/config/configuration.test.ts

@@ -1,8 +1,8 @@
 import { ConfigurationChangeEvent, ExtensionContext, workspace } from 'vscode';
 
-import { ConfigNamespace, JiraCreateSiteAndProjectKey } from '../constants';
+import { ConfigNamespace, JiraPreSelectedCreateKey } from '../constants';
 import { Configuration, configuration } from './configuration';
-import { SiteIdAndProjectKey } from './model';
+import { LastCreatePreSelectedValues } from './model';
 
 // Mock vscode module
 jest.mock('vscode', () => ({
@@ -156,22 +156,21 @@ describe('Configuration', () => {
         });
 
         it('should call updateEffective with correct parameters', async () => {
-            const siteAndProject: SiteIdAndProjectKey = { siteId: 'site1', projectKey: 'PROJ' };
+            const siteAndProject: LastCreatePreSelectedValues = {
+                siteId: 'site1',
+                projectKey: 'PROJ',
+                issueTypeId: '',
+            };
 
             await config.setLastCreateSiteAndProject(siteAndProject);
 
-            expect(config.updateEffective).toHaveBeenCalledWith(
-                JiraCreateSiteAndProjectKey,
-                siteAndProject,
-                null,
-                true,
-            );
+            expect(config.updateEffective).toHaveBeenCalledWith(JiraPreSelectedCreateKey, siteAndProject, null, true);
         });
 
         it('should handle undefined siteAndProject', async () => {
             await config.setLastCreateSiteAndProject(undefined);
 
-            expect(config.updateEffective).toHaveBeenCalledWith(JiraCreateSiteAndProjectKey, undefined, null, true);
+            expect(config.updateEffective).toHaveBeenCalledWith(JiraPreSelectedCreateKey, undefined, null, true);
         });
     });
 });

src/config/configuration.ts

@@ -11,8 +11,8 @@ import {
     workspace,
 } from 'vscode';
 
-import { ConfigNamespace, JiraCreateSiteAndProjectKey } from '../constants';
-import { SiteIdAndProjectKey } from './model';
+import { ConfigNamespace, JiraPreSelectedCreateKey } from '../constants';
+import { LastCreatePreSelectedValues } from './model';
 
 /*
 Configuration is a helper to manage configuration changes in various parts of the system.
@@ -108,8 +108,8 @@ export class Configuration extends Disposable {
             .update(section, value, target);
     }
 
-    async setLastCreateSiteAndProject(siteAndProject?: SiteIdAndProjectKey) {
-        await this.updateEffective(JiraCreateSiteAndProjectKey, siteAndProject, null, true);
+    async setLastCreateSiteAndProject(siteAndProject?: LastCreatePreSelectedValues) {
+        await this.updateEffective(JiraPreSelectedCreateKey, siteAndProject, null, true);
     }
 
     // this tries to figure out where the current value is set and update it there

src/config/model.ts

@@ -52,7 +52,7 @@ export interface RovoDevConfig {
 
 export interface JiraConfig {
     enabled: boolean;
-    lastCreateSiteAndProject: SiteIdAndProjectKey;
+    lastCreatePreSelectedValues: LastCreatePreSelectedValues;
     explorer: JiraExplorer;
     issueMonitor: JiraIssueMonitor;
     statusbar: JiraStatusBar;
@@ -63,9 +63,10 @@ export interface JiraConfig {
     showCreateIssueProblems: boolean;
 }
 
-export type SiteIdAndProjectKey = {
+export type LastCreatePreSelectedValues = {
     siteId: string;
     projectKey: string;
+    issueTypeId: string;
 };
 
 export interface JiraStatusBar {
@@ -207,7 +208,7 @@ const emptyStartWorkBranchTemplate: StartWorkBranchTemplate = {
 
 const emptyJiraConfig: JiraConfig = {
     enabled: true,
-    lastCreateSiteAndProject: { siteId: '', projectKey: '' },
+    lastCreatePreSelectedValues: { siteId: '', projectKey: '', issueTypeId: '' },
     explorer: emptyJiraExplorer,
     issueMonitor: emtpyIssueMonitor,
     statusbar: emptyJiraStatusBar,

src/constants.ts

@@ -1,7 +1,7 @@
 export const ExtensionId = 'atlassian.atlascode';
 export const ConfigNamespace = 'atlascode';
 export const extensionOutputChannelName = 'Atlassian';
-export const JiraCreateSiteAndProjectKey = 'jira.lastCreateSiteAndProject';
+export const JiraPreSelectedCreateKey = 'jira.lastCreatePreSelectedValues';
 export const JiraEnabledKey = 'jira.enabled';
 export const BitbucketEnabledKey = 'bitbucket.enabled';
 export const JiraHoverProviderConfigurationKey = 'jira.hover.enabled';

src/siteManager.test.ts

@@ -77,8 +77,10 @@ describe('SiteManager', () => {
             },
             config: {
                 jira: {
-                    lastCreateSiteAndProject: {
+                    lastCreatePreSelectedValues: {
                         siteId: 'site1',
+                        projectKey: '',
+                        issueTypeId: '',
                     },
                 },
             },

src/siteManager.ts

@@ -351,7 +351,7 @@ export class SiteManager extends Disposable {
                     });
                 }
 
-                if (deletedSite.id === Container.config.jira.lastCreateSiteAndProject.siteId) {
+                if (deletedSite.id === Container.config.jira.lastCreatePreSelectedValues.siteId) {
                     configuration.setLastCreateSiteAndProject(undefined);
                 }
 

src/webviews/createIssueWebview.test.ts

@@ -35,9 +35,10 @@ jest.mock('../container', () => ({
         },
         config: {
             jira: {
-                lastCreateSiteAndProject: {
+                lastCreatePreSelectedValues: {
                     siteId: '',
                     projectKey: '',
+                    issueTypeId: '',
                 },
                 showCreateIssueProblems: false,
             },
@@ -1095,11 +1096,12 @@ describe('CreateIssueWebview', () => {
         });
     });
 
-    describe('Should correctly set site and project (updateSiteAndProject)', () => {
+    describe('Should correctly set site, project and issueTypeId (updateSiteAndProject)', () => {
         beforeEach(() => {
-            Container.config.jira.lastCreateSiteAndProject = {
+            Container.config.jira.lastCreatePreSelectedValues = {
                 siteId: '',
                 projectKey: '',
+                issueTypeId: '',
             };
             jest.spyOn(SearchJiraHelper, 'getAssignedIssuesPerSite').mockReturnValue([]);
         });
@@ -1108,9 +1110,10 @@ describe('CreateIssueWebview', () => {
             const lastUsedSiteId = 'last-used-site';
             const lastUsedProjectKey = 'last-used-project';
 
-            Container.config.jira.lastCreateSiteAndProject = {
+            Container.config.jira.lastCreatePreSelectedValues = {
                 siteId: lastUsedSiteId,
                 projectKey: lastUsedProjectKey,
+                issueTypeId: '',
             };
 
             Container.siteManager.getSiteForId = jest.fn().mockReturnValue({
@@ -1126,6 +1129,7 @@ describe('CreateIssueWebview', () => {
             expect(configuration.setLastCreateSiteAndProject).toHaveBeenCalledWith({
                 siteId: lastUsedSiteId,
                 projectKey: lastUsedProjectKey,
+                issueTypeId: '',
             });
         });
 
@@ -1158,6 +1162,7 @@ describe('CreateIssueWebview', () => {
             expect(configuration.setLastCreateSiteAndProject).toHaveBeenCalledWith({
                 siteId: maxIssuesSite.id,
                 projectKey: maxIssuesProject.key,
+                issueTypeId: '',
             });
         });
 
@@ -1174,6 +1179,7 @@ describe('CreateIssueWebview', () => {
             expect(configuration.setLastCreateSiteAndProject).toHaveBeenCalledWith({
                 siteId: 'first-site',
                 projectKey: 'first-project',
+                issueTypeId: '',
             });
         });
 
@@ -1195,6 +1201,7 @@ describe('CreateIssueWebview', () => {
             expect(configuration.setLastCreateSiteAndProject).toHaveBeenLastCalledWith({
                 projectKey: inputProject.key,
                 siteId: 'site-1',
+                issueTypeId: 'issueType-1',
             });
         });
 
@@ -1216,6 +1223,7 @@ describe('CreateIssueWebview', () => {
             expect(configuration.setLastCreateSiteAndProject).toHaveBeenLastCalledWith({
                 siteId: inputSite.id,
                 projectKey: 'TEST',
+                issueTypeId: 'issueType-1',
             });
         });
     });

src/webviews/createIssueWebview.ts

@@ -259,7 +259,7 @@ export class CreateIssueWebview
         if (inputSite) {
             this._siteDetails = inputSite;
         } else {
-            let siteId = Container.config.jira.lastCreateSiteAndProject.siteId;
+            let siteId = Container.config.jira.lastCreatePreSelectedValues.siteId;
             if (!siteId) {
                 siteId = '';
             }
@@ -281,7 +281,7 @@ export class CreateIssueWebview
         } else if (inputProject) {
             this._currentProject = inputProject;
         } else {
-            let projectKey = Container.config.jira.lastCreateSiteAndProject.projectKey;
+            let projectKey = Container.config.jira.lastCreatePreSelectedValues.projectKey;
             if (!projectKey) {
                 projectKey = '';
             }
@@ -304,6 +304,7 @@ export class CreateIssueWebview
         await configuration.setLastCreateSiteAndProject({
             siteId: this._siteDetails.id,
             projectKey: this._currentProject!.key,
+            issueTypeId: this._selectedIssueTypeId || '',
         });
 
         if (this._todoData) {
@@ -482,6 +483,13 @@ export class CreateIssueWebview
             this._screenData = screenData;
             this._selectedIssueTypeId = this._screenData.selectedIssueType.id;
 
+            if (this._currentProject) {
+                const savedIssueTypeId = Container.config.jira.lastCreatePreSelectedValues.issueTypeId;
+                if (savedIssueTypeId && this._screenData.issueTypeUIs[savedIssueTypeId]) {
+                    this._selectedIssueTypeId = savedIssueTypeId;
+                }
+            }
+
             if (fieldValues) {
                 const overrides = this.getValuesForExisitngKeys(
                     this._screenData.issueTypeUIs[this._selectedIssueTypeId],
@@ -570,6 +578,14 @@ export class CreateIssueWebview
         this._screenData.issueTypeUIs[issueType.id].fieldValues['issuetype'] = issueType;
         this._selectedIssueTypeId = issueType.id;
 
+        if (this._currentProject) {
+            configuration.setLastCreateSiteAndProject({
+                siteId: this._siteDetails.id,
+                projectKey: this._currentProject.key,
+                issueTypeId: issueType.id,
+            });
+        }
+
         const createData: CreateIssueData = this._screenData.issueTypeUIs[this._selectedIssueTypeId] as CreateIssueData;
         createData.type = 'update';
         createData.transformerProblems = Container.config.jira.showCreateIssueProblems ? this._screenData.problems : {};
@@ -794,11 +810,12 @@ export class CreateIssueWebview
                     handled = true;
                     if (isCreateIssue(msg)) {
                         try {
+                            const [payload, worklog, issuelinks, attachments] = this.formatCreatePayload(msg);
                             await configuration.setLastCreateSiteAndProject({
                                 siteId: this._siteDetails.id,
                                 projectKey: this._currentProject!.key,
+                                issueTypeId: payload.issuetype?.id || this._selectedIssueTypeId,
                             });
-                            const [payload, worklog, issuelinks, attachments] = this.formatCreatePayload(msg);
 
                             // Handle parent payload
                             if (this._siteDetails.isCloud && payload.parent) {

src/work-items/create-work-item/createWorkItemWebviewProvider.ts

@@ -203,7 +203,7 @@ export class CreateWorkItemWebviewProvider extends Disposable implements Webview
 
             this._availableSites = this.toFieldMap(allSites);
 
-            const selectedSiteAndProject = Container.config.jira.lastCreateSiteAndProject;
+            const selectedSiteAndProject = Container.config.jira.lastCreatePreSelectedValues;
 
             const selectedSite =
                 this._availableSites[selectedSiteAndProject.siteId] ||
@@ -454,6 +454,7 @@ export class CreateWorkItemWebviewProvider extends Disposable implements Webview
                     await configuration.setLastCreateSiteAndProject({
                         siteId: this._selectedSite!.id,
                         projectKey: this._selectedProject!.key,
+                        issueTypeId: this._selectedIssueType?.id || '',
                     });
                     const payload = {
                         summary: message.payload.summary,
@@ -511,7 +512,7 @@ export class CreateWorkItemWebviewProvider extends Disposable implements Webview
             'create',
         );
 
-        const lastCreateSiteAndProject = Container.config.jira.lastCreateSiteAndProject;
+        const lastCreateSiteAndProject = Container.config.jira.lastCreatePreSelectedValues;
         const selectedProject =
             projects.projects.find((p) => p.key === lastCreateSiteAndProject.projectKey) || projects.projects[0];