diff --git a/src/frontend/app/installer/install-action/install-action.component.html b/src/frontend/app/installer/install-action/install-action.component.html index d079592eb3f4048f6498f566d10bd45d7b5b6374..c1bc5718963af69d26a2413f2b231c312eae9e15 100644 --- a/src/frontend/app/installer/install-action/install-action.component.html +++ b/src/frontend/app/installer/install-action/install-action.component.html @@ -26,12 +26,12 @@ </mat-expansion-panel> </mat-accordion> </div> - <ng-container *ngIf="isInstallComplete() || isInstallError()"> + <ng-container *ngIf="isInstallComplete() || isInstallError() || !isInstallBegin()"> <span class="divider-modal"></span> <div mat-dialog-actions class="actions"> - <button *ngIf="!isInstallError()" mat-raised-button mat-button color="primary" + <button *ngIf="!isInstallError() && isInstallComplete()" mat-raised-button mat-button color="primary" (click)="goToInstance()">{{lang.goToNewInstance}}</button> - <button *ngIf="isInstallError()" mat-raised-button mat-button [mat-dialog-close]="">{{lang.cancel}}</button> + <button *ngIf="isInstallError() || !isInstallBegin()" mat-raised-button mat-button [mat-dialog-close]="">{{lang.cancel}}</button> </div> </ng-container> </div> \ No newline at end of file diff --git a/src/frontend/app/installer/install-action/install-action.component.ts b/src/frontend/app/installer/install-action/install-action.component.ts index ff9b74363953dd2b2ec864ec9080ddd682209dff..a50bb4a261892f30e0173b71c2257156436f74be 100644 --- a/src/frontend/app/installer/install-action/install-action.component.ts +++ b/src/frontend/app/installer/install-action/install-action.component.ts @@ -91,6 +91,10 @@ export class InstallActionComponent implements OnInit, AfterViewInit { }); } + isInstallBegin() { + return this.steps.filter(step => step.state === '').length !== this.steps.length; + } + isInstallComplete() { return this.steps.filter(step => step.state === '').length === 0; }