You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/07/06 13:42:51 UTC
[incubator-dlab] branch develop updated: [DLAB-1917]: Fixed set of
UI Audit tasks (#811)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 2111c06 [DLAB-1917]: Fixed set of UI Audit tasks (#811)
2111c06 is described below
commit 2111c069c84835b307d875cf67bc4d60c79f52d2
Author: Dmytro Gnatyshyn <42...@users.noreply.github.com>
AuthorDate: Mon Jul 6 16:42:43 2020 +0300
[DLAB-1917]: Fixed set of UI Audit tasks (#811)
---
.../manage-environment-dilog.component.html | 36 +---------------------
.../manage-environment-dilog.component.ts | 8 ++++-
.../audit/audit-grid/audit-grid.component.scss | 9 ++++++
.../audit/audit-grid/audit-grid.component.ts | 12 ++++++--
4 files changed, 27 insertions(+), 38 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 aa78f05..c555280 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
@@ -42,9 +42,7 @@
</span>
</div>
<div class="period">
-<!-- <mat-slide-toggle formControlName="shared_image_enabled" labelPosition="after">-->
- <mat-slide-toggle formControlName="is_monthly_budget">
-<!-- <span class="hold-label">Per month</span>-->
+ <mat-slide-toggle formControlName="monthlyBudget">
</mat-slide-toggle>
</div>
<div class="quotes">
@@ -54,32 +52,6 @@
*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['projects']['controls'][i].controls['canBeStopped'].value; else not_allowed_stop"-->
-<!-- matTooltip="Stop" matTooltipPosition="above" (click)="applyAction('stop', item)">-->
-<!-- <i class="material-icons">pause_circle_outline</i>-->
-<!-- </span>-->
-<!-- <ng-template #not_allowed_stop>-->
-<!-- <span matTooltip="Unable to stop project because all resources are already stopped'"-->
-<!-- matTooltipPosition="above" class="not-active">-->
-<!-- <i class="material-icons">pause_circle_outline</i>-->
-<!-- </span>-->
-<!-- </ng-template>-->
-
-<!-- <span-->
-<!-- *ngIf="manageUsersForm?.controls['projects']['controls'][i].controls['canBeTerminated'].value; else not_allowed_terminate"-->
-<!-- matTooltip="Terminate" matTooltipPosition="above" (click)="applyAction('terminate', item)">-->
-<!-- <i class="material-icons">phonelink_off</i>-->
-<!-- </span>-->
-<!-- <ng-template #not_allowed_terminate>-->
-<!-- <span matTooltip="Unable to terminate project because all resources are already terminated"-->
-<!-- matTooltipPosition="above" class="not-active">-->
-<!-- <i class="material-icons">phonelink_off</i>-->
-<!-- </span>-->
-<!-- </ng-template>-->
-
-<!-- </div>-->
</mat-list-item>
</div>
<div class="control-group total-budget">
@@ -93,12 +65,6 @@
placeholder="Enter total budget, in USD">
<span class="error" *ngIf="manageUsersForm?.controls['total'].hasError('overrun')">Total budget cannot be lower than a sum of users quotes</span>
</div>
-<!-- <label class="username">Total budget</label>-->
-<!-- <div class="quotes">-->
-<!-- <input type="number" (keypress)="CheckUtils.numberOnly($event)" formControlName="total"-->
-<!-- placeholder="Enter total budget, in USD">-->
-<!-- <span class="error" *ngIf="manageUsersForm?.controls['total'].hasError('overrun')">Total budget cannot be lower than a sum of users quotes</span>-->
-<!-- </div>-->
</mat-list-item>
</div>
<div class="text-center m-top-30">
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 6f9f018..848daf7 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
@@ -74,6 +74,12 @@ export class ManageEnvironmentComponent implements OnInit {
public setBudgetLimits(value) {
if (this.getCurrentTotalValue() >= this.getCurrentUsersTotal() || !this.getCurrentTotalValue()) {
+ value.projects = value.projects.filter((v, i) =>
+ this.initialFormState.projects[i].budget !== v.budget ||
+ this.initialFormState.projects[i].monthlyBudget !== v.monthlyBudget);
+ if (this.initialFormState.total === value.total) {
+ delete value.total;
+ }
this.dialogRef.close(value);
} else {
this.manageUsersForm.controls['total'].setErrors({ overrun: true });
@@ -94,7 +100,7 @@ export class ManageEnvironmentComponent implements OnInit {
this._fb.array((this.data.projectsList || []).map((x: any) => this._fb.group({
project: x.name,
budget: [x.budget.value, [ this.userValidityCheck.bind(this)]],
- is_monthly_budget: x.budget.is_monthly_budget,
+ monthlyBudget: x.budget.monthlyBudget,
}))));
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss
index 67abbaf..29250ea 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss
@@ -280,3 +280,12 @@
padding-left: 19px;
}
+.table-footer{
+ position: sticky;
+ bottom: 0;
+ background: inherit;
+ border-top: 1px solid #E0E0E0;
+ transform: translateY(-1px);
+ border-bottom: none;
+}
+
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
index 92f9497..8c71bdd 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
@@ -221,9 +221,17 @@ export class AuditGridComponent implements OnInit {
</mat-list>
<ng-template #message>
<div class="message-wrapper">
- <p *ngIf="data.element.type !== 'COMPUTATIONAL'; else computation">{{data.element.info}}.</p>
+ <p *ngIf="data.element.type !== 'COMPUTATIONAL'; else computation">
+ <span *ngIf="data.element.info === 'Scheduled action.';else notScheduledNotebook">{{data.element.action | titlecase}} by scheduler.</span>
+ <ng-template #notScheduledNotebook>
+ <span>{{data.element.info}}.</span>
+ </ng-template>
+ </p>
<ng-template #computation>
- <p > {{data.element.action | titlecase}} computational resource <span class="strong">{{data.element.resourceName}}</span>, requested for notebook <span class="strong">{{data.element.info.split(' ')[data.element.info.split(' ').length - 1] }}</span></p>
+ <p *ngIf="data.element.info.indexOf('Scheduled') !== -1;else notScheduled"> {{data.element.action | titlecase}} by scheduler, requested for notebook <span class="strong">{{data.element.info.split(' ')[data.element.info.split(' ').length - 1] }}</span></p>
+ <ng-template #notScheduled>
+ <p> {{data.element.action | titlecase}} computational resource <span class="strong">{{data.element.resourceName}}</span>, requested for notebook <span class="strong">{{data.element.info.split(' ')[data.element.info.split(' ').length - 1] }}</span></p>
+ </ng-template>
</ng-template>
</div>
</ng-template></div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org