From 0e7ce904bb11e4557e9450778c7aad5bf8561884 Mon Sep 17 00:00:00 2001
From: Marco Mura <mmura@atlassian.com>
Date: Tue, 18 Feb 2025 14:51:33 -0800
Subject: [PATCH] Fix 'Create issue webview' stuck on the loader

---
 .../components/issue/CreateIssuePage.tsx      |  5 +----
 src/webviews/createIssueWebview.ts            | 21 +++++++++----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/webviews/components/issue/CreateIssuePage.tsx b/src/webviews/components/issue/CreateIssuePage.tsx
index 88925a8f..09389f90 100644
--- a/src/webviews/components/issue/CreateIssuePage.tsx
+++ b/src/webviews/components/issue/CreateIssuePage.tsx
@@ -286,10 +286,7 @@ export default class CreateIssuePage extends AbstractIssueEditorPage<Emit, Accep
     }
 
     public render() {
-        if (
-            !this.state.fieldValues['issuetype'] ||
-            (this.state.fieldValues['issuetype'].id === '' && !this.state.isErrorBannerOpen && this.state.isOnline)
-        ) {
+        if (!this.state.fieldValues['issuetype']?.id && !this.state.isErrorBannerOpen && this.state.isOnline) {
             this.postMessage({ action: 'refresh' });
             return <AtlLoader />;
         }
diff --git a/src/webviews/createIssueWebview.ts b/src/webviews/createIssueWebview.ts
index 78c4f113..1da47e7d 100644
--- a/src/webviews/createIssueWebview.ts
+++ b/src/webviews/createIssueWebview.ts
@@ -6,6 +6,7 @@ import {
     isScreensForSite,
     isSetIssueType,
 } from '../ipc/issueActions';
+import { WebViewID } from '../lib/ipc/models/common';
 import { CreateMetaTransformerResult, FieldValues, IssueTypeUI, ValueType } from '@atlassianlabs/jira-pi-meta-models';
 import { DetailedSiteInfo, Product, ProductJira, emptySiteInfo } from '../atlclients/authInfo';
 import { IssueType, Project, emptyIssueType } from '@atlassianlabs/jira-pi-common-models';
@@ -74,7 +75,7 @@ export class CreateIssueWebview
         return 'Create Jira Issue';
     }
     public get id(): string {
-        return 'atlascodeCreateIssueScreen';
+        return WebViewID.CreateJiraIssueWebview;
     }
 
     public get siteOrUndefined(): DetailedSiteInfo | undefined {
@@ -266,16 +267,14 @@ export class CreateIssueWebview
                 };
             }
 
-            if (this._screenData) {
-                const createData: CreateIssueData = this._screenData.issueTypeUIs[
-                    this._selectedIssueTypeId
-                ] as CreateIssueData;
-                createData.type = 'update';
-                createData.transformerProblems = Container.config.jira.showCreateIssueProblems
-                    ? this._screenData.problems
-                    : {};
-                this.postMessage(createData);
-            }
+            const createData: CreateIssueData = this._screenData.issueTypeUIs[
+                this._selectedIssueTypeId
+            ] as CreateIssueData;
+            createData.type = 'update';
+            createData.transformerProblems = Container.config.jira.showCreateIssueProblems
+                ? this._screenData.problems
+                : {};
+            this.postMessage(createData);
         } catch (e) {
             const err = new Error(`error updating issue fields: ${e}`);
             Logger.error(err);