This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1991
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1991 by this push:
new ddf2c34 [DLAB-1991]: Fixed set of UI changes
ddf2c34 is described below
commit ddf2c34fd535c2f1c804427a24e96eef771dc28c
Author: Dmytro_Gnatyshyn <[email protected]>
AuthorDate: Thu Aug 13 15:57:39 2020 +0300
[DLAB-1991]: Fixed set of UI changes
---
.../service/impl/ProjectServiceImpl.java | 8 ++--
.../manage-environment-dilog.component.ts | 2 -
.../app/administration/roles/roles.component.ts | 1 -
.../audit/audit-grid/audit-grid.component.ts | 47 ++++++++++++++--------
.../install-libraries.component.scss | 7 +++-
.../src/app/shared/navbar/navbar.component.ts | 7 +---
6 files changed, 40 insertions(+), 32 deletions(-)
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
index ebcfeb3..79ee3f1 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
@@ -80,10 +80,10 @@ public class ProjectServiceImpl implements ProjectService {
private static final String STOP_ACTION = "stop";
private static final String TERMINATE_ACTION = "terminate";
- private static final String AUDIT_ADD_ENDPOINT = "Added endpoint(s) %s";
- private static final String AUDIT_ADD_GROUP = "Added group(s) %s ";
- private static final String AUDIT_REMOVE_GROUP = "Removed group(s) %s";
- private static final String AUDIT_UPDATE_BUDGET = "Update quota %d->%d.
Is monthly period: %b";
+ private static final String AUDIT_ADD_ENDPOINT = "Add endpoint(s):
%s\n";
+ private static final String AUDIT_ADD_GROUP = "Add group(s): %s\n";
+ private static final String AUDIT_REMOVE_GROUP = "Remove group(s):
%s\n";
+ private static final String AUDIT_UPDATE_BUDGET = "Update quota:
%d->%d\nUpdate period: %b";
private static final String AUDIT_ADD_EDGE_NODE = "Create edge node for
endpoint %s, requested in project %s";
private final ProjectDAO projectDAO;
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 0c42312..7f28631 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
@@ -60,8 +60,6 @@ export class ManageEnvironmentComponent implements OnInit {
public onFormChange() {
this.manageUsersForm.valueChanges.subscribe(value => {
this.isFormChanged = JSON.stringify(this.initialFormState) ===
JSON.stringify(this.manageUsersForm.value);
- console.log(JSON.stringify(this.initialFormState));
- console.log(JSON.stringify(this.manageUsersForm.value));
if ((this.getCurrentTotalValue() && this.getCurrentTotalValue() >=
this.getCurrentUsersTotal())) {
this.manageUsersForm.controls['projects']['controls'].forEach(v => {
v.controls['budget'].errors &&
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
index 8e0dcc9..884e1e2 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
@@ -154,7 +154,6 @@ export class RolesComponent implements OnInit {
}
public manageRolesGroups($event) {
- console.log($event);
switch ($event.action) {
case 'create':
this.rolesService.setupNewGroup($event.value).subscribe(() => {
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 953aeae..95a36d6 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
@@ -21,6 +21,7 @@ import {Component, EventEmitter, Inject, OnInit, Output} from
'@angular/core';
import {FilterAuditModel} from '../filter-audit.model';
import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from
'@angular/material/dialog';
import {AuditService} from '../../../core/services/audit.service';
+import {SortUtils} from '../../../core/util';
export interface AuditItem {
@@ -286,23 +287,35 @@ export class AuditInfoDialogComponent {
this.info = JSON.parse(data.element.info);
}
if (data.element.info.indexOf('Update quota') !== -1) {
- this.data.element.info.replace(/->/g, ' ').split('/n').forEach( (val, j)
=> {
- this.updateBudget[j] = [];
- val.split(' ')
- .forEach((v, i, arr) => {
- if (arr[0] === 'Update') {
- if (i === 1) {
- this.updateBudget[j].push(`${arr[0]} ${arr[1]}`);
- }
- if (i > 1) {
- this.updateBudget[j].push(arr[i]);
- }
- } else {
- this.updateBudget[j].push(arr[i]);
- }
-
- });
- });
+ this.updateBudget = data.element.info.split('\n').reduce((acc, v, i,
arr) => {
+ const row = v.split(':').map((el, index) => {
+ if (el.indexOf('->') !== -1) {
+ el = el.split('->');
+ } else if (index === 1 && el.indexOf('->') === -1) {
+ el = ['', el];
+ }
+ return el;
+ });
+ acc.push(SortUtils.flatDeep(row, 1));
+ return acc;
+ }, []);
+ // this.data.element.info.replace(/->/g, ' ').split('\n').forEach( (val,
j) => {
+ // this.updateBudget[j] = [];
+ // val.split(' ')
+ // .forEach((v, i, arr) => {
+ // if (arr[0] === 'Update') {
+ // if (i === 1) {
+ // this.updateBudget[j].push(`${arr[0]} ${arr[1]}`);
+ // }
+ // if (i > 1) {
+ // this.updateBudget[j].push(arr[i]);
+ // }
+ // } else {
+ // this.updateBudget[j].push(arr[i]);
+ // }
+ //
+ // });
+ // });
}
this.actionList = data.element.info.split('\n').map(v =>
v.split(':')).filter(v => v[0] !== '');
}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
index 05648e1..50ba25f 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
@@ -336,8 +336,11 @@ mat-chip.mat-chip:not(.mat-basic-chip) {
}
/* Tab info */
-.list-header{
- line-height: 40px;
+
+.install-libraries{
+ .list-header{
+ line-height: 40px;
+ }
}
.mat-dialog-container {
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
index 75f1272..6ac010c 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
@@ -164,13 +164,8 @@ export class NavbarComponent implements OnInit, OnDestroy {
}
private checkQuoteUsed(): void {
- if (!this.storage.getBillingQuoteUsed()) {
- console.log('storage');
+ if (!this.storage.getBillingQuoteUsed( )) {
this.healthStatusService.getQuotaStatus().pipe(take(1)).subscribe((params:
Quota) => {
- params = {
- projectQuotas: {Project2: 90, Project211: 90, Project21: 100,
Project12: 100},
- totalQuotaUsed: 90
- };
let checkQuotaAlert = '';
const exceedProjects = [], informProjects = [];
Object.keys(params.projectQuotas).forEach(key => {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
