[AAE-10777] Move in common service the real common services (#8203)

* Move in common service the real common services
remove Pagination js-api dependencies
move search-input component in content

* fix unit

* fix lint

* fix

* fix

demo-shell/src/app/components/search/search-config-test.service.ts

@@ -16,7 +16,7 @@
  */
 
 import { QueryBody } from '@alfresco/js-api';
-import { SearchConfigurationInterface } from '@alfresco/adf-core';
+import { SearchConfigurationInterface } from '@alfresco/adf-content-services';
 import { Injectable } from '@angular/core';
 
 @Injectable()

docs/README.md

@@ -113,7 +113,7 @@ for more information about installing and using the source code.
 | The main purpose of the Notification history component is list all the notification received in the current session. They will disappear from the list after the refresh. | [Source](../lib/core/src/lib/notifications/components/notification-history.component.ts) |  |
 | [Pagination Component](core/components/pagination.component.md) | Adds pagination to the component it is used with. | [Source](../lib/core/src/lib/pagination/pagination.component.ts) |
 | [Rich Text Editor component](core/components/rich-text-editor.md) | Wrap Editor.js element to show a Rich Text editor allows to add formatted text. | [Source](../lib/core/src/lib/rich-text-editor/rich-text-editor.component.ts) |
-| [Search Text Input Component](core/components/search-text-input.component.md) | Displays a input text that supports autocompletion | [Source](../lib/core/src/lib/search-text/search-text-input.component.ts) |
+| [Search Text Input Component](core/components/search-text-input.component.md) | Displays a input text that supports autocompletion | [Source](lib/content-services/src/lib/search-text/search-text-input.component.ts) |
 | [Sidebar action menu component](core/components/sidebar-action-menu.component.md) | Displays a sidebar-action menu information panel. | [Source](../lib/core/src/lib/layout/components/sidebar-action/sidebar-action-menu.component.ts) |
 | [Sidenav Layout component](core/components/sidenav-layout.component.md) | Displays the standard three-region ADF application layout. | [Source](../lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.ts) |
 | [Snackbar Content Component](core/components/snackbar-content.component.md) | Custom content for Snackbar which allows use icon as action. | [Source](../lib/core/src/lib/snackbar-content/snackbar-content.component.ts) |
@@ -213,7 +213,7 @@ for more information about installing and using the source code.
 | [Favorites Api service](core/services/favorites-api.service.md) | Gets a list of items a user has marked as their favorites. | [Source](lib/content-services/src/lib/common/services/favorites-api.service.ts) |
 | [Form Rendering service](core/services/form-rendering.service.md) | Maps a form field type string onto the corresponding form widget component type. | [Source](../lib/core/form/services/form-rendering.service.ts) |
 | [Form service](core/services/form.service.md) | Implements Process Services form methods | [Source](../lib/core/src/lib/form/services/form.service.ts) |
-| [Highlight Transform service](core/services/highlight-transform.service.md) | Adds HTML to a string to highlight chosen sections. | [Source](../lib/core/src/lib/services/highlight-transform.service.ts) |
+| [Highlight Transform service](core/services/highlight-transform.service.md) | Adds HTML to a string to highlight chosen sections. | [Source](lib/core/src/lib/common/services/highlight-transform.service.ts) |
 | [Identity Group service](core/services/identity-group.service.md) | Performs CRUD operations on identity groups. | [Source](../lib/process-services-cloud/src/lib/group/services/identity-group.service.ts) |
 | [Identity role service](core/services/identity-role.service.md) | Provides APIs for working with the Roles in Identity Services. | [Source](../lib/core/src/lib/auth/services/identity-role.service.ts) |
 | [Identity user service](core/services/identity-user.service.md) | Gets OAuth2 personal details and roles for users and performs CRUD operations on identity users. | [Source](../lib/process-services-cloud/src/lib/people/services/identity-user.service.ts) |
@@ -222,7 +222,7 @@ for more information about installing and using the source code.
 | [Login Dialog service](core/services/login-dialog.service.md) | Manages login dialogs. | [Source](../lib/core/src/lib/services/login-dialog.service.ts) |
 | [Nodes Api service](core/services/nodes-api.service.md) | Accesses and manipulates ACS document nodes using their node IDs. | [Source](../lib/core/src/lib/services/nodes-api.service.ts) |
 | [Notification Service](core/services/notification.service.md) | Shows a notification message with optional feedback. | [Source](../lib/core/src/lib/notifications/services/notification.service.ts) |
-| [Page Title service](core/services/page-title.service.md) | Sets the page title. | [Source](../lib/core/src/lib/services/page-title.service.ts) |
+| [Page Title service](core/services/page-title.service.md) | Sets the page title. | [Source](lib/core/src/lib/common/services/page-title.service.ts) |
 | [People Content service](core/services/people-content.service.md) | Gets information about a Content Services user. | [Source](../lib/core/src/lib/services/people-content.service.ts) |
 | [People Process service](core/services/people-process.service.md) | Gets information about Process Services users. | [Source](../lib/core/src/lib/services/people-process.service.ts) |
 | [Process Content Service](core/services/process-content.service.md) | Manipulates content related to a Process Instance or Task Instance in APS. | [Source](../lib/process-services/src/lib/form/services/process-content.service.ts) |
@@ -231,8 +231,8 @@ for more information about installing and using the source code.
 | [Search service](core/services/search.service.md) | Accesses the Content Services Search API. | [Source](../lib/core/src/lib/services/search.service.ts) |
 | [Shared Links Api service](core/services/shared-links-api.service.md) | Finds shared links to Content Services items. | [Source](lib/content-services/src/lib/content-node-share/services/shared-links-api.service.ts) |
 | [Storage service](core/services/storage.service.md) | Stores items in the form of key-value pairs. | [Source](../lib/core/src/lib/services/storage.service.ts) |
-| [Thumbnail service](core/services/thumbnail.service.md) | Retrieves an SVG thumbnail image to represent a document type. | [Source](../lib/core/src/lib/services/thumbnail.service.ts) |
-| [Translation service](core/services/translation.service.md) | Supports localisation. | [Source](../lib/core/src/lib/services/translation.service.ts) |
+| [Thumbnail service](core/services/thumbnail.service.md) | Retrieves an SVG thumbnail image to represent a document type. | [Source](lib/core/src/lib/common/services/thumbnail.service.ts) |
+| [Translation service](core/services/translation.service.md) | Supports localisation. | [Source](lib/core/src/lib/translation/translation.service.ts) |
 | [Upload Service](core/services/upload.service.md) | Provides access to various APIs related to file upload features. | [Source](../lib/core/src/lib/services/upload.service.ts) |
 | [User access service](core/services/user-access.service.md) | Checks the global and application access of a user | [Source](../lib/core/src/lib/services/user-access.service.ts) |
 | [User Preferences Service](core/services/user-preferences.service.md) | Stores preferences for the app and for individual components. | [Source](../lib/core/src/lib/common/services/user-preferences.service.ts) |

docs/core/components/search-text-input.component.md

@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2019-11-06
 ---
 
-# [Search Text Input Component](../../../lib/core/src/lib/search-text/search-text-input.component.ts "Defined in search-text-input.component.ts")
+# [Search Text Input Component](lib/content-services/src/lib/search-text/search-text-input.component.ts "Defined in search-text-input.component.ts")
 
 Displays a input text that supports autocompletion
 

docs/core/interfaces/card-view-item.interface.md

@@ -51,7 +51,7 @@ Picard's birthday (47457.1):
 1.  Define the model for the custom type.
 
     Your model must extend the [`CardViewBaseItemModel`](../../../lib/core/src/lib/card-view/models/card-view-baseitem.model.ts) class and implement the [`CardViewItem`](../../../lib/core/src/lib/card-view/interfaces/card-view-item.interface.ts)
-    and [`DynamicComponentModel`](../../../lib/core/src/lib/services/dynamic-component-mapper.service.ts) interfaces. See the
+    and [`DynamicComponentModel`](lib/core/src/lib/common/services/dynamic-component-mapper.service.ts) interfaces. See the
     [Card View Text Item model source](https://github.com/Alfresco/alfresco-ng2-components/blob/develop/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.ts)
     for an example of how to do this.
 

docs/core/interfaces/search-configuration.interface.md

@@ -4,7 +4,7 @@ Added: v2.1.0
 Status: Active
 ---
 
-# [Search Configuration interface](lib/core/src/lib/search-text/interfaces/search-configuration.interface.ts "Defined in search-configuration.interface.ts")
+# [Search Configuration interface](lib/content-services/src/lib/common/interface/search-configuration.interface.ts "Defined in search-configuration.interface.ts")
 
 Provides fine control of parameters to a search.
 

docs/core/services/card-item-types.service.md

@@ -13,31 +13,31 @@ Maps type names to field component types for the [Card View component](../compon
 
 ### Methods
 
--   **getComponentTypeResolver**(type: `string`, defaultValue: `Type<any>` = `this.defaultValue`): [`DynamicComponentResolveFunction`](../../../lib/core/src/lib/services/dynamic-component-mapper.service.ts)<br/>
-    Gets the currently active [DynamicComponentResolveFunction](../../../lib/core/src/lib/services/dynamic-component-mapper.service.ts) for a field type.
+-   **getComponentTypeResolver**(type: `string`, defaultValue: `Type<any>` = `this.defaultValue`): [`DynamicComponentResolveFunction`](lib/core/src/lib/common/services/dynamic-component-mapper.service.ts)<br/>
+    Gets the currently active [DynamicComponentResolveFunction](lib/core/src/lib/common/services/dynamic-component-mapper.service.ts) for a field type.
     -   _type:_ `string`  - The type whose resolver you want
     -   _defaultValue:_ `Type<any>`  - Default type returned for types that are not yet mapped
-    -   **Returns** [`DynamicComponentResolveFunction`](../../../lib/core/src/lib/services/dynamic-component-mapper.service.ts) - Resolver function
+    -   **Returns** [`DynamicComponentResolveFunction`](lib/core/src/lib/common/services/dynamic-component-mapper.service.ts) - Resolver function
 -   **register**(components: `Function`, override: `boolean` = `false`)<br/>
     Register multiple components
     -   _components:_ `Function`  - 
     -   _override:_ `boolean`  - 
--   **resolveComponentType**(model: [`DynamicComponentModel`](../../../lib/core/src/lib/services/dynamic-component-mapper.service.ts), defaultValue: `Type<any>` = `this.defaultValue`): `Type<any>`<br/>
+-   **resolveComponentType**(model: [`DynamicComponentModel`](lib/core/src/lib/common/services/dynamic-component-mapper.service.ts), defaultValue: `Type<any>` = `this.defaultValue`): `Type<any>`<br/>
     Finds the component type that is needed to render a form field.
-    -   _model:_ [`DynamicComponentModel`](../../../lib/core/src/lib/services/dynamic-component-mapper.service.ts)  - [Form](../../../lib/process-services/src/lib/task-list/models/form.model.ts) field model for the field to render
+    -   _model:_ [`DynamicComponentModel`](lib/core/src/lib/common/services/dynamic-component-mapper.service.ts)  - [Form](../../../lib/process-services/src/lib/task-list/models/form.model.ts) field model for the field to render
     -   _defaultValue:_ `Type<any>`  - Default type returned for field types that are not yet mapped.
     -   **Returns** `Type<any>` - Component type
--   **setComponentTypeResolver**(type: `string`, resolver: [`DynamicComponentResolveFunction`](../../../lib/core/src/lib/services/dynamic-component-mapper.service.ts), override: `boolean` = `true`)<br/>
-    Sets or optionally replaces a [DynamicComponentResolveFunction](../../../lib/core/src/lib/services/dynamic-component-mapper.service.ts) for a field type.
+-   **setComponentTypeResolver**(type: `string`, resolver: [`DynamicComponentResolveFunction`](lib/core/src/lib/common/services/dynamic-component-mapper.service.ts), override: `boolean` = `true`)<br/>
+    Sets or optionally replaces a [DynamicComponentResolveFunction](lib/core/src/lib/common/services/dynamic-component-mapper.service.ts) for a field type.
     -   _type:_ `string`  - The type whose resolver you want to set
-    -   _resolver:_ [`DynamicComponentResolveFunction`](../../../lib/core/src/lib/services/dynamic-component-mapper.service.ts)  - The new resolver function
+    -   _resolver:_ [`DynamicComponentResolveFunction`](lib/core/src/lib/common/services/dynamic-component-mapper.service.ts)  - The new resolver function
     -   _override:_ `boolean`  - The new resolver will only replace an existing one if this parameter is true
 
 ## Details
 
 The [Card View component](../components/card-view.component.md) uses this service to find the component
 type that is required to display a particular field type (text, date, etc). The service
-maps a type name string to a corresponding [`DynamicComponentResolveFunction`](../../../lib/core/src/lib/services/dynamic-component-mapper.service.ts) that takes a
+maps a type name string to a corresponding [`DynamicComponentResolveFunction`](lib/core/src/lib/common/services/dynamic-component-mapper.service.ts) that takes a
 model object as a parameter and returns the component type needed to display that model.
 
 The default mapping is shown below:

docs/core/services/form-rendering.service.md

@@ -13,24 +13,24 @@ Maps a form field type string onto the corresponding form [widget component](../
 
 ### Methods
 
--   **getComponentTypeResolver**(type: `string`, defaultValue: `Type<any>` = `this.defaultValue`): [`DynamicComponentResolveFunction`](../../../lib/core/src/lib/services/dynamic-component-mapper.service.ts)<br/>
-    Gets the currently active [DynamicComponentResolveFunction](../../../lib/core/src/lib/services/dynamic-component-mapper.service.ts) for a field type.
+-   **getComponentTypeResolver**(type: `string`, defaultValue: `Type<any>` = `this.defaultValue`): [`DynamicComponentResolveFunction`](lib/core/src/lib/common/services/dynamic-component-mapper.service.ts)<br/>
+    Gets the currently active [DynamicComponentResolveFunction](lib/core/src/lib/common/services/dynamic-component-mapper.service.ts) for a field type.
     -   _type:_ `string`  - The type whose resolver you want
     -   _defaultValue:_ `Type<any>`  - Default type returned for types that are not yet mapped
-    -   **Returns** [`DynamicComponentResolveFunction`](../../../lib/core/src/lib/services/dynamic-component-mapper.service.ts) - Resolver function
+    -   **Returns** [`DynamicComponentResolveFunction`](lib/core/src/lib/common/services/dynamic-component-mapper.service.ts) - Resolver function
 -   **register**(components: `Function`, override: `boolean` = `false`)<br/>
     Register multiple components
     -   _components:_ `Function`  - 
     -   _override:_ `boolean`  - 
--   **resolveComponentType**(model: [`DynamicComponentModel`](../../../lib/core/src/lib/services/dynamic-component-mapper.service.ts), defaultValue: `Type<any>` = `this.defaultValue`): `Type<any>`<br/>
+-   **resolveComponentType**(model: [`DynamicComponentModel`](lib/core/src/lib/common/services/dynamic-component-mapper.service.ts), defaultValue: `Type<any>` = `this.defaultValue`): `Type<any>`<br/>
     Finds the component type that is needed to render a form field.
-    -   _model:_ [`DynamicComponentModel`](../../../lib/core/src/lib/services/dynamic-component-mapper.service.ts)  - [Form](../../../lib/process-services/src/lib/task-list/models/form.model.ts) field model for the field to render
+    -   _model:_ [`DynamicComponentModel`](lib/core/src/lib/common/services/dynamic-component-mapper.service.ts)  - [Form](../../../lib/process-services/src/lib/task-list/models/form.model.ts) field model for the field to render
     -   _defaultValue:_ `Type<any>`  - Default type returned for field types that are not yet mapped.
     -   **Returns** `Type<any>` - Component type
--   **setComponentTypeResolver**(type: `string`, resolver: [`DynamicComponentResolveFunction`](../../../lib/core/src/lib/services/dynamic-component-mapper.service.ts), override: `boolean` = `true`)<br/>
-    Sets or optionally replaces a [DynamicComponentResolveFunction](../../../lib/core/src/lib/services/dynamic-component-mapper.service.ts) for a field type.
+-   **setComponentTypeResolver**(type: `string`, resolver: [`DynamicComponentResolveFunction`](lib/core/src/lib/common/services/dynamic-component-mapper.service.ts), override: `boolean` = `true`)<br/>
+    Sets or optionally replaces a [DynamicComponentResolveFunction](lib/core/src/lib/common/services/dynamic-component-mapper.service.ts) for a field type.
     -   _type:_ `string`  - The type whose resolver you want to set
-    -   _resolver:_ [`DynamicComponentResolveFunction`](../../../lib/core/src/lib/services/dynamic-component-mapper.service.ts)  - The new resolver function
+    -   _resolver:_ [`DynamicComponentResolveFunction`](lib/core/src/lib/common/services/dynamic-component-mapper.service.ts)  - The new resolver function
     -   _override:_ `boolean`  - The new resolver will only replace an existing one if this parameter is true
 
 ## Details
@@ -38,7 +38,7 @@ Maps a form field type string onto the corresponding form [widget component](../
 The [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) Field component uses this service to choose which [widget](../../../lib/testing/src/lib/core/pages/form/widgets/widget.ts) to use to render an instance of a
 form field. The [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) Field model stores the field type name as a string (see the table below).
 The [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) Rendering service maintains a mapping between each type name and
-a corresponding [`DynamicComponentResolveFunction`](../../../lib/core/src/lib/services/dynamic-component-mapper.service.ts). The function takes a [`FormFieldModel`](../../core/models/form-field.model.md) object as its argument and
+a corresponding [`DynamicComponentResolveFunction`](lib/core/src/lib/common/services/dynamic-component-mapper.service.ts). The function takes a [`FormFieldModel`](../../core/models/form-field.model.md) object as its argument and
 uses the data from the object to determine which [widget](../../../lib/testing/src/lib/core/pages/form/widgets/widget.ts) should be used to render the field.
 
 In some cases, the field type string alone is enough to determine the [widget](../../../lib/testing/src/lib/core/pages/form/widgets/widget.ts) type and so the function

docs/core/services/highlight-transform.service.md

@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2018-11-13
 ---
 
-# [Highlight Transform service](../../../lib/core/src/lib/services/highlight-transform.service.ts "Defined in highlight-transform.service.ts")
+# [Highlight Transform service](lib/core/src/lib/common/services/highlight-transform.service.ts "Defined in highlight-transform.service.ts")
 
 Adds HTML to a string to highlight chosen sections.
 
@@ -13,12 +13,12 @@ Adds HTML to a string to highlight chosen sections.
 
 ### Methods
 
--   **highlight**(text: `string`, search: `string`, wrapperClass: `string` = `"adf-highlight"`): [`HighlightTransformResult`](../../../lib/core/src/lib/services/highlight-transform.service.ts)<br/>
+-   **highlight**(text: `string`, search: `string`, wrapperClass: `string` = `"adf-highlight"`): [`HighlightTransformResult`](lib/core/src/lib/common/services/highlight-transform.service.ts)<br/>
     Searches for `search` string(s) within `text` and highlights all occurrences.
     -   _text:_ `string`  - Text to search within
     -   _search:_ `string`  - Text pattern to search for
     -   _wrapperClass:_ `string`  - CSS class used to provide highlighting style
-    -   **Returns** [`HighlightTransformResult`](../../../lib/core/src/lib/services/highlight-transform.service.ts) - New text along with boolean value to indicate whether anything was highlighted
+    -   **Returns** [`HighlightTransformResult`](lib/core/src/lib/common/services/highlight-transform.service.ts) - New text along with boolean value to indicate whether anything was highlighted
 
 ## Details
 
@@ -33,7 +33,7 @@ highlight any of those words individually. The &lt;span> element includes a
 `class` attribute which defaults to "highlight" but you can pass any class name
 you like using the `wrapperClass` parameter.
 
-The resulting text with HTML highlighting is returned within a [`HighlightTransformResult`](../../../lib/core/src/lib/services/highlight-transform.service.ts)
+The resulting text with HTML highlighting is returned within a [`HighlightTransformResult`](lib/core/src/lib/common/services/highlight-transform.service.ts)
 object:
 
 ```ts

docs/core/services/page-title.service.md

@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2018-11-19
 ---
 
-# [Page Title service](../../../lib/core/src/lib/services/page-title.service.ts "Defined in page-title.service.ts")
+# [Page Title service](lib/core/src/lib/common/services/page-title.service.ts "Defined in page-title.service.ts")
 
 Sets the page title.
 

docs/core/services/thumbnail.service.md

@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2019-03-20
 ---
 
-# [Thumbnail service](../../../lib/core/src/lib/services/thumbnail.service.ts "Defined in thumbnail.service.ts")
+# [Thumbnail service](lib/core/src/lib/common/services/thumbnail.service.ts "Defined in thumbnail.service.ts")
 
 Retrieves an SVG thumbnail image to represent a document type.
 

docs/core/services/translation.service.md

@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2019-02-08
 ---
 
-# [Translation service](../../../lib/core/src/lib/services/translation.service.ts "Defined in translation.service.ts")
+# [Translation service](lib/core/src/lib/translation/translation.service.ts "Defined in translation.service.ts")
 
 Supports localisation.
 

docs/upgrade-guide/upgrade50-60.md

@@ -133,6 +133,8 @@ v6.0.0 and after:
 | `SharedLinksApiService` | `@alfresco/adf-core` | `@alfresco/adf-process-services` |
 | `LockService` | `@alfresco/adf-core` | `@alfresco/adf-process-services` |
 | `FavoritesApiService` | `@alfresco/adf-core` | `@alfresco/adf-process-services` |
+| `SearchConfigurationInterface` | `@alfresco/adf-core` | `@alfresco/adf-content-services` |
+
 
 ### Update Data-table a data change
 

lib/content-services/src/lib/common/public-api.ts

@@ -18,3 +18,4 @@
 export * from './services/favorites-api.service';
 export * from './services/card-view-content-update.service';
 export * from './services/sites.service';
+export * from './interface/search-configuration.interface';

lib/content-services/src/lib/content.module.ts

@@ -46,6 +46,7 @@ import { versionCompatibilityFactory } from './version-compatibility/version-com
 import { VersionCompatibilityService } from './version-compatibility/version-compatibility.service';
 import { ContentPipeModule } from './pipes/content-pipe.module';
 import { NodeCommentsModule } from './node-comments/node-comments.module';
+import { SearchTextModule } from './search-text/search-text-input.module';
 
 @NgModule({
     imports: [
@@ -75,7 +76,8 @@ import { NodeCommentsModule } from './node-comments/node-comments.module';
         ContentTypeModule,
         AspectListModule,
         VersionCompatibilityModule,
-        NodeCommentsModule
+        NodeCommentsModule,
+        SearchTextModule
     ],
     providers: [
         {
@@ -109,7 +111,8 @@ import { NodeCommentsModule } from './node-comments/node-comments.module';
         AspectListModule,
         ContentTypeModule,
         VersionCompatibilityModule,
-        NodeCommentsModule
+        NodeCommentsModule,
+        SearchTextModule
     ]
 })
 export class ContentModule {

lib/content-services/src/lib/permission-manager/components/add-permission/search-config-permission.service.ts

@@ -16,7 +16,7 @@
  */
 
 import { QueryBody } from '@alfresco/js-api';
-import { SearchConfigurationInterface } from '@alfresco/adf-core';
+import { SearchConfigurationInterface } from '../../../common/interface/search-configuration.interface';
 import { Injectable, Optional, Inject, InjectionToken } from '@angular/core';
 
 export const SEARCH_QUERY_TOKEN = new InjectionToken<QueryProvider>('Alfresco Search Query Token');

lib/content-services/src/lib/search-text/public-api.ts

@@ -19,5 +19,3 @@ export * from './animations';
 export * from './search-text-input.component';
 export * from './search-trigger.directive';
 export * from './search-text-input.module';
-
-export * from './interfaces/search-configuration.interface';

lib/content-services/src/lib/search-text/search-text-input.component.spec.ts

@@ -16,14 +16,12 @@
  */
 
 import { ComponentFixture, TestBed, discardPeriodicTasks, fakeAsync, tick } from '@angular/core/testing';
-import { CoreTestingModule } from '../testing/core.testing.module';
+import { CoreTestingModule, UserPreferencesService, setupTestBed } from '@alfresco/adf-core';
 import { SearchTextInputComponent } from './search-text-input.component';
 import { DebugElement } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { Subject } from 'rxjs';
 import { TranslateModule } from '@ngx-translate/core';
-import { UserPreferencesService } from '../common/services/user-preferences.service';
-import { setupTestBed } from '../testing/setup-test-bed';
 
 describe('SearchTextInputComponent', () => {
 

lib/content-services/src/lib/search-text/search-text-input.component.ts

@@ -20,8 +20,8 @@ import { Subject, Observable, Subscription } from 'rxjs';
 import { debounceTime, takeUntil, filter } from 'rxjs/operators';
 import { Direction } from '@angular/cdk/bidi';
 import { searchAnimation } from './animations';
-import { UserPreferencesService } from '../common/services/user-preferences.service';
-import { SearchTextStateEnum, SearchAnimationState, SearchAnimationDirection } from '../models/search-text-input.model';
+import { UserPreferencesService } from '@alfresco/adf-core';
+import { SearchTextStateEnum, SearchAnimationState, SearchAnimationDirection } from './models/search-text-input.model';
 
 @Component({
     selector: 'adf-search-text-input',

lib/content-services/src/lib/search-text/search-text-input.module.ts

@@ -17,11 +17,11 @@
 
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { MaterialModule } from '../material.module';
 import { FormsModule } from '@angular/forms';
 import { SearchTextInputComponent } from './search-text-input.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { SearchTriggerDirective } from './search-trigger.directive';
+import { MaterialModule } from '../material.module';
 
 @NgModule({
     declarations: [

lib/content-services/src/lib/search-text/search-trigger.directive.ts

@@ -33,7 +33,7 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { DOCUMENT } from '@angular/common';
 import { Observable, Subject, Subscription, merge, of, fromEvent } from 'rxjs';
 import { filter, switchMap, takeUntil } from 'rxjs/operators';
-import { SearchComponentInterface } from './interfaces/search-configuration.interface';
+import { SearchComponentInterface } from '../common/interface/search-configuration.interface';
 
 export const SEARCH_AUTOCOMPLETE_VALUE_ACCESSOR: any = {
     provide: NG_VALUE_ACCESSOR,

lib/content-services/src/lib/search/components/search-control.component.spec.ts

@@ -21,8 +21,7 @@ import { By } from '@angular/platform-browser';
 import {
     AuthenticationService,
     setupTestBed,
-    UserPreferencesService,
-    SearchTextInputComponent
+    UserPreferencesService
 } from '@alfresco/adf-core';
 import { noResult, results } from '../../mock';
 import { SearchControlComponent } from './search-control.component';
@@ -30,6 +29,7 @@ import { SearchService } from '../services/search.service';
 import { of } from 'rxjs';
 import { ContentTestingModule } from '../../testing/content.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
+import { SearchTextInputComponent } from '../../search-text/search-text-input.component';
 
 @Component({
     template: `

lib/content-services/src/lib/search/components/search-control.component.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { AuthenticationService, ThumbnailService, SearchTextInputComponent } from '@alfresco/adf-core';
+import { AuthenticationService, ThumbnailService } from '@alfresco/adf-core';
 import { Component, EventEmitter, Input, OnDestroy, Output,
          QueryList, ViewEncapsulation, ViewChild, ViewChildren, TemplateRef, ContentChild } from '@angular/core';
 import { NodeEntry } from '@alfresco/js-api';
@@ -23,6 +23,7 @@ import { Subject } from 'rxjs';
 import { SearchComponent } from './search.component';
 import { MatListItem } from '@angular/material/list';
 import { EmptySearchResultComponent } from './empty-search-result.component';
+import { SearchTextInputComponent } from '../../search-text/search-text-input.component';
 
 @Component({
     selector: 'adf-search-control',

lib/content-services/src/lib/search/components/search.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { SearchService } from '../services/search.service';
-import { SearchComponentInterface } from '@alfresco/adf-core';
+import { SearchComponentInterface } from '../../common/interface/search-configuration.interface';
 import {
     AfterContentInit,
     Component,

lib/content-services/src/lib/search/search.module.ts

@@ -47,6 +47,7 @@ import { SearchFacetFieldComponent } from './components/search-facet-field/searc
 import { SearchWidgetChipComponent } from './components/search-filter-chips/search-widget-chip/search-widget-chip.component';
 import { SearchFacetChipComponent } from './components/search-filter-chips/search-facet-chip/search-facet-chip.component';
 import { ResetSearchDirective } from './components/reset-search.directive';
+import { SearchTextModule } from '../search-text/search-text-input.module';
 
 @NgModule({
     imports: [
@@ -54,7 +55,8 @@ import { ResetSearchDirective } from './components/reset-search.directive';
         FormsModule,
         ReactiveFormsModule,
         MaterialModule,
-        CoreModule
+        CoreModule,
+        SearchTextModule
     ],
     declarations: [
         SearchComponent,

lib/content-services/src/lib/search/services/search-configuration.service.ts

@@ -17,7 +17,7 @@
 
 import { Injectable } from '@angular/core';
 import { QueryBody } from '@alfresco/js-api';
-import { SearchConfigurationInterface } from '@alfresco/adf-core';
+import { SearchConfigurationInterface } from '../../common/interface/search-configuration.interface';
 
 @Injectable({
     providedIn: 'root'

lib/content-services/src/public-api.ts

@@ -41,5 +41,6 @@ export * from './lib/interfaces/index';
 export * from './lib/version-compatibility/index';
 export * from './lib/pipes/index';
 export * from './lib/common/index';
+export * from './lib/search-text/index';
 
 export * from './lib/content.module';

lib/core/src/lib/auth/interfaces/identity-user.service.interface.ts

@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-import { Pagination } from '@alfresco/js-api';
 import { Observable } from 'rxjs';
 import { IdentityGroupModel } from '../models/identity-group.model';
 import { IdentityRoleModel } from '../models/identity-role.model';
 import { IdentityUserModel } from '../models/identity-user.model';
+import { PaginationModel } from '../../models/pagination.model';
 
 export interface IdentityUserQueryResponse {
 
     entries: IdentityUserModel[];
-    pagination: Pagination;
+    pagination: PaginationModel;
 }
 
 export interface IdentityUserPasswordModel {

lib/core/src/lib/auth/models/identity-group.model.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { Pagination } from '@alfresco/js-api';
+import { PaginationModel } from '../../models/pagination.model';
 
 export interface IdentityGroupModel {
     id?: string;
@@ -35,7 +35,7 @@ export interface IdentityGroupSearchParam {
 export interface IdentityGroupQueryResponse {
 
     entries: IdentityGroupModel[];
-    pagination: Pagination;
+    pagination: PaginationModel;
 }
 
 export interface IdentityGroupQueryCloudRequestModel {

lib/core/src/lib/auth/services/identity-role.service.ts

@@ -19,14 +19,14 @@ import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { throwError as observableThrowError, Observable, of } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
-import { Pagination } from '@alfresco/js-api';
+import { PaginationModel } from '../../models/pagination.model';
 import { IdentityRoleModel } from '../models/identity-role.model';
 import { AppConfigService } from '../../app-config/app-config.service';
 import { LogService } from '../../common/services/log.service';
 
 export interface IdentityRoleResponseModel {
     entries: IdentityRoleModel[];
-    pagination: Pagination;
+    pagination: PaginationModel;
   }
 
 @Injectable({

lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.ts

@@ -30,7 +30,7 @@ import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { BaseCardView } from '../base-card-view';
 import { ClipboardService } from '../../../clipboard/clipboard.service';
-import { TranslationService } from '../../../services/translation.service';
+import { TranslationService } from '../../../translation/translation.service';
 
 @Component({
     providers: [

lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.ts

@@ -21,7 +21,7 @@ import { CardViewUpdateService } from '../../services/card-view-update.service';
 import { BaseCardView } from '../base-card-view';
 import { MatChipInputEvent } from '@angular/material/chips';
 import { ClipboardService } from '../../../clipboard/clipboard.service';
-import { TranslationService } from '../../../services/translation.service';
+import { TranslationService } from '../../../translation/translation.service';
 import { CardViewItemValidator } from '../../interfaces/card-view-item-validator.interface';
 import { UntypedFormControl } from '@angular/forms';
 import { debounceTime, takeUntil, filter } from 'rxjs/operators';

lib/core/src/lib/card-view/models/card-view-arrayitem.model.ts

@@ -16,7 +16,7 @@
  */
 
 import { CardViewItem } from '../interfaces/card-view-item.interface';
-import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
+import { DynamicComponentModel } from '../../common/services/dynamic-component-mapper.service';
 import { CardViewBaseItemModel } from './card-view-baseitem.model';
 import { Observable } from 'rxjs';
 import { CardViewArrayItemProperties } from '../interfaces/card-view-arrayitem-properties.interface';

lib/core/src/lib/card-view/models/card-view-boolitem.model.ts

@@ -16,7 +16,7 @@
  */
 
 import { CardViewItem } from '../interfaces/card-view-item.interface';
-import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
+import { DynamicComponentModel } from '../../common/services/dynamic-component-mapper.service';
 import { CardViewBaseItemModel } from './card-view-baseitem.model';
 import { CardViewBoolItemProperties } from '../interfaces/card-view.interfaces';
 

lib/core/src/lib/card-view/models/card-view-dateitem.model.ts

@@ -16,7 +16,7 @@
  */
 
 import { CardViewItem } from '../interfaces/card-view-item.interface';
-import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
+import { DynamicComponentModel } from '../../common/services/dynamic-component-mapper.service';
 import { CardViewBaseItemModel } from './card-view-baseitem.model';
 import { CardViewDateItemProperties } from '../interfaces/card-view.interfaces';
 import { LocalizedDatePipe } from '../../pipes/localized-date.pipe';

lib/core/src/lib/card-view/models/card-view-datetimeitem.model.ts

@@ -16,7 +16,7 @@
  */
 
 import { CardViewItem } from '../interfaces/card-view-item.interface';
-import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
+import { DynamicComponentModel } from '../../common/services/dynamic-component-mapper.service';
 import { CardViewDateItemModel } from './card-view-dateitem.model';
 import { CardViewDateItemProperties } from '../interfaces/card-view.interfaces';
 

lib/core/src/lib/card-view/models/card-view-floatitem.model.ts

@@ -16,7 +16,7 @@
  */
 
 import { CardViewItem } from '../interfaces/card-view-item.interface';
-import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
+import { DynamicComponentModel } from '../../common/services/dynamic-component-mapper.service';
 import { CardViewTextItemModel } from './card-view-textitem.model';
 import { CardViewTextItemProperties } from '../interfaces/card-view.interfaces';
 import { CardViewItemFloatValidator } from '../validators/card-view.validators';

lib/core/src/lib/card-view/models/card-view-intitem.model.ts

@@ -16,7 +16,7 @@
  */
 
 import { CardViewItem } from '../interfaces/card-view-item.interface';
-import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
+import { DynamicComponentModel } from '../../common/services/dynamic-component-mapper.service';
 import { CardViewTextItemModel } from './card-view-textitem.model';
 import { CardViewTextItemProperties } from '../interfaces/card-view.interfaces';
 import { CardViewItemIntValidator } from '../validators/card-view.validators';

lib/core/src/lib/card-view/models/card-view-keyvaluepairs.model.ts

@@ -16,7 +16,7 @@
  */
 
 import { CardViewItem } from '../interfaces/card-view-item.interface';
-import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
+import { DynamicComponentModel } from '../../common/services/dynamic-component-mapper.service';
 import { CardViewBaseItemModel } from './card-view-baseitem.model';
 import { CardViewKeyValuePairsItemProperties } from '../interfaces/card-view.interfaces';
 

lib/core/src/lib/card-view/models/card-view-mapitem.model.ts

@@ -16,7 +16,7 @@
  */
 
 import { CardViewItem } from '../interfaces/card-view-item.interface';
-import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
+import { DynamicComponentModel } from '../../common/services/dynamic-component-mapper.service';
 import { CardViewBaseItemModel } from './card-view-baseitem.model';
 
 export class CardViewMapItemModel extends CardViewBaseItemModel implements CardViewItem, DynamicComponentModel {

lib/core/src/lib/card-view/models/card-view-selectitem.model.ts

@@ -16,7 +16,7 @@
  */
 
 import { CardViewItem } from '../interfaces/card-view-item.interface';
-import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
+import { DynamicComponentModel } from '../../common/services/dynamic-component-mapper.service';
 import { CardViewBaseItemModel } from './card-view-baseitem.model';
 import { CardViewSelectItemProperties, CardViewSelectItemOption } from '../interfaces/card-view.interfaces';
 import { Observable, of } from 'rxjs';

lib/core/src/lib/card-view/models/card-view-textitem.model.ts

@@ -16,7 +16,7 @@
  */
 
 import { CardViewItem } from '../interfaces/card-view-item.interface';
-import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
+import { DynamicComponentModel } from '../../common/services/dynamic-component-mapper.service';
 import { CardViewBaseItemModel } from './card-view-baseitem.model';
 import { CardViewTextItemPipeProperty, CardViewTextItemProperties } from '../interfaces/card-view.interfaces';
 

lib/core/src/lib/card-view/public-api.ts

@@ -27,6 +27,7 @@ export {
     SelectFilterInputComponent
 } from './components/card-view.components';
 
+export * from './interfaces/card-view.interfaces';
 export * from './interfaces/card-view.interfaces';
 export * from './validators/card-view.validators';
 export * from './models/card-view.models';

lib/core/src/lib/card-view/services/card-item-types.service.ts

@@ -22,7 +22,7 @@ import { CardViewTextItemComponent } from '../components/card-view-textitem/card
 import { CardViewSelectItemComponent } from '../components/card-view-selectitem/card-view-selectitem.component';
 import { CardViewBoolItemComponent } from '../components/card-view-boolitem/card-view-boolitem.component';
 import { CardViewKeyValuePairsItemComponent } from '../components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component';
-import { DynamicComponentMapper, DynamicComponentResolveFunction, DynamicComponentResolver } from '../../services/dynamic-component-mapper.service';
+import { DynamicComponentMapper, DynamicComponentResolveFunction, DynamicComponentResolver } from '../../common/services/dynamic-component-mapper.service';
 import { CardViewArrayItemComponent } from '../components/card-view-arrayitem/card-view-arrayitem.component';
 
 @Injectable({

lib/core/src/lib/common/index.ts

@@ -20,6 +20,11 @@ export * from './services/log.service';
 export * from './services/storage.service';
 export * from './services/user-preferences.service';
 export * from './services/language-item.interface';
+export * from './services/dynamic-component-mapper.service';
+export * from './services/highlight-transform.service';
+export * from './services/page-title.service';
+export * from './services/thumbnail.service';
+export * from './services/sort-by-category.service';
 
 export * from './models/log-levels.model';
 

lib/core/src/lib/common/services/directionality-config.service.spec.ts

@@ -16,11 +16,11 @@
  */
 
 import { TestBed } from '@angular/core/testing';
-import { CoreTestingModule } from '../testing/core.testing.module';
-import { setupTestBed } from '../testing/setup-test-bed';
-import { UserPreferencesService } from '../common/services/user-preferences.service';
+import { CoreTestingModule } from '../../testing/core.testing.module';
+import { setupTestBed } from '../../testing/setup-test-bed';
+import { UserPreferencesService } from './user-preferences.service';
 import { TranslateModule } from '@ngx-translate/core';
-import { CoreModule } from '../core.module';
+import { CoreModule } from '../../core.module';
 
 describe('DirectionalityConfigService', () => {
     let userPreferencesService: UserPreferencesService;

lib/core/src/lib/common/services/directionality-config.service.ts

@@ -17,7 +17,7 @@
 
 import { Injectable, Inject, Renderer2, RendererFactory2 } from '@angular/core';
 import { Directionality, Direction } from '@angular/cdk/bidi';
-import { UserPreferencesService } from '../common/services/user-preferences.service';
+import { UserPreferencesService } from './user-preferences.service';
 import { DOCUMENT } from '@angular/common';
 
 @Injectable({

lib/core/src/lib/common/services/dynamic-component-mapper.service.ts

@@ -16,7 +16,8 @@
  */
 
 import { Type } from '@angular/core';
-import { getType } from './get-type';
+
+const getType = (type: any): any => () => type;
 
 export interface DynamicComponentModel { type: string }
 export type DynamicComponentResolveFunction = (model: DynamicComponentModel) => Type<any>;

lib/core/src/lib/common/services/page-title.service.ts

@@ -17,8 +17,8 @@
 
 import { Injectable } from '@angular/core';
 import { Title } from '@angular/platform-browser';
-import { AppConfigService } from '../app-config/app-config.service';
-import { TranslationService } from './translation.service';
+import { AppConfigService } from '../../app-config/app-config.service';
+import { TranslationService } from '../../translation/translation.service';
 
 @Injectable({
     providedIn: 'root'

lib/core/src/lib/common/services/thumbnail.service.spec.ts

@@ -17,8 +17,8 @@
 
 import { TestBed } from '@angular/core/testing';
 import { ThumbnailService } from './thumbnail.service';
-import { setupTestBed } from '../testing/setup-test-bed';
-import { CoreTestingModule } from '../testing/core.testing.module';
+import { setupTestBed } from '../../testing/setup-test-bed';
+import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
 describe('ThumbnailService', () => {

lib/core/src/lib/common/services/thumbnail.service.ts

@@ -19,7 +19,7 @@
 import { Injectable } from '@angular/core';
 import { MatIconRegistry } from '@angular/material/icon';
 import { DomSanitizer } from '@angular/platform-browser';
-import { AlfrescoApiService } from './alfresco-api.service';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { ContentApi, NodeEntry } from '@alfresco/js-api';
 
 const DEFAULT_ICON = './assets/images/ft_ic_miscellaneous.svg';

lib/core/src/lib/core.module.ts

@@ -47,15 +47,14 @@ import { DownloadZipDialogModule } from './dialogs/download-zip/download-zip.dia
 import { PipeModule } from './pipes/pipe.module';
 
 import { AlfrescoApiService } from './services/alfresco-api.service';
-import { TranslationService } from './services/translation.service';
+import { TranslationService } from './translation/translation.service';
 import { startupServiceFactory } from './services/startup-service-factory';
 import { SortingPickerModule } from './sorting-picker/sorting-picker.module';
 import { IconModule } from './icon/icon.module';
-import { TranslateLoaderService } from './services/translate-loader.service';
+import { TranslateLoaderService } from './translation/translate-loader.service';
 import { ExtensionsModule } from '@alfresco/adf-extensions';
-import { directionalityConfigFactory } from './services/directionality-config-factory';
-import { DirectionalityConfigService } from './services/directionality-config.service';
-import { SearchTextModule } from './search-text/search-text-input.module';
+import { directionalityConfigFactory } from './common/services/directionality-config-factory';
+import { DirectionalityConfigService } from './common/services/directionality-config.service';
 import { AlfrescoJsClientsModule } from '@alfresco/adf-core/api';
 import { AuthenticationInterceptor, Authentication } from '@alfresco/adf-core/auth';
 import { LegacyApiClientModule } from './api-factories/legacy-api-client.module';
@@ -95,7 +94,6 @@ import { MAT_SNACK_BAR_DEFAULT_OPTIONS } from '@angular/material/snack-bar';
         IconModule,
         SortingPickerModule,
         NotificationHistoryModule,
-        SearchTextModule,
         BlankPageModule,
         LegacyApiClientModule,
         AlfrescoJsClientsModule,
@@ -136,7 +134,6 @@ import { MAT_SNACK_BAR_DEFAULT_OPTIONS } from '@angular/material/snack-bar';
         SortingPickerModule,
         IconModule,
         NotificationHistoryModule,
-        SearchTextModule,
         BlankPageModule,
         RichTextEditorModule
     ]

lib/core/src/lib/directives/highlight.directive.spec.ts

@@ -18,7 +18,7 @@
 import { Component, ViewChildren } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { HighlightTransformService } from '../services/highlight-transform.service';
+import { HighlightTransformService } from '../common/services/highlight-transform.service';
 import { HighlightDirective } from './highlight.directive';
 import { setupTestBed } from '../testing/setup-test-bed';
 import { CoreTestingModule } from '../testing/core.testing.module';

lib/core/src/lib/directives/highlight.directive.ts

@@ -18,7 +18,7 @@
 /* eslint-disable @angular-eslint/no-input-rename */
 
 import { Directive, ElementRef, Input, Renderer2, AfterViewChecked } from '@angular/core';
-import { HighlightTransformService, HighlightTransformResult } from '../services/highlight-transform.service';
+import { HighlightTransformService, HighlightTransformResult } from '../common/services/highlight-transform.service';
 
 @Directive({
     selector: '[adf-highlight]'

lib/core/src/lib/events/public-api.ts

@@ -17,5 +17,4 @@
 
 export * from './base.event';
 export * from './base-ui.event';
-export * from './folder-created.event';
 export * from './file.event';

lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.spec.ts

@@ -23,7 +23,7 @@ import { CheckboxWidgetComponent } from './checkbox.widget';
 import { setupTestBed } from '../../../../testing/setup-test-bed';
 import { FormBaseModule } from '../../../form-base.module';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderService } from '../../../../services/translate-loader.service';
+import { TranslateLoaderService } from '../../../../translation/translate-loader.service';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { CoreTestingModule } from '../../../../testing';
 import { MatTooltipModule } from '@angular/material/tooltip';

lib/core/src/lib/form/components/widgets/core/form.model.spec.ts

@@ -24,9 +24,7 @@ import { FormFieldModel } from './form-field.model';
 import { FormOutcomeModel } from './form-outcome.model';
 import { FormModel } from './form.model';
 import { TabModel } from './tab.model';
-import { fakeMetadataForm, fakeViewerForm } from '../../mock/form.mock';
-import { Node } from '@alfresco/js-api';
-import { UploadWidgetContentLinkModel } from './upload-widget-content-link.model';
+import { fakeMetadataForm } from '../../mock/form.mock';
 import { CoreTestingModule, setupTestBed } from '../../../../testing';
 
 describe('FormModel', () => {
@@ -609,37 +607,4 @@ describe('FormModel', () => {
 
         });
     });
-
-    describe('setNodeIdValueForViewersLinkedToUploadWidget', () => {
-        const fakeNodeWithProperties: Node = {
-            id: 'fake-properties',
-            name: 'fake-properties-name',
-            content: {
-                mimeType: 'application/pdf'
-            },
-            properties: {
-                'pfx:property_one': 'testValue',
-                'pfx:property_two': true
-            }
-        } as Node;
-        let form: FormModel;
-
-        it('should set the node id to the viewers linked to the upload widget in the event', () => {
-            form = new FormModel(fakeMetadataForm);
-            const uploadWidgetContentLinkModel = new UploadWidgetContentLinkModel(fakeNodeWithProperties, 'content_form_nodes');
-
-            form.setNodeIdValueForViewersLinkedToUploadWidget(uploadWidgetContentLinkModel);
-
-            expect(form.values['cmfb85b2a7295ba41209750bca176ccaf9a']).toBe(fakeNodeWithProperties.id);
-        });
-
-        it('should not set the node id to the viewers when they are not linked', () => {
-            form = new FormModel(fakeViewerForm);
-            const uploadWidgetContentLinkModel = new UploadWidgetContentLinkModel(fakeNodeWithProperties, 'upload_widget');
-
-            form.setNodeIdValueForViewersLinkedToUploadWidget(uploadWidgetContentLinkModel);
-
-            expect(form.values['cmfb85b2a7295ba41209750bca176ccaf9a']).toBeNull();
-        });
-    });
 });

lib/core/src/lib/form/services/form-rendering.service.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { DynamicComponentMapper, DynamicComponentResolveFunction, DynamicComponentResolver } from '../../services/dynamic-component-mapper.service';
+import { DynamicComponentMapper, DynamicComponentResolveFunction, DynamicComponentResolver } from '../../common/services/dynamic-component-mapper.service';
 import { Injectable, Type } from '@angular/core';
 import * as widgets from '../components/widgets';
 

lib/core/src/lib/language-menu/language-menu.component.spec.ts

@@ -21,7 +21,7 @@ import { LanguageMenuComponent } from './language-menu.component';
 import { CoreTestingModule } from '../testing/core.testing.module';
 import { UserPreferencesService } from '../common/services/user-preferences.service';
 import { TranslateModule } from '@ngx-translate/core';
-import { LanguageService } from '../services/language.service';
+import { LanguageService } from './service/language.service';
 
 describe('LanguageMenuComponent', () => {
 

lib/core/src/lib/language-menu/language-menu.component.stories.ts

@@ -21,7 +21,7 @@ import { CoreStoryModule } from '../testing/core.story.module';
 import { LanguageMenuModule } from './language-menu.module';
 import { LanguageMenuComponent } from './language-menu.component';
 
-import { LanguageService } from '../services/language.service';
+import { LanguageService } from './service/language.service';
 import { LanguageServiceMock } from '../mock/language.service.mock';
 
 export default {

lib/core/src/lib/language-menu/language-menu.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, EventEmitter, Output } from '@angular/core';
-import { LanguageService } from '../services/language.service';
+import { LanguageService } from './service/language.service';
 import { Observable } from 'rxjs';
 import { LanguageItem } from '../common/services/language-item.interface';
 

lib/core/src/lib/language-menu/language-picker.component.stories.ts

@@ -21,7 +21,7 @@ import { CoreStoryModule } from '../testing/core.story.module';
 import { LanguageMenuModule } from './language-menu.module';
 import { LanguagePickerComponent } from './language-picker.component';
 
-import { LanguageService } from '../services/language.service';
+import { LanguageService } from './service/language.service';
 import { LanguageServiceMock } from '../mock/language.service.mock';
 
 export default {

lib/core/src/lib/language-menu/public-api.ts

@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+export * from './service/language.service';
+
 export * from './language-menu.component';
 export * from './language-menu.module';
 export * from './language-picker.component';

lib/core/src/lib/language-menu/service/language.service.interface.ts

@@ -16,7 +16,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { LanguageItem } from '../common/services/language-item.interface';
+import { LanguageItem } from '../../common/services/language-item.interface';
 
 export interface LanguageServiceInterface {
 

lib/core/src/lib/language-menu/service/language.service.ts

@@ -18,9 +18,9 @@
 import { LanguageServiceInterface } from './language.service.interface';
 import { Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
-import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
-import { LanguageItem } from '../common/services/language-item.interface';
-import { UserPreferencesService } from '../common/services/user-preferences.service';
+import { AppConfigService, AppConfigValues } from '../../app-config/app-config.service';
+import { LanguageItem } from '../../common/services/language-item.interface';
+import { UserPreferencesService } from '../../common/services/user-preferences.service';
 
 @Injectable({providedIn: 'root'})
 export class LanguageService implements LanguageServiceInterface {

lib/core/src/lib/login/components/login.component.ts

@@ -23,7 +23,7 @@ import { AbstractControl, UntypedFormBuilder, UntypedFormGroup, Validators } fro
 import { Router, ActivatedRoute, Params } from '@angular/router';
 import { AuthenticationService } from '../../auth/services/authentication.service';
 import { OauthConfigModel } from '../../auth/models/oauth-config.model';
-import { TranslationService } from '../../services/translation.service';
+import { TranslationService } from '../../translation/translation.service';
 import { UserPreferencesService } from '../../common/services/user-preferences.service';
 import { AlfrescoApiService } from '../../services/alfresco-api.service';
 

lib/core/src/lib/mock/language.service.mock.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { LanguageServiceInterface } from '../services/language.service.interface';
+import { LanguageServiceInterface } from '../language-menu/service/language.service.interface';
 import { Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 import { LanguageItem } from '../common/services/language-item.interface';

lib/core/src/lib/mock/translation.service.mock.ts

@@ -17,7 +17,7 @@
 
 import { EventEmitter, Injectable } from '@angular/core';
 import { Observable, of } from 'rxjs';
-import { TranslationService } from '../services/translation.service';
+import { TranslationService } from '../translation/translation.service';
 
 export interface LangChangeEvent {
     lang: string;

lib/core/src/lib/models/public-api.ts

@@ -27,7 +27,6 @@ export * from './request-pagination.model';
 export * from './decimal-number.model';
 export * from './bpm-user.model';
 export * from './ecm-user.model';
-export * from './search-text-input.model';
 export * from './node-metadata.model';
 export * from './application-access.model';
 export * from './user-access.model';

lib/core/src/lib/notifications/components/notification-history.component.ts

@@ -22,7 +22,7 @@ import { MatMenuTrigger, MenuPositionX, MenuPositionY } from '@angular/material/
 import { takeUntil } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 import { StorageService } from '../../common/services/storage.service';
-import { Pagination } from '@alfresco/js-api';
+import { PaginationModel } from '../../models/pagination.model';
 
 @Component({
     selector: 'adf-notification-history',
@@ -53,7 +53,7 @@ export class NotificationHistoryComponent implements OnDestroy, OnInit, AfterVie
     onDestroy$ = new Subject<boolean>();
     notifications: NotificationModel[] = [];
     paginatedNotifications = [];
-    pagination: Pagination;
+    pagination: PaginationModel;
 
     constructor(
         private notificationService: NotificationService,

lib/core/src/lib/notifications/services/notification.service.spec.ts

@@ -22,7 +22,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { MatSnackBar, MatSnackBarConfig, MatSnackBarModule } from '@angular/material/snack-bar';
 import { NotificationService } from './notification.service';
-import { TranslationService } from '../../services/translation.service';
+import { TranslationService } from '../../translation/translation.service';
 import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';

lib/core/src/lib/notifications/services/notification.service.ts

@@ -17,7 +17,7 @@
 
 import { Injectable } from '@angular/core';
 import { MatSnackBar, MatSnackBarRef, MatSnackBarConfig } from '@angular/material/snack-bar';
-import { TranslationService } from '../../services/translation.service';
+import { TranslationService } from '../../translation/translation.service';
 import { Subject } from 'rxjs';
 import { NotificationModel } from '../models/notification.model';
 import { info, warning, error } from '../helpers/notification.factory';

lib/core/src/lib/pipes/file-size.pipe.ts

@@ -16,7 +16,7 @@
  */
 
 import { Pipe, PipeTransform } from '@angular/core';
-import { TranslationService } from '../services/translation.service';
+import { TranslationService } from '../translation/translation.service';
 
 @Pipe({
     name: 'adfFileSize',

lib/core/src/lib/pipes/localized-role.pipe.ts

@@ -16,7 +16,7 @@
  */
 
 import { Pipe, PipeTransform } from '@angular/core';
-import { TranslationService } from '../services/translation.service';
+import { TranslationService } from '../translation/translation.service';
 
 @Pipe({
     name: 'adfLocalizedRole'

lib/core/src/lib/pipes/mime-type-icon.pipe.ts

@@ -16,7 +16,7 @@
  */
 
 import { Pipe, PipeTransform } from '@angular/core';
-import { ThumbnailService } from '../services/thumbnail.service';
+import { ThumbnailService } from '../common/services/thumbnail.service';
 
 @Pipe({
     name: 'adfMimeTypeIcon'

lib/core/src/lib/pipes/text-highlight.pipe.ts

@@ -16,7 +16,7 @@
  */
 
 import { Pipe, PipeTransform } from '@angular/core';
-import { HighlightTransformService, HighlightTransformResult } from '../services/highlight-transform.service';
+import { HighlightTransformService, HighlightTransformResult } from '../common/services/highlight-transform.service';
 
 @Pipe({
     name: 'highlight'

lib/core/src/lib/search-text/search-text-input.component.stories.ts

@@ -1,196 +0,0 @@
-/*!
- * @license
- * Copyright 2019 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Meta, moduleMetadata, Story } from '@storybook/angular';
-import { CoreStoryModule } from '../testing/core.story.module';
-
-import { SearchTextInputComponent } from './search-text-input.component';
-import { SearchTextModule } from './search-text-input.module';
-
-export default {
-    component: SearchTextInputComponent,
-    title: 'Core/Search Text Input/Search Text Input',
-    decorators: [
-        moduleMetadata({
-            imports: [CoreStoryModule, SearchTextModule]
-        })
-    ],
-    argTypes: {
-        autocomplete: {
-            control: 'boolean',
-            description: 'Toggles auto-completion of the search input field.',
-            defaultValue: false,
-            table: {
-                type: { summary: 'boolean' },
-                defaultValue: { summary: 'false' }
-            }
-        },
-        expandable: {
-            control: 'boolean',
-            description: 'Toggles whether to use an expanding search control. If false, a regular input is used.',
-            defaultValue: true,
-            table: {
-                type: { summary: 'boolean' },
-                defaultValue: { summary: 'true' }
-            }
-        },
-        inputType: {
-            control: 'radio',
-            options: ['date', 'month', 'number', 'search', 'text', 'time'],
-            description: 'Type of the input field to render, e.g. "search" or "text" (default).',
-            defaultValue: 'text',
-            table: {
-                category: 'HTML input attributes',
-                type: { summary: 'string' },
-                defaultValue: { summary: 'text' }
-            }
-        },
-        liveSearchEnabled: {
-            control: 'boolean',
-            description: 'Toggles "find-as-you-type" suggestions for possible matches.',
-            defaultValue: true,
-            table: {
-                type: { summary: 'boolean' },
-                defaultValue: { summary: 'true' }
-            }
-        },
-        searchAutocomplete: {
-            control: 'boolean',
-            description: 'Trigger autocomplete results on input change.',
-            defaultValue: false,
-            table: {
-                type: { summary: 'boolean' },
-                defaultValue: { summary: 'false' }
-            }
-        },
-        searchTerm: {
-            control: 'text',
-            description: 'Search term preselected.',
-            defaultValue: '',
-            table: {
-                category: 'HTML input attributes',
-                type: { summary: 'string' },
-                defaultValue: { summary: '' }
-            }
-        },
-        debounceTime: {
-            control: 'number',
-            description: 'Debounce time in milliseconds.',
-            defaultValue: 0,
-            table: {
-                type: { summary: 'number' },
-                defaultValue: { summary: '0' }
-            }
-        },
-        focusListener: {
-            control: 'object',
-            description: 'Listener for results-list events (focus, blur and focusout).',
-            table: {
-                type: { summary: 'Observable<FocusEvent>' }
-            }
-        },
-        collapseOnSubmit: {
-            control: 'boolean',
-            description: 'Collapse search bar on submit.',
-            defaultValue: true,
-            table: {
-                type: { summary: 'boolean' },
-                defaultValue: { summary: 'true' }
-            }
-        },
-        defaultState: {
-            control: 'inline-radio',
-            options: ['collapsed', 'expanded'],
-            description: 'Default state.',
-            defaultValue: 'collapsed',
-            table: {
-                type: { summary: 'string' },
-                defaultValue: { summary: 'collapsed' }
-            }
-        },
-        collapseOnBlur: {
-            control: 'boolean',
-            description: 'Collapse search bar on blur.',
-            defaultValue: true,
-            table: {
-                type: { summary: 'boolean' },
-                defaultValue: { summary: 'true' }
-            }
-        },
-        showClearButton: {
-            control: 'boolean',
-            description: 'Toggles whether to show a clear button that closes the search.',
-            defaultValue: false,
-            table: {
-                type: { summary: 'boolean' },
-                defaultValue: { summary: 'false' }
-            }
-        },
-        placeholder: {
-            control: 'text',
-            description: 'Placeholder text to show in the input field.',
-            defaultValue: '',
-            table: {
-                category: 'HTML input attributes',
-                type: { summary: 'string' },
-                defaultValue: { summary: '' }
-            }
-        },
-        hintLabel: {
-            control: 'text',
-            description: 'Hint label.',
-            defaultValue: '',
-            table: {
-                category: 'HTML input attributes',
-                type: { summary: 'string' },
-                defaultValue: { summary: '' }
-            }
-        },
-        searchChange: {
-            action: 'searchChange',
-            description: 'Emitted when the search term is changed. The search term is provided in the "value" property of the returned object. If the term is less than three characters in length then it is truncated to an empty string.',
-            table: { category: 'Actions' }
-        },
-        submit: {
-            action: 'submit',
-            description: 'Emitted when the search is submitted by pressing the ENTER key.',
-            table: { category: 'Actions' }
-        },
-        selectResult: {
-            action: 'selectResult',
-            description: 'Emitted when the result list is selected.',
-            table: { category: 'Actions' }
-        },
-        reset: {
-            action: 'reset',
-            description: 'Emitted when the result list is reset.',
-            table: { category: 'Actions' }
-        },
-        searchVisibility: {
-            action: 'searchVisibility',
-            description: 'Emitted when the search visibility changes. True when the search is active, false when it is inactive.',
-            table: { category: 'Actions' }
-        }
-    }
-} as Meta;
-
-const template: Story<SearchTextInputComponent> = (args: SearchTextInputComponent) => ({
-    props: args
-});
-
-export const searchTextInput = template.bind({});
-searchTextInput.parameters = { layout: 'centered' };

lib/core/src/lib/services/content.service.ts

@@ -19,7 +19,6 @@ import { Injectable } from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';
 import { ContentApi, MinimalNode, Node, NodeEntry, NodesApi } from '@alfresco/js-api';
 import { Observable, Subject, from, throwError } from 'rxjs';
-import { FolderCreatedEvent } from '../events/folder-created.event';
 import { AlfrescoApiService } from './alfresco-api.service';
 import { AuthenticationService } from '../auth/services/authentication.service';
 import { LogService } from '../common/services/log.service';
@@ -27,7 +26,14 @@ import { catchError } from 'rxjs/operators';
 import { PermissionsEnum } from '../models/permissions.enum';
 import { AllowableOperationsEnum } from '../models/allowable-operations.enum';
 import { DownloadService } from './download.service';
-import { ThumbnailService } from './thumbnail.service';
+import { ThumbnailService } from '../common/services/thumbnail.service';
+
+export interface FolderCreatedEvent {
+    name: string;
+    relativePath?: string;
+    parentId?: string;
+    node?: NodeEntry;
+}
 
 @Injectable({
     providedIn: 'root'

lib/core/src/lib/services/public-api.ts

@@ -17,27 +17,16 @@
 
 export * from './alfresco-api.service';
 export * from './content.service';
-export * from './page-title.service';
 export * from './renditions.service';
-export * from './translation.service';
-export * from './translate-loader.service';
-export * from './thumbnail.service';
 export * from './upload.service';
-export * from './dynamic-component-mapper.service';
-export * from './highlight-transform.service';
 export * from './deleted-nodes-api.service';
 export * from './nodes-api.service';
 export * from './people-content.service';
 export * from './people-process.service';
 export * from './discovery-api.service';
-export * from './external-alfresco-api.service';
 export * from './download-zip.service';
-export * from './automation.service';
-export * from './automation.service';
 export * from './download.service';
 export * from './bpm-user.service';
 export * from './ecm-user.service';
-export * from './language.service';
-export * from './sort-by-category.service';
 export * from './user-access.service';
 export * from './user-info-resolver.service';

lib/core/src/lib/templates/error-content/error-content.component.spec.ts

@@ -18,7 +18,7 @@
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { ErrorContentComponent } from './error-content.component';
-import { TranslationService } from '../../services/translation.service';
+import { TranslationService } from '../../translation/translation.service';
 import { setupTestBed } from '../../testing/setup-test-bed';
 import { ActivatedRoute } from '@angular/router';
 import { of } from 'rxjs';

lib/core/src/lib/templates/error-content/error-content.component.ts

@@ -23,7 +23,7 @@ import {
     OnInit
 } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { TranslationService } from '../../services/translation.service';
+import { TranslationService } from '../../translation/translation.service';
 @Component({
     selector: 'adf-error-content',
     templateUrl: './error-content.component.html',

lib/core/src/lib/testing/automation.service.ts

@@ -17,7 +17,7 @@
 
 import { Injectable } from '@angular/core';
 import { AppConfigService } from '../app-config/app-config.service';
-import { AlfrescoApiService } from './alfresco-api.service';
+import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { StorageService } from '../common/services/storage.service';
 import { UserPreferencesService } from '../common/services/user-preferences.service';
 import { DemoForm } from '../mock/form/demo-form.mock';

lib/core/src/lib/testing/core.story.module.ts

@@ -19,7 +19,7 @@ import { NgModule } from '@angular/core';
 import { CoreModule } from '../core.module';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
-import { TRANSLATION_PROVIDER } from '../services/translation.service';
+import { TRANSLATION_PROVIDER } from '../translation/translation.service';
 
 @NgModule({
     imports: [

lib/core/src/lib/testing/core.testing.module.ts

@@ -24,14 +24,14 @@ import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
 import { AppConfigService } from '../app-config/app-config.service';
 import { AppConfigServiceMock } from '../common/mock/app-config.service.mock';
-import { TranslationService } from '../services/translation.service';
+import { TranslationService } from '../translation/translation.service';
 import { TranslationMock } from '../mock/translation.service.mock';
 import { DatePipe } from '@angular/common';
 import { CookieService } from '../common/services/cookie.service';
 import { CookieServiceMock } from '../mock/cookie.service.mock';
 import { HttpClientModule } from '@angular/common/http';
-import { directionalityConfigFactory } from '../services/directionality-config-factory';
-import { DirectionalityConfigService } from '../services/directionality-config.service';
+import { directionalityConfigFactory } from '../common/services/directionality-config-factory';
+import { DirectionalityConfigService } from '../common/services/directionality-config.service';
 
 @NgModule({
     imports: [

lib/core/src/lib/testing/index.ts

@@ -17,3 +17,4 @@
 
 export * from './setup-test-bed';
 export * from './core.testing.module';
+export * from './automation.service';

lib/core/src/lib/translation/index.ts

@@ -15,4 +15,4 @@
  * limitations under the License.
  */
 
-export const getType = (type: any): any => () => type;
+export * from './public-api';

lib/core/src/lib/translation/public-api.ts

@@ -15,13 +15,5 @@
  * limitations under the License.
  */
 
-import { NodeEntry } from '@alfresco/js-api';
-
-export interface FolderCreatedEvent {
-
-    name: string;
-    relativePath?: string;
-    parentId?: string;
-    node?: NodeEntry;
-
-}
+export * from './translation.service';
+export * from './translate-loader.service';

lib/core/src/lib/translation/translation.service.spec.ts

@@ -24,7 +24,7 @@ import { TranslateLoaderService } from './translate-loader.service';
 import { TRANSLATION_PROVIDER, TranslationService } from './translation.service';
 import { AppConfigService } from '../app-config/app-config.service';
 import { AppConfigServiceMock } from '../common/mock/app-config.service.mock';
-import { AlfrescoApiService } from './alfresco-api.service';
+import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
 
 declare let jasmine: any;