[AAE-10777] Move services from Core in Content the right place (#8242)

Clean core services and directive

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

@@ -17,9 +17,11 @@
 
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { EventEmitter, Injectable, Output } from '@angular/core';
-import { ContentService, ThumbnailService, TranslationService, AllowableOperationsEnum } from '@alfresco/adf-core';
+import { ThumbnailService, TranslationService } from '@alfresco/adf-core';
 import { Subject, Observable, throwError } from 'rxjs';
 import { ShareDataRow } from '../document-list/data/share-data-row.model';
+import { AllowableOperationsEnum } from '../common/models/allowable-operations.enum';
+import { ContentService } from '../common/services/content.service';
 import { Node, NodeEntry, SitePaging } from '@alfresco/js-api';
 import { DocumentListService } from '../document-list/services/document-list.service';
 import { ContentNodeSelectorComponent } from './content-node-selector.component';

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

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

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

@@ -30,17 +30,17 @@ import {
 } from '@alfresco/js-api';
 import {
     AppConfigService,
-    FileModel,
-    FileUploadStatus,
-    NodesApiService,
     setupTestBed,
-    UploadService,
-    FileUploadCompleteEvent,
     DataRow,
     ThumbnailService,
-    ContentService,
     DataColumn
 } from '@alfresco/adf-core';
+import { ContentService } from '../common/services/content.service';
+import { UploadService } from '../common/services/upload.service';
+import { NodesApiService } from '../common/services/nodes-api.service';
+import { FileModel, FileUploadStatus } from '../common/models/file.model';
+import { FileUploadCompleteEvent } from '../common/events/file.event';
+
 import { of, throwError } from 'rxjs';
 import { DropdownBreadcrumbComponent } from '../breadcrumb';
 import { ContentNodeSelectorPanelComponent } from './content-node-selector-panel.component';

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

@@ -31,14 +31,13 @@ import {
     UserPreferencesService,
     UserPreferenceValues,
     InfinitePaginationComponent, PaginatedComponent,
-    NodesApiService,
-    UploadService,
-    FileUploadCompleteEvent,
-    FileUploadDeleteEvent,
     AppConfigService,
     DataSorting,
     ShowHeaderMode
 } from '@alfresco/adf-core';
+import { NodesApiService } from '../common/services/nodes-api.service';
+import { UploadService } from '../common/services/upload.service';
+import { FileUploadCompleteEvent, FileUploadDeleteEvent } from '../common/events/file.event';
 import { UntypedFormControl } from '@angular/forms';
 import { Node, NodePaging, Pagination, SiteEntry, SitePaging, NodeEntry, QueryBody, RequestScope } from '@alfresco/js-api';
 import { DocumentListComponent } from '../document-list/components/document-list.component';

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

@@ -21,7 +21,10 @@ 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 { ContentService, UploadService, FileModel, FileUploadEvent } from '@alfresco/adf-core';
+import { FileModel } from '../common/models/file.model';
+import { FileUploadEvent } from '../common/events/file.event';
+import { UploadService } from '../common/services/upload.service';
+
 import { of } from 'rxjs';
 import { ContentTestingModule } from '../testing/content.testing.module';
 import { DocumentListService } from '../document-list/services/document-list.service';
@@ -31,6 +34,8 @@ import { UploadModule } from '../upload';
 import { ContentNodeSelectorPanelComponent } from './content-node-selector-panel.component';
 import { NodeAction } from '../document-list/models/node-action.enum';
 import { SitesService } from '../common/services/sites.service';
+import { NodesApiService } from '../common/services/nodes-api.service';
+import { ContentService } from '../common/services/content.service';
 
 describe('ContentNodeSelectorComponent', () => {
     let component: ContentNodeSelectorComponent;
@@ -103,7 +108,8 @@ describe('ContentNodeSelectorComponent', () => {
             }
         });
 
-        spyOn(contentService, 'getNode').and.returnValue(of(fakeFolderNodeWithPermission));
+        const nodesApiService = TestBed.inject(NodesApiService);
+        spyOn(nodesApiService, 'getNode').and.returnValue(of(fakeFolderNodeWithPermission.entry));
 
         component.data.showLocalUploadButton = true;
         component.hasAllowableOperations = true;

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

@@ -17,9 +17,11 @@
 
 import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { TranslationService, NotificationService, AllowableOperationsEnum, ContentService, UploadService } from '@alfresco/adf-core';
+import { TranslationService, NotificationService} from '@alfresco/adf-core';
 import { Node } from '@alfresco/js-api';
-
+import { AllowableOperationsEnum } from '../common/models/allowable-operations.enum';
+import { ContentService } from '../common/services/content.service';
+import { UploadService } from '../common/services/upload.service';
 import { ContentNodeSelectorComponentData } from './content-node-selector.component-data.interface';
 import { NodeEntryEvent } from '../document-list/components/node.event';
 import { NodeAction } from '../document-list/models/node-action.enum';