@@ -139,16 +139,23 @@ export default class DeploymentMetrics extends Component<DeploymentMetricsProps,
139139 const filteredEnvMap = this . props . filteredEnvIds
140140 ?. split ( ',' )
141141 . reduce ( ( agg , curr ) => agg . set ( + curr , true ) , new Map ( ) )
142- let allEnv = envResponse . result
143- ?. filter ( ( env ) => env . prod && ( ! filteredEnvMap || filteredEnvMap . get ( env . environmentId ) ) )
144- . map ( ( env ) => {
145- return {
146- label : env . environmentName ,
147- value : env . environmentId ,
148- deploymentAppDeleteRequest : env . deploymentAppDeleteRequest ,
149- }
150- } ) || [ ]
151- let hideLoader = true
142+ let allEnv =
143+ envResponse . result
144+ ?. filter ( ( env ) => env . prod && ( ! filteredEnvMap || filteredEnvMap . get ( env . environmentId ) ) )
145+ . map ( ( env ) => {
146+ return {
147+ label : env . environmentName ,
148+ value : env . environmentId ,
149+ deploymentAppDeleteRequest : env . deploymentAppDeleteRequest ,
150+ }
151+ } ) || [ ]
152+ this . setState ( {
153+ environments : allEnv ,
154+ filteredEnvironment : allEnv . filter ( ( _env ) => ! _env . deploymentAppDeleteRequest ) ,
155+ view : ( ! allEnv . length || ( prevEnvId && prevEnvId !== this . props . match . params . envId ) || this . props . match . params . envId ) !
156+ ? ViewType . FORM
157+ : ViewType . LOADING ,
158+ } )
152159 if ( allEnv . length ) {
153160 if ( prevEnvId && prevEnvId !== this . props . match . params . envId ) {
154161 const isEnvExist = allEnv . find ( ( e ) => Number ( e . value ) === Number ( prevEnvId ) )
@@ -158,15 +165,9 @@ export default class DeploymentMetrics extends Component<DeploymentMetricsProps,
158165 } )
159166 this . props . history . push ( url )
160167 } else if ( this . props . match . params . envId ) {
161- hideLoader = false
162168 this . callGetDeploymentMetricsAPI ( this . props . match . params . appId , this . props . match . params . envId )
163169 }
164170 }
165- this . setState ( {
166- environments : allEnv ,
167- filteredEnvironment : allEnv . filter ( ( _env ) => ! _env . deploymentAppDeleteRequest ) ,
168- view : hideLoader ? ViewType . FORM : ViewType . LOADING ,
169- } )
170171 } )
171172 . catch ( ( error ) => {
172173 showError ( error )
0 commit comments