Merge branch 'main' into feat/lock-config-release

Author: mukultayal135

src/components/app/create/CreateApp.tsx

@@ -40,7 +40,7 @@ export class AddNewApp extends Component<AddNewAppProps, AddNewAppState> {
     constructor(props) {
         super(props)
         this.state = {
-            view: ViewType.FORM,
+            view: ViewType.LOADING,
             code: 0,
             projects: [],
             disableForm: false,
@@ -72,6 +72,7 @@ export class AddNewApp extends Component<AddNewAppProps, AddNewAppState> {
     }
 
     async componentDidMount() {
+        this.setState({ view: ViewType.LOADING })
         try {
             const { result } = await getTeamListMin()
             sortObjectArrayAlphabetically(result, 'name')

src/components/deploymentConfig/DeploymentTemplateView/DeploymentConfigFormCTA.tsx

@@ -106,7 +106,7 @@ export default function DeploymentConfigFormCTA({
                             ? 'base-deployment-template-save-and-next-button'
                             : 'base-deployment-template-save-changes-button'
                     }`}
-                    disabled={state.unableToParseYaml || (!isValues && !isApprovalPending) || convertVariables}
+                    disabled={loading || state.unableToParseYaml || (!isValues && !isApprovalPending) || convertVariables}
                 >
                     {loading ? (
                         <Progressing />