You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/07/22 14:58:23 UTC
[incubator-dlab] 02/03: [DLAB-814]: updated quota controls
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-814
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 7d8daa0d6e379a6fd4171efa49f3c417a8d3eef4
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Jul 22 17:09:58 2019 +0300
[DLAB-814]: updated quota controls
---
.../manage-environment-dilog.component.ts | 19 ++++++++++---------
.../administration/management/management.component.ts | 18 ++++++++++--------
2 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts
index 8831fd9..0dd8ebe 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts
@@ -46,16 +46,16 @@ export class ManageEnvironmentComponent implements OnInit {
ngOnInit() {
!this.manageUsersForm && this.initForm();
+ this.manageUsersForm.setControl('projects',
+ this._fb.array((this.data.projectsList || []).map((x: any) => this._fb.group({
+ name: x.name, budget: [x.budget, [Validators.min(0), this.userValidityCheck.bind(this)]], status: x.status
+ }))));
- this.manageUsersForm.setControl('users',
- this._fb.array((this.data.usersList || []).map((x: any) => this._fb.group({
- name: x.name, budget: [x.budget, [Validators.min(0), this.userValidityCheck.bind(this)]], status: x.status
- }))));
this.manageUsersForm.controls['total'].setValue(this.data.total.conf_max_budget || null);
}
get usersEnvironments(): FormArray {
- return <FormArray>this.manageUsersForm.get('users');
+ return <FormArray>this.manageUsersForm.get('projects');
}
public setBudgetLimits(value) {
@@ -64,21 +64,22 @@ export class ManageEnvironmentComponent implements OnInit {
public applyAction(action, user) {
const dialogRef: MatDialogRef<ConfirmActionDialogComponent> = this.dialog.open(
- ConfirmActionDialogComponent, { data: {action, user: user.value.name}, width: '550px', panelClass: 'error-modalbox' });
+ ConfirmActionDialogComponent, { data: { action, user: user.value.name }, width: '550px', panelClass: 'error-modalbox' });
+
dialogRef.afterClosed().subscribe(result => {
- if (result) this.manageEnv.emit({action, user: user.value.name});
+ if (result) this.manageEnv.emit({ action, user: user.value.name });
});
}
private initForm(): void {
this.manageUsersForm = this._fb.group({
total: [null, [Validators.min(0), this.totalValidityCheck.bind(this)]],
- users: this._fb.array([this._fb.group({ name: '', budget: null, status: ''})])
+ projects: this._fb.array([this._fb.group({ name: '', budget: null, status: '' })])
});
}
private getCurrentUsersTotal(): number {
- return this.manageUsersForm.value.users.reduce((memo, el) => memo += el.budget, 0);
+ return this.manageUsersForm.value.projects.reduce((memo, el) => memo += el.budget, 0);
}
private getCurrentTotalValue(): number {
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
index 15dd8c3..dad0412 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
@@ -38,6 +38,7 @@ import { EndpointsComponent } from './endpoints/endpoints.component';
import { ExploratoryModel } from '../../resources/resources-grid/resources-grid.model';
import { EnvironmentsDataService } from './management-data.service';
+import { ProjectService } from '../../core/services';
@Component({
selector: 'environments-management',
@@ -58,7 +59,8 @@ export class ManagementComponent implements OnInit {
private manageEnvironmentsService: ManageEnvironmentsService,
private userResourceService: UserResourceService,
private storageService: StorageService,
- private environmentsDataService: EnvironmentsDataService
+ private environmentsDataService: EnvironmentsDataService,
+ private projectService: ProjectService
) { }
ngOnInit() {
@@ -93,13 +95,13 @@ export class ManagementComponent implements OnInit {
}
openManageEnvironmentDialog() {
- this.getActiveUsersList().subscribe(usersList => {
- this.getTotalBudgetData().subscribe(
- total => {
- const dialogRef = this.dialog.open(ManageEnvironmentComponent, { data: { usersList, total }, panelClass: 'modal-xl-s' });
- dialogRef.componentInstance.manageEnv.subscribe((data) => this.manageEnvironment(data));
- dialogRef.afterClosed().subscribe(result => result && this.setBudgetLimits(result));
- }, () => this.toastr.error('Failed users list loading!', 'Oops!'));
+ // this.getActiveUsersList().subscribe(usersList => {
+ this.projectService.getProjectsList().subscribe(projectsList => {
+ this.getTotalBudgetData().subscribe(total => {
+ const dialogRef = this.dialog.open(ManageEnvironmentComponent, { data: { projectsList, total }, panelClass: 'modal-xl-s' });
+ dialogRef.componentInstance.manageEnv.subscribe((data) => this.manageEnvironment(data));
+ dialogRef.afterClosed().subscribe(result => result && this.setBudgetLimits(result));
+ }, () => this.toastr.error('Failed users list loading!', 'Oops!'));
});
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org