[AAE-5139] User name style and Discovery service initialization fix (#7010)

* [AAE-5139] User name style fix and Discovery serice fixed

* * fixed unit test

* * fixed test and us latest js-api events

* * tests fixed

* * update js api

* * fixed test and lint
This commit is contained in:
Dharan
2021-05-12 00:10:21 +05:30
committed by GitHub
parent 453198c1e8
commit e603486b00
31 changed files with 34543 additions and 132 deletions

View File

@@ -72,8 +72,8 @@
<adf-empty-content
id="adf-no-permissions-template"
icon="supervisor_account"
title="PERMISSION_MANAGER.MESSAGE.EMPTY-PERMISSION"
subtitle="PERMISSION_MANAGER.MESSAGE.EMPTY-SUBTITLE">
[title]="'PERMISSION_MANAGER.MESSAGE.EMPTY-PERMISSION' | translate"
[subtitle]="'PERMISSION_MANAGER.MESSAGE.EMPTY-SUBTITLE' | translate">
</adf-empty-content>
</ng-template>
</adf-no-content-template>

View File

@@ -17,7 +17,7 @@
text-transform: uppercase;
}
&-people-icon {
&-group-icon {
height: 20px !important;
width: 20px !important;
background: mat-color($primary);

View File

@@ -26,7 +26,7 @@ import { NodePermissionService } from '../../services/node-permission.service';
template: `
<div class="adf-cell-value" [attr.id]="group ? 'group-icon' : 'person-icon'" *ngIf="!isSelected">
<ng-container *ngIf="displayText$ | async as user">
<mat-icon *ngIf="group" class="adf-people-icon">people_alt_outline</mat-icon>
<mat-icon *ngIf="group" class="adf-group-icon">people_alt_outline</mat-icon>
<div *ngIf="!group" [outerHTML]="user | usernameInitials: 'adf-people-initial'"></div>
</ng-container>
</div>

View File

@@ -1,24 +1,18 @@
@mixin member-theme($theme) {
@mixin user-name-column-theme($theme) {
$primary: map-get($theme, primary);
$foreground: map-get($theme, foreground);
.adf-user {
display: flex;
flex-direction: column;
&-name-column {
padding: 2px 10px;
font-weight: 600;
font-size: 14px;
}
&-email-column {
padding: 2px 10px;
font-size: 14px;
letter-spacing: -0.2px;
line-height: 1.43;
color: mat-color($foreground, text, 0.72);
}
}
}

View File

@@ -24,10 +24,12 @@ import { EcmUserModel } from '@alfresco/adf-core';
@Component({
selector: 'adf-user-name-column',
template: `
<div class="adf-ellipsis-cell adf-user" [attr.data-automation-id]="displayText$ | async">
<span title="{{ displayText$ | async }}"> {{ displayText$ | async }}</span>
<div class="adf-ellipsis-cell" [attr.data-automation-id]="displayText$ | async">
<span class="adf-user-name-column" title="{{ displayText$ | async }}"> {{ displayText$ | async }}</span>
<br/>
<span title="{{ subTitleText$ | async }}">{{ subTitleText$ | async }}</span>
<span class="adf-user-email-column" title="{{ subTitleText$ | async }}" *ngIf="subTitleText$ | async">
{{ subTitleText$ | async }}
</span>
</div>
`,
host: { class: 'adf-user-name-column adf-datatable-content-cell adf-expand-cell-5 adf-ellipsis-cell' },

View File

@@ -31,6 +31,7 @@
@import '../aspect-list/aspect-list-dialog.component';
@import '../permission-manager/components/permission-container/permission-container.component';
@import '../permission-manager/components/user-icon-column/user-icon-column.component';
@import '../permission-manager/components/user-name-column/user-name-column.component';
@mixin adf-content-services-theme($theme) {
@include adf-breadcrumb-theme($theme);
@@ -52,6 +53,7 @@
@include adf-permission-list-theme($theme);
@include adf-permission-container-theme($theme);
@include adf-user-icon-column-theme($theme);
@include user-name-column-theme($theme);
@include adf-add-permission-theme($theme);
@include adf-add-permission-dialog-theme($theme);
@include adf-add-permission-panel-theme($theme);