This is an automated email from the ASF dual-hosted git repository. ytykhun pushed a commit to branch DATALAB-2491 in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit a040ed7a91a63262ca3c76d4cd9dcf38b4a55b48 Author: Yurii Tykhun <[email protected]> AuthorDate: Mon Jul 5 17:47:15 2021 +0300 [DATALAB-2491] fixed bug with confirmation message for yml editor --- .../administration/configuration/configuration.component.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/configuration/configuration.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/configuration/configuration.component.ts index dc0601d..919799f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/configuration/configuration.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/configuration/configuration.component.ts @@ -372,8 +372,8 @@ export class ConfigurationComponent implements OnInit, OnDestroy { <span [hidden]="(filterProvisioning.length < 2) || filterProvisioning.length === 2 && filterProvisioning[0] === 'self-service'">s</span>: restarting will make DataLab unavailable for some time. </ng-template> - <ng-template [ngIf]="data.action === 'restart' && data.environmentStatuses[data.activeEndpoint]?.length && (data.services.includes('provisioning') || !filterProvisioning.length)"> - <div class="warning" [ngStyle]="data.services.includes('provisioning') && data.services?.length > 1 && {'margin-top': '10px'}"> + <ng-template [ngIf]="data.action === 'restart' && data.environmentStatuses[data.activeEndpoint]?.length && (data?.services?.includes('provisioning') || !filterProvisioning.length)"> + <div class="warning" [ngStyle]="data?.services?.includes('provisioning') && data.services?.length > 1 && {'margin-top': '10px'}"> <span>Provisioning service: </span>can not be restarted because one of resources is in processing stage. Please try again later. </div> </ng-template> @@ -381,14 +381,14 @@ export class ConfigurationComponent implements OnInit, OnDestroy { <ng-template [ngIf]="data.action === 'discard'" ]>Discard all unsaved changes.</ng-template> <ng-template [ngIf]="data.action === 'save'" ]>After you save changes you need to restart service.</ng-template> </div> - <div class="text-center " *ngIf="!data.environmentStatuses[data.activeEndpoint]?.length || (data.environmentStatuses[data.activeEndpoint]?.length && (!data.services.includes('provisioning') || filterProvisioning?.length))"> + <div class="text-center " *ngIf="!data.environmentStatuses[data.activeEndpoint]?.length || (data.environmentStatuses[data.activeEndpoint]?.length && (!data?.services?.includes('provisioning') || filterProvisioning?.length))"> <p class="strong">Do you want to proceed?</p> </div> - <div class="text-center m-top-20 pb-25" *ngIf="!data.environmentStatuses[data.activeEndpoint]?.length || (data.environmentStatuses[data.activeEndpoint]?.length && (!data.services.includes('provisioning') || filterProvisioning.length))"> + <div class="text-center m-top-20 pb-25" *ngIf="!data.environmentStatuses[data.activeEndpoint]?.length || (data.environmentStatuses[data.activeEndpoint]?.length && (!data?.services?.includes('provisioning') || filterProvisioning.length))"> <button type="button" class="butt" mat-raised-button (click)="dialogRef.close()">No</button> <button type="button" class="butt butt-success" mat-raised-button (click)="dialogRef.close(true)">Yes</button> </div> - <div class="text-center m-top-20 pb-25" *ngIf="data.action === 'restart' && data.environmentStatuses[data.activeEndpoint]?.length && data.services.includes('provisioning') && data.services.length === 1"> + <div class="text-center m-top-20 pb-25" *ngIf="data.action === 'restart' && data.environmentStatuses[data.activeEndpoint]?.length && data?.services?.includes('provisioning') && data.services.length === 1"> <button type="button" class="butt" mat-raised-button (click)="dialogRef.close()">Close</button> </div> </div> @@ -415,7 +415,7 @@ export class SettingsConfirmationDialogComponent implements OnInit { ) { } ngOnInit() { - this.filterProvisioning = this.data.services?.filter(service => service !== 'provisioning'); + this.filterProvisioning = this.data?.services?.filter(service => service !== 'provisioning'); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
