ACS-8320, ACS-8321: move content/process user info to demo shell (#9918)

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,

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();

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);

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()

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) |

docs/content-services/components/content-user-info.component.md

@@ -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
-<adf-content-user-info></adf-content-user-info>
-```
-
-## 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.

docs/process-services/components/process-user-info.component.md

@@ -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
-<adf-process-user-info></adf-process-user-info>
-```
-
-## 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.

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 };
-};

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;

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,

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';

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

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';