You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dg...@apache.org on 2020/12/09 16:43:21 UTC
[incubator-datalab] branch DATALAB-2183 created (now fd166af)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DATALAB-2183
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
at fd166af [DATALAB-2183]: Fixed column width on audit
This branch includes the following new commits:
new fd166af [DATALAB-2183]: Fixed column width on audit
The 1 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@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/01: [DATALAB-2183]: Fixed column width on
audit
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2183
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit fd166af3f4a680338a85db22876bf2afbf49dc80
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Wed Dec 9 18:42:51 2020 +0200
[DATALAB-2183]: Fixed column width on audit
---
.../management-grid/management-grid.component.scss | 28 ++++++++++++++++++++--
.../app/administration/roles/roles.component.html | 2 +-
.../app/administration/roles/roles.component.ts | 3 ++-
.../audit/audit-grid/audit-grid.component.html | 26 ++++++++++++++++----
.../audit/audit-grid/audit-grid.component.scss | 15 ++++++++++++
5 files changed, 66 insertions(+), 8 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 d841c9b..841a193 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
@@ -72,7 +72,7 @@
.name,
.project {
- width: 10%;
+ width: 9%;
min-width: 140px;
.list-menu li {
text-transform: inherit;
@@ -104,7 +104,7 @@
}
.resources {
- width: 24%;
+ width: 27%;
min-width: 225px;
}
@@ -303,3 +303,27 @@ table.management {
.table-footer{
height: 48px;
}
+
+
+@media screen and (max-width: 1550px) {
+ .managment-wrapper{
+ .source {
+ .resource-wrap {
+ .resource-name {
+ width: 40%;
+ }
+
+ .resource-status {
+ width: 40%;
+ }
+
+ .resource-actions {
+ width: 20%;
+
+ }
+ }
+ }
+ }
+}
+
+
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html
index 87d61e5..f785d4b 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html
@@ -42,7 +42,7 @@
contain letters, numbers, hyphens and '_'.</div>
<div class="error" *ngIf="setupGroupName.errors?.duplicate && setupGroupName.dirty">Group name already
exists.</div>
- <div class="error" *ngIf="setupGroupName.errors?.long">Group name cannot be longer than 50 characters.</div>
+ <div class="error" *ngIf="setupGroupName.errors?.long">Group name cannot be longer than {{maxGroupLength}} characters.</div>
</div>
<div class="text-center m-bott-10">
<button mat-raised-button (click)="resetDialog()" class="butt">Cancel</button>
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 b194851..ff05b89 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
@@ -52,6 +52,7 @@ export class RolesComponent implements OnInit {
@Output() manageRolesGroupAction: EventEmitter<{}> = new EventEmitter();
private startedGroups: Array<any>;
public noPermissionMessage: string = 'You have not permissions for groups which are not assigned to your projects.';
+ public maxGroupLength: number = 25;
constructor(
public toastr: ToastrService,
@@ -235,7 +236,7 @@ export class RolesComponent implements OnInit {
public groupValidation(): ValidatorFn {
const duplicateList: any = this.groupsData.map(item => item.group.toLowerCase());
return <ValidatorFn>((control: FormControl) => {
- if (control.value && control.value.length > 50) {
+ if (control.value && control.value.length > this.maxGroupLength) {
return { long: true };
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html
index 980f7d4..ea38b85 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html
@@ -44,7 +44,11 @@
</i>
</button>
</th>
- <td mat-cell *matCellDef="let element" class="th_user"><span class="table-item user-col">{{element.user || 'N/A'}}</span></td>
+ <td mat-cell *matCellDef="let element" class="th_user">
+ <div class="table-item-wrapper">
+ <span class="table-item user-col">{{element.user || 'N/A'}}</span>
+ </div>
+ </td>
<td mat-footer-cell *matFooterCellDef class="table-footer"></td>
</ng-container>
@@ -86,7 +90,11 @@
</i>
</button>
</th>
- <td mat-cell *matCellDef="let element" class="th_project"><span class="table-item project">{{element.project || 'N/A'}}</span></td>
+ <td mat-cell *matCellDef="let element" class="th_project">
+ <div class="table-item-wrapper">
+ <span class="table-item project">{{element.project || 'N/A'}}</span>
+ </div>
+ </td>
<td mat-footer-cell *matFooterCellDef class="table-footer"></td>
</ng-container>
@@ -100,7 +108,13 @@
</i>
</button>
</th>
- <td mat-cell *matCellDef="let element" class="th_resource-type"><span class="table-item">{{element.type ? (element.type | convertaction) : 'N/A'}}</span></td>
+ <td mat-cell *matCellDef="let element" class="th_resource-type">
+ <div class="table-item-wrapper">
+ <span class="table-item">
+ {{element.type ? (element.type | convertaction) : 'N/A'}}
+ </span>
+ </div>
+ </td>
<td mat-footer-cell *matFooterCellDef class="table-footer" [colSpan]="3" >
<div class="pagination-wrapper">
<div class="selected-items-wrapper">
@@ -161,7 +175,11 @@
</i>
</button>
</th>
- <td mat-cell *matCellDef="let element" class="th_resource"><span class="table-item">{{element.resourceName || 'N/A'}}</span></td>
+ <td mat-cell *matCellDef="let element" class="th_resource">
+ <div class="table-item-wrapper">
+ <span class="table-item">{{element.resourceName || 'N/A'}}</span>
+ </div>
+ </td>
<td mat-footer-cell *matFooterCellDef class="table-footer" [hidden]="true">
</td>
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 f21a152..8ebf87b 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
@@ -57,21 +57,25 @@
width: 14%;
z-index: 10 !important;
padding-left: 0;
+ max-width: 240px;
}
.th_project {
width: 11%;
z-index: 7 !important;
+ max-width: 206px;
}
.th_resource {
width: 14%;
z-index: 5 !important;
+ max-width: 240px;
}
.th_resource-type {
width: 14%;
z-index: 6 !important;
+ max-width: 240px;
}
.th_buttons {
@@ -236,6 +240,17 @@
}
}
+ .table-item-wrapper{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding-right: 10px;
+ span{
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+ }
+
.action-wrapper {
display: flex;
align-items: center;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org