diff --git a/src/app/appmarket/appinstance/appinstance/appinstance.component.html b/src/app/appmarket/appinstance/appinstance/appinstance.component.html index fb4a7c6bbb737f776b57f9c780446cbeac8fa16a..24ef2c76bd9785a19674855b78fb96f5b5d66532 100644 --- a/src/app/appmarket/appinstance/appinstance/appinstance.component.html +++ b/src/app/appmarket/appinstance/appinstance/appinstance.component.html @@ -160,9 +160,6 @@ <!-- if application deployment failed --> <div class="btn-group pull-right" *ngIf="getStateAsEnum(appInstanceStatus?.state) === AppInstanceState.FAILURE"> - <button class="btn btn-primary" - *roles="['ROLE_DOMAIN_ADMIN', 'ROLE_SYSTEM_ADMIN']" - (click)="openVersionUpdateModal()">{{'APP_INSTANCE.REDEPLOY_BUTTON' | translate}}</button> <button class="btn btn-primary" *roles="['ROLE_DOMAIN_ADMIN', 'ROLE_SYSTEM_ADMIN']" (click)="redeployConfirm.show()">{{'APP_INSTANCE.REDEPLOY_BUTTON' | translate}}</button> @@ -202,11 +199,11 @@ <h4 style="text-align: center">{{'APP_INSTANCES.MANUAL_UPDATE.HEADER' | translate}}</h4> </div> <div class="nmaas-modal-body"> - <div class="form-group" style="height: 150px"> + <div class="" style="height: 150px"> <p>{{'APP_INSTANCES.MANUAL_UPDATE.BODY' | translate}}</p> <div> - <p-dropdown [options]="appVersions" optionLabel="version" optionValue="version" placeholder="Select version" emptyMessage="No version available" - [disabled]="appVersions.length == 0" [(ngModel)]="selectedVersion"></p-dropdown> + <p-dropdown id="manualUpdate" [options]="appVersions" optionLabel="version" optionValue="version" placeholder="Select version" emptyMessage="No version available" + [disabled]="appVersions.length == 0" [(ngModel)]="selectedVersion" name="manualUpdate" ngDefaultControl></p-dropdown> </div> </div> </div> diff --git a/src/app/appmarket/appinstance/appinstance/appinstance.component.spec.ts b/src/app/appmarket/appinstance/appinstance/appinstance.component.spec.ts index 457cb6d9555d857ed7f1e70ce45dbba8f5895124..858d09784f0413af0b35c536001c4b1621e286bc 100644 --- a/src/app/appmarket/appinstance/appinstance/appinstance.component.spec.ts +++ b/src/app/appmarket/appinstance/appinstance/appinstance.component.spec.ts @@ -302,6 +302,7 @@ describe('Component: AppInstance', () => { TestBed.createComponent(AppInstanceProgressMockComponent).componentInstance as AppInstanceProgressComponent; component.undeployModal = TestBed.createComponent(MockNmaasModalComponent).componentInstance as ModalComponent; + component.manualUpdateModal = TestBed.createComponent(MockNmaasModalComponent).componentInstance as ModalComponent; appConfigService = fixture.debugElement.injector.get(AppConfigService); appsService = fixture.debugElement.injector.get(AppsService);