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 1e7757d [DLAB-1934] Fixed audit issues (#819)
1e7757d is described below
commit 1e7757d13feb5b73bde2de06fdb21ca3544d1f2b
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Mon Jul 13 18:36:21 2020 +0300
[DLAB-1934] Fixed audit issues (#819)
---
.../management-grid/management-grid.component.scss | 3 +++
.../audit/audit-grid/audit-grid.component.ts | 26 +++++++++++++---------
.../resources-grid/resources-grid.component.scss | 4 ++--
3 files changed, 20 insertions(+), 13 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
index 7bde8bd..00f13e0 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
@@ -19,6 +19,9 @@
.data-grid {
&.management {
+ .settings{
+ min-width: 7%;
+ }
.mat-column-checkbox{
padding-left: 10px;
padding-right: 0px;
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 4bb0d6c..7b112ee 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
@@ -115,7 +115,7 @@ export class AuditGridComponent implements OnInit {
}
public openActionInfo(element: AuditItem): void {
- if (element.type === 'GROUP' && element.info.indexOf('role') !== -1 ||
element.type === 'BUCKET') {
+ if (element.type === 'GROUP' && element.info.indexOf('role') !== -1) {
this.dialog.open(AuditInfoDialogComponent, { data: {element, dialogSize:
'big'}, panelClass: 'modal-xl-m' });
} else {
this.dialog.open(AuditInfoDialogComponent, { data: {element, dialogSize:
'small'}, panelClass: 'modal-md' });
@@ -176,12 +176,14 @@ export class AuditGridComponent implements OnInit {
<button type="button" class="close"
(click)="dialogRef.close()">×</button>
</header>
<div mat-dialog-content class="content audit-info-content"
[ngClass]="{'pb-40': actionList[0].length > 1}">
- <mat-list *ngIf="actionList[0].length > 1 && data.element.type ===
'FOLLOW_LINK'|| data.element.info.indexOf('Update quota') !== -1;else message">
+ <mat-list *ngIf="actionList[0].length > 1 && data.element.action
!== 'FOLLOW_LINK'|| data.element.info.indexOf('Update quota') !== -1;else
message">
<ng-container *ngIf="data.element.info.indexOf('Update quota')
=== -1;else quotas">
+
<mat-list-item class="list-header">
<div class="info-item-title"
[ngClass]="{'same-column-width': data.dialogSize === 'small'}">Action</div>
<div class="info-item-data" [ngClass]="{'same-column-width':
data.dialogSize === 'small'}"> Description </div>
</mat-list-item>
+
<div class="scrolling-content mat-list-wrapper" id="scrolling">
<mat-list-item class="list-item" *ngFor="let action of
actionList">
<div *ngIf="(data.element.action === 'upload' && action[0]
=== 'File(s)') || (data.element.action === 'download' && action[0] ===
'File(s)');else multiAction" class="info-item-title">File</div>
@@ -189,7 +191,10 @@ export class AuditGridComponent implements OnInit {
<div class="info-item-title"
[ngClass]="{'same-column-width': data.dialogSize ===
'small'}">{{action[0]}}</div>
</ng-template>
<div class="info-item-data"
[ngClass]="{'same-column-width': data.dialogSize === 'small'}" *ngIf="action[0]
=== 'File(s)'">
- <div class="file-description ellipsis" *ngFor="let
description of action[1]?.split(',')" [matTooltip]="description"
matTooltipPosition="above">
+ <div class="file-description ellipsis"
+ *ngFor="let description of action[1]?.split(',')"
+ [matTooltip]="description"
+ matTooltipPosition="above">
{{description}}
</div>
</div>
@@ -222,22 +227,21 @@ export class AuditGridComponent implements OnInit {
<ng-template #message>
<div class="message-wrapper">
<p *ngIf="data.element.type !== 'COMPUTE'; else computation">
- <span *ngIf="data.element.info.indexOf('Scheduled') !==
-1;else notScheduledNotebook">{{data.element.action | titlecase}} by
scheduler.1</span>
-
+ <span *ngIf="data.element.info.indexOf('Scheduled') !==
-1;else notScheduledNotebook">{{data.element.action | titlecase}} by
scheduler.</span>
<ng-template #notScheduledNotebook>
- <span *ngIf="data.element.type ===
'WEB_TERMINAL'">{{data.element.info}} <span
class="strong">{{data.element.resourceName}}</span>.2</span>
- <span *ngIf="data.element.type !== 'WEB_TERMINAL' &&
data.element.type !== 'FOLLOW_LINK' && data.element.type !== 'EDGE_NODE'"
>{{data.element.info}}.</span>
+ <span *ngIf="data.element.type ===
'WEB_TERMINAL'">{{data.element.info}} <span
class="strong">{{data.element.resourceName}}</span>.</span>
+ <span *ngIf="data.element.type !== 'WEB_TERMINAL' &&
data.element.type !== 'EDGE_NODE'">{{data.element.info}}.</span>
<span *ngIf="data.element.type === 'EDGE_NODE' &&
data.element.action === 'CREATE'">
- Create edge node for endpoint <span
class="strong">{{data.element.resourceName}}</span>, requested in project <span
class="strong">{{data.element.project}}</span>
- .</span>
+ Create edge node for endpoint <span
class="strong">{{data.element.resourceName}}</span>, requested in project <span
class="strong">{{data.element.project}}</span>.
+ </span>
</ng-template>
</p>
<ng-template #computation>
<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>
- <span *ngIf="data.element.action ===
'FOLLOW_LINK'">Follow compute <span
class="strong">{{info.cluster}}</span> <span>{{info.custerType}}</span>
link, requested for notebook <span
class="strong">{{info.notebook}}</span>.</span>
- <span *ngIf="data.element.action !==
'FOLLOW_LINK'">{{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>.</span>
+ <span *ngIf="data.element.action ===
'FOLLOW_LINK'">Follow compute <span
class="strong">{{info.cluster}}</span> <span>{{info.clusterType}}</span>
link, requested for notebook <span
class="strong">{{info.notebook}}</span>.</span>
+ <span *ngIf="data.element.action !==
'FOLLOW_LINK'">{{data.element.action | titlecase}} compute <span
class="strong">{{data.element.resourceName}}</span>, requested for notebook
<span class="strong">{{data.element.info.split(' ')[data.element.info.split('
').length - 1] }}</span>.</span>
</p>
</ng-template>
</ng-template>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss
index c0f0a6f..b65e3e4 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss
@@ -91,7 +91,7 @@ table {
}
.name-col {
- width: 18%;
+ width: 15%;
padding-right: 5px;
padding-left: 24px;
background-color: inherit;
@@ -110,7 +110,7 @@ table {
.status-col,
.shape-col {
- width: 15%;
+ width: 12%;
.label{
padding-top: 14px;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
