[AAE-11889] move sites service to content lib (#8073)

* move sites service to content lib

* update migration guide

* update imports

docs/content-services/services/sites.service.md

@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2018-11-13
 ---
 
-# [Sites service](lib/core/src/lib/services/sites.service.ts "Defined in sites.service.ts")
+# Sites service
 
 Accesses and manipulates sites from a Content Services repository.
 

docs/upgrade-guide/upgrade50-60.md

@@ -79,8 +79,14 @@ How to fix it:
 
 ## Relocated classes
 
+| Class | Before | After |
+| --- | -- | --- |
+| `VersionCompatibilityService` | `@alfresco/adf-core` | `@alfresco/adf-content-services` |
+| `VersionCompatibilityDirective` | `@alfresco/adf-core` | `@alfresco/adf-content-services` |
+| `SitesService` | `@alfresco/adf-core` | `@alfresco/adf-content-services` |
+
 Following classes have been relocated:
-- `VersionCompatibilityService` and `VersionCompatibilityDirective` relocated from `@alfresco/adf-core` to `@alfresco/adf-content-services`
+
 The following directives have been moved from the Core library to the Content Services
 library. You should modify your code to import these classes from
 `@alfresco/adf-content-services`.

lib/content-services/src/lib/content-node-selector/content-node-dialog.service.spec.ts

@@ -17,7 +17,7 @@
 
 import { TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { NodeEntry, Node, SitePaging, Site } from '@alfresco/js-api';
-import { AppConfigService, SitesService, setupTestBed } from '@alfresco/adf-core';
+import { AppConfigService, setupTestBed } from '@alfresco/adf-core';
 import { DocumentListService } from '../document-list/services/document-list.service';
 import { ContentNodeDialogService } from './content-node-dialog.service';
 import { MatDialog } from '@angular/material/dialog';
@@ -25,6 +25,7 @@ import { Subject, of } from 'rxjs';
 import { ContentTestingModule } from '../testing/content.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 import { NodeAction } from '../document-list/models/node-action.enum';
+import { SitesService } from '../services/sites.service';
 
 const fakeNodeEntry = {
     entry: {

lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts

@@ -17,7 +17,7 @@
 
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { EventEmitter, Injectable, Output } from '@angular/core';
-import { ContentService, ThumbnailService, SitesService, TranslationService, AllowableOperationsEnum } from '@alfresco/adf-core';
+import { ContentService, ThumbnailService, TranslationService, AllowableOperationsEnum } from '@alfresco/adf-core';
 import { Subject, Observable, throwError } from 'rxjs';
 import { ShareDataRow } from '../document-list/data/share-data-row.model';
 import { Node, NodeEntry, SitePaging } from '@alfresco/js-api';
@@ -27,6 +27,7 @@ import { ContentNodeSelectorComponentData } from './content-node-selector.compon
 import { NodeAction } from '../document-list/models/node-action.enum';
 import { NodeLockDialogComponent } from '../dialogs/node-lock.dialog';
 import { switchMap } from 'rxjs/operators';
+import { SitesService } from '../services/sites.service';
 
 @Injectable({
     providedIn: 'root'

lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component-search.spec.ts

@@ -28,12 +28,7 @@ import {
     SiteEntry,
     SitePaging
 } from '@alfresco/js-api';
-import {
+import { NodesApiService, setupTestBed } from '@alfresco/adf-core';
-
-    NodesApiService,
-    setupTestBed,
-    SitesService
-} from '@alfresco/adf-core';
 import { of } from 'rxjs';
 import { ContentNodeSelectorPanelComponent } from './content-node-selector-panel.component';
 import { ContentTestingModule } from '../testing/content.testing.module';
@@ -44,6 +39,7 @@ import { NodeEntryEvent, ShareDataRow } from '../document-list';
 import { TranslateModule } from '@ngx-translate/core';
 import { SearchQueryBuilderService } from '../search';
 import { mockQueryBody } from '../mock/search-query.mock';
+import { SitesService } from '../services/sites.service';
 
 const fakeResultSetPaging: ResultSetPaging = {
     list: {

lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.spec.ts

@@ -34,7 +34,6 @@ import {
     FileUploadStatus,
     NodesApiService,
     setupTestBed,
-    SitesService,
     UploadService,
     FileUploadCompleteEvent,
     DataRow,
@@ -53,6 +52,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { SearchQueryBuilderService } from '../search';
 import { ContentNodeSelectorPanelService } from './content-node-selector-panel.service';
 import { mockContentModelTextProperty } from '../mock/content-model.mock';
+import { SitesService } from '../services/sites.service';
 
 const fakeResultSetPaging: ResultSetPaging = {
     list: {

lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.ts

@@ -32,7 +32,6 @@ import {
     UserPreferenceValues,
     InfinitePaginationComponent, PaginatedComponent,
     NodesApiService,
-    SitesService,
     UploadService,
     FileUploadCompleteEvent,
     FileUploadDeleteEvent,
@@ -53,6 +52,7 @@ import { SEARCH_QUERY_SERVICE_TOKEN } from '../search/search-query-service.token
 import { SearchQueryBuilderService } from '../search/services/search-query-builder.service';
 import { ContentNodeSelectorPanelService } from './content-node-selector-panel.service';
 import { NodeEntryEvent } from '../document-list/components/node.event';
+import { SitesService } from '../services/sites.service';
 
 export type ValidationFunction = (entry: Node) => boolean;
 

lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts

@@ -21,7 +21,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ContentNodeSelectorComponent } from './content-node-selector.component';
 import { Node, NodeEntry, SitePaging } from '@alfresco/js-api';
 import { By } from '@angular/platform-browser';
-import { SitesService, ContentService, UploadService, FileModel, FileUploadEvent } from '@alfresco/adf-core';
+import { ContentService, UploadService, FileModel, FileUploadEvent } from '@alfresco/adf-core';
 import { of } from 'rxjs';
 import { ContentTestingModule } from '../testing/content.testing.module';
 import { DocumentListService } from '../document-list/services/document-list.service';
@@ -30,6 +30,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { UploadModule } from '../upload';
 import { ContentNodeSelectorPanelComponent } from './content-node-selector-panel.component';
 import { NodeAction } from '../document-list/models/node-action.enum';
+import { SitesService } from '../services/sites.service';
 
 describe('ContentNodeSelectorComponent', () => {
     let component: ContentNodeSelectorComponent;

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

@@ -19,12 +19,13 @@ import { LibraryDialogComponent } from './library.dialog';
 import { TestBed, fakeAsync, tick, flush, ComponentFixture, flushMicrotasks } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { MatDialogRef } from '@angular/material/dialog';
-import { setupTestBed, SitesService } from '@alfresco/adf-core';
+import { setupTestBed } from '@alfresco/adf-core';
 import { ContentTestingModule } from '../../testing/content.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 import { of, throwError } from 'rxjs';
 import { delay } from 'rxjs/operators';
 import { SiteEntry } from '@alfresco/js-api';
+import { SitesService } from '../../services/sites.service';
 
 describe('LibraryDialogComponent', () => {
     let fixture: ComponentFixture<LibraryDialogComponent>;

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

@@ -33,8 +33,9 @@ import {
 } from '@angular/forms';
 import { MatDialogRef } from '@angular/material/dialog';
 import { QueriesApi, SiteBodyCreate, SiteEntry, SitePaging } from '@alfresco/js-api';
-import { AlfrescoApiService, SitesService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-core';
 import { debounceTime, finalize, mergeMap, takeUntil } from 'rxjs/operators';
+import { SitesService } from '../../services/sites.service';
 
 @Component({
     selector: 'adf-library-dialog',

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

@@ -20,8 +20,9 @@ import { LibraryMembershipDirective } from './library-membership.directive';
 import { NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core';
 import { of, throwError, Subject } from 'rxjs';
 import { TranslateModule } from '@ngx-translate/core';
-import { AlfrescoApiService, CoreModule, CoreTestingModule, SitesService } from '@alfresco/adf-core';
+import { AlfrescoApiService, CoreModule, CoreTestingModule } from '@alfresco/adf-core';
 import { ContentDirectiveModule } from './content-directive.module';
+import { SitesService } from '../services/sites.service';
 
 describe('LibraryMembershipDirective', () => {
     let alfrescoApiService: AlfrescoApiService;

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

@@ -24,10 +24,11 @@ import {
     SitesApi
 } from '@alfresco/js-api';
 import { BehaviorSubject, from, Observable } from 'rxjs';
-import { SitesService, AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-core';
 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';
+import { SitesService } from '../services/sites.service';
 
 @Directive({
     selector: '[adf-library-membership]',

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

@@ -16,3 +16,4 @@
  */
 
 export * from './card-view-content-update.service';
+export * from './sites.service';

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

@@ -16,10 +16,8 @@
  */
 
 import { TestBed } from '@angular/core/testing';
-import { AppConfigService } from '../app-config/app-config.service';
+import { AppConfigService, setupTestBed, CoreTestingModule } from '@alfresco/adf-core';
 import { SitesService } from './sites.service';
-import { setupTestBed } from '../testing/setup-test-bed';
-import { CoreTestingModule } from '../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
 declare let jasmine: any;

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

@@ -17,7 +17,7 @@
 
 import { Injectable } from '@angular/core';
 import { from, Observable, throwError } from 'rxjs';
-import { AlfrescoApiService } from './alfresco-api.service';
+import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
 import {
     MinimalNode,
     SiteBodyCreate,
@@ -33,7 +33,6 @@ import {
     SitesApi
 } from '@alfresco/js-api';
 import { catchError } from 'rxjs/operators';
-import { LogService } from './log.service';
 
 @Injectable({
     providedIn: 'root'

lib/content-services/src/lib/site-dropdown/sites-dropdown.component.spec.ts

@@ -19,7 +19,7 @@ import { DebugElement } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { DropdownSitesComponent, Relations } from './sites-dropdown.component';
-import { SitesService, setupTestBed } from '@alfresco/adf-core';
+import { setupTestBed } from '@alfresco/adf-core';
 import { of } from 'rxjs';
 import { getFakeSitePaging,
     getFakeSitePagingNoMoreItems,
@@ -29,6 +29,7 @@ import { getFakeSitePaging,
 } from '../mock';
 import { ContentTestingModule } from '../testing/content.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
+import { SitesService } from '../services/sites.service';
 
 const customSiteList = {
     list: {

lib/content-services/src/lib/site-dropdown/sites-dropdown.component.ts

@@ -16,11 +16,12 @@
  */
 
 import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core';
-import { SitesService, LogService, InfiniteSelectScrollDirective } from '@alfresco/adf-core';
+import { LogService, InfiniteSelectScrollDirective } from '@alfresco/adf-core';
 import { SitePaging, SiteEntry } from '@alfresco/js-api';
 import { MatSelectChange } from '@angular/material/select';
 import {LiveAnnouncer} from '@angular/cdk/a11y';
 import {TranslateService} from '@ngx-translate/core';
+import { SitesService } from '../services/sites.service';
 
 /* eslint-disable no-shadow */
 /* eslint-disable @typescript-eslint/naming-convention */

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

@@ -43,7 +43,6 @@ export * from './people-content.service';
 export * from './people-process.service';
 export * from './search.service';
 export * from './shared-links-api.service';
-export * from './sites.service';
 export * from './discovery-api.service';
 export * from './comment-process.service';
 export * from './search-configuration.service';

lib/process-services/src/lib/form/services/activiti-alfresco.service.ts

@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { AlfrescoApiService, LogService, SitesService, ExternalContent, ExternalContentLink } from '@alfresco/adf-core';
+import { AlfrescoApiService, LogService, ExternalContent, ExternalContentLink } from '@alfresco/adf-core';
+import { SitesService } from '@alfresco/adf-content-services';
 import { Injectable } from '@angular/core';
 import {
     IntegrationAlfrescoOnPremiseApi,

lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.spec.ts

@@ -17,11 +17,11 @@
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { ContentModule, ContentNodeSelectorPanelComponent, DocumentListService } from '@alfresco/adf-content-services';
+import { ContentModule, ContentNodeSelectorPanelComponent, DocumentListService, SitesService } from '@alfresco/adf-content-services';
 import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core';
 import { ProcessTestingModule } from '../../../testing/process.testing.module';
 import { AttachFileWidgetDialogComponent } from './attach-file-widget-dialog.component';
-import { setupTestBed, AuthenticationService, SitesService, AlfrescoApiService, NodesApiService } from '@alfresco/adf-core';
+import { setupTestBed, AuthenticationService, AlfrescoApiService, NodesApiService } from '@alfresco/adf-core';
 import { AttachFileWidgetDialogComponentData } from './attach-file-widget-dialog-component.interface';
 import { of, throwError } from 'rxjs';
 import { By } from '@angular/platform-browser';

lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.ts

@@ -17,9 +17,9 @@
 
 import { Component, Inject, ViewEncapsulation, ViewChild } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { ExternalAlfrescoApiService, AlfrescoApiService, LoginDialogPanelComponent, SearchService, TranslationService, AuthenticationService, SitesService } from '@alfresco/adf-core';
+import { ExternalAlfrescoApiService, AlfrescoApiService, LoginDialogPanelComponent, SearchService, TranslationService, AuthenticationService } from '@alfresco/adf-core';
 import { AttachFileWidgetDialogComponentData } from './attach-file-widget-dialog-component.interface';
-import { DocumentListService } from '@alfresco/adf-content-services';
+import { DocumentListService, SitesService } from '@alfresco/adf-content-services';
 import { Node } from '@alfresco/js-api';
 
 @Component({