@@ -102,9 +102,9 @@ export class ApplicationsComponent extends ApplicationBaseClassComponent impleme
102102 this . getApplicationHistory ( ) ;
103103 this . getComputeCenters ( ) ;
104104 this . applicationsservice . getExtensionRequestsCounter ( ) . subscribe ( ( result : any ) : void => {
105- this . numberOfCreditRequests = result [ 'credits_extension_requests_vo ' ] ;
106- this . numberOfExtensionRequests = result [ 'lifetime_extension_requests_vo ' ] ;
107- this . numberOfModificationRequests = result [ 'modification_requests_vo ' ] ;
105+ this . numberOfCreditRequests = result [ 'credits_extension_requests_all ' ] ;
106+ this . numberOfExtensionRequests = result [ 'lifetime_extension_requests_all ' ] ;
107+ this . numberOfModificationRequests = result [ 'modification_requests_all ' ] ;
108108 this . numberOfProjectApplications = result [ 'applications_submitted_vo' ] ;
109109 } ) ;
110110 } else {
@@ -161,12 +161,19 @@ export class ApplicationsComponent extends ApplicationBaseClassComponent impleme
161161 this . applicationsservice . approveAdditionalLifetime ( application . project_application_id )
162162 . subscribe ( ( res : any ) : void => {
163163 if ( application . project_application_openstack_project ) {
164+ application . project_application_status = [ ]
165+ this . getApplication ( application )
166+
167+
164168 this . updateNotificationModal ( 'Success' , 'The request has been sent to the facility manager.' , true , 'success' ) ;
165169 } else {
166170 this . updateNotificationModal ( 'Success' , 'The project has been extended!' , true , 'success' ) ;
167171 }
168- this . all_applications . splice ( this . all_applications . indexOf ( application ) , 1 ) ;
169- this . numberOfExtensionRequests -- ;
172+ if ( ! application . project_application_openstack_project ) {
173+ this . numberOfExtensionRequests -- ;
174+ this . all_applications . splice ( this . all_applications . indexOf ( application ) , 1 ) ;
175+
176+ }
170177 } ,
171178 ( err : any ) : void => {
172179 console . log ( 'error' , err . status ) ;
@@ -194,9 +201,18 @@ export class ApplicationsComponent extends ApplicationBaseClassComponent impleme
194201
195202 this . applicationsservice . approveModificationRequest ( application . project_application_id )
196203 . subscribe ( ( res : any ) : void => {
204+
197205 this . updateNotificationModal ( 'Success' , 'The resource modification request was approved!' , true , 'success' ) ;
198- this . all_applications . splice ( this . all_applications . indexOf ( application ) , 1 ) ;
199- this . numberOfModificationRequests -- ;
206+ if ( ! application . project_application_openstack_project ) {
207+
208+ this . numberOfModificationRequests -- ;
209+ this . all_applications . splice ( this . all_applications . indexOf ( application ) , 1 ) ;
210+
211+ } else {
212+ application . project_application_status = [ ]
213+
214+ this . getApplication ( application )
215+ }
200216 } ,
201217 ( err : any ) : void => {
202218 console . log ( 'error' , err . status ) ;
@@ -221,9 +237,18 @@ export class ApplicationsComponent extends ApplicationBaseClassComponent impleme
221237 approveCreditExtension ( application : Application ) : void {
222238 this . applicationsservice . approveAdditionalCreditsRequest ( application . project_application_id )
223239 . subscribe ( ( res : any ) : void => {
240+
224241 this . updateNotificationModal ( 'Success' , 'The credit extension request was approved!' , true , 'success' ) ;
225- this . all_applications . splice ( this . all_applications . indexOf ( application ) , 1 ) ;
226- this . numberOfCreditRequests -- ;
242+ if ( ! application . project_application_openstack_project ) {
243+
244+ this . numberOfCreditRequests -- ;
245+ this . all_applications . splice ( this . all_applications . indexOf ( application ) , 1 ) ;
246+
247+ } else {
248+ application . project_application_status = [ ]
249+
250+ this . getApplication ( application )
251+ }
227252 } ,
228253 ( err : any ) : void => {
229254 console . log ( 'error' , err . status ) ;
@@ -424,15 +449,17 @@ export class ApplicationsComponent extends ApplicationBaseClassComponent impleme
424449 this . groupservice . createGroupOpenStack (
425450 application . project_application_id , compute_center )
426451 . subscribe ( ( result : { [ key : string ] : string } ) : void => {
452+
427453 if ( result [ 'Error' ] ) {
428454 this . updateNotificationModal ( 'Failed' , result [ 'Error' ] , true , 'danger' ) ;
429455
430456 } else {
457+ application . project_application_status = [ ]
458+
431459 this . updateNotificationModal ( 'Success' , 'The new project was created' , true , 'success' ) ;
432- this . all_applications . splice ( this . all_applications . indexOf ( application ) , 1 ) ;
433- this . numberOfProjectApplications -- ;
460+ this . getApplication ( application ) ;
461+
434462 }
435- this . getApplication ( application ) ;
436463 } ,
437464 ( ) : void => {
438465 this . updateNotificationModal ( 'Failed' , 'Project could not be created!' , true , 'danger' ) ;
![dependabot-preview[bot]](https://avatars.githubusercontent.com/in/2141?v=4&size=40){kind=avatar}
0 commit comments