[AAE-20109] Move alfresco js-API and alfrescoapi service out from the core (#9317)

* AAE-20109 Remove alfrescoapiservice from core

* fix after rebase

* [AAe-12502] Post-rebase fix

* [AAE-12502] Add unit test fix

---------

Co-authored-by: Bartosz Sekula <Bartosz.Sekula@hyland.com>
Co-authored-by: MichalKinas <michal.kinas@hyland.com>

.github/workflows/release-branch.yml

@@ -123,12 +123,21 @@ jobs:
         with:
           dry-run-flag: ${{ inputs.dry-run-flag }}
       - uses: ./.github/actions/download-node-modules-and-artifacts
-      - name: build libraries
+      - name: Set libraries versions
         run: |
           set -u;
           ./scripts/update-version.sh -gnu || exit 1;
+      - name: Set migrations
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            const setMigrations = require('./scripts/github/release/set-migrations.js');
+            setMigrations();
+      - name: Build libraries
+        run: |
           npx nx affected:build $NX_CALCULATION_FLAGS --prod --exclude="demoshell" --skip-nx-cache
           npx nx affected $NX_CALCULATION_FLAGS --target=pretheme
+          npx nx affected $NX_CALCULATION_FLAGS --target=build-schematics
       - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         name: release libraries GH registry
         with:

.github/workflows/release.yml

@@ -182,12 +182,21 @@ jobs:
         with:
           dry-run-flag: ${{ inputs.dry-run-flag }}
       - uses: ./.github/actions/download-node-modules-and-artifacts
-      - name: build libraries
+      - name: Set libraries versions
         run: |
           set -u;
           ./scripts/github/build/bumpversion.sh
+      - name: Set migrations
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            const setMigrations = require('./scripts/github/release/set-migrations.js');
+            setMigrations();
+      - name: build libraries
+        run: |
           npx nx affected:build $NX_CALCULATION_FLAGS --prod --exclude="demoshell" --skip-nx-cache
           npx nx affected $NX_CALCULATION_FLAGS --target=pretheme
+          npx nx affected $NX_CALCULATION_FLAGS --target=build-schematics
       - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         name: release libraries GH registry
         with:

demo-shell/src/app/components/app-layout/app-layout.component.ts

@@ -17,7 +17,6 @@
 
 import { Component, ViewEncapsulation } from '@angular/core';
 import {
-    AlfrescoApiService,
     AvatarComponent,
     HeaderLayoutComponent,
     LogoutDirective,
@@ -35,7 +34,7 @@ import { MatIconModule } from '@angular/material/icon';
 import { MatLineModule } from '@angular/material/core';
 import { CommonModule } from '@angular/common';
 import { RouterLink, RouterLinkActive, RouterOutlet } from '@angular/router';
-import { FileUploadingDialogComponent } from '@alfresco/adf-content-services';
+import { AlfrescoApiService, FileUploadingDialogComponent } from '@alfresco/adf-content-services';
 
 @Component({
     standalone: true,

demo-shell/src/app/components/process-service/process-service.component.ts

@@ -18,6 +18,7 @@
 // eslint-disable-next-line
 import { AfterViewInit, Component, ElementRef, Input, OnDestroy, OnInit, ViewChild, ViewEncapsulation, EventEmitter, Output } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { Pagination, UserProcessInstanceFilterRepresentation, ScriptFilesApi, UserTaskFilterRepresentation } from '@alfresco/js-api';
 import {
     FORM_FIELD_VALIDATORS,
@@ -26,7 +27,6 @@ import {
     AppConfigService,
     PaginationComponent,
     UserPreferenceValues,
-    AlfrescoApiService,
     UserPreferencesService,
     NotificationService,
     SidebarActionMenuComponent

demo-shell/src/app/components/settings/host-settings.component.ts

@@ -17,7 +17,7 @@
 
 import { Component, EventEmitter, Output, ViewEncapsulation, OnInit, Input } from '@angular/core';
 import { Validators, UntypedFormGroup, UntypedFormBuilder, UntypedFormControl, ReactiveFormsModule } from '@angular/forms';
-import { AppConfigService, AppConfigValues, StorageService, AlfrescoApiService, AuthenticationService } from '@alfresco/adf-core';
+import { AppConfigService, AppConfigValues, StorageService, AuthenticationService } from '@alfresco/adf-core';
 import { ENTER } from '@angular/cdk/keycodes';
 import { MAT_FORM_FIELD_DEFAULT_OPTIONS, MatFormFieldModule } from '@angular/material/form-field';
 import { CommonModule } from '@angular/common';
@@ -26,6 +26,7 @@ import { MatRadioModule } from '@angular/material/radio';
 import { MatInputModule } from '@angular/material/input';
 import { MatSlideToggleModule } from '@angular/material/slide-toggle';
 import { MatButtonModule } from '@angular/material/button';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 
 export const HOST_REGEX = '^(http|https)://.*[^/]$';
 

demo-shell/src/testing/automation.service.ts

@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
+import { AppConfigService, UserPreferencesService, StorageService, AuthenticationService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
-import { AppConfigService, AlfrescoApiService, StorageService, UserPreferencesService, AuthenticationService } from '@alfresco/adf-core';
 import { DemoForm } from './demo-form.mock';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 
 @Injectable({
     providedIn: 'root'

docs/README.md

@@ -194,7 +194,7 @@ A collection of Angular components for generic use.
 | Name | Description | Source link |
 | ---- | ----------- | -------- |
 | [APS Alfresco Content Service](core/services/activiti-alfresco.service.md) | Gets Alfresco Repository folder content based on a Repository account configured in Alfresco Process Services (APS). | [Source](../lib/process-services/src/lib/form/services/activiti-alfresco.service.ts) |
-| [Alfresco Api Service](core/services/alfresco-api.service.md) | Provides access to an initialized AlfrescoJSApi instance. | [Source](../lib/core/src/lib/services/alfresco-api.service.ts) |
+| [Alfresco Api Service](core/services/alfresco-api.service.md) | Provides access to an initialized AlfrescoJSApi instance. | [Source](lib/content-services/src/lib/services/alfresco-api.service.ts) |
 | [App Config service](core/services/app-config.service.md) | Supports app configuration settings, stored server side. | [Source](../lib/core/src/lib/app-config/app-config.service.ts) |
 | [Apps Process service](core/services/apps-process.service.md) | Gets details of the Process Services apps that are deployed for the user. | [Source](../lib/process-services/src/lib/services/apps-process.service.ts) |
 | [Auth Guard Bpm service](core/services/auth-guard-bpm.service.md) | Adds authentication with Process Services to a route within the app. | [Source](../lib/core/src/lib/auth/guard/auth-guard-bpm.service.ts) |

docs/breaking-changes/breaking-change-6.10.0-7.0.0.md

@@ -0,0 +1,24 @@
+---
+Title: Breaking changes, 6.10.0 -> 7.0.0
+---
+
+# Breaking changes, 6.10.0 -> 7.0.0
+
+This document lists all the deprecated ADF v2.x components that were removed for v3.0.0:
+
+- [PR-9317](https://github.com/Alfresco/alfresco-ng2-components/pull/9317) Move alfresco js-API and AlfrescoApi service out from the core
+
+    Move `AlfrescoApiServiceMock` and `AlfrescoApiServiceMock` from `core` library to `content-services`, These libraries are content related therefore should not live in `core`
+
+    To mitigate this change, we can run migration:
+
+    ```
+    npx nx migrate @alfresco/adf-core@7.0.0
+    npx nx migrate --run-migrations
+    ```
+
+    Or for pure angular repository:
+
+    ```
+    npx ng update @alfresco/adf-core@7.0.0
+    ```

docs/content-services/components/document-list.component.md

@@ -66,7 +66,7 @@ Displays the documents from a repository.
 | contentActionsPosition | `string` | "right" | Position of the content actions dropdown menu. Can be set to "left" or "right". |
 | contextMenuActions | `boolean` | false | Toggles context menus for each row |
 | currentFolderId | `string` | null | The ID of the folder node to display or a reserved string alias for special sources |
-| displayCheckboxesOnHover | `boolean` | false | Enables checkboxes in datatable rows being displayed on hover only. | 
+| displayCheckboxesOnHover | `boolean` | false | Enables checkboxes in datatable rows being displayed on hover only. |
 | emptyFolderImageUrl | `string` |  | Custom image for empty folder. Default value: './assets/images/empty_doc_lib.svg' |
 | filterValue | `any` |  | Initial value for filter. |
 | headerFilters | `boolean` | false | Toggles the header filters mode. |
@@ -152,7 +152,7 @@ the other DOM events that the [Document List component](document-list.component.
 Below is a basic example of handling DOM events in the parent elements.
 
 ```html
-<div (node-click)="onNodeClicked($event)" 
+<div (node-click)="onNodeClicked($event)"
 (node-dblclick)="onNodeDblClicked($event)">
     <div>
         <adf-upload-drag-area ...>
@@ -195,7 +195,7 @@ The Document List by default supports 2 types of pagination:  [Pagination compon
 ```html
 <adf-document-list #documentList ...></adf-document-list>
 
-<adf-infinite-pagination 
+<adf-infinite-pagination
     [target]="documentList"
     [loading]="documentList.infiniteLoading">
 </adf-infinite-pagination>
@@ -363,7 +363,7 @@ points you should pay attention to:
 
 ```ts
 import { ChangeDetectorRef } from '@angular/core';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 
 export class FilesComponent implements OnInit {
 
@@ -408,7 +408,7 @@ It is useful for examining other information that you can access if necessary:
 Typically you will bind Document List properties to your application/component class properties:
 
 ```html
-<adf-document-list 
+<adf-document-list
     [currentFolderId]="myStartFolder">
 </adf-document-list>
 ```
@@ -420,7 +420,7 @@ Typically you will bind Document List properties to your application/component c
 export class MyAppComponent {
 
     myStartFolder: string = '-my-';
-    
+
 }
 ```
 
@@ -432,7 +432,7 @@ section of the Angular docs for more information.
 Below is an example of getting a reference:
 
 ```html
-<adf-document-list 
+<adf-document-list
     #documentList
     [currentFolderId]="myStartFolder">
 </adf-document-list>
@@ -448,7 +448,7 @@ import { DocumentListComponent } from '@alfresco/adf-content-services';
 export class MyAppComponent implements AfterViewInit {
 
     myStartFolder: string = '-my-';
-    
+
     @ViewChild(DocumentListComponent)
     documentList: DocumentListComponent;
 
@@ -498,7 +498,7 @@ Here's a short example:
         <data-column key="$thumbnail" type="image"></data-column>
         <data-column title="Name" key="name" class="full-width ellipsis-cell"></data-column>
         <data-column
-            title="Created By" 
+            title="Created By"
             key="createdByUser.displayName">
         </data-column>
     </data-columns>
@@ -517,21 +517,21 @@ A custom set of columns might look like the following:
     <data-columns>
         <data-column key="$thumbnail" type="image"></data-column>
         <data-column
-            title="Name" 
+            title="Name"
-            key="name" 
+            key="name"
             sortable="true"
             class="full-width ellipsis-cell">
         </data-column>
         <data-column
-            title="Created By" 
+            title="Created By"
             key="createdByUser.displayName"
             sortable="true"
             class="desktop-only">
         </data-column>
         <data-column
-            title="Created On" 
+            title="Created On"
-            key="createdAt" 
+            key="createdAt"
-            type="date" 
+            type="date"
             format="medium"
             sortable="true"
             class="desktop-only">
@@ -692,7 +692,7 @@ may be sometimes be useful.
 The following example switches navigation to single clicks:
 
 ```html
-<adf-document-list 
+<adf-document-list
     [navigationMode]="'click'">
 </adf-document-list>
 ```
@@ -702,8 +702,8 @@ The following example switches navigation to single clicks:
 You can enable Header filters in your document list simply setting to true its `headerFilters` input.
 
 ```html
-<adf-document-list 
+<adf-document-list
-    currentFolderId="-my-" 
+    currentFolderId="-my-"
     [headerFilters]="true">
 </adf-document-list>
 ```
@@ -788,11 +788,11 @@ This will give the following output:
 
 ### File Auto downloading
 
-In case of files exceeding a predefined file size, the [document list component](../../content-services/components/document-list.component.md) can be configured to automatically download those file when trying to preview them. 
+In case of files exceeding a predefined file size, the [document list component](../../content-services/components/document-list.component.md) can be configured to automatically download those file when trying to preview them.
 This can help in reducing server load, and ensuring quick access to such files. After turning this feature on, whenever the user tries to preview a file with a large
 file size, the [Document List component](../../content-services/components/document-list.component.md) will first preview a dialog, asking for confirmation from the user on whether they want to download the file, or cancel the preview altogether.
 
-In order to configure the Document List to automatically download the files, the following environment variables would need to be set up in app.config.json - 
+In order to configure the Document List to automatically download the files, the following environment variables would need to be set up in app.config.json -
 
 ```
 "viewer": {

docs/core/pipes/localized-date.pipe.md

@@ -25,7 +25,7 @@ Converts a date to a given format and locale.
 
 ## Details
 
-The pipe takes a date and formats it and localizes it so the date is displayed in the proper format for the region. It uses the [Angular Date Pipe](https://angular.io/api/common/DatePipe#custom-format-options) so all the pre-defined and custom formats can be used. 
+The pipe takes a date and formats it and localizes it so the date is displayed in the proper format for the region. It uses the [Angular Date Pipe](https://angular.io/api/common/DatePipe#custom-format-options) so all the pre-defined and custom formats can be used.
 
 To localize the dates in your application, you will need to add the specific locale file for your region in order to use it. Read more about internationalization [here](https://angular.io/guide/i18n#i18n-pipes).
 
@@ -58,4 +58,4 @@ You can overwrite the default values of this pipe by adding these properties to
 | defaultDateTimeFormat | string | The format to apply to date-time values |
 | defaultLocale         | string | The locale id to apply                  |
 
-This configuration overwrites the values in the [localized date pipe](../../core/pipes/localized-date.pipe.md) as well as other components to have more consistency across your app. However, you can still overwrite these values any time by using the pipe in your code. 
+This configuration overwrites the values in the [localized date pipe](../../core/pipes/localized-date.pipe.md) as well as other components to have more consistency across your app. However, you can still overwrite these values any time by using the pipe in your code.

docs/core/services/alfresco-api.service.md

@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2019-01-17
 ---
 
-# [Alfresco Api Service](../../../lib/core/src/lib/services/alfresco-api.service.ts "Defined in alfresco-api.service.ts")
+# [Alfresco Api Service](lib/content-services/src/lib/services/alfresco-api.service.ts "Defined in alfresco-api.service.ts")
 
 Provides access to an initialized **AlfrescoJSApi** instance.
 

docs/tutorials/working-with-data-table.md

@@ -111,21 +111,21 @@ the source code below to the `mydatatable` component, just before the constructo
 data = new ObjectDataTableAdapter(
   [
     {
-      id: 1, 
+      id: 1,
-      firstName: 'Name #1', 
+      firstName: 'Name #1',
-      lastName: 'Lastname #1', 
+      lastName: 'Lastname #1',
       icon: 'material-icons://folder_open'
     },
     {
-      id: 2, 
+      id: 2,
-      firstName: 'Name #2', 
+      firstName: 'Name #2',
-      lastName: 'Lastname #2', 
+      lastName: 'Lastname #2',
       icon: 'material-icons://accessibility'
     },
     {
-      id: 3, 
+      id: 3,
-      firstName: 'Name #3', 
+      firstName: 'Name #3',
-      lastName: 'Lastname #3', 
+      lastName: 'Lastname #3',
       icon: 'material-icons://alarm'
     }
   ]
@@ -137,21 +137,21 @@ configure the columns. Open the `src/app/mydatatable/mydatatable.component.html`
 with the following:
 
 ```html
-<adf-datatable 
+<adf-datatable
   [data]="data">
   <data-columns>
-    <data-column 
+    <data-column
-      key="icon" 
+      key="icon"
-      type="image" 
+      type="image"
         [sortable]="false">
       </data-column>
-    <data-column 
+    <data-column
-      key="firstName" 
+      key="firstName"
       title="First Name">
     </data-column>
-    <data-column 
+    <data-column
-      key="lastName" 
+      key="lastName"
-      title="Last Name" 
+      title="Last Name"
       class="full-width name-column">
     </data-column>
   </data-columns>
@@ -179,7 +179,7 @@ As a simple example, we'll add a `click` event to display an alert when a row is
 `src/app/mydatatable/mydatatable.component.html` and add the following:
 
 ```html
-<adf-datatable 
+<adf-datatable
   (rowClick)="onRowClick($event)"
   [data]="data">
   .......
@@ -205,9 +205,9 @@ Let's dig a bit deeper into the different options for rendering columns within t
 is quite in-depth and has lots of examples. We highly recommend checking it out.
 
 From the documentation we can see that the [Data Column component](../core/components/data-column.component.md) has quite a few properties but the
-most important ones are `key`, `type`, `sortable`, `title` and  `class`. 
+most important ones are `key`, `type`, `sortable`, `title` and  `class`.
 
--   `key` is the name of the corresponding property in the [`ObjectDataTableAdapter`](lib/core/src/lib/datatable/data/object-datatable-adapter.ts) object. 
+-   `key` is the name of the corresponding property in the [`ObjectDataTableAdapter`](lib/core/src/lib/datatable/data/object-datatable-adapter.ts) object.
 -   `type` indicates how to render. By default it will take the `text` from the matching key in the data,
     but other modes are also available:
     	 \- `image` will take a URI for a Material Icon or a URL for any image and display it.
@@ -231,24 +231,24 @@ Open `src/app/mydatatable/mydatatable.component.ts` and change the data to the f
 data = new ObjectDataTableAdapter(
   [
     {
-      id: 1, 
+      id: 1,
-      name: 'Name #1', 
+      name: 'Name #1',
-      createdBy: 'User #1', 
+      createdBy: 'User #1',
-      status: 'green', 
+      status: 'green',
       icon: 'material-icons://folder_open'
     },
     {
-      id: 2, 
+      id: 2,
-      name: 'Name #2', 
+      name: 'Name #2',
-      createdBy: 'User #2', 
+      createdBy: 'User #2',
-      status: 'red', 
+      status: 'red',
       icon: 'material-icons://accessibility'
     },
     {
-      id: 3, 
+      id: 3,
-      name: 'Name #3', 
+      name: 'Name #3',
-      createdBy: 'User #3', 
+      createdBy: 'User #3',
-      status: 'green', 
+      status: 'green',
       icon: 'material-icons://alarm'
     }
   ]
@@ -286,7 +286,7 @@ file and replace the content with the following:
 
 ```ts
 import { Component, OnInit } from '@angular/core';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { ObjectDataTableAdapter, ObjectDataRow } from '@alfresco/adf-core';
 
 @Component({
@@ -356,7 +356,7 @@ Make the changes shown below to the `src/app/mydatatable/mydatatable.component.h
 </adf-datatable>
 ```
 
-Also update `src/app/mydatatable/mydatatable.component.ts` as follows: 
+Also update `src/app/mydatatable/mydatatable.component.ts` as follows:
 
 ```ts
 import { DataCellEvent, DataRowActionEvent } from '@alfresco/adf-core';

lib/content-services/src/lib/api-factories/alfresco-api-no-auth.service.ts

@@ -16,10 +16,9 @@
  */
 
 import { AdfHttpClient } from '@alfresco/adf-core/api';
-import { StorageService } from '../common/services/storage.service';
+import { StorageService, AppConfigService } from '@alfresco/adf-core';
 import { AlfrescoApi, AlfrescoApiConfig } from '@alfresco/js-api';
 import { Injectable } from '@angular/core';
-import { AppConfigService } from '../app-config';
 import { AlfrescoApiService } from '../services/alfresco-api.service';
 
 @Injectable()

lib/content-services/src/lib/api-factories/alfresco-api-v2-loader.service.ts

@@ -17,9 +17,8 @@
 
 import { AlfrescoApiConfig } from '@alfresco/js-api';
 import { Injectable } from '@angular/core';
-import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
+import { AppConfigService, AppConfigValues, StorageService } from '@alfresco/adf-core';
-import { AlfrescoApiService } from '../services/alfresco-api.service';
+import {  AlfrescoApiService } from '../services/alfresco-api.service';
-import { StorageService } from '../common/services/storage.service';
 
 /**
  * Create a factory to resolve an api service instance

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

@@ -0,0 +1,19 @@
+/*!
+ * @license
+ * Copyright © 2005-2024 Hyland Software, Inc. and its affiliates. All rights reserved.
+ *
+ * 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.
+ */
+
+export * from './alfresco-api-no-auth.service';
+export * from './alfresco-api-v2-loader.service';

lib/content-services/src/lib/aspect-list/services/aspect-list.service.spec.ts

@@ -16,10 +16,10 @@
  */
 
 import { TestBed } from '@angular/core/testing';
-import { AlfrescoApiService } from '@alfresco/adf-core';
 import { AspectListService } from './aspect-list.service';
 import { AspectPaging, AspectsApi, AspectEntry } from '@alfresco/js-api';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { AlfrescoApiService } from '../../services';
 
 const stdAspect1: AspectEntry = { entry: { id: 'std:standardAspectOne', description: 'Standard Aspect One', title: 'StandardAspectOne' } };
 const stdAspect2: AspectEntry = { entry: { id: 'std:standardAspectTwo', description: 'Standard Aspect Two', title: 'StandardAspectTwo' } };

lib/content-services/src/lib/aspect-list/services/aspect-list.service.ts

@@ -16,7 +16,8 @@
  */
 
 import { Injectable } from '@angular/core';
-import { AlfrescoApiService, AppConfigService } from '@alfresco/adf-core';
+import { AlfrescoApiService  } from '../../services/alfresco-api.service';
+import { AppConfigService } from '@alfresco/adf-core';
 import { from, Observable, of, zip } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 import { AspectEntry, AspectPaging, AspectsApi } from '@alfresco/js-api';

lib/content-services/src/lib/aspect-list/services/node-aspect.service.spec.ts

@@ -23,7 +23,7 @@ import { ContentTestingModule } from '../../testing/content.testing.module';
 import { NodeAspectService } from './node-aspect.service';
 import { DialogAspectListService } from './dialog-aspect-list.service';
 import { CardViewContentUpdateService } from '../../common/services/card-view-content-update.service';
-import { TagService } from '@alfresco/adf-content-services';
+import { TagService } from '../../tag';
 
 describe('NodeAspectService', () => {
     let dialogAspectListService: DialogAspectListService;

lib/content-services/src/lib/category/services/category-tree-datasource.service.spec.ts

@@ -17,11 +17,12 @@
 
 import { fakeAsync, TestBed } from '@angular/core/testing';
 import { CategoryService } from '../services/category.service';
-import { CategoryNode, CategoryTreeDatasourceService } from '@alfresco/adf-content-services';
 import { CategoryServiceMock } from '../mock/category-mock.service';
 import { TreeNodeType, TreeResponse } from '../../tree';
 import { EMPTY, of } from 'rxjs';
 import { Pagination } from '@alfresco/js-api';
+import { CategoryTreeDatasourceService } from './category-tree-datasource.service';
+import { CategoryNode } from '../models/category-node.interface';
 
 describe('CategoryTreeDatasourceService', () => {
     let categoryTreeDatasourceService: CategoryTreeDatasourceService;

lib/content-services/src/lib/category/services/category.service.ts

@@ -16,7 +16,7 @@
  */
 
 import { Injectable } from '@angular/core';
-import { AlfrescoApiService, AppConfigService, UserPreferencesService } from '@alfresco/adf-core';
+import { AppConfigService, UserPreferencesService } from '@alfresco/adf-core';
 import {
     CategoriesApi,
     CategoryBody,
@@ -27,6 +27,7 @@ import {
     SearchApi,
     SEARCH_LANGUAGE
 } from '@alfresco/js-api';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { from, Observable } from 'rxjs';
 
 @Injectable({ providedIn: 'root' })

lib/content-services/src/lib/common/services/content.service.ts

@@ -18,9 +18,10 @@
 import { Injectable } from '@angular/core';
 import { ContentApi, Node, NodeEntry } from '@alfresco/js-api';
 import { Subject } from 'rxjs';
-import { AlfrescoApiService, AuthenticationService, ThumbnailService } from '@alfresco/adf-core';
+import { AuthenticationService, ThumbnailService } from '@alfresco/adf-core';
 import { PermissionsEnum } from '../models/permissions.enum';
 import { AllowableOperationsEnum } from '../models/allowable-operations.enum';
+import { AlfrescoApiService  } from '../../services/alfresco-api.service';
 
 export interface FolderCreatedEvent {
     name: string;

lib/content-services/src/lib/common/services/discovery-api.service.ts

@@ -18,21 +18,15 @@
 import { Injectable } from '@angular/core';
 import { from, Observable, throwError, Subject } from 'rxjs';
 import { catchError, map, switchMap, filter, take } from 'rxjs/operators';
-import {
+import { RepositoryInfo, SystemPropertiesRepresentation, DiscoveryApi, AboutApi, SystemPropertiesApi } from '@alfresco/js-api';
-    RepositoryInfo,
-    SystemPropertiesRepresentation,
-    DiscoveryApi,
-    AboutApi,
-    SystemPropertiesApi
-} from '@alfresco/js-api';
 
-import { AlfrescoApiService, BpmProductVersionModel, AuthenticationService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
+import { BpmProductVersionModel, AuthenticationService } from '@alfresco/adf-core';
 
 @Injectable({
     providedIn: 'root'
 })
 export class DiscoveryApiService {
-
     private _discoveryApi: DiscoveryApi;
     get discoveryApi(): DiscoveryApi {
         this._discoveryApi = this._discoveryApi ?? new DiscoveryApi(this.alfrescoApiService.getInstance());
@@ -44,34 +38,28 @@ export class DiscoveryApiService {
      */
     ecmProductInfo$ = new Subject<RepositoryInfo>();
 
-    constructor(
+    constructor(private authenticationService: AuthenticationService, private alfrescoApiService: AlfrescoApiService) {
-        private authenticationService: AuthenticationService,
-        private alfrescoApiService: AlfrescoApiService
-    ) {
         this.authenticationService.onLogin.subscribe(() => {
-            this.alfrescoApiService.alfrescoApiInitialized.pipe(
+            this.alfrescoApiService.alfrescoApiInitialized
-                filter(() => this.authenticationService.isEcmLoggedIn()),
+                .pipe(
-                take(1),
+                    filter(() => this.authenticationService.isEcmLoggedIn()),
-                switchMap(() => this.getEcmProductInfo())
+                    take(1),
-            )
+                    switchMap(() => this.getEcmProductInfo())
+                )
                 .subscribe((info) => this.ecmProductInfo$.next(info));
-
         });
     }
 
-
     /**
      * Gets product information for Content Services.
      *
      * @returns ProductVersionModel containing product details
      */
     getEcmProductInfo(): Observable<RepositoryInfo> {
-
+        return from(this.discoveryApi.getRepositoryInformation()).pipe(
-        return from(this.discoveryApi.getRepositoryInformation())
+            map((res) => res.entry.repository),
-            .pipe(
+            catchError((err) => throwError(err))
-                map((res) => res.entry.repository),
+        );
-                catchError((err) => throwError(err))
-            );
     }
 
     /**
@@ -82,25 +70,23 @@ export class DiscoveryApiService {
     getBpmProductInfo(): Observable<BpmProductVersionModel> {
         const aboutApi = new AboutApi(this.alfrescoApiService.getInstance());
 
-        return from(aboutApi.getAppVersion())
+        return from(aboutApi.getAppVersion()).pipe(
-            .pipe(
+            map((res) => new BpmProductVersionModel(res)),
-                map((res) => new BpmProductVersionModel(res)),
+            catchError((err) => throwError(err))
-                catchError((err) => throwError(err))
+        );
-            );
     }
 
     getBPMSystemProperties(): Observable<SystemPropertiesRepresentation> {
         const systemPropertiesApi = new SystemPropertiesApi(this.alfrescoApiService.getInstance());
 
-        return from(systemPropertiesApi.getProperties())
+        return from(systemPropertiesApi.getProperties()).pipe(
-            .pipe(
+            map((res: any) => {
-                map((res: any) => {
+                if ('string' === typeof res) {
-                    if ('string' === typeof (res)) {
+                    throw new Error('Not valid response');
-                        throw new Error('Not valid response');
+                }
-                    }
+                return res;
-                    return res;
+            }),
-                }),
+            catchError((err) => throwError(err.error))
-                catchError((err) => throwError(err.error))
+        );
-            );
     }
 }

lib/content-services/src/lib/common/services/favorites-api.service.ts

@@ -18,7 +18,8 @@
 import { Injectable } from '@angular/core';
 import { FavoritesApi, NodePaging, FavoritePaging } from '@alfresco/js-api';
 import { Observable, from, of } from 'rxjs';
-import { AlfrescoApiService, UserPreferencesService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
+import { UserPreferencesService } from '@alfresco/adf-core';
 import { catchError } from 'rxjs/operators';
 
 @Injectable({

lib/content-services/src/lib/common/services/nodes-api.service.ts

@@ -15,12 +15,13 @@
  * limitations under the License.
  */
 
-import { AlfrescoApiService, UserPreferencesService } from '@alfresco/adf-core';
+import { UserPreferencesService } from '@alfresco/adf-core';
 import { ContentPagingQuery, Node, NodeAssignedHold, NodeEntry, NodePaging, NodesApi, NodesIncludeQuery, TrashcanApi } from '@alfresco/js-api';
 import { Injectable } from '@angular/core';
 import { from, Observable, Subject, throwError } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 import { NodeMetadata } from '../models/node-metadata.model';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 
 @Injectable({
     providedIn: 'root'

lib/content-services/src/lib/common/services/people-content.service.spec.ts

@@ -16,12 +16,14 @@
  */
 
 import { fakeEcmUser } from '../mocks/ecm-user.service.mock';
-import { AlfrescoApiService, AlfrescoApiServiceMock, RedirectAuthService } from '@alfresco/adf-core';
+import { RedirectAuthService } from '@alfresco/adf-core';
 import { PeopleContentQueryRequestModel, PeopleContentService } from './people-content.service';
 import { TestBed } from '@angular/core/testing';
 import { PersonPaging } from '@alfresco/js-api';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { EMPTY, of } from 'rxjs';
+import { AlfrescoApiService } from '../../services';
+import { AlfrescoApiServiceMock } from '../../mock';
 
 export const fakeEcmUser2 = {
     id: 'another-fake-id',

lib/content-services/src/lib/common/services/people-content.service.ts

@@ -17,11 +17,12 @@
 
 import { Injectable } from '@angular/core';
 import { from, Observable, of } from 'rxjs';
-import { AlfrescoApiService, AuthenticationService } from '@alfresco/adf-core';
+import { AuthenticationService } from '@alfresco/adf-core';
 import { map, tap } from 'rxjs/operators';
 import { Pagination, PeopleApi, PersonBodyCreate, PersonBodyUpdate } from '@alfresco/js-api';
 import { EcmUserModel } from '../models/ecm-user.model';
 import { ContentService } from './content.service';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 
 export interface PeopleContentQueryResponse {
     pagination: Pagination;

lib/content-services/src/lib/common/services/rendition.service.ts

@@ -17,7 +17,8 @@
 
 import { Injectable } from '@angular/core';
 import { ContentApi, RenditionEntry, RenditionPaging, RenditionsApi, VersionsApi } from '@alfresco/js-api';
-import { AlfrescoApiService, Track, TranslationService, ViewUtilService } from '@alfresco/adf-core';
+import { Track, TranslationService, ViewUtilService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 
 @Injectable({
     providedIn: 'root'

lib/content-services/src/lib/common/services/rendition.services.spec.ts

@@ -16,9 +16,10 @@
  */
 
 import { TestBed } from '@angular/core/testing';
-import { AlfrescoApiService, TranslationService, ViewUtilService } from '@alfresco/adf-core';
+import { TranslationService, ViewUtilService } from '@alfresco/adf-core';
 import { Rendition, RenditionEntry, RenditionPaging, RenditionsApi } from '@alfresco/js-api';
-import { RenditionService } from '@alfresco/adf-content-services';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
+import { RenditionService } from './rendition.service';
 
 const getRenditionEntry = (status: Rendition.StatusEnum): RenditionEntry => ({
     entry: {

lib/content-services/src/lib/common/services/sites.service.ts

@@ -17,7 +17,6 @@
 
 import { Injectable } from '@angular/core';
 import { from, Observable } from 'rxjs';
-import { AlfrescoApiService } from '@alfresco/adf-core';
 import {
     Node,
     SiteBodyCreate,
@@ -32,6 +31,7 @@ import {
     SitePaging,
     SitesApi
 } from '@alfresco/js-api';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 
 @Injectable({
     providedIn: 'root'

lib/content-services/src/lib/common/services/upload.service.spec.ts

@@ -17,13 +17,15 @@
 
 import { EventEmitter } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
-import { AlfrescoApiService, AlfrescoApiServiceMock, AppConfigModule, AppConfigService, AppConfigServiceMock } from '@alfresco/adf-core';
+import { AppConfigModule, AppConfigService, AppConfigServiceMock } from '@alfresco/adf-core';
 import { UploadService } from './upload.service';
 import { RepositoryInfo } from '@alfresco/js-api';
 import { BehaviorSubject } from 'rxjs';
 import { DiscoveryApiService } from '../../common/services/discovery-api.service';
 import { FileModel, FileUploadStatus } from '../../common/models/file.model';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { AlfrescoApiService } from '../../services';
+import { AlfrescoApiServiceMock } from '../../mock';
 
 declare let jasmine: any;
 

lib/content-services/src/lib/common/services/upload.service.ts

@@ -20,10 +20,11 @@ import { Minimatch } from 'minimatch';
 import { Subject } from 'rxjs';
 import { FileUploadCompleteEvent, FileUploadDeleteEvent, FileUploadErrorEvent, FileUploadEvent } from '../events/file.event';
 import { FileModel, FileUploadProgress, FileUploadStatus } from '../models/file.model';
-import { AppConfigService, AlfrescoApiService } from '@alfresco/adf-core';
+import { AppConfigService } from '@alfresco/adf-core';
 import { filter } from 'rxjs/operators';
 import { DiscoveryApiService } from '../../common/services/discovery-api.service';
 import { NodeBodyCreate, NodesApi, UploadApi, VersionsApi } from '@alfresco/js-api';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 
 const MIN_CANCELLABLE_FILE_SIZE = 1000000;
 const MAX_CANCELLABLE_FILE_PERCENTAGE = 50;

lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.spec.ts

@@ -25,7 +25,7 @@ import { NodeAspectService } from '../../../aspect-list/services/node-aspect.ser
 import { ContentMetadataService } from '../../services/content-metadata.service';
 import { AllowableOperationsEnum } from '../../../common/models/allowable-operations.enum';
 import { of } from 'rxjs';
-import { AlfrescoApiService, AlfrescoApiServiceMock, AuthModule, NoopTranslateModule } from '@alfresco/adf-core';
+import { AuthModule, NoopTranslateModule } from '@alfresco/adf-core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { versionCompatibilityFactory } from '../../../version-compatibility/version-compatibility-factory';
 import { VersionCompatibilityService } from '../../../version-compatibility';
@@ -34,6 +34,8 @@ import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { CategoryService } from '../../../category';
 import { TagService } from '../../../tag';
 import { PropertyDescriptorsService } from '../../public-api';
+import { AlfrescoApiService } from '../../../services/alfresco-api.service';
+import { AlfrescoApiServiceMock } from '../../../mock/alfresco-api.service.mock';
 
 describe('ContentMetadataCardComponent', () => {
     let component: ContentMetadataCardComponent;

lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts

@@ -35,20 +35,16 @@ import { EMPTY, of, throwError } from 'rxjs';
 import { CardViewContentUpdateService } from '../../../common/services/card-view-content-update.service';
 import { PropertyGroup } from '../../interfaces/property-group.interface';
 import { PropertyDescriptorsService } from '../../services/property-descriptors.service';
-import {
-    CategoriesManagementComponent,
-    CategoriesManagementMode,
-    CategoryService,
-    TagsCreatorComponent,
-    TagsCreatorMode,
-    TagService
-} from '@alfresco/adf-content-services';
 import { MatExpansionPanel } from '@angular/material/expansion';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { MatChipHarness } from '@angular/material/chips/testing';
+import { TagService } from '../../../tag/services/tag.service';
+import { CategoryService } from '../../../category/services/category.service';
+import { TagsCreatorComponent, TagsCreatorMode } from '../../../tag';
+import { CategoriesManagementComponent, CategoriesManagementMode } from '../../../category';
 
 describe('ContentMetadataComponent', () => {
     let component: ContentMetadataComponent;

lib/content-services/src/lib/content-metadata/services/property-descriptors.service.ts

@@ -16,7 +16,7 @@
  */
 
 import { Injectable } from '@angular/core';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { Observable, defer, forkJoin } from 'rxjs';
 import { PropertyGroup, PropertyGroupContainer } from '../interfaces/content-metadata.interfaces';
 import { map } from 'rxjs/operators';

lib/content-services/src/lib/content-node-share/content-node-share.directive.ts

@@ -21,7 +21,7 @@ import { NodeEntry, NodesApi } from '@alfresco/js-api';
 
 import { ShareDialogComponent } from './content-node-share.dialog';
 import { Observable, from, Subject } from 'rxjs';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { takeUntil } from 'rxjs/operators';
 
 @Directive({

lib/content-services/src/lib/content-node-share/services/shared-links-api.service.ts

@@ -18,8 +18,9 @@
 import { Injectable } from '@angular/core';
 import { NodePaging, SharedLinkBodyCreate, SharedLinkEntry, SharedlinksApi } from '@alfresco/js-api';
 import { Observable, from, of, Subject } from 'rxjs';
-import { AlfrescoApiService, UserPreferencesService } from '@alfresco/adf-core';
+import { UserPreferencesService } from '@alfresco/adf-core';
 import { catchError } from 'rxjs/operators';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 
 @Injectable({
     providedIn: 'root'

lib/content-services/src/lib/content-type/content-type.service.ts

@@ -17,9 +17,10 @@
 
 import { TypeEntry, TypePaging, TypesApi } from '@alfresco/js-api';
 import { Injectable } from '@angular/core';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { from, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+
 @Injectable({
     providedIn: 'root'
 })

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

@@ -46,6 +46,9 @@ import { AlfrescoViewerComponent } from './viewer';
 import { ContentTypeDialogComponent } from './content-type';
 import { MaterialModule } from './material.module';
 import { AlfrescoIconComponent } from './alfresco-icon/alfresco-icon.component';
+import { AlfrescoApiService } from './services/alfresco-api.service';
+import { AlfrescoApiNoAuthService } from './api-factories/alfresco-api-no-auth.service';
+import { AlfrescoApiLoaderService, createAlfrescoApiInstance } from './api-factories/alfresco-api-v2-loader.service';
 
 @NgModule({
     imports: [
@@ -111,6 +114,7 @@ export class ContentModule {
             providers: [
                 provideTranslations('adf-content-services', 'assets/adf-content-services'),
                 ContentAuthLoaderService,
+                { provide: AlfrescoApiService, useClass: AlfrescoApiNoAuthService },
                 {
                     provide: APP_INITIALIZER,
                     useFactory: versionCompatibilityFactory,
@@ -122,6 +126,12 @@ export class ContentModule {
                     useFactory: contentAuthLoaderFactory,
                     deps: [ContentAuthLoaderService],
                     multi: true
+                },
+                {
+                    provide: APP_INITIALIZER,
+                    useFactory: createAlfrescoApiInstance,
+                    deps: [AlfrescoApiLoaderService],
+                    multi: true
                 }
             ]
         };

lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.spec.ts

@@ -21,8 +21,10 @@ import { DownloadZipDialogComponent } from './download-zip.dialog';
 import { DownloadZipService } from './services/download-zip.service';
 import { DownloadEntry, FileDownloadStatus } from '@alfresco/js-api';
 import { EMPTY, Observable, of } from 'rxjs';
-import { AlfrescoApiService, AlfrescoApiServiceMock, NoopTranslateModule, RedirectAuthService } from '@alfresco/adf-core';
+import { NoopTranslateModule, RedirectAuthService } from '@alfresco/adf-core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { AlfrescoApiService } from '../../services';
+import { AlfrescoApiServiceMock } from '../../mock';
 
 describe('DownloadZipDialogComponent', () => {
     let fixture: ComponentFixture<DownloadZipDialogComponent>;

lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.stories.ts

@@ -16,7 +16,6 @@
  */
 
 import { applicationConfig, Meta, moduleMetadata, StoryFn } from '@storybook/angular';
-import { AlfrescoApiService } from '@alfresco/adf-core';
 import { MatButtonModule } from '@angular/material/button';
 import { DownloadZipDialogStorybookComponent } from './download-zip.dialog.stories.component';
 import { AlfrescoApiServiceMock, ContentApiMock, DownloadZipMockService, NodesApiMock } from './mock/download-zip-service.mock';
@@ -27,6 +26,7 @@ import { MatDialogModule } from '@angular/material/dialog';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { importProvidersFrom } from '@angular/core';
 import { CoreStoryModule } from '../../../../../core/src/public-api';
+import { AlfrescoApiService } from '../../services';
 
 export default {
     component: DownloadZipDialogStorybookComponent,

lib/content-services/src/lib/dialogs/download-zip/services/download-zip.service.ts

@@ -18,7 +18,7 @@
 import { DownloadEntry, DownloadBodyCreate, DownloadsApi } from '@alfresco/js-api';
 import { Injectable } from '@angular/core';
 import { Observable, from } from 'rxjs';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../../../services/alfresco-api.service';
 
 @Injectable({
     providedIn: 'root'

lib/content-services/src/lib/dialogs/library/library.dialog.ts

@@ -28,7 +28,7 @@ import {
 } from '@angular/forms';
 import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { QueriesApi, SiteBodyCreate, SiteEntry, SitePaging } from '@alfresco/js-api';
-import { AlfrescoApiService, NotificationService } from '@alfresco/adf-core';
+import { NotificationService } from '@alfresco/adf-core';
 import { debounceTime, finalize, mergeMap, takeUntil } from 'rxjs/operators';
 import { SitesService } from '../../common/services/sites.service';
 import { CommonModule } from '@angular/common';
@@ -38,6 +38,7 @@ import { MatInputModule } from '@angular/material/input';
 import { AutoFocusDirective } from '../../directives';
 import { MatRadioModule } from '@angular/material/radio';
 import { MatButtonModule } from '@angular/material/button';
+import { AlfrescoApiService } from '../../services';
 
 @Component({
     selector: 'adf-library-dialog',

lib/content-services/src/lib/dialogs/node-lock/node-lock.dialog.ts

@@ -20,7 +20,6 @@ import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/materia
 import { ReactiveFormsModule, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { differenceInSeconds } from 'date-fns';
 import { NodeBodyLock, Node, NodeEntry, NodesApi } from '@alfresco/js-api';
-import { AlfrescoApiService } from '@alfresco/adf-core';
 import { CommonModule } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
 import { MatCheckboxModule } from '@angular/material/checkbox';
@@ -28,6 +27,7 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatDatetimepickerModule } from '@mat-datetimepicker/core';
 import { MatInputModule } from '@angular/material/input';
 import { MatButtonModule } from '@angular/material/button';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 
 @Component({
     selector: 'adf-node-lock',

lib/content-services/src/lib/directives/library-favorite.directive.ts

@@ -17,7 +17,7 @@
 
 import { Directive, HostListener, Input, OnChanges, Output, EventEmitter, SimpleChanges } from '@angular/core';
 import { FavoriteBodyCreate, FavoritesApi } from '@alfresco/js-api';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { LibraryEntity } from '../interfaces/library-entity.interface';
 
 @Directive({

lib/content-services/src/lib/directives/library-membership.directive.spec.ts

@@ -19,9 +19,10 @@ import { fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { LibraryMembershipDirective } from './library-membership.directive';
 import { SimpleChange } from '@angular/core';
 import { of, throwError, Subject } from 'rxjs';
-import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-core';
 import { SitesService } from '../common/services/sites.service';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { AlfrescoApiService } from '../services/alfresco-api.service';
+import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
 
 describe('LibraryMembershipDirective', () => {
     let alfrescoApiService: AlfrescoApiService;

lib/content-services/src/lib/directives/library-membership.directive.ts

@@ -18,7 +18,7 @@
 import { Directive, EventEmitter, HostListener, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
 import { SiteEntry, SiteMembershipRequestBodyCreate, SiteMembershipRequestEntry, SitesApi } from '@alfresco/js-api';
 import { BehaviorSubject, from, Observable } from 'rxjs';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { LibraryMembershipToggleEvent } from '../interfaces/library-membership-toggle-event.interface';
 import { LibraryMembershipErrorEvent } from '../interfaces/library-membership-error-event.interface';
 import { VersionCompatibilityService } from '../version-compatibility/version-compatibility.service';

lib/content-services/src/lib/directives/node-delete.directive.ts

@@ -20,8 +20,9 @@
 import { Directive, ElementRef, EventEmitter, HostListener, Input, OnChanges, Output } from '@angular/core';
 import { NodeEntry, Node, DeletedNodeEntry, DeletedNode, TrashcanApi, NodesApi } from '@alfresco/js-api';
 import { Observable, forkJoin, from, of } from 'rxjs';
-import { AlfrescoApiService, TranslationService } from '@alfresco/adf-core';
+import { TranslationService } from '@alfresco/adf-core';
 import { map, catchError, retry } from 'rxjs/operators';
+import { AlfrescoApiService } from '../services/alfresco-api.service';
 
 interface ProcessedNodeData {
     entry: Node | DeletedNode;

lib/content-services/src/lib/directives/node-download.directive.spec.ts

@@ -19,10 +19,11 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { MatDialog, MatDialogModule } from '@angular/material/dialog';
 import { Component, DebugElement, ViewChild } from '@angular/core';
-import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-core';
 import { NodeDownloadDirective } from './node-download.directive';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { ContentApi } from '@alfresco/js-api';
+import { AlfrescoApiService } from '../services/alfresco-api.service';
+import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
 
 @Component({
     standalone: true,

lib/content-services/src/lib/directives/node-download.directive.ts

@@ -17,9 +17,10 @@
 
 import { Directive, Input, HostListener } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { AlfrescoApiService, DownloadService } from '@alfresco/adf-core';
+import { DownloadService } from '@alfresco/adf-core';
 import { DownloadZipDialogComponent } from '../dialogs/download-zip/download-zip.dialog';
 import { ContentApi, NodeEntry, VersionEntry } from '@alfresco/js-api';
+import { AlfrescoApiService } from '../services/alfresco-api.service';
 
 /**
  * Directive selectors without adf- prefix will be deprecated on 3.0.0

lib/content-services/src/lib/directives/node-favorite.directive.spec.ts

@@ -18,8 +18,10 @@
 import { SimpleChange } from '@angular/core';
 import { fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { NodeFavoriteDirective } from './node-favorite.directive';
-import { AlfrescoApiService, AlfrescoApiServiceMock, AppConfigService, AppConfigServiceMock } from '@alfresco/adf-core';
+import { AppConfigService, AppConfigServiceMock } from '@alfresco/adf-core';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { AlfrescoApiService } from '../services';
+import { AlfrescoApiServiceMock } from '../mock';
 
 describe('NodeFavoriteDirective', () => {
     let directive: NodeFavoriteDirective;

lib/content-services/src/lib/directives/node-favorite.directive.ts

@@ -21,7 +21,7 @@ import { Directive, EventEmitter, HostListener, Input, OnChanges, Output, Simple
 import { FavoriteBodyCreate, NodeEntry, SharedLinkEntry, Node, SharedLink, FavoritesApi } from '@alfresco/js-api';
 import { Observable, from, forkJoin, of } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../services/alfresco-api.service';
 
 @Directive({
     standalone: true,

lib/content-services/src/lib/directives/node-restore.directive.ts

@@ -21,8 +21,9 @@ import { Directive, EventEmitter, HostListener, Input, Output } from '@angular/c
 import { TrashcanApi, DeletedNodeEntry, DeletedNodesPaging } from '@alfresco/js-api';
 import { Observable, forkJoin, from, of } from 'rxjs';
 import { tap, mergeMap, map, catchError } from 'rxjs/operators';
-import { AlfrescoApiService, TranslationService } from '@alfresco/adf-core';
+import { TranslationService } from '@alfresco/adf-core';
 import { RestoreMessageModel } from '../interfaces/restore-message-model.interface';
+import { AlfrescoApiService } from '../services/alfresco-api.service';
 
 @Directive({
     standalone: true,

lib/content-services/src/lib/document-list/components/document-list.component.ts

@@ -19,7 +19,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 
 import {
-    AlfrescoApiService,
     AppConfigService,
     ColumnsSelectorComponent,
     CustomEmptyContentTemplateDirective,
@@ -86,6 +85,7 @@ import { FilterHeaderComponent } from './filter-header/filter-header.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { MatIconModule } from '@angular/material/icon';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 
 const BYTES_TO_MB_CONVERSION_VALUE = 1048576;
 

lib/content-services/src/lib/document-list/services/custom-resources.service.ts

@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { AlfrescoApiService, PaginationModel } from '@alfresco/adf-core';
+import { PaginationModel } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import {
     DeletedNodesPaging,
     SearchRequest,

lib/content-services/src/lib/document-list/services/document-list.service.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { AlfrescoApiService, PaginationModel } from '@alfresco/adf-core';
+import { PaginationModel } from '@alfresco/adf-core';
 import { NodesApiService } from '../../common/services/nodes-api.service';
 import { inject, Injectable } from '@angular/core';
 import { Node, NodeEntry, NodePaging, NodesApi } from '@alfresco/js-api';
@@ -24,6 +24,7 @@ import { Observable, from, forkJoin, Subject } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { DocumentListLoader } from '../interfaces/document-list-loader.interface';
 import { CustomResourcesService } from './custom-resources.service';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 
 const ROOT_ID = '-root-';
 

lib/content-services/src/lib/document-list/services/node-actions.service.ts

@@ -18,10 +18,11 @@
 import { Injectable, Output, EventEmitter } from '@angular/core';
 import { Node, NodeEntry } from '@alfresco/js-api';
 import { Subject } from 'rxjs';
-import { AlfrescoApiService, DownloadService } from '@alfresco/adf-core';
+import { DownloadService } from '@alfresco/adf-core';
 import { MatDialog } from '@angular/material/dialog';
 import { ContentService } from '../../common/services/content.service';
 import { NodeDownloadDirective } from '../../directives/node-download.directive';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 
 import { DocumentListService } from './document-list.service';
 import { ContentNodeDialogService } from '../../content-node-selector/content-node-dialog.service';

lib/content-services/src/lib/group/services/group.service.spec.ts

@@ -17,8 +17,8 @@
 
 import { TestBed } from '@angular/core/testing';
 import { ContentTestingModule } from '../../testing/content.testing.module';
-import { GroupService } from '@alfresco/adf-content-services';
 import { ContentIncludeQuery, GroupEntry } from '@alfresco/js-api';
+import { GroupService } from './group.service';
 
 describe('GroupService', () => {
     let service: GroupService;
@@ -83,12 +83,16 @@ describe('GroupService', () => {
 
             service.updateGroup(group.entry, opts).subscribe((groupEntry) => {
                 expect(groupEntry).toEqual(returnedGroup);
-                expect(service.groupsApi.updateGroup).toHaveBeenCalledWith(group.entry.id, {
+                expect(service.groupsApi.updateGroup).toHaveBeenCalledWith(
-                    displayName: group.entry.displayName,
+                    group.entry.id,
-                    description: group.entry.description
+                    {
-                }, {
+                        displayName: group.entry.displayName,
-                    include: ['description']
+                        description: group.entry.description
-                });
+                    },
+                    {
+                        include: ['description']
+                    }
+                );
                 done();
             });
         });
@@ -105,12 +109,16 @@ describe('GroupService', () => {
                         description: ''
                     }
                 });
-                expect(service.groupsApi.updateGroup).toHaveBeenCalledWith(group.entry.id, {
+                expect(service.groupsApi.updateGroup).toHaveBeenCalledWith(
-                    displayName: group.entry.displayName,
+                    group.entry.id,
-                    description: group.entry.description
+                    {
-                }, {
+                        displayName: group.entry.displayName,
-                    include: ['description']
+                        description: group.entry.description
-                });
+                    },
+                    {
+                        include: ['description']
+                    }
+                );
                 done();
             });
         });
@@ -121,12 +129,16 @@ describe('GroupService', () => {
 
             service.updateGroup(group.entry, opts).subscribe((groupEntry) => {
                 expect(groupEntry).toEqual(returnedGroup);
-                expect(service.groupsApi.updateGroup).toHaveBeenCalledWith(group.entry.id, {
+                expect(service.groupsApi.updateGroup).toHaveBeenCalledWith(
-                    displayName: group.entry.displayName,
+                    group.entry.id,
-                    description: group.entry.description
+                    {
-                }, {
+                        displayName: group.entry.displayName,
-                    include: ['description']
+                        description: group.entry.description
-                });
+                    },
+                    {
+                        include: ['description']
+                    }
+                );
                 done();
             });
         });

lib/content-services/src/lib/group/services/group.service.ts

@@ -17,7 +17,7 @@
 
 import { Injectable } from '@angular/core';
 import { ContentIncludeQuery, Group, GroupEntry, GroupsApi } from '@alfresco/js-api';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { from, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 

lib/content-services/src/lib/legal-hold/services/legal-hold.service.ts

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { AlfrescoApiService } from '@alfresco/adf-core';
 import {
     BulkAssignHoldResponseEntry,
     ContentPagingQuery,
@@ -30,6 +29,7 @@ import {
 import { Injectable } from '@angular/core';
 import { Observable, from } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 
 @Injectable({
     providedIn: 'root'

lib/content-services/src/lib/mock/alfresco-api.service.mock.ts

@@ -16,9 +16,8 @@
  */
 
 import { Injectable } from '@angular/core';
-import { AppConfigService } from '../app-config/app-config.service';
 import { AlfrescoApiService } from '../services/alfresco-api.service';
-import { StorageService } from '../common/services/storage.service';
+import { AppConfigService, StorageService } from '@alfresco/adf-core';
 
 @Injectable()
 export class AlfrescoApiServiceMock extends AlfrescoApiService {

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

@@ -24,3 +24,4 @@ export * from './sites-dropdown.component.mock';
 export * from './search-query.mock';
 export * from './new-version-uploader.service.mock';
 export * from './date-range-search-filter.mock';
+export * from './alfresco-api.service.mock';

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

@@ -18,6 +18,8 @@
 import { Component, ViewChild } from '@angular/core';
 import { SearchComponent } from '../search/components/search.component';
 import { SearchRequest, ResultSetPaging, ResultSetRowEntry, ContentInfo, UserInfo, ResultNode } from '@alfresco/js-api';
+import { SearchModule } from '../search';
+import { CommonModule } from '@angular/common';
 
 const entryItem = new ResultSetRowEntry({
     entry: new ResultNode({
@@ -103,7 +105,9 @@ export const noResult = {
             </ng-template>
         </adf-search>
         <span id="component-result-message">{{ message }}</span>
-    `
+    `,
+    standalone: true,
+    imports: [SearchModule, CommonModule]
 })
 export class SimpleSearchTestComponent {
     @ViewChild('search', { static: true })

lib/content-services/src/lib/new-version-uploader/new-version-uploader.service.ts

@@ -17,7 +17,8 @@
 
 import { Injectable } from '@angular/core';
 import { MatDialog, MatDialogConfig } from '@angular/material/dialog';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../services/alfresco-api.service';
+
 import { NewVersionUploaderDialogComponent } from './new-version-uploader.dialog';
 import { VersionsApi } from '@alfresco/js-api';
 import { NewVersionUploaderData, NewVersionUploaderDialogData } from './models';

lib/content-services/src/lib/node-comments/services/node-comments.service.spec.ts

@@ -16,11 +16,13 @@
  */
 
 import { TestBed } from '@angular/core/testing';
-import { AlfrescoApiService, AlfrescoApiServiceMock, CommentModel, RedirectAuthService } from '@alfresco/adf-core';
+import { CommentModel, RedirectAuthService } from '@alfresco/adf-core';
 import { fakeContentComment, fakeContentComments } from '../mocks/node-comments.mock';
 import { NodeCommentsService } from './node-comments.service';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { EMPTY, of } from 'rxjs';
+import { AlfrescoApiService } from '../../services';
+import { AlfrescoApiServiceMock } from '../../mock';
 
 declare let jasmine: any;
 

lib/content-services/src/lib/node-comments/services/node-comments.service.ts

@@ -15,12 +15,13 @@
  * limitations under the License.
  */
 
-import { AlfrescoApiService, CommentModel, CommentsService, User } from '@alfresco/adf-core';
+import { CommentModel, CommentsService, User } from '@alfresco/adf-core';
 import { CommentEntry, CommentsApi, Comment } from '@alfresco/js-api';
 import { Injectable } from '@angular/core';
 import { Observable, from } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ContentService } from '../../common/services/content.service';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 
 @Injectable({
     providedIn: 'root'

lib/content-services/src/lib/permission-manager/components/pop-over.directive.spec.ts

@@ -17,9 +17,9 @@
 
 import { Component } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { PopOverDirective } from '@alfresco/adf-content-services';
 import { By } from '@angular/platform-browser';
 import { OverlayModule } from '@angular/cdk/overlay';
+import { PopOverDirective } from './pop-over.directive';
 
 @Component({
     standalone: true,

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

@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { AlfrescoApiService, TranslationService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
+import { TranslationService } from '@alfresco/adf-core';
 import { NodesApiService } from '../../common/services/nodes-api.service';
 import { EcmUserModel } from '../../common/models/ecm-user.model';
 import { Group, GroupMemberPaging, GroupsApi, Node, PathElement, PermissionElement, SearchRequest } from '@alfresco/js-api';

lib/content-services/src/lib/prediction/services/prediction.service.ts

@@ -16,9 +16,9 @@
  */
 
 import { Injectable } from '@angular/core';
-import { AlfrescoApiService } from '@alfresco/adf-core';
 import { PredictionsApi, PredictionPaging, ReviewStatus } from '@alfresco/js-api';
 import { from, Observable } from 'rxjs';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 
 @Injectable({ providedIn: 'root' })
 export class PredictionService {

lib/content-services/src/lib/search/components/search-filter-autocomplete-chips/search-filter-autocomplete-chips.component.spec.ts

@@ -19,9 +19,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { ContentTestingModule } from '../../../testing/content.testing.module';
 import { SearchFilterAutocompleteChipsComponent } from './search-filter-autocomplete-chips.component';
-import { TagService } from '@alfresco/adf-content-services';
 import { EMPTY, of } from 'rxjs';
 import { AutocompleteField } from '../../models/autocomplete-option.interface';
+import { TagService } from '../../../tag/services/tag.service';
 
 describe('SearchFilterAutocompleteChipsComponent', () => {
     let component: SearchFilterAutocompleteChipsComponent;

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

@@ -20,10 +20,11 @@ import { SearchPropertiesComponent } from './search-properties.component';
 import { ContentTestingModule } from '../../../testing/content.testing.module';
 import { By } from '@angular/platform-browser';
 import { MatOption } from '@angular/material/core';
-import { SearchChipAutocompleteInputComponent, SearchQueryBuilderService } from '@alfresco/adf-content-services';
 import { FileSizeUnit } from './file-size-unit.enum';
 import { FileSizeOperator } from './file-size-operator.enum';
 import { SearchProperties } from './search-properties';
+import { SearchChipAutocompleteInputComponent } from '../search-chip-autocomplete-input';
+import { SearchQueryBuilderService } from '../../services/search-query-builder.service';
 
 describe('SearchPropertiesComponent', () => {
     let component: SearchPropertiesComponent;

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

@@ -17,10 +17,11 @@
 
 import { SearchSortingPickerComponent } from './search-sorting-picker.component';
 import { SearchQueryBuilderService } from '../../services/search-query-builder.service';
-import { AlfrescoApiService, AppConfigService } from '@alfresco/adf-core';
+import { AppConfigService } from '@alfresco/adf-core';
 import { SearchConfiguration } from '../../models/search-configuration.interface';
 import { TestBed } from '@angular/core/testing';
 import { ContentTestingModule } from '../../../testing/content.testing.module';
+import { AlfrescoApiService } from '../../../services/alfresco-api.service';
 
 describe('SearchSortingPickerComponent', () => {
     let queryBuilder: SearchQueryBuilderService;

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

@@ -29,8 +29,7 @@ describe('SearchComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [ContentTestingModule],
+            imports: [ContentTestingModule, SimpleSearchTestComponent]
-            declarations: [SimpleSearchTestComponent]
         });
         fixture = TestBed.createComponent(SimpleSearchTestComponent);
         component = fixture.componentInstance;

lib/content-services/src/lib/search/services/base-query-builder.service.ts

@@ -16,7 +16,7 @@
  */
 
 import { Subject, Observable, from, ReplaySubject } from 'rxjs';
-import { AlfrescoApiService, AppConfigService } from '@alfresco/adf-core';
+import { AppConfigService } from '@alfresco/adf-core';
 import {
     SearchRequest,
     RequestFacetFields,
@@ -36,6 +36,7 @@ import { SearchSortingDefinition } from '../models/search-sorting-definition.int
 import { FacetField } from '../models/facet-field.interface';
 import { FacetFieldBucket } from '../models/facet-field-bucket.interface';
 import { SearchForm } from '../models/search-form.interface';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 
 export abstract class BaseQueryBuilderService {
     private _searchApi: SearchApi;

lib/content-services/src/lib/search/services/search-facet-filters.service.spec.ts

@@ -20,8 +20,9 @@ import { TestBed } from '@angular/core/testing';
 import { SearchFacetFiltersService } from './search-facet-filters.service';
 import { ContentTestingModule } from '../../testing/content.testing.module';
 import { SearchQueryBuilderService } from './search-query-builder.service';
-import { CategoryService, FacetBucketSortBy, FacetBucketSortDirection } from '@alfresco/adf-content-services';
 import { EMPTY, of } from 'rxjs';
+import { CategoryService } from '../../category/services/category.service';
+import { FacetBucketSortBy, FacetBucketSortDirection } from '../models/facet-field.interface';
 
 describe('SearchFacetFiltersService', () => {
     let searchFacetFiltersService: SearchFacetFiltersService;
@@ -31,12 +32,14 @@ describe('SearchFacetFiltersService', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [ContentTestingModule],
-            providers: [{
+            providers: [
-                provide: CategoryService,
+                {
-                useValue: {
+                    provide: CategoryService,
-                    getCategory: () => EMPTY
+                    useValue: {
+                        getCategory: () => EMPTY
+                    }
                 }
-            }]
+            ]
         });
 
         categoryService = TestBed.inject(CategoryService);
@@ -67,17 +70,19 @@ describe('SearchFacetFiltersService', () => {
         };
 
         const queries = [
-            { label: 'q1', filterQuery: 'query1', metrics: [{value: {count: 1}}] },
+            { label: 'q1', filterQuery: 'query1', metrics: [{ value: { count: 1 } }] },
-            { label: 'q2', filterQuery: 'query2', metrics: [{value: {count: 1}}] }
+            { label: 'q2', filterQuery: 'query2', metrics: [{ value: { count: 1 } }] }
         ];
         const data = {
             list: {
                 context: {
-                    facets: [{
+                    facets: [
-                        type: 'query',
+                        {
-                        label: 'label1',
+                            type: 'query',
-                        buckets: queries
+                            label: 'label1',
-                    }]
+                            buckets: queries
+                        }
+                    ]
                 }
             }
         };
@@ -104,19 +109,20 @@ describe('SearchFacetFiltersService', () => {
         };
 
         const queries = [
-            { label: 'q2', filterQuery: 'query2', metrics: [{value: {count: 1}}] },
+            { label: 'q2', filterQuery: 'query2', metrics: [{ value: { count: 1 } }] },
-            { label: 'q1', filterQuery: 'query1', metrics: [{value: {count: 1}}] },
+            { label: 'q1', filterQuery: 'query1', metrics: [{ value: { count: 1 } }] },
-            { label: 'q3', filterQuery: 'query3', metrics: [{value: {count: 1}}] }
+            { label: 'q3', filterQuery: 'query3', metrics: [{ value: { count: 1 } }] }
-
         ];
         const data = {
             list: {
                 context: {
-                    facets: [{
+                    facets: [
-                        type: 'query',
+                        {
-                        label: 'label1',
+                            type: 'query',
-                        buckets: queries
+                            label: 'label1',
-                    }]
+                            buckets: queries
+                        }
+                    ]
                 }
             }
         };
@@ -158,10 +164,12 @@ describe('SearchFacetFiltersService', () => {
 
         queryBuilder.config = {
             categories: [],
-            facetFields: { fields: [
+            facetFields: {
+                fields: [
                     { label: 'f1', field: 'f1', mincount: 0 },
                     { label: 'f2', field: 'f2', mincount: 0 }
-                ]},
+                ]
+            },
             facetQueries: {
                 queries: []
             }
@@ -189,9 +197,7 @@ describe('SearchFacetFiltersService', () => {
     it('should filter response facet fields based on search filter config method', () => {
         queryBuilder.config = {
             categories: [],
-            facetFields: { fields: [
+            facetFields: { fields: [{ label: 'f1', field: 'f1' }] },
-                    { label: 'f1', field: 'f1' }
-                ]},
             facetQueries: {
                 queries: []
             },
@@ -199,10 +205,13 @@ describe('SearchFacetFiltersService', () => {
         };
 
         const initialFields: any = [
-            { type: 'field', label: 'f1', buckets: [
+            {
-                    { label: 'firstLabel', display: 'firstLabel', metrics: [{value: {count: 5}}] },
+                type: 'field',
-                    { label: 'secondLabel', display: 'secondLabel', metrics: [{value: {count: 5}}] },
+                label: 'f1',
-                    { label: 'thirdLabel', display: 'thirdLabel', metrics: [{value: {count: 5}}] }
+                buckets: [
+                    { label: 'firstLabel', display: 'firstLabel', metrics: [{ value: { count: 5 } }] },
+                    { label: 'secondLabel', display: 'secondLabel', metrics: [{ value: { count: 5 } }] },
+                    { label: 'thirdLabel', display: 'thirdLabel', metrics: [{ value: { count: 5 } }] }
                 ]
             }
         ];
@@ -239,10 +248,12 @@ describe('SearchFacetFiltersService', () => {
 
         queryBuilder.config = {
             categories: [],
-            facetFields: { fields: [
+            facetFields: {
+                fields: [
                     { label: 'f1', field: 'f1' },
                     { label: 'f2', field: 'f2' }
-                ]},
+                ]
+            },
             facetQueries: {
                 queries: []
             }
@@ -253,8 +264,8 @@ describe('SearchFacetFiltersService', () => {
                 type: 'field',
                 label: 'f1',
                 buckets: [
-                    { label: 'b1', metrics: [{value: {count: 10}}] },
+                    { label: 'b1', metrics: [{ value: { count: 10 } }] },
-                    { label: 'b2', metrics: [{value: {count: 1}}] }
+                    { label: 'b2', metrics: [{ value: { count: 1 } }] }
                 ]
             },
             { type: 'field', label: 'f2', buckets: [] }
@@ -276,17 +287,28 @@ describe('SearchFacetFiltersService', () => {
     it('should fetch facet fields from response payload and update the existing bucket values', () => {
         queryBuilder.config = {
             categories: [],
-            facetFields: { fields: [
+            facetFields: {
+                fields: [
                     { label: 'f1', field: 'f1' },
                     { label: 'f2', field: 'f2' }
-                ]},
+                ]
+            },
             facetQueries: {
                 queries: []
             }
         };
 
         const initialFields: any = [
-            { type: 'field', label: 'f1', buckets: { items: [{ label: 'b1', count: 10, filterQuery: 'filter' }, { label: 'b2', count: 1 }]} },
+            {
+                type: 'field',
+                label: 'f1',
+                buckets: {
+                    items: [
+                        { label: 'b1', count: 10, filterQuery: 'filter' },
+                        { label: 'b2', count: 1 }
+                    ]
+                }
+            },
             { type: 'field', label: 'f2', buckets: [] }
         ];
         searchFacetFiltersService.responseFacets = initialFields;
@@ -294,9 +316,14 @@ describe('SearchFacetFiltersService', () => {
         expect(searchFacetFiltersService.responseFacets[0].buckets.items[1].count).toEqual(1);
 
         const serverResponseFields: any = [
-            { type: 'field', label: 'f1', buckets:
+            {
-                    [{ label: 'b1', metrics: [{value: {count: 6}}], filterQuery: 'filter' },
+                type: 'field',
-                        { label: 'b2', metrics: [{value: {count: 0}}] }] },
+                label: 'f1',
+                buckets: [
+                    { label: 'b1', metrics: [{ value: { count: 6 } }], filterQuery: 'filter' },
+                    { label: 'b2', metrics: [{ value: { count: 0 } }] }
+                ]
+            },
             { type: 'field', label: 'f2', buckets: [] }
         ];
         const data = {
@@ -321,21 +348,25 @@ describe('SearchFacetFiltersService', () => {
             facetQueries: { queries: [] }
         };
 
-        const firstCallFields: any = [{
+        const firstCallFields: any = [
-            type: 'field',
+            {
-            label: 'f1',
+                type: 'field',
-            buckets: [{ label: 'b1', metrics: [{value: {count: 10}}] }]
+                label: 'f1',
-        }];
+                buckets: [{ label: 'b1', metrics: [{ value: { count: 10 } }] }]
-        const firstCallData = { list: { context: { facets: firstCallFields }}};
+            }
+        ];
+        const firstCallData = { list: { context: { facets: firstCallFields } } };
         searchFacetFiltersService.onDataLoaded(firstCallData);
         expect(searchFacetFiltersService.responseFacets[0].buckets.items[0].count).toEqual(10);
 
-        const secondCallFields: any = [{
+        const secondCallFields: any = [
-            type: 'field',
+            {
-            label: 'f1',
+                type: 'field',
-            buckets: [{ label: 'b1', metrics: [{value: {count: 6}}] }]
+                label: 'f1',
-        }];
+                buckets: [{ label: 'b1', metrics: [{ value: { count: 6 } }] }]
-        const secondCallData = { list: { context: { facets: secondCallFields}}};
+            }
+        ];
+        const secondCallData = { list: { context: { facets: secondCallFields } } };
         searchFacetFiltersService.onDataLoaded(secondCallData);
         expect(searchFacetFiltersService.responseFacets[0].buckets.items[0].count).toEqual(6);
     });
@@ -346,25 +377,33 @@ describe('SearchFacetFiltersService', () => {
             categories: [],
             facetIntervals: {
                 intervals: [
-                    { label: 'test_intervals1', field: 'f1', sets: [
+                    {
-                            { label: 'interval1', start: 's1', end: 'e1'},
+                        label: 'test_intervals1',
-                            { label: 'interval2', start: 's2', end: 'e2'}
+                        field: 'f1',
-                        ]},
+                        sets: [
-                    { label: 'test_intervals2', field: 'f2', sets: [
+                            { label: 'interval1', start: 's1', end: 'e1' },
-                            { label: 'interval3', start: 's3', end: 'e3'},
+                            { label: 'interval2', start: 's2', end: 'e2' }
-                            { label: 'interval4', start: 's4', end: 'e4'}
+                        ]
-                        ]}
+                    },
+                    {
+                        label: 'test_intervals2',
+                        field: 'f2',
+                        sets: [
+                            { label: 'interval3', start: 's3', end: 'e3' },
+                            { label: 'interval4', start: 's4', end: 'e4' }
+                        ]
+                    }
                 ]
             }
         };
 
         const response1 = [
-            { label: 'interval1', filterQuery: 'query1', metrics: [{ value: { count: 1 }}]},
+            { label: 'interval1', filterQuery: 'query1', metrics: [{ value: { count: 1 } }] },
-            { label: 'interval2', filterQuery: 'query2', metrics: [{ value: { count: 2 }}]}
+            { label: 'interval2', filterQuery: 'query2', metrics: [{ value: { count: 2 } }] }
         ];
         const response2 = [
-            { label: 'interval3', filterQuery: 'query3', metrics: [{ value: { count: 3 }}]},
+            { label: 'interval3', filterQuery: 'query3', metrics: [{ value: { count: 3 } }] },
-            { label: 'interval4', filterQuery: 'query4', metrics: [{ value: { count: 4 }}]}
+            { label: 'interval4', filterQuery: 'query4', metrics: [{ value: { count: 4 } }] }
         ];
         const data = {
             list: {
@@ -390,25 +429,35 @@ describe('SearchFacetFiltersService', () => {
             categories: [],
             facetIntervals: {
                 intervals: [
-                    { label: 'test_intervals1', field: 'f1', mincount: 2, sets: [
+                    {
-                            { label: 'interval1', start: 's1', end: 'e1'},
+                        label: 'test_intervals1',
-                            { label: 'interval2', start: 's2', end: 'e2'}
+                        field: 'f1',
-                        ]},
+                        mincount: 2,
-                    { label: 'test_intervals2', field: 'f2', mincount: 5, sets: [
+                        sets: [
-                            { label: 'interval3', start: 's3', end: 'e3'},
+                            { label: 'interval1', start: 's1', end: 'e1' },
-                            { label: 'interval4', start: 's4', end: 'e4'}
+                            { label: 'interval2', start: 's2', end: 'e2' }
-                        ]}
+                        ]
+                    },
+                    {
+                        label: 'test_intervals2',
+                        field: 'f2',
+                        mincount: 5,
+                        sets: [
+                            { label: 'interval3', start: 's3', end: 'e3' },
+                            { label: 'interval4', start: 's4', end: 'e4' }
+                        ]
+                    }
                 ]
             }
         };
 
         const response1 = [
-            { label: 'interval1', filterQuery: 'query1', metrics: [{ value: { count: 1 }}]},
+            { label: 'interval1', filterQuery: 'query1', metrics: [{ value: { count: 1 } }] },
-            { label: 'interval2', filterQuery: 'query2', metrics: [{ value: { count: 2 }}]}
+            { label: 'interval2', filterQuery: 'query2', metrics: [{ value: { count: 2 } }] }
         ];
         const response2 = [
-            { label: 'interval3', filterQuery: 'query3', metrics: [{ value: { count: 3 }}]},
+            { label: 'interval3', filterQuery: 'query3', metrics: [{ value: { count: 3 } }] },
-            { label: 'interval4', filterQuery: 'query4', metrics: [{ value: { count: 4 }}]}
+            { label: 'interval4', filterQuery: 'query4', metrics: [{ value: { count: 4 } }] }
         ];
         const data = {
             list: {
@@ -443,14 +492,14 @@ describe('SearchFacetFiltersService', () => {
             },
             facetFields: {
                 fields: [
-                    { field: 'field1', label: 'Field 1', settings: { facetOrder: 200 }},
+                    { field: 'field1', label: 'Field 1', settings: { facetOrder: 200 } },
-                    { field: 'field2', label: 'Field 2', settings: { facetOrder: 400 }},
+                    { field: 'field2', label: 'Field 2', settings: { facetOrder: 400 } },
-                    { field: 'field3', label: 'Field 3', settings: { facetOrder: 500 }},
+                    { field: 'field3', label: 'Field 3', settings: { facetOrder: 500 } },
-                    { field: 'field4', label: 'Field 4', settings: { facetOrder: 100 }}
+                    { field: 'field4', label: 'Field 4', settings: { facetOrder: 100 } }
                 ]
             }
         };
-        const queryBucketsMock = [{ label: 'q1', filterQuery: 'query1', metrics: [{value: {count: 1} }] }];
+        const queryBucketsMock = [{ label: 'q1', filterQuery: 'query1', metrics: [{ value: { count: 1 } }] }];
         const fieldBucketsMock = [{ label: 'b1', metrics: [{ value: { count: 10 } }] }];
         const data = {
             list: {
@@ -467,20 +516,20 @@ describe('SearchFacetFiltersService', () => {
         };
 
         searchFacetFiltersService.onDataLoaded(data);
-        expect(searchFacetFiltersService.responseFacets.map(f => f.field)).toEqual(['field4', 'field1', 'Query 1', 'field2', 'field3']);
+        expect(searchFacetFiltersService.responseFacets.map((f) => f.field)).toEqual(['field4', 'field1', 'Query 1', 'field2', 'field3']);
     });
 
     it('should load category names for cm:categories facet', () => {
-        const entry = {id: 'test-id-test', name: 'name', path: '/categories/General/Test Category/Subcategory'};
+        const entry = { id: 'test-id-test', name: 'name', path: '/categories/General/Test Category/Subcategory' };
         searchFacetFiltersService.responseFacets = null;
-        spyOn(categoryService, 'getCategory').and.returnValue(of({entry}));
+        spyOn(categoryService, 'getCategory').and.returnValue(of({ entry }));
 
         queryBuilder.config = {
             categories: [],
             facetFields: {
                 fields: [
-                    {label: 'f1', field: 'f1', mincount: 0},
+                    { label: 'f1', field: 'f1', mincount: 0 },
-                    {label: 'categories', field: 'cm:categories', mincount: 0}
+                    { label: 'categories', field: 'cm:categories', mincount: 0 }
                 ]
             },
             facetQueries: {
@@ -489,12 +538,16 @@ describe('SearchFacetFiltersService', () => {
         };
 
         const fields: any = [
-            {type: 'field', label: 'f1', buckets: [{label: 'a1'}, {label: 'a2'}]},
+            { type: 'field', label: 'f1', buckets: [{ label: 'a1' }, { label: 'a2' }] },
             {
-                type: 'field', label: 'categories', buckets: [{
+                type: 'field',
-                    label: `workspace://SpacesStore/${entry.id}`,
+                label: 'categories',
-                    filterQuery: `cm:categories:"workspace://SpacesStore/${entry.id}"`
+                buckets: [
-                }]
+                    {
+                        label: `workspace://SpacesStore/${entry.id}`,
+                        filterQuery: `cm:categories:"workspace://SpacesStore/${entry.id}"`
+                    }
+                ]
             }
         ];
         const data = {
@@ -507,7 +560,7 @@ describe('SearchFacetFiltersService', () => {
 
         searchFacetFiltersService.onDataLoaded(data);
 
-        expect(categoryService.getCategory).toHaveBeenCalledWith(entry.id, { include: [ 'path' ]});
+        expect(categoryService.getCategory).toHaveBeenCalledWith(entry.id, { include: ['path'] });
         expect(searchFacetFiltersService.responseFacets[1].buckets.items[0].display).toBe(`Test Category/Subcategory/${entry.name}`);
         expect(searchFacetFiltersService.responseFacets[1].buckets.length).toEqual(1);
         expect(searchFacetFiltersService.responseFacets.length).toEqual(2);
@@ -517,10 +570,12 @@ describe('SearchFacetFiltersService', () => {
         searchFacetFiltersService.responseFacets = null;
         queryBuilder.config = {
             categories: [],
-            facetFields: { fields: [
+            facetFields: {
+                fields: [
                     { label: 'creator', field: 'creator' },
                     { label: 'modifier', field: 'modifier' }
-                ]},
+                ]
+            },
             facetQueries: {
                 queries: []
             }
@@ -531,16 +586,16 @@ describe('SearchFacetFiltersService', () => {
                 type: 'field',
                 label: 'creator',
                 buckets: [
-                    { label: 'b1', metrics: [{value: {count: 10}}] },
+                    { label: 'b1', metrics: [{ value: { count: 10 } }] },
-                    { label: 'b2', metrics: [{value: {count: 1}}] }
+                    { label: 'b2', metrics: [{ value: { count: 1 } }] }
                 ]
             },
             {
                 type: 'field',
                 label: 'modifier',
                 buckets: [
-                    { label: 'c1', metrics: [{value: {count: 10}}] },
+                    { label: 'c1', metrics: [{ value: { count: 10 } }] },
-                    { label: 'c2', metrics: [{value: {count: 1}}] }
+                    { label: 'c2', metrics: [{ value: { count: 1 } }] }
                 ]
             }
         ];
@@ -594,13 +649,17 @@ describe('SearchFacetFiltersService', () => {
                 facetQueries: { queries: [] },
                 facetFields: {
                     fields: [
-                        { field: 'field', label: 'Field', settings: { bucketSortBy: FacetBucketSortBy.LABEL, bucketSortDirection: FacetBucketSortDirection.DESCENDING }}
+                        {
+                            field: 'field',
+                            label: 'Field',
+                            settings: { bucketSortBy: FacetBucketSortBy.LABEL, bucketSortDirection: FacetBucketSortDirection.DESCENDING }
+                        }
                     ]
                 }
             };
             searchFacetFiltersService.onDataLoaded(data);
 
-            expect(searchFacetFiltersService.responseFacets[0].buckets.items.map(b => b.label)).toEqual(['xyzzy', 'qux', 'foo', 'baz', 'bar']);
+            expect(searchFacetFiltersService.responseFacets[0].buckets.items.map((b) => b.label)).toEqual(['xyzzy', 'qux', 'foo', 'baz', 'bar']);
         });
 
         it('should sort the buckets by count', () => {
@@ -609,13 +668,17 @@ describe('SearchFacetFiltersService', () => {
                 facetQueries: { queries: [] },
                 facetFields: {
                     fields: [
-                        { field: 'field', label: 'Field', settings: { bucketSortBy: FacetBucketSortBy.COUNT, bucketSortDirection: FacetBucketSortDirection.ASCENDING }}
+                        {
+                            field: 'field',
+                            label: 'Field',
+                            settings: { bucketSortBy: FacetBucketSortBy.COUNT, bucketSortDirection: FacetBucketSortDirection.ASCENDING }
+                        }
                     ]
                 }
             };
             searchFacetFiltersService.onDataLoaded(data);
 
-            expect(searchFacetFiltersService.responseFacets[0].buckets.items.map(b => b.label)).toEqual(['baz', 'foo', 'xyzzy', 'qux', 'bar']);
+            expect(searchFacetFiltersService.responseFacets[0].buckets.items.map((b) => b.label)).toEqual(['baz', 'foo', 'xyzzy', 'qux', 'bar']);
         });
     });
 });

lib/content-services/src/lib/search/services/search-header-query-builder.service.spec.ts

@@ -16,10 +16,11 @@
  */
 
 import { SearchConfiguration } from '../models/search-configuration.interface';
-import { AlfrescoApiService, AppConfigService } from '@alfresco/adf-core';
+import { AppConfigService } from '@alfresco/adf-core';
 import { SearchHeaderQueryBuilderService } from './search-header-query-builder.service';
 import { TestBed } from '@angular/core/testing';
 import { ContentTestingModule } from '../../testing/content.testing.module';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 
 describe('SearchHeaderQueryBuilderService', () => {
 

lib/content-services/src/lib/search/services/search-header-query-builder.service.ts

@@ -16,7 +16,7 @@
  */
 
 import { Injectable } from '@angular/core';
-import { AlfrescoApiService, AppConfigService, DataSorting } from '@alfresco/adf-core';
+import { AppConfigService, DataSorting } from '@alfresco/adf-core';
 import { SearchConfiguration } from '../models/search-configuration.interface';
 import { BaseQueryBuilderService } from './base-query-builder.service';
 import { SearchCategory } from '../models/search-category.interface';
@@ -26,6 +26,7 @@ import { Observable } from 'rxjs';
 import { SearchSortingDefinition } from '../models/search-sorting-definition.interface';
 import { FilterSearch } from '../models/filter-search.interface';
 import { NodesApiService } from '../../common/services/nodes-api.service';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 
 @Injectable({
     providedIn: 'root'

lib/content-services/src/lib/search/services/search-query-builder.service.spec.ts

@@ -17,7 +17,8 @@
 
 import { SearchQueryBuilderService } from './search-query-builder.service';
 import { SearchConfiguration } from '../models/search-configuration.interface';
-import { AlfrescoApiService, AppConfigService } from '@alfresco/adf-core';
+import { AppConfigService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { FacetField } from '../models/facet-field.interface';
 import { TestBed } from '@angular/core/testing';
 import { ContentTestingModule } from '../../testing/content.testing.module';

lib/content-services/src/lib/search/services/search-query-builder.service.ts

@@ -16,10 +16,11 @@
  */
 
 import { Inject, Injectable, Optional } from '@angular/core';
-import { AlfrescoApiService, AppConfigService } from '@alfresco/adf-core';
+import { AppConfigService } from '@alfresco/adf-core';
 import { SearchConfiguration } from '../models/search-configuration.interface';
 import { BaseQueryBuilderService } from './base-query-builder.service';
 import { ADF_SEARCH_CONFIGURATION } from '../search-configuration.token';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 
 @Injectable({ providedIn: 'root' })
 export class SearchQueryBuilderService extends BaseQueryBuilderService {

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

@@ -18,7 +18,7 @@
 import { inject, Injectable } from '@angular/core';
 import { NodePaging, QueriesApi, SearchRequest, ResultSetPaging, SearchApi } from '@alfresco/js-api';
 import { Observable, Subject, from } from 'rxjs';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { SearchConfigurationService } from './search-configuration.service';
 
 @Injectable({

lib/content-services/src/lib/security/services/security-controls-groups-marks-security.service.ts

@@ -32,8 +32,9 @@ import {
     NodeSecurityMarkBody,
     GsGroupInclude
 } from '@alfresco/js-api';
-import { AlfrescoApiService, UserPreferencesService } from '@alfresco/adf-core';
+import { UserPreferencesService } from '@alfresco/adf-core';
 import { finalize } from 'rxjs/operators';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 
 const DEFAULT_SKIP_COUNT = 0;
 const DEFAULT_INCLUDE = 'inUse';

lib/content-services/src/lib/services/alfresco-api.service.ts

@@ -17,12 +17,9 @@
 
 import { Inject, Injectable, InjectionToken, Optional } from '@angular/core';
 import { AlfrescoApi, AlfrescoApiConfig } from '@alfresco/js-api';
-import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
 import { ReplaySubject } from 'rxjs';
-import { OauthConfigModel } from '../auth/models/oauth-config.model';
-import { StorageService } from '../common/services/storage.service';
-import { OpenidConfiguration } from '../auth/interfaces/openid-configuration.interface';
 import { AlfrescoApiFactory } from './alfresco-api.interface';
+import { AppConfigService, AppConfigValues, OauthConfigModel, OpenidConfiguration, StorageService } from '@alfresco/adf-core';
 
 export const ALFRESCO_API_FACTORY = new InjectionToken('ALFRESCO_API_FACTORY');
 
@@ -30,7 +27,6 @@ export const ALFRESCO_API_FACTORY = new InjectionToken('ALFRESCO_API_FACTORY');
     providedIn: 'root'
 })
 export class AlfrescoApiService {
-
     alfrescoApiInitialized: ReplaySubject<boolean> = new ReplaySubject(1);
 
     protected alfrescoApi: AlfrescoApi;
@@ -50,14 +46,15 @@ export class AlfrescoApiService {
         protected appConfig: AppConfigService,
         protected storageService: StorageService,
         @Optional()
-        @Inject(ALFRESCO_API_FACTORY) private alfrescoApiFactory?: AlfrescoApiFactory
+        @Inject(ALFRESCO_API_FACTORY)
+        private alfrescoApiFactory?: AlfrescoApiFactory
     ) {}
 
     async load(config: AlfrescoApiConfig): Promise<void> {
         this.currentAppConfig = config;
 
         if (config.authType === 'OAUTH') {
-                await this.mapAlfrescoApiOpenIdConfig();
+            await this.mapAlfrescoApiOpenIdConfig();
         }
 
         this.initAlfrescoApiWithConfig();

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

@@ -0,0 +1,18 @@
+/*!
+ * @license
+ * Copyright © 2005-2024 Hyland Software, Inc. and its affiliates. All rights reserved.
+ *
+ * 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.
+ */
+
+export * from './public-api';

lib/content-services/src/lib/tag/services/tag.service.ts

@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { AlfrescoApiService, AppConfigService, UserPreferencesService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
+import { AppConfigService, UserPreferencesService } from '@alfresco/adf-core';
 import { EventEmitter, Injectable, Output } from '@angular/core';
 import { from, Observable } from 'rxjs';
 import { map, tap } from 'rxjs/operators';

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

@@ -20,10 +20,8 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import {
     CoreModule,
-    AlfrescoApiService,
     AppConfigService,
     CookieService,
-    AlfrescoApiServiceMock,
     AppConfigServiceMock,
     CookieServiceMock,
     AuthModule,
@@ -31,8 +29,10 @@ import {
 } from '@alfresco/adf-core';
 import { ContentModule } from '../content.module';
 import { versionCompatibilityFactory } from '../version-compatibility/version-compatibility-factory';
+import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { VersionCompatibilityService } from '../version-compatibility/version-compatibility.service';
 import { MatIconTestingModule } from '@angular/material/icon/testing';
+import { AlfrescoApiServiceMock } from '../mock';
 
 @NgModule({
     imports: [

lib/content-services/src/lib/version-manager/content-version.service.ts

@@ -16,7 +16,7 @@
  */
 
 import { Injectable } from '@angular/core';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { ContentApi } from '@alfresco/js-api';
 import { Observable, of } from 'rxjs';
 

lib/content-services/src/lib/version-manager/version-list.component.ts

@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { AlfrescoApiService, ConfirmDialogComponent } from '@alfresco/adf-core';
+import { ConfirmDialogComponent } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { Component, Input, OnChanges, ViewEncapsulation, EventEmitter, Output, OnInit, OnDestroy, ViewChild } from '@angular/core';
 import { VersionsApi, Node, VersionEntry, NodesApi, NodeEntry, ContentApi, ContentPagingQuery } from '@alfresco/js-api';
 import { MatDialog } from '@angular/material/dialog';

lib/content-services/src/lib/viewer/components/alfresco-viewer.component.spec.ts

@@ -23,8 +23,6 @@ import { AppExtensionService, ViewerExtensionRef } from '@alfresco/adf-extension
 import { ContentInfo, Node, NodeEntry, VersionEntry } from '@alfresco/js-api';
 import { AlfrescoViewerComponent, ContentService, NodeActionsService, RenditionService } from '@alfresco/adf-content-services';
 import {
-    AlfrescoApiService,
-    AlfrescoApiServiceMock,
     AuthModule,
     CloseButtonPosition,
     EventMock,
@@ -41,6 +39,8 @@ import { throwError } from 'rxjs';
 import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { ESCAPE } from '@angular/cdk/keycodes';
 import { By } from '@angular/platform-browser';
+import { AlfrescoApiService } from '../../services';
+import { AlfrescoApiServiceMock } from '../../mock';
 
 @Component({
     selector: 'adf-viewer-container-toolbar',

lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts

@@ -30,7 +30,6 @@ import {
     ViewEncapsulation
 } from '@angular/core';
 import {
-    AlfrescoApiService,
     CloseButtonPosition,
     Track,
     ViewerComponent,
@@ -42,6 +41,7 @@ import {
     ViewerToolbarComponent,
     ViewUtilService
 } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { Subject } from 'rxjs';
 import { ContentApi, Node, NodeEntry, NodesApi, RenditionEntry, SharedlinksApi, Version, VersionEntry, VersionsApi } from '@alfresco/js-api';
 import { RenditionService } from '../../common/services/rendition.service';

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

@@ -42,9 +42,13 @@ export * from './lib/tree/index';
 export * from './lib/category/index';
 export * from './lib/viewer/index';
 export * from './lib/security/index';
+export * from './lib/api-factories';
+export * from './lib/services/index';
 export * from './lib/infinite-scroll-datasource';
 export * from './lib/prediction/index';
 export * from './lib/legal-hold/index';
+export * from './lib/api-factories';
+export * from './lib/mock/alfresco-api.service.mock';
 
 export * from './lib/content.module';
 export * from './lib/material.module';

lib/core/index.ts

@@ -16,3 +16,4 @@
  */
 
 export * from './src/public-api';
+export * from './api/src/index';

lib/core/package.json

@@ -37,7 +37,8 @@
     "@alfresco/adf-extensions": ">=7.0.0-alpha.2-0",
     "@ngx-translate/core": ">=14.0.0",
     "minimatch-browser": ">=1.0.0",
-    "pdfjs-dist": ">=3.3.122"
+    "pdfjs-dist": ">=3.3.122",
+    "ts-morph": "^20.0.0"
   },
   "keywords": [
     "core",
@@ -45,5 +46,11 @@
     "angular",
     "components"
   ],
-  "license": "Apache-2.0"
+  "license": "Apache-2.0",
+  "ng-update": {
+    "migrations": "./schematics/migrations/collection.json"
+  },
+  "nx-migrations": {
+    "migrations": "./schematics/migrations/collection.json"
+  }
 }

lib/core/project.json

@@ -23,6 +23,16 @@
       },
       "defaultConfiguration": "production"
     },
+    "build-schematics": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          {
+            "command": "npx tsc -p lib/core/tsconfig.schematics.json && cp lib/core/schematics/migrations/collection.json dist/libs/core/schematics/migrations/collection.json"
+          }
+        ]
+      }
+    },
     "test": {
       "executor": "@angular-devkit/build-angular:karma",
       "options": {
@@ -133,7 +143,7 @@
     },
     "npm-publish": {
       "executor": "nx:run-commands",
-      "dependsOn": ["build", "pretheme"],
+      "dependsOn": ["build", "pretheme", "build-schematics"],
       "options": {
         "cwd": "dist/libs/core",
         "commands": [

lib/core/schematics/migrations/7_0_0/index.ts

@@ -0,0 +1,189 @@
+/*!
+ * @license
+ * Copyright © 2005-2024 Hyland Software, Inc. and its affiliates. All rights reserved.
+ *
+ * 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 { Rule, SchematicContext, SchematicsException, Tree } from '@angular-devkit/schematics';
+import { Project, NamedImports, SourceFile, ImportSpecifier, ImportDeclaration } from 'ts-morph';
+
+interface MigrationData {
+    change: {
+        importedValue: string;
+        importSource: string;
+    };
+    to: {
+        importedValue: string;
+        importSource: string;
+    };
+}
+
+const alfrescoApiServiceMigration: MigrationData = {
+    change: {
+        importedValue: 'AlfrescoApiService',
+        importSource: '@alfresco/adf-core'
+    },
+    to: {
+        importedValue: 'AlfrescoApiService',
+        importSource: '@alfresco/adf-content-services'
+    }
+};
+
+const alfrescoApiMockMigration: MigrationData = {
+    change: {
+        importedValue: 'AlfrescoApiServiceMock',
+        importSource: '@alfresco/adf-core'
+    },
+    to: {
+        importedValue: 'AlfrescoApiServiceMock',
+        importSource: '@alfresco/adf-content-services'
+    }
+};
+
+const alfrescoApiFactoryMigration: MigrationData = {
+    change: {
+        importedValue: 'AlfrescoApiFactory',
+        importSource: '@alfresco/adf-core'
+    },
+    to: {
+        importedValue: 'AlfrescoApiFactory',
+        importSource: '@alfresco/adf-content-services'
+    }
+};
+
+const migrations: MigrationData[] = [alfrescoApiServiceMigration, alfrescoApiMockMigration, alfrescoApiFactoryMigration];
+
+/**
+ * @returns Schematic rule for updating imports
+ */
+export function updateAlfrescoApiImports(): Rule {
+    const project = new Project();
+
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    return (tree: Tree, _context: SchematicContext) => {
+        tree.visit((filePath: string) => visitor(filePath, tree, project));
+
+        return tree;
+    };
+}
+
+export const visitor = (filePath: string, tree: Pick<Tree, 'read' | 'overwrite'>, project: Project) => {
+    if (
+        !filePath.includes('/.git/') &&
+        !filePath.includes('/node_modules/') &&
+        !filePath.includes('/.angular/') &&
+        !filePath.includes('/.nxcache/') &&
+        /\.ts$/.test(filePath)
+    ) {
+        const bufferFileContent = tree.read(filePath);
+
+        if (!bufferFileContent) {
+            throw new SchematicsException(`Could not read file: ${filePath}`);
+        }
+
+        migrations.forEach((migrationData) => {
+            const fileWithUpdatedImport = moveImport(filePath, bufferFileContent, project, migrationData);
+
+            if (fileWithUpdatedImport) {
+                tree.overwrite(filePath, fileWithUpdatedImport);
+            }
+        });
+    }
+};
+
+const moveImport = (filePath: string, bufferFileContent: Buffer, project: Project, migrationData: MigrationData): string | undefined => {
+    const fileContent = bufferFileContent.toString();
+    const predictImport = fileContent.includes(migrationData.change.importedValue);
+
+    if (predictImport) {
+        const sourceFile = project.getSourceFile(`migration-${filePath}`) ?? project.createSourceFile(`migration-${filePath}`, fileContent);
+
+        const alfrescoApiImportResult = getImportedValueFromSource(sourceFile, {
+            importedIdentifier: migrationData.change.importedValue,
+            from: migrationData.change.importSource
+        });
+
+        if (alfrescoApiImportResult?.importedValue) {
+            if (alfrescoApiImportResult.allImportedValuesCount === 1) {
+                // There is only one import e.g. import { A } from 'A';
+                // Therefore, we need to remove whole import statement
+                alfrescoApiImportResult.importSource?.remove();
+            } else {
+                alfrescoApiImportResult.importedValue?.remove();
+            }
+
+            const alfrescoContentServiceImport = getSourceImport(sourceFile, migrationData.to.importSource);
+
+            if (alfrescoContentServiceImport) {
+                alfrescoContentServiceImport.addNamedImport(migrationData.to.importedValue);
+            } else {
+                sourceFile.insertStatements(
+                    sourceFile.getImportDeclarations().length + 1,
+                    `import { ${migrationData.to.importedValue} } from '${migrationData.to.importSource}';`
+                );
+            }
+
+            return sourceFile.getFullText();
+        }
+    }
+
+    return undefined;
+};
+
+const getSourceImport = (sourceFile: SourceFile, from: string): ImportDeclaration | undefined => {
+    const moduleImports = sourceFile.getImportDeclarations();
+
+    const importDeclaration = moduleImports.find((moduleImport) => {
+        const currentImportSource = moduleImport.getModuleSpecifierValue();
+        return currentImportSource === from;
+    });
+
+    return importDeclaration;
+};
+
+const getImportedValueFromSource = (
+    sourceFile: SourceFile,
+    searchedImport: {
+        importedIdentifier: string;
+        from: string;
+    }
+): {
+    importedValue: ImportSpecifier | undefined;
+    importSource: ImportDeclaration | undefined;
+    allImportedValuesCount: number | undefined;
+} => {
+    const importSource = getSourceImport(sourceFile, searchedImport.from);
+
+    if (!importSource) {
+        return {
+            importedValue: undefined,
+            importSource: undefined,
+            allImportedValuesCount: undefined
+        };
+    }
+
+    const importedValues = importSource?.getImportClause();
+    const namedImports = importedValues?.getNamedBindings() as NamedImports;
+    const namedImportsElements = namedImports?.getElements() ?? [];
+
+    const importedValue = namedImportsElements.find((binding) => binding.getName() === searchedImport.importedIdentifier);
+
+    return {
+        importedValue,
+        importSource,
+        allImportedValuesCount: namedImportsElements.length
+    };
+};
+
+export default updateAlfrescoApiImports;

lib/core/schematics/migrations/collection.json

@@ -0,0 +1,46 @@
+{
+  "$schema": "../../../node_modules/@angular-devkit/schematics/collection-schema.json",
+  "schematics": {
+    "move-out-alfresco-api": {
+      "description": "Update alfresco-api imports",
+      "version": "7.0.0",
+      "factory": "./7_0_0/index#updateAlfrescoApiImports"
+    }
+  },
+  "packageJsonUpdates": {
+    "move-out-alfresco-api": {
+      "version": "7.0.0",
+      "packages": {
+        "ts-morph": {
+          "version": "^20.0.0",
+          "alwaysAddToPackageJson": true,
+          "addToPackageJson": "devDependencies"
+        },
+        "@alfresco/adf-content-services": {
+          "version": "7.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@alfresco/adf-extensions": {
+          "version": "7.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@alfresco/adf-process-services-cloud": {
+          "version": "7.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@alfresco/adf-process-services": {
+          "version": "7.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@alfresco/eslint-plugin-eslint-angular": {
+          "version": "7.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@alfresco/js-api": {
+          "version": "8.0.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    }
+  }
+}

lib/core/src/lib/app-config/app-config.service.ts

@@ -63,7 +63,6 @@ export enum Status {
     providedIn: 'root'
 })
 export class AppConfigService {
-
     config: any = {
         application: {
             name: 'Alfresco ADF Application'
@@ -97,11 +96,10 @@ export class AppConfigService {
      * @returns Property value, when loaded
      */
     select(property: string): Observable<any> {
-        return this.onLoadSubject
+        return this.onLoadSubject.pipe(
-            .pipe(
+            map((config) => ObjectUtils.getValue(config, property)),
-                map((config) => ObjectUtils.getValue(config, property)),
+            distinctUntilChanged()
-                distinctUntilChanged()
+        );
-            );
     }
 
     /**
@@ -170,9 +168,7 @@ export class AppConfigService {
     protected onDataLoaded() {
         this.onLoadSubject.next(this.config);
 
-        this.extensionService.setup$
+        this.extensionService.setup$.pipe(take(1)).subscribe((config) => this.onExtensionsLoaded(config));
-            .pipe(take(1))
-            .subscribe((config) => this.onExtensionsLoaded(config));
     }
 
     protected onExtensionsLoaded(config: ExtensionConfig) {
@@ -227,20 +223,18 @@ export class AppConfigService {
      * @param hostIdp host address
      * @returns Discovery configuration
      */
-     loadWellKnown(hostIdp: string): Promise<OpenidConfiguration> {
+    loadWellKnown(hostIdp: string): Promise<OpenidConfiguration> {
         return new Promise((resolve, reject) => {
-            this.http
+            this.http.get<OpenidConfiguration>(`${hostIdp}/.well-known/openid-configuration`).subscribe({
-                .get<OpenidConfiguration>(`${hostIdp}/.well-known/openid-configuration`)
+                next: (res: OpenidConfiguration) => {
-                .subscribe({
+                    resolve(res);
-                    next: (res: OpenidConfiguration) => {
+                },
-                        resolve(res);
+                error: (err: any) => {
-                    },
+                    // eslint-disable-next-line no-console
-                    error: (err: any) => {
+                    console.error('hostIdp not correctly configured or unreachable');
-                        // eslint-disable-next-line no-console
+                    reject(err);
-                        console.error('hostIdp not correctly configured or unreachable');
+                }
-                        reject(err);
+            });
-                    }
-                });
         });
     }
 
@@ -273,5 +267,4 @@ export class AppConfigService {
 
         return result;
     }
-
 }

lib/core/src/lib/auth/oidc/auth.module.ts

@@ -17,8 +17,6 @@
 
 import { APP_INITIALIZER, ModuleWithProviders, NgModule } from '@angular/core';
 import { AUTH_CONFIG, OAuthModule, OAuthStorage } from 'angular-oauth2-oidc';
-import { AlfrescoApiNoAuthService } from '../../api-factories/alfresco-api-no-auth.service';
-import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { AuthenticationService } from '../services/authentication.service';
 import { StorageService } from '../../common/services/storage.service';
 import { AuthModuleConfig, AUTH_MODULE_CONFIG } from './auth-config';
@@ -44,7 +42,6 @@ export function loginFactory(redirectService: RedirectAuthService): () => Promis
     providers: [
         { provide: OAuthStorage, useExisting: StorageService },
         { provide: AuthenticationService},
-        { provide: AlfrescoApiService, useClass: AlfrescoApiNoAuthService },
         {
             provide: AUTH_CONFIG,
             useFactory: authConfigFactory,

lib/core/src/lib/common/services/user-preferences.service.spec.ts

@@ -21,8 +21,6 @@ import { AppConfigService } from '../../app-config/app-config.service';
 import { StorageService } from '../../common/services/storage.service';
 import { UserPreferencesService, UserPreferenceValues } from '../../common/services/user-preferences.service';
 import { AppConfigServiceMock } from '../mock/app-config.service.mock';
-import { AlfrescoApiService } from '../../services/alfresco-api.service';
-import { AlfrescoApiServiceMock } from '../../mock';
 import { NoopTranslateModule } from '@alfresco/adf-core';
 
 describe('UserPreferencesService', () => {
@@ -30,14 +28,12 @@ describe('UserPreferencesService', () => {
     let preferences: UserPreferencesService;
     let storage: StorageService;
     let appConfig: AppConfigServiceMock;
-    let alfrescoApiService: AlfrescoApiServiceMock;
     let translate: TranslateService;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [NoopTranslateModule],
             providers: [
-                { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
                 { provide: AppConfigService, useClass: AppConfigServiceMock }
             ]
         });
@@ -53,7 +49,6 @@ describe('UserPreferencesService', () => {
         storage = TestBed.inject(StorageService);
         storage.clear();
         translate = TestBed.inject(TranslateService);
-        alfrescoApiService = TestBed.inject(AlfrescoApiService) as AlfrescoApiServiceMock;
     });
 
     afterEach(() => {
@@ -103,7 +98,7 @@ describe('UserPreferencesService', () => {
         });
 
         it('should null value return default prefix', () => {
-            storage.setItem('paginationSize', null);
+            storage.setItem('paginationSize', '');
             const paginationSize = preferences.getPropertyKey('paginationSize');
             expect(preferences.get(paginationSize, 'default')).toBe('default');
         });
@@ -172,7 +167,7 @@ describe('UserPreferencesService', () => {
                 }
             ];
             appConfig.config.locale = 'fake-locale-config';
-            alfrescoApiService.initialize();
+            appConfig.load();
             const textOrientation = preferences.getPropertyKey('textOrientation');
             expect(storage.getItem(textOrientation)).toBe('ltr');
         });
@@ -185,7 +180,7 @@ describe('UserPreferencesService', () => {
                 }
             ];
             appConfig.config.locale = 'fake-locale-config';
-            alfrescoApiService.initialize();
+            appConfig.load();
             const textOrientation = preferences.getPropertyKey('textOrientation');
             expect(storage.getItem(textOrientation)).toBe('rtl');
         });
@@ -196,7 +191,6 @@ describe('UserPreferencesService', () => {
                     key: 'fake-locale-browser'
                 }
             ];
-            alfrescoApiService.initialize();
 
             const textOrientation = preferences.getPropertyKey('textOrientation');
             expect(storage.getItem(textOrientation)).toBe(null);
@@ -210,7 +204,7 @@ describe('UserPreferencesService', () => {
                 }
             ];
             spyOn(translate, 'getBrowserCultureLang').and.returnValue('fake-locale-browser');
-            alfrescoApiService.initialize();
+            appConfig.load();
 
             let lastValue;