Skip to content
Snippets Groups Projects
Commit ba905dea authored by Patryk Kazimierowski's avatar Patryk Kazimierowski
Browse files

some changes

parent c73fcd59
No related branches found
No related tags found
2 merge requests!258Develop,!195Add api to scaling support
...@@ -81,6 +81,16 @@ ...@@ -81,6 +81,16 @@
{{'APP_INSTANCE.INSTANCE_ACTIONS' | translate}} <span class="caret"></span> {{'APP_INSTANCE.INSTANCE_ACTIONS' | translate}} <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li *ngIf="getStateAsEnum(appInstanceStatus?.state) !== AppInstanceState.SCALE_DOWN">
<a role="button" (click)="scaleDown()">
{{'APP_INSTANCE.SCALE_DOWN' | translate}}
</a>
</li>
<li *ngIf="getStateAsEnum(appInstanceStatus?.state) == AppInstanceState.SCALE_DOWN">
<a role="button" (click)="scaleUp()">
{{'APP_INSTANCE.SCALE_UP' | translate}}
</a>
</li>
<ng-container *ngIf="getStateAsEnum(appInstanceStatus?.state) === AppInstanceState.RUNNING"> <ng-container *ngIf="getStateAsEnum(appInstanceStatus?.state) === AppInstanceState.RUNNING">
<li> <li>
<a role="button" (click)="openAccessMethodsModal()"> <a role="button" (click)="openAccessMethodsModal()">
......
...@@ -279,16 +279,18 @@ export class AppInstanceComponent implements OnInit, OnDestroy { ...@@ -279,16 +279,18 @@ export class AppInstanceComponent implements OnInit, OnDestroy {
} }
return apps return apps
} }
showHistory() { showHistory() {
this.updateAppInstanceHistory() this.updateAppInstanceHistory()
this.intervalCheckerStateHistory = interval(5000).subscribe(() => { this.intervalCheckerStateHistory = interval(5000).subscribe(() => {
if (this.showAppInstanceHistory) { if (this.showAppInstanceHistory) {
this.updateAppInstanceHistory() this.updateAppInstanceHistory()
} else { } else {
this.intervalCheckerStateHistory.unsubscribe(); this.intervalCheckerStateHistory.unsubscribe();
} }
}); });
} }
private updateAppInstanceHistory() { private updateAppInstanceHistory() {
this.appInstanceService.getAppInstanceHistory(this.appInstanceId).subscribe(history => { this.appInstanceService.getAppInstanceHistory(this.appInstanceId).subscribe(history => {
this.appInstanceStateHistory = [...history].reverse(); this.appInstanceStateHistory = [...history].reverse();
...@@ -607,24 +609,24 @@ export class AppInstanceComponent implements OnInit, OnDestroy { ...@@ -607,24 +609,24 @@ export class AppInstanceComponent implements OnInit, OnDestroy {
} }
public openVersionUpdateModal() { public openVersionUpdateModal() {
this.appsService.getApplicationVersions(this.appInstance.application.applicationBase.id).subscribe( versions => { this.appsService.getApplicationVersions(this.appInstance.application.applicationBase.id).subscribe(versions => {
this.appVersions = versions.filter(val => val.state.toString() === 'ACTIVE' && val.version !== this.appInstance.applicationVersion ) this.appVersions = versions.filter(val => val.state.toString() === 'ACTIVE' && val.version !== this.appInstance.applicationVersion)
this.appVersions.sort(this.appVersionCompare) this.appVersions.sort(this.appVersionCompare)
}) })
this.manualUpdateModal.show(); this.manualUpdateModal.show();
} }
public manualUpdateVersion() { public manualUpdateVersion() {
this.appInstanceService.manualUpdateVersion(this.appInstanceId, this.selectedVersion).subscribe( next => { this.appInstanceService.manualUpdateVersion(this.appInstanceId, this.selectedVersion).subscribe(next => {
this.manualUpdateModal.hide(); this.manualUpdateModal.hide();
this.updateAppInstance() this.updateAppInstance()
}) })
} }
public openShowConfigModal() { public openShowConfigModal() {
console.warn("Sumbission", this.submission) console.warn('Sumbission', this.submission)
this.appInstanceService.getConfiguration(this.appInstanceId).subscribe( config => { this.appInstanceService.getConfiguration(this.appInstanceId).subscribe(config => {
this.submission['data']['configuration'] = config; this.submission['data']['configuration'] = config;
this.deployParameters$.subscribe(additionalParams => { this.deployParameters$.subscribe(additionalParams => {
this.submission['data']['additionalParameters'] = additionalParams this.submission['data']['additionalParameters'] = additionalParams
...@@ -632,7 +634,7 @@ export class AppInstanceComponent implements OnInit, OnDestroy { ...@@ -632,7 +634,7 @@ export class AppInstanceComponent implements OnInit, OnDestroy {
property: 'submission', property: 'submission',
value: this.submission value: this.submission
}); });
console.log("updated", this.submission) console.log('updated', this.submission)
}) })
}) })
this.showConfigurationModal.show() this.showConfigurationModal.show()
...@@ -647,9 +649,35 @@ export class AppInstanceComponent implements OnInit, OnDestroy { ...@@ -647,9 +649,35 @@ export class AppInstanceComponent implements OnInit, OnDestroy {
this.appInstanceService.getDeploymentParameters(this.appInstanceId).subscribe( this.appInstanceService.getDeploymentParameters(this.appInstanceId).subscribe(
deployParams => { deployParams => {
this.deployParametersSubject.next(deployParams) this.deployParametersSubject.next(deployParams)
this.accessMethodsModal.show() ; this.accessMethodsModal.show();
}) })
}
public scaleDown(): void {
this.appInstanceService.scaleDown(this.appInstanceId).subscribe(
{
next: () => {
console.log('Scaled down');
},
error: (err) => {
console.error('Failed to scale down', err);
}
}
)
} }
public scaleUp(): void {
this.appInstanceService.scaleUp(this.appInstanceId).subscribe(
{
next: () => {
console.log('Scaled up');
},
error: (err) => {
console.error('Failed to scale up', err);
}
}
)
}
} }
...@@ -10,7 +10,8 @@ export enum AppInstanceState { ...@@ -10,7 +10,8 @@ export enum AppInstanceState {
DONE, DONE,
FAILURE, FAILURE,
UNKNOWN, UNKNOWN,
REMOVED REMOVED,
SCALE_DOWN
} }
export class AppInstanceStatus { export class AppInstanceStatus {
......
...@@ -153,6 +153,12 @@ export class AppInstanceService extends GenericDataService { ...@@ -153,6 +153,12 @@ export class AppInstanceService extends GenericDataService {
return this.http.get<Map<string, string>>(this.getUrl() + `${appInstanceId}/parameters`); return this.http.get<Map<string, string>>(this.getUrl() + `${appInstanceId}/parameters`);
} }
public scaleDown(appInstanceId: number): Observable<any> {
return this.http.put(this.getUrl() + `${appInstanceId}/scale-down`, null)
}
public scaleUp(appInstanceId: number): Observable<any> {
return this.http.put(this.getUrl() + `${appInstanceId}/scale-up`, null)
}
} }
export class CustomerSearchCriteria { export class CustomerSearchCriteria {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment