Skip to content

Commit 2797d2a

Browse files
authored
Merge pull request #1577 from devtron-labs/fix/automation-create-app
fix: loading issue in create app and build configuration
2 parents 75ed9f8 + 668e9eb commit 2797d2a

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/components/app/create/CreateApp.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export class AddNewApp extends Component<AddNewAppProps, AddNewAppState> {
4040
constructor(props) {
4141
super(props)
4242
this.state = {
43-
view: ViewType.FORM,
43+
view: ViewType.LOADING,
4444
code: 0,
4545
projects: [],
4646
disableForm: false,
@@ -72,6 +72,7 @@ export class AddNewApp extends Component<AddNewAppProps, AddNewAppState> {
7272
}
7373

7474
async componentDidMount() {
75+
this.setState({ view: ViewType.LOADING })
7576
try {
7677
const { result } = await getTeamListMin()
7778
sortObjectArrayAlphabetically(result, 'name')

src/components/deploymentConfig/DeploymentTemplateView/DeploymentConfigFormCTA.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export default function DeploymentConfigFormCTA({
7070
? 'base-deployment-template-save-and-next-button'
7171
: 'base-deployment-template-save-changes-button'
7272
}`}
73-
disabled={state.unableToParseYaml || (!isValues && !isApprovalPending) || convertVariables}
73+
disabled={loading || state.unableToParseYaml || (!isValues && !isApprovalPending) || convertVariables}
7474
>
7575
{loading ? (
7676
<Progressing />

0 commit comments

Comments
 (0)