[AAE-22098] Update AlfrescoApiService imports (#4015)

* [AAE-22098] Update AlfrescoApiService imports * [link-adf:dev-eromano-AAE-12502] Link ADF * [link-adf:dev-eromano-AAE-12502] Link ADF * [AAE-22098] Use proper ADF version * fix tests * fix tests v2 * fix yet another BC * Use latest ADF * use published ADF --------- Co-authored-by: Bartosz Sekula <Bartosz.Sekula@hyland.com>
2026-09-09 18:02:54 +00:00 · 2024-09-06 19:31:28 +02:00
parent 3a2d870db1
commit 796a3c7861
50 changed files with 255 additions and 112 deletions
@@ -48,6 +48,7 @@ import { HarnessLoader } from '@angular/cdk/testing';
 import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { MatProgressBarHarness } from '@angular/material/progress-bar/testing';
 import { MatSlideToggleHarness } from '@angular/material/slide-toggle/testing';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';

 describe('ManageRulesSmartComponent', () => {
  let fixture: ComponentFixture<ManageRulesSmartComponent>;
@@ -71,6 +72,7 @@ describe('ManageRulesSmartComponent', () => {
            toggleAppNavBar$: new Subject()
          }
        },
+        { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
        { provide: Store, useValue: { dispatch: () => {} } },
        { provide: ActivatedRoute, useValue: { params: of({ nodeId: owningFolderIdMock }) } }
      ]
@@ -28,6 +28,7 @@ import { RuleActionListUiComponent } from './rule-action-list.ui-component';
 import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
 import { RuleActionUiComponent } from './rule-action.ui-component';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';

 describe('RuleActionListUiComponent', () => {
  let fixture: ComponentFixture<RuleActionListUiComponent>;
@@ -38,7 +39,8 @@ describe('RuleActionListUiComponent', () => {

  beforeEach(() => {
    TestBed.configureTestingModule({
-      imports: [CoreTestingModule]
+      imports: [CoreTestingModule],
+      providers: [{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
    });

    fixture = TestBed.createComponent(RuleActionListUiComponent);
@@ -34,7 +34,7 @@ import {
 import { By } from '@angular/platform-browser';
 import { dummyCategoriesConstraints, dummyConstraints, dummyTagsConstraints } from '../../mock/action-parameter-constraints.mock';
 import { securityMarksResponseMock, updateNotificationMock } from '../../mock/security-marks.mock';
-import { CategoryService, NodeAction, TagService } from '@alfresco/adf-content-services';
+import { AlfrescoApiService, AlfrescoApiServiceMock, CategoryService, NodeAction, TagService } from '@alfresco/adf-content-services';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { HarnessLoader } from '@angular/cdk/testing';
 import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
@@ -63,7 +63,8 @@ describe('RuleActionUiComponent', () => {

  beforeEach(() => {
    TestBed.configureTestingModule({
-      imports: [CoreTestingModule, RuleActionUiComponent]
+      imports: [CoreTestingModule, RuleActionUiComponent],
+      providers: [{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
    });

    fixture = TestBed.createComponent(RuleActionUiComponent);
@@ -33,13 +33,15 @@ import {
  compositeConditionWithThreeConditionMock
 } from '../../mock/conditions.mock';
 import { RuleSimpleConditionUiComponent } from './rule-simple-condition.ui-component';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';

 describe('RuleCompositeConditionUiComponent', () => {
  let fixture: ComponentFixture<RuleCompositeConditionUiComponent>;

  beforeEach(() => {
    TestBed.configureTestingModule({
-      imports: [CoreTestingModule, RuleCompositeConditionUiComponent, RuleSimpleConditionUiComponent]
+      imports: [CoreTestingModule, RuleCompositeConditionUiComponent, RuleSimpleConditionUiComponent],
+      providers: [{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
    });

    fixture = TestBed.createComponent(RuleCompositeConditionUiComponent);
@@ -28,7 +28,7 @@ import { CoreTestingModule } from '@alfresco/adf-core';
 import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
 import { tagMock, mimeTypeMock, simpleConditionUnknownFieldMock, categoriesListMock } from '../../mock/conditions.mock';
-import { CategoryService, TagService } from '@alfresco/adf-content-services';
+import { AlfrescoApiService, AlfrescoApiServiceMock, CategoryService, TagService } from '@alfresco/adf-content-services';
 import { of } from 'rxjs';
 import { RuleSimpleCondition } from '../../model/rule-simple-condition.model';
 import { delay } from 'rxjs/operators';
@@ -83,7 +83,8 @@ describe('RuleSimpleConditionUiComponent', () => {

  beforeEach(() => {
    TestBed.configureTestingModule({
-      imports: [CoreTestingModule, RuleSimpleConditionUiComponent]
+      imports: [CoreTestingModule, RuleSimpleConditionUiComponent],
+      providers: [{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
    });

    fixture = TestBed.createComponent(RuleSimpleConditionUiComponent);
@@ -29,6 +29,7 @@ import { RuleDetailsUiComponent } from './rule-details.ui-component';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { CoreTestingModule } from '@alfresco/adf-core';
 import { of, timer } from 'rxjs';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';

 describe('EditRuleDialogSmartComponent', () => {
  let fixture: ComponentFixture<EditRuleDialogUiComponent>;
@@ -43,7 +44,8 @@ describe('EditRuleDialogSmartComponent', () => {
      imports: [CoreTestingModule, EditRuleDialogUiComponent],
      providers: [
        { provide: MatDialogRef, useValue: dialogRef },
-        { provide: MAT_DIALOG_DATA, useValue: dialogOptions }
+        { provide: MAT_DIALOG_DATA, useValue: dialogOptions },
+        { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }
      ]
    });

@@ -33,6 +33,7 @@ import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field';
 import { HarnessLoader } from '@angular/cdk/testing';
 import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { MatSelectHarness } from '@angular/material/select/testing';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';

 describe('RuleOptionsUiComponent', () => {
  let fixture: ComponentFixture<RuleOptionsUiComponent>;
@@ -62,7 +63,16 @@ describe('RuleOptionsUiComponent', () => {
    TestBed.configureTestingModule({
      schemas: [CUSTOM_ELEMENTS_SCHEMA],
      imports: [FormsModule, ReactiveFormsModule, CoreTestingModule, RuleOptionsUiComponent],
-      providers: [{ provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: { floatLabel: 'auto' } }]
+      providers: [
+        {
+          provide: MAT_FORM_FIELD_DEFAULT_OPTIONS,
+          useValue: { floatLabel: 'auto' }
+        },
+        {
+          provide: AlfrescoApiService,
+          useClass: AlfrescoApiServiceMock
+        }
+      ]
    });

    fixture = TestBed.createComponent(RuleOptionsUiComponent);
@@ -30,7 +30,7 @@ import { By } from '@angular/platform-browser';
 import { RuleTriggersUiComponent } from './triggers/rule-triggers.ui-component';
 import { RuleOptionsUiComponent } from './options/rule-options.ui-component';
 import { RuleActionListUiComponent } from './actions/rule-action-list.ui-component';
-import { CategoryService } from '@alfresco/adf-content-services';
+import { AlfrescoApiService, AlfrescoApiServiceMock, CategoryService } from '@alfresco/adf-content-services';

 describe('RuleDetailsUiComponent', () => {
  let fixture: ComponentFixture<RuleDetailsUiComponent>;
@@ -55,7 +55,8 @@ describe('RuleDetailsUiComponent', () => {

  beforeEach(() => {
    TestBed.configureTestingModule({
-      imports: [CoreTestingModule, RuleDetailsUiComponent]
+      imports: [CoreTestingModule, RuleDetailsUiComponent],
+      providers: [{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
    });

    fixture = TestBed.createComponent(RuleDetailsUiComponent);
@@ -27,6 +27,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { CoreTestingModule } from '@alfresco/adf-core';
 import { DebugElement } from '@angular/core';
 import { By } from '@angular/platform-browser';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';

 describe('RuleTriggerUiComponent', () => {
  let fixture: ComponentFixture<RuleTriggersUiComponent>;
@@ -41,7 +42,8 @@ describe('RuleTriggerUiComponent', () => {

  beforeEach(() => {
    TestBed.configureTestingModule({
-      imports: [CoreTestingModule, RuleTriggersUiComponent]
+      imports: [CoreTestingModule, RuleTriggersUiComponent],
+      providers: [{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
    });

    fixture = TestBed.createComponent(RuleTriggersUiComponent);
@@ -30,6 +30,7 @@ import { DebugElement } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { owningFolderIdMock } from '../../mock/node.mock';
 import { of } from 'rxjs';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';

 describe('RuleListUiComponent', () => {
  let fixture: ComponentFixture<RuleListUiComponent>;
@@ -38,7 +39,8 @@ describe('RuleListUiComponent', () => {

  beforeEach(() => {
    TestBed.configureTestingModule({
-      imports: [CoreTestingModule, RuleListUiComponent]
+      imports: [CoreTestingModule, RuleListUiComponent],
+      providers: [{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
    });

    fixture = TestBed.createComponent(RuleListUiComponent);
@@ -32,6 +32,7 @@ import { of } from 'rxjs';
 import { ownedRuleSetMock, ruleSetWithLinkMock, ruleSetWithNoRulesToLinkMock, ruleSetWithOwnedRulesToLinkMock } from '../mock/rule-sets.mock';
 import { ContentApiService } from '@alfresco/aca-shared';
 import { By } from '@angular/platform-browser';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';

 describe('RuleSetPickerSmartComponent', () => {
  let fixture: ComponentFixture<RuleSetPickerSmartComponent>;
@@ -55,6 +56,7 @@ describe('RuleSetPickerSmartComponent', () => {
    TestBed.configureTestingModule({
      imports: [CoreTestingModule, RuleSetPickerSmartComponent],
      providers: [
+        { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
        { provide: MatDialogRef, useValue: dialogRef },
        { provide: MAT_DIALOG_DATA, useValue: dialogOptions },
        {
@@ -30,6 +30,7 @@ import { actionDefListMock, actionsTransformedListMock } from '../mock/actions.m
 import { take } from 'rxjs/operators';
 import { dummyConstraints, rawConstraints } from '../mock/action-parameter-constraints.mock';
 import { of } from 'rxjs';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';

 describe('ActionsService', () => {
  let actionsService: ActionsService;
@@ -37,7 +38,7 @@ describe('ActionsService', () => {
  beforeEach(() => {
    TestBed.configureTestingModule({
      imports: [CoreTestingModule],
-      providers: [ActionsService]
+      providers: [ActionsService, { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
    });

    actionsService = TestBed.inject(ActionsService);
@@ -24,7 +24,7 @@

 import { Injectable } from '@angular/core';
 import { ActionDefinition, ActionDefinitionEntry, ActionDefinitionList, ActionsApi } from '@alfresco/js-api';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { BehaviorSubject, forkJoin, from, Observable, of } from 'rxjs';
 import { finalize, map, switchMap } from 'rxjs/operators';
 import { ActionDefinitionTransformed, ActionParameterDefinitionTransformed } from '../model/rule-action.model';
@@ -32,6 +32,7 @@ import { of } from 'rxjs';
 import { getDefaultRuleSetResponseMock, getRuleSetsResponseMock, inheritedRuleSetMock, ownedRuleSetMock } from '../mock/rule-sets.mock';
 import { take } from 'rxjs/operators';
 import { inheritedRulesMock, linkedRulesMock, ownedRulesMock, ruleMock } from '../mock/rules.mock';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';

 describe('FolderRuleSetsService', () => {
  let folderRuleSetsService: FolderRuleSetsService;
@@ -45,7 +46,7 @@ describe('FolderRuleSetsService', () => {
  beforeEach(() => {
    TestBed.configureTestingModule({
      imports: [CoreTestingModule],
-      providers: [FolderRuleSetsService, FolderRulesService, ContentApiService]
+      providers: [FolderRuleSetsService, FolderRulesService, ContentApiService, { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
    });

    folderRuleSetsService = TestBed.inject(FolderRuleSetsService);
@@ -23,7 +23,7 @@
 */

 import { Injectable } from '@angular/core';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { BehaviorSubject, combineLatest, from, Observable, of } from 'rxjs';
 import { NodeInfo } from '@alfresco/aca-shared/store';
 import { catchError, finalize, map, switchMap, tap } from 'rxjs/operators';
@@ -38,6 +38,7 @@ import {
 import { ruleSetMock } from '../mock/rule-sets.mock';
 import { owningFolderIdMock } from '../mock/node.mock';
 import { take } from 'rxjs/operators';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';

 describe('FolderRulesService', () => {
  let folderRulesService: FolderRulesService;
@@ -56,7 +57,7 @@ describe('FolderRulesService', () => {
  beforeEach(() => {
    TestBed.configureTestingModule({
      imports: [CoreTestingModule],
-      providers: [FolderRulesService]
+      providers: [FolderRulesService, { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
    });

    folderRulesService = TestBed.inject<FolderRulesService>(FolderRulesService);
@@ -23,7 +23,7 @@
 */

 import { Injectable } from '@angular/core';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { BehaviorSubject, from, Observable } from 'rxjs';
 import { finalize, map } from 'rxjs/operators';
 import { Rule, RuleForForm, RuleOptions, RuleSettings } from '../model/rule.model';
@@ -37,6 +37,7 @@ import { AuthenticationService, CORE_PIPES, PageTitleService } from '@alfresco/a
 import { BreadcrumbComponent, ContentService, SearchQueryBuilderService } from '@alfresco/adf-content-services';
 import { By } from '@angular/platform-browser';
 import { ContentActionRef } from '@alfresco/adf-extensions';
+import { MatSnackBarModule } from '@angular/material/snack-bar';

 describe('DetailsComponent', () => {
  let component: DetailsComponent;
@@ -63,7 +64,7 @@ describe('DetailsComponent', () => {

  beforeEach(() => {
    TestBed.configureTestingModule({
-      imports: [AppTestingModule, DetailsComponent, ...CORE_PIPES],
+      imports: [AppTestingModule, DetailsComponent, ...CORE_PIPES, MatSnackBarModule],
      providers: [
        RouterTestingModule,
        SearchQueryBuilderService,
@@ -24,7 +24,8 @@

 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
-import { AlfrescoApiService, UserPreferencesService } from '@alfresco/adf-core';
+import { UserPreferencesService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { FavoriteLibrariesComponent } from './favorite-libraries.component';
 import { AppTestingModule } from '../../testing/app-testing.module';
 import { AppHookService, ContentApiService } from '@alfresco/aca-shared';
@@ -34,6 +35,7 @@ import { of, throwError } from 'rxjs';
 import { LibraryEffects } from '../../store/effects';
 import { NodeEntry } from '@alfresco/js-api';
 import { getTitleElementText } from '../../testing/test-utils';
+import { MatSnackBarModule } from '@angular/material/snack-bar';

 describe('FavoriteLibrariesComponent', () => {
  let fixture: ComponentFixture<FavoriteLibrariesComponent>;
@@ -56,7 +58,7 @@ describe('FavoriteLibrariesComponent', () => {

  beforeEach(() => {
    TestBed.configureTestingModule({
-      imports: [AppTestingModule, EffectsModule.forRoot([RouterEffects, LibraryEffects]), FavoriteLibrariesComponent]
+      imports: [AppTestingModule, EffectsModule.forRoot([RouterEffects, LibraryEffects]), FavoriteLibrariesComponent, MatSnackBarModule]
    });

    fixture = TestBed.createComponent(FavoriteLibrariesComponent);
@@ -30,6 +30,7 @@ import { FavoritesComponent } from './favorites.component';
 import { AppTestingModule } from '../../testing/app-testing.module';
 import { AppService, ContentApiService } from '@alfresco/aca-shared';
 import { getTitleElementText } from '../../testing/test-utils';
+import { MatSnackBarModule } from '@angular/material/snack-bar';

 describe('FavoritesComponent', () => {
  let fixture: ComponentFixture<FavoritesComponent>;
@@ -40,7 +41,7 @@ describe('FavoritesComponent', () => {

  beforeEach(() => {
    TestBed.configureTestingModule({
-      imports: [AppTestingModule, FavoritesComponent],
+      imports: [AppTestingModule, FavoritesComponent, MatSnackBarModule],
      providers: [
        {
          provide: AppService,
@@ -34,6 +34,7 @@ import { of, Subject, throwError } from 'rxjs';
 import { By } from '@angular/platform-browser';
 import { NodeEntry, NodePaging, Node, PathElement } from '@alfresco/js-api';
 import { DocumentListPresetRef } from '@alfresco/adf-extensions';
+import { MatSnackBarModule } from '@angular/material/snack-bar';

 describe('FilesComponent', () => {
  let node;
@@ -66,7 +67,7 @@ describe('FilesComponent', () => {

  beforeEach(() => {
    TestBed.configureTestingModule({
-      imports: [AppTestingModule, FilesComponent],
+      imports: [AppTestingModule, FilesComponent, MatSnackBarModule],
      providers: [
        {
          provide: Router,
@@ -46,7 +46,7 @@ import {
  isAdmin
 } from '@alfresco/aca-shared/store';
 import { debounceTime, filter, mergeMap, takeUntil } from 'rxjs/operators';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { Observable, from, Subject } from 'rxjs';
 import { ErrorStateMatcher, MatOptionModule } from '@angular/material/core';
 import { CommonModule } from '@angular/common';
@@ -34,6 +34,7 @@ import { Actions } from '@ngrx/effects';
 import { of, Subject } from 'rxjs';
 import { ContentActionType } from '@alfresco/adf-extensions';
 import { CategoryService, ContentMetadataComponent, ContentMetadataService, TagService } from '@alfresco/adf-content-services';
+import { MatDialogModule } from '@angular/material/dialog';

 describe('MetadataTabComponent', () => {
  let fixture: ComponentFixture<MetadataTabComponent>;
@@ -54,7 +55,7 @@ describe('MetadataTabComponent', () => {
  beforeEach(() => {
    actions$ = new Subject<EditOfflineAction>();
    TestBed.configureTestingModule({
-      imports: [AppTestingModule, MetadataTabComponent, PipeModule],
+      imports: [AppTestingModule, MetadataTabComponent, PipeModule, MatDialogModule],
      providers: [
        {
          provide: Actions,
@@ -24,13 +24,14 @@

 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { Router } from '@angular/router';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { LibrariesComponent } from './libraries.component';
 import { AppTestingModule } from '../../testing/app-testing.module';
 import { EffectsModule } from '@ngrx/effects';
 import { LibraryEffects } from '../../store/effects';
 import { ContentApiService } from '@alfresco/aca-shared';
 import { getTitleElementText } from '../../testing/test-utils';
+import { MatSnackBarModule } from '@angular/material/snack-bar';

 describe('LibrariesComponent', () => {
  let fixture: ComponentFixture<LibrariesComponent>;
@@ -51,7 +52,7 @@ describe('LibrariesComponent', () => {

  beforeEach(() => {
    TestBed.configureTestingModule({
-      imports: [AppTestingModule, EffectsModule.forRoot([LibraryEffects]), LibrariesComponent]
+      imports: [AppTestingModule, EffectsModule.forRoot([LibraryEffects]), LibrariesComponent, MatSnackBarModule]
    });

    fixture = TestBed.createComponent(LibrariesComponent);
@@ -30,6 +30,7 @@ import { Router } from '@angular/router';
 import { NodePaging, SearchApi } from '@alfresco/js-api';
 import { of } from 'rxjs';
 import { getTitleElementText } from '../../testing/test-utils';
+import { MatSnackBarModule } from '@angular/material/snack-bar';

 describe('RecentFilesComponent', () => {
  let fixture: ComponentFixture<RecentFilesComponent>;
@@ -39,7 +40,7 @@ describe('RecentFilesComponent', () => {
    const searchApi = jasmine.createSpyObj('SearchApi', ['search']);

    const testBed = TestBed.configureTestingModule({
-      imports: [AppTestingModule, RecentFilesComponent],
+      imports: [AppTestingModule, RecentFilesComponent, MatSnackBarModule],
      providers: [{ provide: SearchApi, useValue: searchApi }]
    });

@@ -24,7 +24,7 @@

 import { TestBed } from '@angular/core/testing';
 import { AppTestingModule } from '../../../testing/app-testing.module';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { SearchLibrariesQueryBuilderService, LibrarySearchQuery } from './search-libraries-query-builder.service';

 describe('SearchLibrariesQueryBuilderService', () => {
@@ -22,7 +22,7 @@
 * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
 */

-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { Injectable } from '@angular/core';
 import { QueriesApi, SitePaging } from '@alfresco/js-api';
 import { Subject } from 'rxjs';
@@ -29,6 +29,7 @@ import { SearchLibrariesResultsComponent } from './search-libraries-results.comp
 import { SearchLibrariesQueryBuilderService } from './search-libraries-query-builder.service';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { AppService } from '@alfresco/aca-shared';
+import { MatSnackBarModule } from '@angular/material/snack-bar';

 describe('SearchLibrariesResultsComponent', () => {
  let component: SearchLibrariesResultsComponent;
@@ -44,7 +45,7 @@ describe('SearchLibrariesResultsComponent', () => {
  beforeEach(() => {
    appServiceMock.setAppNavbarMode.calls.reset();
    TestBed.configureTestingModule({
-      imports: [AppTestingModule, SearchLibrariesResultsComponent],
+      imports: [AppTestingModule, SearchLibrariesResultsComponent, MatSnackBarModule],
      schemas: [NO_ERRORS_SCHEMA],
      providers: [
        {
@@ -33,6 +33,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { AppTestingModule } from '../../../testing/app-testing.module';
 import { AppService } from '@alfresco/aca-shared';
+import { MatSnackBarModule } from '@angular/material/snack-bar';

 describe('SearchComponent', () => {
  let component: SearchResultsComponent;
@@ -49,7 +50,7 @@ describe('SearchComponent', () => {
  beforeEach(() => {
    params = new BehaviorSubject({ q: 'TYPE: "cm:folder" AND %28=cm: name: email OR cm: name: budget%29' });
    TestBed.configureTestingModule({
-      imports: [AppTestingModule, SearchResultsComponent],
+      imports: [AppTestingModule, SearchResultsComponent, MatSnackBarModule],
      providers: [
        {
          provide: AppService,
@@ -32,6 +32,7 @@ import { SharedLinkPaging } from '@alfresco/js-api';
 import { AppService } from '@alfresco/aca-shared';
 import { getTitleElementText } from '../../testing/test-utils';
 import { ActivatedRoute, Router } from '@angular/router';
+import { MatSnackBarModule } from '@angular/material/snack-bar';

 describe('SharedFilesComponent', () => {
  let fixture: ComponentFixture<SharedFilesComponent>;
@@ -56,7 +57,7 @@ describe('SharedFilesComponent', () => {

  beforeEach(() => {
    TestBed.configureTestingModule({
-      imports: [AppTestingModule, SharedFilesComponent],
+      imports: [AppTestingModule, SharedFilesComponent, MatSnackBarModule],
      providers: [
        { provide: ActivatedRoute, useValue: route },
        {
@@ -23,7 +23,7 @@
 */

 import { AppStore, SetSelectedNodesAction } from '@alfresco/aca-shared/store';
-import { AlfrescoApiService, ViewerModule } from '@alfresco/adf-core';
+import { ViewerModule } from '@alfresco/adf-core';
 import { ContentActionRef } from '@alfresco/adf-extensions';
 import { SharedLinkEntry, SharedlinksApi } from '@alfresco/js-api';
 import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
@@ -33,7 +33,7 @@ import { forkJoin, from, of, Subject } from 'rxjs';
 import { catchError, mergeMap, takeUntil } from 'rxjs/operators';
 import { AppExtensionService, AppService, ToolbarComponent } from '@alfresco/aca-shared';
 import { CommonModule } from '@angular/common';
-import { AlfrescoViewerModule } from '@alfresco/adf-content-services';
+import { AlfrescoApiService, AlfrescoViewerModule } from '@alfresco/adf-content-services';

@Component({
  standalone: true,
@@ -27,7 +27,8 @@ import { NodeEntry, SharedLinkEntry, Node, NodesApi } from '@alfresco/js-api';
 import { Component, inject, OnInit, ViewEncapsulation } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { AppExtensionService, isLocked } from '@alfresco/aca-shared';
-import { AlfrescoApiService, NotificationService } from '@alfresco/adf-core';
+import { NotificationService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { CommonModule } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
 import { MatMenuModule } from '@angular/material/menu';
@@ -23,10 +23,11 @@
 */

 import { TestBed, ComponentFixture } from '@angular/core/testing';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { TrashcanComponent } from './trashcan.component';
 import { AppTestingModule } from '../../testing/app-testing.module';
 import { getTitleElementText } from '../../testing/test-utils';
+import { MatSnackBarModule } from '@angular/material/snack-bar';

 describe('TrashcanComponent', () => {
  let fixture: ComponentFixture<TrashcanComponent>;
@@ -35,7 +36,7 @@ describe('TrashcanComponent', () => {

  beforeEach(() => {
    TestBed.configureTestingModule({
-      imports: [AppTestingModule, TrashcanComponent]
+      imports: [AppTestingModule, TrashcanComponent, MatSnackBarModule]
    });

    fixture = TestBed.createComponent(TrashcanComponent);
@@ -22,7 +22,7 @@
 * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
 */

-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { PeopleApi, Person } from '@alfresco/js-api';
 import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
 import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
@@ -29,8 +29,7 @@ import { take, map, catchError, mergeMap } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 import { ContentApiService } from '@alfresco/aca-shared';
 import { DirectAccessUrlEntry } from '@alfresco/js-api';
-import { ContentVersionService } from '@alfresco/adf-content-services';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService, ContentVersionService } from '@alfresco/adf-content-services';

@Injectable({ providedIn: 'root' })
 export class ContentUrlService extends ContentVersionService {
@@ -25,8 +25,8 @@
 import { TestBed } from '@angular/core/testing';
 import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { of, throwError, Subject, Observable } from 'rxjs';
-import { AlfrescoApiService, TranslationService } from '@alfresco/adf-core';
-import { DocumentListService, NodeAction } from '@alfresco/adf-content-services';
+import { TranslationService } from '@alfresco/adf-core';
+import { AlfrescoApiService, DocumentListService, NodeAction } from '@alfresco/adf-content-services';
 import { NodeActionsService } from './node-actions.service';
 import { Node, NodeChildAssociationEntry, NodeEntry } from '@alfresco/js-api';
 import { AppTestingModule } from '../testing/app-testing.module';
@@ -25,8 +25,9 @@
 import { Injectable } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Observable, Subject, of, zip, from } from 'rxjs';
-import { AlfrescoApiService, ThumbnailService, TranslationService } from '@alfresco/adf-core';
+import { ThumbnailService, TranslationService } from '@alfresco/adf-core';
 import {
+  AlfrescoApiService,
  DocumentListService,
  ContentNodeSelectorComponent,
  ContentNodeSelectorComponentData,
@@ -27,9 +27,15 @@ import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { CreateFromTemplateDialogComponent } from '../dialogs/node-template/create-from-template.dialog';
 import { Subject, from, of } from 'rxjs';
 import { Node, ResultNode, PathElement, SearchApi } from '@alfresco/js-api';
-import { AlfrescoApiService, TranslationService, NotificationService } from '@alfresco/adf-core';
+import { TranslationService, NotificationService } from '@alfresco/adf-core';
 import { switchMap, catchError } from 'rxjs/operators';
-import { ContentNodeSelectorComponent, ContentNodeSelectorComponentData, ShareDataRow, NodeAction } from '@alfresco/adf-content-services';
+import {
+  AlfrescoApiService,
+  ContentNodeSelectorComponent,
+  ContentNodeSelectorComponentData,
+  ShareDataRow,
+  NodeAction
+} from '@alfresco/adf-content-services';

 export interface TemplateDialogConfig {
  primaryPathName: string;
@@ -36,11 +36,11 @@ import {
  AppStore
 } from '@alfresco/aca-shared/store';
 import { NodeTemplateService, TemplateDialogConfig } from '../../services/node-template.service';
-import { AlfrescoApiService, NotificationService } from '@alfresco/adf-core';
+import { NotificationService } from '@alfresco/adf-core';
 import { from, Observable, of } from 'rxjs';
 import { NodeEntry, NodeBodyUpdate, Node, NodesApi } from '@alfresco/js-api';
 import { MatDialog } from '@angular/material/dialog';
-import { DocumentListService } from '@alfresco/adf-content-services';
+import { AlfrescoApiService, DocumentListService } from '@alfresco/adf-content-services';

@Injectable()
 export class TemplateEffects {
@@ -25,15 +25,8 @@
 import { NgModule } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import {
-  TranslationService,
-  TranslationMock,
-  AuthenticationService,
-  AlfrescoApiService,
-  AlfrescoApiServiceMock,
-  PageTitleService
-} from '@alfresco/adf-core';
-import { DiscoveryApiService, SearchQueryBuilderService } from '@alfresco/adf-content-services';
+import { TranslationService, TranslationMock, AuthenticationService, PageTitleService } from '@alfresco/adf-core';
+import { AlfrescoApiService, AlfrescoApiServiceMock, DiscoveryApiService, SearchQueryBuilderService } from '@alfresco/adf-content-services';
 import { RepositoryInfo, VersionInfo } from '@alfresco/js-api';
 import { HttpClientModule } from '@angular/common/http';
 import { StoreModule } from '@ngrx/store';
@@ -46,12 +46,12 @@ import { ContentActionRef, SelectionState } from '@alfresco/adf-extensions';
 import { Node, VersionEntry, VersionsApi } from '@alfresco/js-api';
 import { Component, HostListener, inject, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
 import { ActivatedRoute, PRIMARY_OUTLET, Router } from '@angular/router';
-import { AlfrescoApiService, ViewerOpenWithComponent, ViewerSidebarComponent, ViewerToolbarActionsComponent } from '@alfresco/adf-core';
+import { ViewerOpenWithComponent, ViewerSidebarComponent, ViewerToolbarActionsComponent } from '@alfresco/adf-core';
 import { Store } from '@ngrx/store';
 import { from, Observable, Subject } from 'rxjs';
 import { debounceTime, takeUntil } from 'rxjs/operators';
 import { Actions, ofType } from '@ngrx/effects';
-import { AlfrescoViewerComponent, DocumentListService, NodesApiService, UploadService } from '@alfresco/adf-content-services';
+import { AlfrescoApiService, AlfrescoViewerComponent, DocumentListService, NodesApiService, UploadService } from '@alfresco/adf-content-services';
 import { CommonModule } from '@angular/common';
 import { ViewerService } from '../../services/viewer.service';

@@ -26,9 +26,7 @@ import { AppService } from './app.service';
 import { TestBed } from '@angular/core/testing';
 import {
  AuthenticationService,
-  AlfrescoApiService,
  PageTitleService,
-  AlfrescoApiServiceMock,
  TranslationMock,
  TranslationService,
  UserPreferencesService,
@@ -37,6 +35,8 @@ import {
 import { BehaviorSubject, Observable, of, Subject } from 'rxjs';
 import { HttpClientModule } from '@angular/common/http';
 import {
+  AlfrescoApiService,
+  AlfrescoApiServiceMock,
  DiscoveryApiService,
  FileUploadErrorEvent,
  SearchQueryBuilderService,
@@ -23,16 +23,15 @@
 */

 import { inject, Injectable, OnDestroy } from '@angular/core';
-import {
-  AuthenticationService,
-  AppConfigService,
-  AlfrescoApiService,
-  PageTitleService,
-  UserPreferencesService,
-  NotificationService
-} from '@alfresco/adf-core';
+import { AuthenticationService, AppConfigService, PageTitleService, UserPreferencesService, NotificationService } from '@alfresco/adf-core';
 import { Observable, BehaviorSubject, Subject } from 'rxjs';
-import { SearchQueryBuilderService, SharedLinksApiService, UploadService, FileUploadErrorEvent } from '@alfresco/adf-content-services';
+import {
+  AlfrescoApiService,
+  SearchQueryBuilderService,
+  SharedLinksApiService,
+  UploadService,
+  FileUploadErrorEvent
+} from '@alfresco/adf-content-services';
 import { OverlayContainer } from '@angular/cdk/overlay';
 import { ActivatedRoute, ActivationEnd, NavigationStart, Router } from '@angular/router';
 import { filter, map } from 'rxjs/operators';
@@ -23,7 +23,8 @@
 */

 import { Injectable } from '@angular/core';
-import { AlfrescoApiService, UserPreferencesService } from '@alfresco/adf-core';
+import { UserPreferencesService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { Observable, from } from 'rxjs';
 import {
  NodePaging,
@@ -24,9 +24,8 @@

 import { inject, Injectable } from '@angular/core';
 import { ProfileState } from '@alfresco/adf-extensions';
-import { GroupService } from '@alfresco/adf-content-services';
+import { AlfrescoApiService, GroupService } from '@alfresco/adf-content-services';
 import { BehaviorSubject } from 'rxjs';
-import { AlfrescoApiService } from '@alfresco/adf-core';
 import { PeopleApi } from '@alfresco/js-api';

@Injectable({ providedIn: 'root' })
@@ -25,7 +25,8 @@
 import { Injectable, NgModule } from '@angular/core';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { AlfrescoApiService, AlfrescoApiServiceMock, TranslateLoaderService, TranslationMock, TranslationService } from '@alfresco/adf-core';
+import { TranslateLoaderService, TranslationMock, TranslationService } from '@alfresco/adf-core';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';
 import { HttpClientModule } from '@angular/common/http';
 import { RouterTestingModule } from '@angular/router/testing';
 import { EffectsModule } from '@ngrx/effects';