From 1d6c431e43e18157e966e9bec1d5a2681604fe7c Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 9 Jul 2024 07:59:20 -0400 Subject: [PATCH] ACS-8320, ACS-8321: move content/process user info to demo shell (#9918) --- .../resources/images/bpm-background.png | Bin 0 -> 6393 bytes .../resources}/images/ecm-background.png | Bin demo-shell/src/app/app.module.ts | 6 +- .../content-user-info.component.html | 0 .../content-user-info.component.scss | 0 .../content-user-info.component.spec.ts | 46 ++++++- .../content-user-info.component.ts | 11 +- .../content-user-info.module.ts | 0 .../user-info}/content-user-info/index.ts | 0 .../content-user-info/public-api.ts | 0 .../user-info}/process-user-info/index.ts | 0 .../process-user-info.component.html | 0 .../process-user-info.component.scss | 0 .../process-user-info.component.spec.ts | 0 .../process-user-info.component.ts | 6 +- .../process-user-info/public-api.ts | 0 docs/README.md | 2 - .../components/content-user-info.component.md | 38 ------ .../components/process-user-info.component.md | 38 ------ .../lib/common/mocks/ecm-user.service.mock.ts | 113 +----------------- .../services/people-content.service.spec.ts | 43 ++++++- .../src/lib/content.module.ts | 3 - lib/content-services/src/public-api.ts | 2 +- .../src/lib/process.module.ts | 3 - lib/process-services/src/public-api.ts | 1 - 25 files changed, 99 insertions(+), 213 deletions(-) create mode 100644 demo-shell/resources/images/bpm-background.png rename {lib/core/src/lib/assets => demo-shell/resources}/images/ecm-background.png (100%) rename {lib/content-services/src/lib => demo-shell/src/app/components/app-layout/user-info}/content-user-info/content-user-info.component.html (100%) rename {lib/content-services/src/lib => demo-shell/src/app/components/app-layout/user-info}/content-user-info/content-user-info.component.scss (100%) rename {lib/content-services/src/lib => demo-shell/src/app/components/app-layout/user-info}/content-user-info/content-user-info.component.spec.ts (89%) rename {lib/content-services/src/lib => demo-shell/src/app/components/app-layout/user-info}/content-user-info/content-user-info.component.ts (91%) rename {lib/content-services/src/lib => demo-shell/src/app/components/app-layout/user-info}/content-user-info/content-user-info.module.ts (100%) rename {lib/content-services/src/lib => demo-shell/src/app/components/app-layout/user-info}/content-user-info/index.ts (100%) rename {lib/content-services/src/lib => demo-shell/src/app/components/app-layout/user-info}/content-user-info/public-api.ts (100%) rename {lib/process-services/src/lib => demo-shell/src/app/components/app-layout/user-info}/process-user-info/index.ts (100%) rename {lib/process-services/src/lib => demo-shell/src/app/components/app-layout/user-info}/process-user-info/process-user-info.component.html (100%) rename {lib/process-services/src/lib => demo-shell/src/app/components/app-layout/user-info}/process-user-info/process-user-info.component.scss (100%) rename {lib/process-services/src/lib => demo-shell/src/app/components/app-layout/user-info}/process-user-info/process-user-info.component.spec.ts (100%) rename {lib/process-services/src/lib => demo-shell/src/app/components/app-layout/user-info}/process-user-info/process-user-info.component.ts (94%) rename {lib/process-services/src/lib => demo-shell/src/app/components/app-layout/user-info}/process-user-info/public-api.ts (100%) delete mode 100644 docs/content-services/components/content-user-info.component.md delete mode 100644 docs/process-services/components/process-user-info.component.md diff --git a/demo-shell/resources/images/bpm-background.png b/demo-shell/resources/images/bpm-background.png new file mode 100644 index 0000000000000000000000000000000000000000..923f00885dfd862554b16a100f2182c98bd30892 GIT binary patch literal 6393 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 literal 0 HcmV?d00001 diff --git a/lib/core/src/lib/assets/images/ecm-background.png b/demo-shell/resources/images/ecm-background.png similarity index 100% rename from lib/core/src/lib/assets/images/ecm-background.png rename to demo-shell/resources/images/ecm-background.png diff --git a/demo-shell/src/app/app.module.ts b/demo-shell/src/app/app.module.ts index 94156dc574..ccee4a7b71 100644 --- a/demo-shell/src/app/app.module.ts +++ b/demo-shell/src/app/app.module.ts @@ -67,6 +67,8 @@ import { CustomEditorComponent, CustomWidgetComponent } from './components/cloud import { SearchFilterChipsComponent } from './components/search/search-filter-chips.component'; import { UserInfoComponent } from './components/app-layout/user-info/user-info.component'; import { FolderDirectiveModule } from './folder-directive'; +import { ContentUserInfoModule } from './components/app-layout/user-info/content-user-info'; +import { PROCESS_USER_INFO_DIRECTIVES } from './components/app-layout/user-info/process-user-info'; @NgModule({ imports: [ @@ -89,7 +91,9 @@ import { FolderDirectiveModule } from './folder-directive'; AppCloudSharedModule, MonacoEditorModule.forRoot(), FolderDirectiveModule, - ShowDiagramComponent + ShowDiagramComponent, + ContentUserInfoModule, + ...PROCESS_USER_INFO_DIRECTIVES ], declarations: [ AppComponent, diff --git a/lib/content-services/src/lib/content-user-info/content-user-info.component.html b/demo-shell/src/app/components/app-layout/user-info/content-user-info/content-user-info.component.html similarity index 100% rename from lib/content-services/src/lib/content-user-info/content-user-info.component.html rename to demo-shell/src/app/components/app-layout/user-info/content-user-info/content-user-info.component.html diff --git a/lib/content-services/src/lib/content-user-info/content-user-info.component.scss b/demo-shell/src/app/components/app-layout/user-info/content-user-info/content-user-info.component.scss similarity index 100% rename from lib/content-services/src/lib/content-user-info/content-user-info.component.scss rename to demo-shell/src/app/components/app-layout/user-info/content-user-info/content-user-info.component.scss diff --git a/lib/content-services/src/lib/content-user-info/content-user-info.component.spec.ts b/demo-shell/src/app/components/app-layout/user-info/content-user-info/content-user-info.component.spec.ts similarity index 89% rename from lib/content-services/src/lib/content-user-info/content-user-info.component.spec.ts rename to demo-shell/src/app/components/app-layout/user-info/content-user-info/content-user-info.component.spec.ts index d78bdfe3c7..686776a112 100644 --- a/lib/content-services/src/lib/content-user-info/content-user-info.component.spec.ts +++ b/demo-shell/src/app/components/app-layout/user-info/content-user-info/content-user-info.component.spec.ts @@ -19,11 +19,51 @@ import { CoreTestingModule, IdentityUserModel, InitialUsernamePipe, UserInfoMode import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatMenuModule } from '@angular/material/menu'; import { By, DomSanitizer } from '@angular/platform-browser'; -import { fakeEcmEditedUser, fakeEcmUser, fakeEcmUserNoImage } from '../common/mocks/ecm-user.service.mock'; -import { ContentTestingModule } from '../testing/content.testing.module'; - +import { fakeEcmUser, ContentTestingModule } from '@alfresco/adf-content-services'; import { ContentUserInfoComponent } from './content-user-info.component'; +const fakeEcmEditedUser = { + id: 'fake-id', + firstName: null, + lastName: 'fake-last-name', + description: 'i am a fake user for test', + avatarId: 'fake-avatar-id', + email: 'fakeEcm@ecmUser.com', + skypeId: 'fake-skype-id', + googleId: 'fake-googleId-id', + instantMessageId: 'fake-instantMessageId-id', + company: null, + jobTitle: 'test job', + location: 'fake location', + mobile: '000000000', + telephone: '11111111', + statusUpdatedAt: 'fake-date', + userStatus: 'active', + enabled: true, + emailNotificationsEnabled: true +}; + +export const fakeEcmUserNoImage = { + id: 'fake-id', + firstName: 'fake-first-name', + lastName: 'fake-last-name', + description: 'i am a fake user for test', + avatarId: null, + email: 'fakeEcm@ecmUser.com', + skypeId: 'fake-skype-id', + googleId: 'fake-googleId-id', + instantMessageId: 'fake-instantMessageId-id', + company: null, + jobTitle: null, + location: 'fake location', + mobile: '000000000', + telephone: '11111111', + statusUpdatedAt: 'fake-date', + userStatus: 'active', + enabled: true, + emailNotificationsEnabled: true +}; + class FakeSanitizer extends DomSanitizer { constructor() { super(); diff --git a/lib/content-services/src/lib/content-user-info/content-user-info.component.ts b/demo-shell/src/app/components/app-layout/user-info/content-user-info/content-user-info.component.ts similarity index 91% rename from lib/content-services/src/lib/content-user-info/content-user-info.component.ts rename to demo-shell/src/app/components/app-layout/user-info/content-user-info/content-user-info.component.ts index 91fd28281c..abaaa88504 100644 --- a/lib/content-services/src/lib/content-user-info/content-user-info.component.ts +++ b/demo-shell/src/app/components/app-layout/user-info/content-user-info/content-user-info.component.ts @@ -19,8 +19,7 @@ import { IdentityUserModel, UserInfoMode } from '@alfresco/adf-core'; import { Component, Input, OnDestroy, ViewChild, ViewEncapsulation } from '@angular/core'; import { MatMenuTrigger, MenuPositionX, MenuPositionY } from '@angular/material/menu'; import { Subject } from 'rxjs'; -import { EcmUserModel } from '../common/models/ecm-user.model'; -import { PeopleContentService } from '../common/services/people-content.service'; +import { EcmUserModel, PeopleContentService } from '@alfresco/adf-content-services'; @Component({ selector: 'adf-content-user-info', @@ -29,7 +28,6 @@ import { PeopleContentService } from '../common/services/people-content.service' encapsulation: ViewEncapsulation.None }) export class ContentUserInfoComponent implements OnDestroy { - @ViewChild(MatMenuTrigger) trigger: MatMenuTrigger; /** Determines if user is logged in. */ @@ -50,11 +48,11 @@ export class ContentUserInfoComponent implements OnDestroy { /** Custom path for the background banner image for ACS users. */ @Input() - ecmBackgroundImage: string = './assets/images/ecm-background.png'; + ecmBackgroundImage: string = './resources/images/ecm-background.png'; /** Custom path for the background banner image for APS users. */ @Input() - bpmBackgroundImage: string = './assets/images/bpm-background.png'; + bpmBackgroundImage: string = './resources/images/bpm-background.png'; /** Custom choice for opening the menu at the bottom. Can be `before` or `after`. */ @Input() @@ -79,8 +77,7 @@ export class ContentUserInfoComponent implements OnDestroy { private destroy$ = new Subject(); - constructor(private peopleContentService: PeopleContentService) { - } + constructor(private peopleContentService: PeopleContentService) {} ngOnDestroy(): void { this.destroy$.next(true); diff --git a/lib/content-services/src/lib/content-user-info/content-user-info.module.ts b/demo-shell/src/app/components/app-layout/user-info/content-user-info/content-user-info.module.ts similarity index 100% rename from lib/content-services/src/lib/content-user-info/content-user-info.module.ts rename to demo-shell/src/app/components/app-layout/user-info/content-user-info/content-user-info.module.ts diff --git a/lib/content-services/src/lib/content-user-info/index.ts b/demo-shell/src/app/components/app-layout/user-info/content-user-info/index.ts similarity index 100% rename from lib/content-services/src/lib/content-user-info/index.ts rename to demo-shell/src/app/components/app-layout/user-info/content-user-info/index.ts diff --git a/lib/content-services/src/lib/content-user-info/public-api.ts b/demo-shell/src/app/components/app-layout/user-info/content-user-info/public-api.ts similarity index 100% rename from lib/content-services/src/lib/content-user-info/public-api.ts rename to demo-shell/src/app/components/app-layout/user-info/content-user-info/public-api.ts diff --git a/lib/process-services/src/lib/process-user-info/index.ts b/demo-shell/src/app/components/app-layout/user-info/process-user-info/index.ts similarity index 100% rename from lib/process-services/src/lib/process-user-info/index.ts rename to demo-shell/src/app/components/app-layout/user-info/process-user-info/index.ts diff --git a/lib/process-services/src/lib/process-user-info/process-user-info.component.html b/demo-shell/src/app/components/app-layout/user-info/process-user-info/process-user-info.component.html similarity index 100% rename from lib/process-services/src/lib/process-user-info/process-user-info.component.html rename to demo-shell/src/app/components/app-layout/user-info/process-user-info/process-user-info.component.html diff --git a/lib/process-services/src/lib/process-user-info/process-user-info.component.scss b/demo-shell/src/app/components/app-layout/user-info/process-user-info/process-user-info.component.scss similarity index 100% rename from lib/process-services/src/lib/process-user-info/process-user-info.component.scss rename to demo-shell/src/app/components/app-layout/user-info/process-user-info/process-user-info.component.scss diff --git a/lib/process-services/src/lib/process-user-info/process-user-info.component.spec.ts b/demo-shell/src/app/components/app-layout/user-info/process-user-info/process-user-info.component.spec.ts similarity index 100% rename from lib/process-services/src/lib/process-user-info/process-user-info.component.spec.ts rename to demo-shell/src/app/components/app-layout/user-info/process-user-info/process-user-info.component.spec.ts diff --git a/lib/process-services/src/lib/process-user-info/process-user-info.component.ts b/demo-shell/src/app/components/app-layout/user-info/process-user-info/process-user-info.component.ts similarity index 94% rename from lib/process-services/src/lib/process-user-info/process-user-info.component.ts rename to demo-shell/src/app/components/app-layout/user-info/process-user-info/process-user-info.component.ts index 2d0c87f346..692c58e053 100644 --- a/lib/process-services/src/lib/process-user-info/process-user-info.component.ts +++ b/demo-shell/src/app/components/app-layout/user-info/process-user-info/process-user-info.component.ts @@ -20,7 +20,7 @@ import { EcmUserModel, PeopleContentService } from '@alfresco/adf-content-servic import { Component, Input, OnDestroy, ViewChild, ViewEncapsulation } from '@angular/core'; import { MatMenuModule, MatMenuTrigger, MenuPositionX, MenuPositionY } from '@angular/material/menu'; import { Subject } from 'rxjs'; -import { PeopleProcessService } from '../services/people-process.service'; +import { PeopleProcessService } from '@alfresco/adf-process-services'; import { UserRepresentation } from '@alfresco/js-api'; import { CommonModule } from '@angular/common'; import { MatButtonModule } from '@angular/material/button'; @@ -57,11 +57,11 @@ export class ProcessUserInfoComponent implements OnDestroy { /** Custom path for the background banner image for APS users. */ @Input() - bpmBackgroundImage: string = './assets/images/bpm-background.png'; + bpmBackgroundImage: string = './resources/images/bpm-background.png'; /** Custom path for the background banner image for ACS users. */ @Input() - ecmBackgroundImage: string = './assets/images/ecm-background.png'; + ecmBackgroundImage: string = './resources/images/ecm-background.png'; /** Custom choice for opening the menu at the bottom. Can be `before` or `after`. */ @Input() diff --git a/lib/process-services/src/lib/process-user-info/public-api.ts b/demo-shell/src/app/components/app-layout/user-info/process-user-info/public-api.ts similarity index 100% rename from lib/process-services/src/lib/process-user-info/public-api.ts rename to demo-shell/src/app/components/app-layout/user-info/process-user-info/public-api.ts diff --git a/docs/README.md b/docs/README.md index 4bcd49f95f..73ff140a4e 100644 --- a/docs/README.md +++ b/docs/README.md @@ -278,7 +278,6 @@ for more information about installing and using the source code. | [Content Node Selector Panel component](content-services/components/content-node-selector-panel.component.md) | Opens a Content Node Selector in its own dialog window. | [Source](../lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.ts) | | [Content Node Selector component](content-services/components/content-node-selector.component.md) | Allows a user to select items from a Content Services repository. | [Source](../lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts) | | [Content Type Dialog component](content-services/components/content-type-dialog.component.md) | Confirm dialog when user changes content type of a node. | [Source](../lib/content-services/src/lib/content-type/content-type-dialog.component.ts) | -| [Content User Info component](content-services/components/content-user-info.component.md) | Shows user information for CONTENT and CONTENT_SSO mode. | [Source](../lib/content-services/src/lib/content-user-info/content-user-info.component.ts) | | [Document List component](content-services/components/document-list.component.md) | Displays the documents from a repository. | [Source](../lib/content-services/src/lib/document-list/components/document-list.component.ts) | | [Dropdown Breadcrumb Component](content-services/components/dropdown-breadcrumb.component.md) | Indicates the current position within a navigation hierarchy using a dropdown menu. | [Source](../lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts) | | [File Uploading Dialog Component](content-services/components/file-uploading-dialog.component.md) | Shows a dialog listing all the files uploaded with the Upload Button or Drag Area components. | [Source](../lib/content-services/src/lib/upload/components/file-uploading-dialog.component.ts) | @@ -429,7 +428,6 @@ for more information about installing and using the source code. | [Process Instance Details Header component](process-services/components/process-instance-header.component.md) | Sub-component of the process details component, which renders some general information about the selected process. | [Source](../lib/process-services/src/lib/process-list/components/process-instance-header/process-instance-header.component.ts) | | [Process Instance Tasks component](process-services/components/process-instance-tasks.component.md) | Lists both the active and completed tasks associated with a particular process instance | [Source](../lib/process-services/src/lib/process-list/components/process-instance-tasks/process-instance-tasks.component.ts) | | [Process Instance List](process-services/components/process-list.component.md) | Renders a list containing all the process instances matched by the parameters specified. | [Source](../lib/process-services/src/lib/process-list/components/process-list/process-list.component.ts) | -| [Process User Info component](process-services/components/process-user-info.component.md) | Shows user information for PROCESS and ALL mode. | [Source](../lib/process-services/src/lib/process-user-info/process-user-info.component.ts) | | [Select App Component](process-services/components/select-apps-dialog.component.md) | Shows all available apps and returns the selected app. | [Source](../lib/process-services/src/lib/app-list/select-apps-dialog/select-apps-dialog.component.ts) | | [Start Process component](process-services/components/start-process.component.md) | Starts a process. | [Source](../lib/process-services/src/lib/process-list/components/start-process/start-process.component.ts) | | [Start Task Component](process-services/components/start-task.component.md) | Creates/Starts a new task for the specified app. | [Source](../lib/process-services/src/lib/task-list/components/start-task/start-task.component.ts) | diff --git a/docs/content-services/components/content-user-info.component.md b/docs/content-services/components/content-user-info.component.md deleted file mode 100644 index b60bcb6436..0000000000 --- a/docs/content-services/components/content-user-info.component.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -Title: Content User Info component -Added: v6.0.0 -Status: Active -Last reviewed: 2023-01-24 ---- - -# [Content User Info component](../../../lib/content-services/src/lib/content-user-info/content-user-info.component.ts "Defined in content-user-info.component.ts") - -Shows user information for `CONTENT` and `CONTENT_SSO` mode. - -## Basic usage - -```html - -``` - -## Class members - -### Properties - -| Name | Type | Default value | Description | -| ---- | ---- | ------------- | ----------- | -| bpmBackgroundImage | `string` | | Custom path for the background banner image for APS users. | -| ecmBackgroundImage | `string` | | Custom path for the background banner image for ACS users. | -| ecmUser | [`EcmUserModel`](../../core/models/ecm-user.model.md) | | ECM user info. | -| identityUser | [`IdentityUserModel`](../../../lib/process-services-cloud/src/lib/people/models/identity-user.model.ts) | | Identity user info. | -| isLoggedIn | `boolean` | | Determines if user is logged in. | -| menuPositionX | [`MenuPositionX`](https://github.com/angular/components/blob/master/src/material/menu/menu-positions.ts) | "after" | Custom choice for opening the menu at the bottom. Can be `before` or `after`. | -| menuPositionY | [`MenuPositionY`](https://github.com/angular/components/blob/master/src/material/menu/menu-positions.ts) | "below" | Custom choice for opening the menu at the bottom. Can be `above` or `below`. | -| mode | `UserInfoMode` | | current mode. | -| namePosition | `string` | "right" | When the username is shown, this defines its position relative to the user info button. Can be `right` or `left`. | -| showName | `boolean` | true | Shows/hides the username next to the user info button. | - -## Details - -The component shows a round icon for the user and will show extra information about -the user when clicked. diff --git a/docs/process-services/components/process-user-info.component.md b/docs/process-services/components/process-user-info.component.md deleted file mode 100644 index bfd11a0fb2..0000000000 --- a/docs/process-services/components/process-user-info.component.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -Title: Process User Info component -Added: v6.0.0 -Status: Active -Last reviewed: 2023-01-24 ---- - -# [Process User Info component](../../../lib/process-services/src/lib/process-user-info/process-user-info.component.ts "Defined in process-user-info.component.ts") - -Shows user information for `PROCESS` and `ALL` mode. - -## Basic usage - -```html - -``` - -## Class members - -### Properties - -| Name | Type | Default value | Description | -| ---- | ---- | ------------- | ----------- | -| bpmBackgroundImage | `string` | | Custom path for the background banner image for APS users. | -| bpmUser | UserRepresentation | | BPM user info. | -| ecmBackgroundImage | `string` | | Custom path for the background banner image for ACS users. | -| ecmUser | [`EcmUserModel`](../../core/models/ecm-user.model.md) | | ECM user info. | -| isLoggedIn | `boolean` | | Determines if user is logged in. | -| menuPositionX | [`MenuPositionX`](https://github.com/angular/components/blob/master/src/material/menu/menu-positions.ts) | "after" | Custom choice for opening the menu at the bottom. Can be `before` or `after`. | -| menuPositionY | [`MenuPositionY`](https://github.com/angular/components/blob/master/src/material/menu/menu-positions.ts) | "below" | Custom choice for opening the menu at the bottom. Can be `above` or `below`. | -| mode | `UserInfoMode` | | current mode. | -| namePosition | `string` | "right" | When the username is shown, this defines its position relative to the user info button. Can be `right` or `left`. | -| showName | `boolean` | true | Shows/hides the username next to the user info button. | - -## Details - -The component shows a round icon for the user and will show extra information about -the user when clicked. diff --git a/lib/content-services/src/lib/common/mocks/ecm-user.service.mock.ts b/lib/content-services/src/lib/common/mocks/ecm-user.service.mock.ts index e42e31bcda..c72236fc80 100644 --- a/lib/content-services/src/lib/common/mocks/ecm-user.service.mock.ts +++ b/lib/content-services/src/lib/common/mocks/ecm-user.service.mock.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { PersonEntry, Person, PersonPaging } from '@alfresco/js-api'; +import { Person } from '@alfresco/js-api'; export const fakeEcmUser: Person = { id: 'fake-id', @@ -37,114 +37,3 @@ export const fakeEcmUser: Person = { enabled: true, emailNotificationsEnabled: true }; - -export const fakeEcmAdminUser = { - ...fakeEcmUser, - capabilities: { - isAdmin: true - } -}; - -export const fakeEcmUser2 = { - id: 'another-fake-id', - firstName: 'another-fake-first-name', - lastName: 'another', - displayName: 'admin.adf User', - email: 'admin.adf@alfresco.com', - company: null, - enabled: true, - emailNotificationsEnabled: true -}; - -export const fakeEcmUserNoImage = { - id: 'fake-id', - firstName: 'fake-first-name', - lastName: 'fake-last-name', - description: 'i am a fake user for test', - avatarId: null, - email: 'fakeEcm@ecmUser.com', - skypeId: 'fake-skype-id', - googleId: 'fake-googleId-id', - instantMessageId: 'fake-instantMessageId-id', - company: null, - jobTitle: null, - location: 'fake location', - mobile: '000000000', - telephone: '11111111', - statusUpdatedAt: 'fake-date', - userStatus: 'active', - enabled: true, - emailNotificationsEnabled: true -}; - -export const fakeEcmEditedUser = { - id: 'fake-id', - firstName: null, - lastName: 'fake-last-name', - description: 'i am a fake user for test', - avatarId: 'fake-avatar-id', - email: 'fakeEcm@ecmUser.com', - skypeId: 'fake-skype-id', - googleId: 'fake-googleId-id', - instantMessageId: 'fake-instantMessageId-id', - company: null, - jobTitle: 'test job', - location: 'fake location', - mobile: '000000000', - telephone: '11111111', - statusUpdatedAt: 'fake-date', - userStatus: 'active', - enabled: true, - emailNotificationsEnabled: true -}; - -export const fakeEcmUserList = new PersonPaging({ - list: { - pagination: { - count: 2, - hasMoreItems: false, - totalItems: 2, - skipCount: 0, - maxItems: 100 - }, - entries: [ - { - entry: fakeEcmUser - }, - { - entry: fakeEcmUser2 - } - ] - } -}); - -export const createNewPersonMock = { - id: 'fake-id', - firstName: 'fake-ecm-first-name', - lastName: 'fake-ecm-last-name', - description: 'i am a fake user for test', - password: 'fake-avatar-id', - email: 'fakeEcm@ecmUser.com' -}; - -export const getFakeUserWithContentAdminCapability = (): PersonEntry => { - const fakeEcmUserWithAdminCapabilities = { - ...fakeEcmUser, - capabilities: { - isAdmin: true - } - }; - const mockPerson = new Person(fakeEcmUserWithAdminCapabilities); - return { entry: mockPerson }; -}; - -export const getFakeUserWithContentUserCapability = (): PersonEntry => { - const fakeEcmUserWithAdminCapabilities = { - ...fakeEcmUser, - capabilities: { - isAdmin: false - } - }; - const mockPerson = new Person(fakeEcmUserWithAdminCapabilities); - return { entry: mockPerson }; -}; diff --git a/lib/content-services/src/lib/common/services/people-content.service.spec.ts b/lib/content-services/src/lib/common/services/people-content.service.spec.ts index 9dc0acac95..fcc15021d6 100644 --- a/lib/content-services/src/lib/common/services/people-content.service.spec.ts +++ b/lib/content-services/src/lib/common/services/people-content.service.spec.ts @@ -15,10 +15,51 @@ * limitations under the License. */ -import { createNewPersonMock, fakeEcmAdminUser, fakeEcmUser, fakeEcmUser2, fakeEcmUserList } from '../mocks/ecm-user.service.mock'; +import { fakeEcmUser } from '../mocks/ecm-user.service.mock'; import { AlfrescoApiService, AlfrescoApiServiceMock, CoreTestingModule } from '@alfresco/adf-core'; import { PeopleContentQueryRequestModel, PeopleContentService } from './people-content.service'; import { TestBed } from '@angular/core/testing'; +import { PersonPaging } from '@alfresco/js-api'; + +export const fakeEcmUser2 = { + id: 'another-fake-id', + firstName: 'another-fake-first-name', + lastName: 'another', + displayName: 'admin.adf User', + email: 'admin.adf@alfresco.com', + company: null, + enabled: true, + emailNotificationsEnabled: true +}; + +const fakeEcmUserList = new PersonPaging({ + list: { + pagination: { + count: 2, + hasMoreItems: false, + totalItems: 2, + skipCount: 0, + maxItems: 100 + }, + entries: [{ entry: fakeEcmUser }, { entry: fakeEcmUser2 }] + } +}); + +export const createNewPersonMock = { + id: 'fake-id', + firstName: 'fake-ecm-first-name', + lastName: 'fake-ecm-last-name', + description: 'i am a fake user for test', + password: 'fake-avatar-id', + email: 'fakeEcm@ecmUser.com' +}; + +export const fakeEcmAdminUser = { + ...fakeEcmUser, + capabilities: { + isAdmin: true + } +}; describe('PeopleContentService', () => { let peopleContentService: PeopleContentService; diff --git a/lib/content-services/src/lib/content.module.ts b/lib/content-services/src/lib/content.module.ts index 180686686c..3d122dc1bd 100644 --- a/lib/content-services/src/lib/content.module.ts +++ b/lib/content-services/src/lib/content.module.ts @@ -44,7 +44,6 @@ import { CONTENT_PIPES } from './pipes/content-pipe.module'; import { NodeCommentsModule } from './node-comments/node-comments.module'; import { TreeModule } from './tree/tree.module'; import { AlfrescoViewerModule } from './viewer/alfresco-viewer.module'; -import { ContentUserInfoModule } from './content-user-info/content-user-info.module'; import { CategoriesModule } from './category/category.module'; import { contentAuthLoaderFactory } from './auth-loader/content-auth-loader-factory'; import { ContentAuthLoaderService } from './auth-loader/content-auth-loader.service'; @@ -61,7 +60,6 @@ import { DropdownSitesComponent } from './content-node-selector/site-dropdown/si DialogModule, SearchModule, DocumentListModule, - ContentUserInfoModule, UploadModule, MaterialModule, DropdownSitesComponent, @@ -87,7 +85,6 @@ import { DropdownSitesComponent } from './content-node-selector/site-dropdown/si ...CONTENT_PIPES, TagModule, DocumentListModule, - ContentUserInfoModule, UploadModule, SearchModule, DropdownSitesComponent, diff --git a/lib/content-services/src/public-api.ts b/lib/content-services/src/public-api.ts index bd437d50d7..759af620dc 100644 --- a/lib/content-services/src/public-api.ts +++ b/lib/content-services/src/public-api.ts @@ -18,7 +18,6 @@ export * from './lib/directives/index'; export * from './lib/tag/index'; export * from './lib/document-list/index'; -export * from './lib/content-user-info/index'; export * from './lib/upload/index'; export * from './lib/search/index'; export * from './lib/breadcrumb/index'; @@ -46,3 +45,4 @@ export * from './lib/infinite-scroll-datasource'; export * from './lib/prediction/index'; export * from './lib/content.module'; +export * from './lib/testing/content.testing.module'; diff --git a/lib/process-services/src/lib/process.module.ts b/lib/process-services/src/lib/process.module.ts index 24af7906fd..ffb90ec8d3 100644 --- a/lib/process-services/src/lib/process.module.ts +++ b/lib/process-services/src/lib/process.module.ts @@ -26,7 +26,6 @@ import { PROCESS_LIST_DIRECTIVES } from './process-list'; import { TASK_LIST_DIRECTIVES } from './task-list'; import { FORM_DIRECTIVES } from './form'; import { TASK_COMMENTS_DIRECTIVES } from './task-comments'; -import { PROCESS_USER_INFO_DIRECTIVES } from './process-user-info'; import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field'; @NgModule({ @@ -36,7 +35,6 @@ import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field'; ...TASK_LIST_DIRECTIVES, ...TASK_COMMENTS_DIRECTIVES, ...APPS_LIST_DIRECTIVES, - ...PROCESS_USER_INFO_DIRECTIVES, ...ATTACHMENT_DIRECTIVES, ...PEOPLE_DIRECTIVES, ...FORM_DIRECTIVES @@ -51,7 +49,6 @@ import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field'; ...TASK_LIST_DIRECTIVES, ...TASK_COMMENTS_DIRECTIVES, ...APPS_LIST_DIRECTIVES, - ...PROCESS_USER_INFO_DIRECTIVES, ...ATTACHMENT_DIRECTIVES, ...PEOPLE_DIRECTIVES, ...FORM_DIRECTIVES diff --git a/lib/process-services/src/public-api.ts b/lib/process-services/src/public-api.ts index e954c9ceab..b24fe2c080 100644 --- a/lib/process-services/src/public-api.ts +++ b/lib/process-services/src/public-api.ts @@ -19,7 +19,6 @@ export * from './lib/process-list/index'; export * from './lib/task-list/index'; export * from './lib/app-list/index'; export * from './lib/attachment/index'; -export * from './lib/process-user-info/index'; export * from './lib/process-comments/index'; export * from './lib/people/index'; export * from './lib/form/index';