inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AAE-5021] Add listPeople method to PeopleContentService (#6947)

Browse Source 
* [AAE-5021] Add listPeople method to PeopleContentService

* lint

* Replace Person with EcmUserModel

* Update imports to @alfresco/adf-core

* Change to const + lint
This commit is contained in:
Thomas Hunter
2021-04-28 17:50:53 +02:00
committed by GitHub
parent 42c81e46bb
commit 9cbae9abd8
11 changed files with 124 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/content-services/src/lib/permission-manager/components/user-name-column/user-name-column.component.ts
View File

@@ -17,8 +17,9 @@
import { Component, Input, OnInit } from '@angular/core';
import { BehaviorSubject } from 'rxjs';
import { Group, NodeEntry, Person } from '@alfresco/js-api';
import { Group, NodeEntry } from '@alfresco/js-api';
import { NodePermissionService } from '../../services/node-permission.service';
import { EcmUserModel } from '@alfresco/adf-core';
@Component({
selector: 'adf-user-name-column',
@@ -59,7 +60,7 @@ export class UserNameColumnComponent implements OnInit {
}
}
private updatePerson(person: Person) {
private updatePerson(person: EcmUserModel) {
if (person) {
this.displayText$.next(`${person.firstName ?? ''} ${person.lastName ?? ''}`);
this.subTitleText$.next(person.email ?? '');

7
lib/content-services/src/lib/permission-manager/models/member.model.ts
View File

@@ -15,9 +15,10 @@
* limitations under the License.
*/
import { Group, Node, NodeEntry, PermissionElement, Person } from '@alfresco/js-api';
import { Group, Node, NodeEntry, PermissionElement } from '@alfresco/js-api';
import { PermissionDisplayModel } from './permission.model';
import { RoleModel } from './role.model';
import { EcmUserModel } from '@alfresco/adf-core';
export interface NodePermissionsModel {
node: Node;
@@ -31,7 +32,7 @@ export class MemberModel {
role: string;
accessStatus: PermissionElement.AccessStatusEnum | string;
entry: {
person?: Person;
person?: EcmUserModel;
group?: Group;
};
readonly: boolean = false;
@@ -46,7 +47,7 @@ export class MemberModel {
const result = new MemberModel();
if (entry.nodeType === 'cm:person') {
const person = new Person({
const person = new EcmUserModel({
firstName: entry.properties['cm:firstName'],
lastName: entry.properties['cm:lastName'],
email: entry.properties['cm:email'],

8
lib/content-services/src/lib/permission-manager/services/node-permission.service.ts
View File

@@ -15,8 +15,8 @@
* limitations under the License.
*/
import { AlfrescoApiService, NodesApiService, SearchService, TranslationService } from '@alfresco/adf-core';
import { Group, GroupMemberEntry, GroupMemberPaging, Node, PathElement, PermissionElement, Person, QueryBody } from '@alfresco/js-api';
import { AlfrescoApiService, NodesApiService, SearchService, TranslationService, EcmUserModel } from '@alfresco/adf-core';
import { Group, GroupMemberEntry, GroupMemberPaging, Node, PathElement, PermissionElement, QueryBody } from '@alfresco/js-api';
import { Injectable } from '@angular/core';
import { forkJoin, from, Observable, of, throwError } from 'rxjs';
import { catchError, map, switchMap } from 'rxjs/operators';
@@ -287,14 +287,14 @@ export class NodePermissionService {
);
}
transformNodeToUserPerson(node: Node): { person: Person, group: Group } {
transformNodeToUserPerson(node: Node): { person: EcmUserModel, group: Group } {
let person = null, group = null;
if (node.nodeType === 'cm:person') {
const firstName = node.properties['cm:firstName'];
const lastName = node.properties['cm:lastName'];
const email = node.properties['cm:email'];
const id = node.properties['cm:userName'];
person = new Person({ id, firstName, lastName, email});
person = new EcmUserModel({ id, firstName, lastName, email});
}
if (node.nodeType === 'cm:authorityContainer') {