Skip to content

Commit 0e7ce90

Browse files
committed
Fix 'Create issue webview' stuck on the loader
1 parent 9fe90a5 commit 0e7ce90

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

src/webviews/components/issue/CreateIssuePage.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,7 @@ export default class CreateIssuePage extends AbstractIssueEditorPage<Emit, Accep
286286
}
287287

288288
public render() {
289-
if (
290-
!this.state.fieldValues['issuetype'] ||
291-
(this.state.fieldValues['issuetype'].id === '' && !this.state.isErrorBannerOpen && this.state.isOnline)
292-
) {
289+
if (!this.state.fieldValues['issuetype']?.id && !this.state.isErrorBannerOpen && this.state.isOnline) {
293290
this.postMessage({ action: 'refresh' });
294291
return <AtlLoader />;
295292
}

src/webviews/createIssueWebview.ts

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
isScreensForSite,
77
isSetIssueType,
88
} from '../ipc/issueActions';
9+
import { WebViewID } from '../lib/ipc/models/common';
910
import { CreateMetaTransformerResult, FieldValues, IssueTypeUI, ValueType } from '@atlassianlabs/jira-pi-meta-models';
1011
import { DetailedSiteInfo, Product, ProductJira, emptySiteInfo } from '../atlclients/authInfo';
1112
import { IssueType, Project, emptyIssueType } from '@atlassianlabs/jira-pi-common-models';
@@ -74,7 +75,7 @@ export class CreateIssueWebview
7475
return 'Create Jira Issue';
7576
}
7677
public get id(): string {
77-
return 'atlascodeCreateIssueScreen';
78+
return WebViewID.CreateJiraIssueWebview;
7879
}
7980

8081
public get siteOrUndefined(): DetailedSiteInfo | undefined {
@@ -266,16 +267,14 @@ export class CreateIssueWebview
266267
};
267268
}
268269

269-
if (this._screenData) {
270-
const createData: CreateIssueData = this._screenData.issueTypeUIs[
271-
this._selectedIssueTypeId
272-
] as CreateIssueData;
273-
createData.type = 'update';
274-
createData.transformerProblems = Container.config.jira.showCreateIssueProblems
275-
? this._screenData.problems
276-
: {};
277-
this.postMessage(createData);
278-
}
270+
const createData: CreateIssueData = this._screenData.issueTypeUIs[
271+
this._selectedIssueTypeId
272+
] as CreateIssueData;
273+
createData.type = 'update';
274+
createData.transformerProblems = Container.config.jira.showCreateIssueProblems
275+
? this._screenData.problems
276+
: {};
277+
this.postMessage(createData);
279278
} catch (e) {
280279
const err = new Error(`error updating issue fields: ${e}`);
281280
Logger.error(err);

0 commit comments

Comments
 (0)