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:21 UTC
[incubator-dlab] branch DLAB-814 created (now 35d430d)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch DLAB-814
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 35d430d [DLAB-814]: updated quota controls; projects form fixes
This branch includes the following new commits:
new 44fcee0 [DLAB-814]: updated quota controls
new 7d8daa0 [DLAB-814]: updated quota controls
new 35d430d [DLAB-814]: updated quota controls; projects form fixes
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/03: [DLAB-814]: updated quota controls
Posted by an...@apache.org.
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
[incubator-dlab] 03/03: [DLAB-814]: updated quota controls;
projects form fixes
Posted by an...@apache.org.
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 35d430d0b3b51732b6e36f1874d429387e62711f
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Jul 22 17:57:54 2019 +0300
[DLAB-814]: updated quota controls; projects form fixes
---
.../manage-environment/manage-environment-dilog.component.html | 2 +-
.../webapp/src/app/administration/management/management.component.ts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html
index 77d84f1..2f2100d 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html
@@ -40,7 +40,7 @@
<div class="quotes" *ngIf="DICTIONARY.cloud_provider !== 'gcp'">
<input type="number" min="0" placeholder="Enter limit, in USD" formControlName="budget">
<span class="danger_color"
- *ngIf="!manageUsersForm?.controls['usprojectsers'].controls[i].controls['budget'].valid && !manageUsersForm?.controls['projects'].controls[i].controls['budget'].hasError('overrun')">Only
+ *ngIf="!manageUsersForm?.controls['projects'].controls[i].controls['budget'].valid && !manageUsersForm?.controls['projects'].controls[i].controls['budget'].hasError('overrun')">Only
positive integers are allowed</span>
<span class="danger_color"
*ngIf="manageUsersForm?.controls['projects'].controls[i].controls['budget'].hasError('overrun')">Per-user
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 dad0412..7afbf17 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
@@ -117,7 +117,7 @@ export class ManagementComponent implements OnInit {
}
setBudgetLimits($event) {
- this.healthStatusService.updateUsersBudget($event.users).subscribe((result: any) => {
+ this.healthStatusService.updateUsersBudget($event.projects).subscribe((result: any) => {
this.healthStatusService.updateTotalBudgetData($event.total).subscribe((res: any) => {
result.status === HTTP_STATUS_CODES.OK
&& res.status === HTTP_STATUS_CODES.NO_CONTENT
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/03: [DLAB-814]: updated quota controls
Posted by an...@apache.org.
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 44fcee0d952c636839896af2fbde1672663072f5
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Jul 22 17:07:49 2019 +0300
[DLAB-814]: updated quota controls
---
.../manage-environment-dilog.component.html | 41 ++++++++++++++--------
1 file changed, 26 insertions(+), 15 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html
index 3f183bd..77d84f1 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html
@@ -24,32 +24,42 @@
</header>
<div class="dialog-content">
<div class="content-box">
- <div *ngIf="data.usersList?.length">
+ <div *ngIf="data.projectsList?.length">
<form [formGroup]="manageUsersForm" (submit)="setBudgetLimits(manageUsersForm.value)" novalidate>
<mat-list>
<mat-list-item class="list-header">
- <div class="username">User</div>
+ <div class="username">Project</div>
<div class="quotes" *ngIf="DICTIONARY.cloud_provider !== 'gcp'">Limit</div>
<div class="action">Actions</div>
</mat-list-item>
- <div class="scrolling-content" id="scrolling" formArrayName="users">
- <mat-list-item *ngFor="let item of usersEnvironments.controls; let i=index" [formGroupName]="i" class="list-item">
- <div class="username ellipsis">{{ manageUsersForm.controls['users'].controls[i].value['name'] }}</div>
+ <div class="scrolling-content" id="scrolling" formArrayName="projects">
+ <mat-list-item *ngFor="let item of usersEnvironments.controls; let i=index" [formGroupName]="i"
+ class="list-item">
+ <div class="username ellipsis">{{ manageUsersForm.controls['projects'].controls[i].value['name'] }}
+ </div>
<div class="quotes" *ngIf="DICTIONARY.cloud_provider !== 'gcp'">
- <input type="number" min="0" placeholder="Enter limit, in USD" formControlName="budget">
- <span class="danger_color" *ngIf="!manageUsersForm?.controls['users'].controls[i].controls['budget'].valid && !manageUsersForm?.controls['users'].controls[i].controls['budget'].hasError('overrun')">Only positive integers are allowed</span>
- <span class="danger_color" *ngIf="manageUsersForm?.controls['users'].controls[i].controls['budget'].hasError('overrun')">Per-user quotes cannot be greater than total budget</span>
+ <input type="number" min="0" placeholder="Enter limit, in USD" formControlName="budget">
+ <span class="danger_color"
+ *ngIf="!manageUsersForm?.controls['usprojectsers'].controls[i].controls['budget'].valid && !manageUsersForm?.controls['projects'].controls[i].controls['budget'].hasError('overrun')">Only
+ positive integers are allowed</span>
+ <span class="danger_color"
+ *ngIf="manageUsersForm?.controls['projects'].controls[i].controls['budget'].hasError('overrun')">Per-user
+ quotes cannot be greater than total budget</span>
</div>
<div class="action">
- <span *ngIf=" manageUsersForm.controls['users'].controls[i].value['status'] === 'ACTIVE'; else not_active" matTooltip="Stop" matTooltipPosition="above" (click)="applyAction('stop', item)"><i class="material-icons">pause_circle_outline</i></span>
+ <span
+ *ngIf=" manageUsersForm.controls['projects'].controls[i].value['status'] === 'ACTIVE'; else not_active"
+ matTooltip="Stop" matTooltipPosition="above" (click)="applyAction('stop', item)"><i
+ class="material-icons">pause_circle_outline</i></span>
<ng-template #not_active>
- <span class="disabled" matTooltip="User's environment is not active" matTooltipPosition="above">
+ <span class="disabled" matTooltip="Project is not active" matTooltipPosition="above">
<i class="material-icons">pause_circle_outline</i>
</span>
</ng-template>
- <span matTooltip="Terminate" matTooltipPosition="above" (click)="applyAction('terminate', item)"><i class="material-icons">phonelink_off</i></span>
+ <span matTooltip="Terminate" matTooltipPosition="above" (click)="applyAction('terminate', item)"><i
+ class="material-icons">phonelink_off</i></span>
</div>
</mat-list-item>
</div>
@@ -57,18 +67,19 @@
<label class="label">Total budget</label>
<div class="control">
<input type="number" formControlName="total" placeholder="Enter total budget, in USD">
- <span class="danger_color" *ngIf="manageUsersForm?.controls['total'].hasError('overrun')">Total budget cannot be lower than a sum of users quotes</span>
+ <span class="danger_color" *ngIf="manageUsersForm?.controls['total'].hasError('overrun')">Total budget
+ cannot be lower than a sum of users quotes</span>
</div>
</div>
<div class="text-center m-top-30" *ngIf="DICTIONARY.cloud_provider !== 'gcp'">
<button mat-raised-button type="button" (click)="dialogRef.close()" class="butt action">Cancel</button>
- <button mat-raised-button type="submit" [disabled]="!manageUsersForm.valid"
- class="butt butt-success" [ngClass]="{'not-allowed': !manageUsersForm.valid}">Apply</button>
+ <button mat-raised-button type="submit" [disabled]="!manageUsersForm.valid" class="butt butt-success"
+ [ngClass]="{'not-allowed': !manageUsersForm.valid}">Apply</button>
</div>
</mat-list>
</form>
</div>
- <div class="info message" *ngIf="!data?.usersList.length">No active users environments</div>
+ <div class="info message" *ngIf="!data?.projectsList.length">No active projects</div>
</div>
</div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org