[AE-11486] move lock and favorite (#8089)

* [ci:force] move lock and favorite

* fix

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

@@ -23,7 +23,7 @@ import { EMPTY, of } from 'rxjs';
 import { ContentTestingModule } from '../../testing/content.testing.module';
 import { NodeAspectService } from './node-aspect.service';
 import { DialogAspectListService } from './dialog-aspect-list.service';
-import { CardViewContentUpdateService } from '../../services/card-view-content-update.service';
+import { CardViewContentUpdateService } from '../../common/services/card-view-content-update.service';
 
 describe('NodeAspectService', () => {
 

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

@@ -18,7 +18,7 @@
 import { Injectable } from '@angular/core';
 import { NodesApiService } from '@alfresco/adf-core';
 import { DialogAspectListService } from './dialog-aspect-list.service';
-import { CardViewContentUpdateService } from '../../services/card-view-content-update.service';
+import { CardViewContentUpdateService } from '../../common/services/card-view-content-update.service';
 
 @Injectable({
     providedIn: 'root'

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

@@ -15,5 +15,6 @@
  * limitations under the License.
  */
 
-export * from './card-view-content-update.service';
-export * from './sites.service';
+export * from './services/favorites-api.service';
+export * from './services/card-view-content-update.service';
+export * from './services/sites.service';

lib/content-services/src/lib/common/services/card-view-content-update.service.ts

@@ -19,7 +19,7 @@ import { UpdateNotification, CardViewBaseItemModel, CardViewUpdateService } from
 import { MinimalNode } from '@alfresco/js-api';
 import { Injectable } from '@angular/core';
 import { Subject } from 'rxjs';
-import { BaseCardViewContentUpdate } from '../interfaces/base-card-view-content-update.interface';
+import { BaseCardViewContentUpdate } from '../../interfaces/base-card-view-content-update.interface';
 
 @Injectable({
   providedIn: 'root'

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

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

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

@@ -29,7 +29,7 @@ import { throwError, of } from 'rxjs';
 import { ContentTestingModule } from '../../../testing/content.testing.module';
 import { mockGroupProperties } from './mock-data';
 import { TranslateModule } from '@ngx-translate/core';
-import { CardViewContentUpdateService } from '../../../services/card-view-content-update.service';
+import { CardViewContentUpdateService } from '../../../common/services/card-view-content-update.service';
 
 describe('ContentMetadataComponent', () => {
     let component: ContentMetadataComponent;

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

@@ -30,7 +30,7 @@ import {
 import { ContentMetadataService } from '../../services/content-metadata.service';
 import { CardViewGroup, PresetConfig } from '../../interfaces/content-metadata.interfaces';
 import { takeUntil, debounceTime, catchError, map } from 'rxjs/operators';
-import { CardViewContentUpdateService } from '../../../services/card-view-content-update.service';
+import { CardViewContentUpdateService } from '../../../common/services/card-view-content-update.service';
 
 const DEFAULT_SEPARATOR = ', ';
 

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

@@ -25,7 +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';
+import { SitesService } from '../common/services/sites.service';
 
 const fakeNodeEntry = {
     entry: {

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

@@ -27,7 +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';
+import { SitesService } from '../common/services/sites.service';
 
 @Injectable({
     providedIn: 'root'

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

@@ -39,7 +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';
+import { SitesService } from '../common/services/sites.service';
 
 const fakeResultSetPaging: ResultSetPaging = {
     list: {

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

@@ -52,7 +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';
+import { SitesService } from '../common/services/sites.service';
 
 const fakeResultSetPaging: ResultSetPaging = {
     list: {

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

@@ -52,7 +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';
+import { SitesService } from '../common/services/sites.service';
 
 export type ValidationFunction = (entry: Node) => boolean;
 

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

@@ -30,7 +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';
+import { SitesService } from '../common/services/sites.service';
 
 describe('ContentNodeSelectorComponent', () => {
     let component: ContentNodeSelectorComponent;

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

@@ -25,7 +25,7 @@ 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';
+import { SitesService } from '../../common/services/sites.service';
 
 describe('LibraryDialogComponent', () => {
     let fixture: ComponentFixture<LibraryDialogComponent>;

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

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

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

@@ -22,7 +22,7 @@ import { of, throwError, Subject } from 'rxjs';
 import { TranslateModule } from '@ngx-translate/core';
 import { AlfrescoApiService, CoreModule, CoreTestingModule } from '@alfresco/adf-core';
 import { ContentDirectiveModule } from './content-directive.module';
-import { SitesService } from '../services/sites.service';
+import { SitesService } from '../common/services/sites.service';
 
 describe('LibraryMembershipDirective', () => {
     let alfrescoApiService: AlfrescoApiService;

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

@@ -28,7 +28,7 @@ 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';
+import { SitesService } from '../common/services/sites.service';
 
 @Directive({
     selector: '[adf-library-membership]',

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

@@ -45,7 +45,6 @@ import {
     RequestPaginationModel,
     AlfrescoApiService,
     UserPreferenceValues,
-    LockService,
     DataRow,
     DataTableService,
     NodesApiService
@@ -63,6 +62,7 @@ import { NavigableComponentInterface } from '../../breadcrumb/navigable-componen
 import { FilterSearch } from './../../search/models/filter-search.interface';
 import { RowFilter } from '../data/row-filter.model';
 import { DocumentListService } from '../services/document-list.service';
+import { LockService } from '../services/lock.service';
 import { DocumentLoaderNode } from '../models/document-folder.model';
 import { takeUntil } from 'rxjs/operators';
 import { ADF_DOCUMENT_PARENT_COMPONENT } from './document-list.token';

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

@@ -38,6 +38,7 @@ export * from './services/document-actions.service';
 export * from './services/document-list.service';
 export * from './services/node-actions.service';
 export * from './services/custom-resources.service';
+export * from './services/lock.service';
 
 // models
 export * from './models/content-action.model';

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

@@ -17,10 +17,8 @@
 
 import { TestBed } from '@angular/core/testing';
 import { LockService } from './lock.service';
-import { CoreTestingModule } from '../testing/core.testing.module';
-import { setupTestBed } from '../testing/setup-test-bed';
+import { CoreTestingModule, setupTestBed, AlfrescoApiService } from '@alfresco/adf-core';
 import { Node } from '@alfresco/js-api';
-import { AlfrescoApiService } from './alfresco-api.service';
 import moment from 'moment';
 import { TranslateModule } from '@ngx-translate/core';
 

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

@@ -17,7 +17,7 @@
 
 import { Injectable } from '@angular/core';
 import { Node } from '@alfresco/js-api';
-import { AlfrescoApiService } from './alfresco-api.service';
+import { AlfrescoApiService } from '@alfresco/adf-core';
 import moment, { Moment } from 'moment';
 
 @Injectable({

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

@@ -29,7 +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';
+import { SitesService } from '../common/services/sites.service';
 
 const customSiteList = {
     list: {

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

@@ -21,7 +21,7 @@ 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';
+import { SitesService } from '../common/services/sites.service';
 
 /* eslint-disable no-shadow */
 /* eslint-disable @typescript-eslint/naming-convention */

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

@@ -40,6 +40,6 @@ export * from './lib/new-version-uploader';
 export * from './lib/interfaces/index';
 export * from './lib/version-compatibility/index';
 export * from './lib/pipes/index';
-export * from './lib/services/index';
+export * from './lib/common/index';
 
 export * from './lib/content.module';

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

@@ -21,7 +21,7 @@ import { ObjectUtils } from '../common/utils/object-utils';
 import { Observable, Subject } from 'rxjs';
 import { map, distinctUntilChanged, take } from 'rxjs/operators';
 import { ExtensionConfig, ExtensionService, mergeObjects } from '@alfresco/adf-extensions';
-import { OpenidConfiguration } from '../services/openid-configuration.interface';
+import { OpenidConfiguration } from '../auth/interfaces/openid-configuration.interface';
 
 /* spellchecker: disable */
 // eslint-disable-next-line no-shadow

lib/core/src/lib/auth/index.ts

@@ -15,39 +15,4 @@
  * limitations under the License.
  */
 
-export * from './authentication-interceptor/auth-bearer.interceptor';
-
-export * from './mock/authentication.service.mock';
-export * from './mock/identity-group.mock';
-export * from './mock/identity-group.service.mock';
-export * from './mock/identity-user.mock';
-export * from './mock/identity-user.service.mock';
-export * from './mock/jwt-helper.service.spec';
-export * from './mock/oauth2.service.mock';
-
-export * from './guard/auth-guard-base';
-export * from './guard/auth-guard.service';
-export * from './guard/auth-guard-ecm.service';
-export * from './guard/auth-guard-bpm.service';
-export * from './guard/auth-guard-sso-role.service';
-
-export * from './services/authentication.service';
-export * from './services/identity-group.interface';
-export * from './services/identity-role.service';
-
-export * from './services/identity-user.service';
-export * from './services/jwt-helper.service';
-export * from './services/oauth2.service';
-
-export * from './services/identity-user.service.interface';
-export * from './services/openid-configuration.interface';
-
-export * from './models/oauth-config.model';
-export * from './models/redirection.model';
-
-export * from './models/identity-group.model';
-export * from './models/identity-user.model';
-export * from './models/identity-role.model';
-
-export * from './interface/authentication.interface';
-
+export * from './public-api';

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

@@ -0,0 +1,52 @@
+/*!
+ * @license
+ * Copyright 2019 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './authentication-interceptor/auth-bearer.interceptor';
+
+export * from './mock/authentication.service.mock';
+export * from './mock/identity-group.mock';
+export * from './mock/identity-group.service.mock';
+export * from './mock/identity-user.mock';
+export * from './mock/identity-user.service.mock';
+export * from './mock/jwt-helper.service.spec';
+export * from './mock/oauth2.service.mock';
+
+export * from './guard/auth-guard-base';
+export * from './guard/auth-guard.service';
+export * from './guard/auth-guard-ecm.service';
+export * from './guard/auth-guard-bpm.service';
+export * from './guard/auth-guard-sso-role.service';
+
+export * from './services/authentication.service';
+export * from './services/identity-group.interface';
+export * from './services/identity-role.service';
+
+export * from './services/identity-user.service';
+export * from './services/jwt-helper.service';
+export * from './services/oauth2.service';
+
+export * from './services/identity-user.service.interface';
+
+export * from './models/oauth-config.model';
+export * from './models/redirection.model';
+
+export * from './models/identity-group.model';
+export * from './models/identity-user.model';
+export * from './models/identity-role.model';
+
+export * from './interfaces/openid-configuration.interface';
+

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

@@ -21,7 +21,7 @@ import { AppConfigService, AppConfigValues } from '../app-config/app-config.serv
 import { ReplaySubject } from 'rxjs';
 import { OauthConfigModel } from '../auth/models/oauth-config.model';
 import { StorageService } from '../common/services/storage.service';
-import { OpenidConfiguration } from './openid-configuration.interface';
+import { OpenidConfiguration } from '../auth/interfaces/openid-configuration.interface';
 
 @Injectable({
     providedIn: 'root'

lib/core/src/lib/services/openid-configuration.interface.ts

@@ -1,26 +0,0 @@
-/*!
- * @license
- * Copyright 2019 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export interface OpenidConfiguration {
-    authorization_endpoint: string;
-    token_endpoint: string;
-    userinfo_endpoint: string;
-    end_session_endpoint: string;
-    check_session_iframe: string;
-    revocation_endpoint: string;
-    introspection_endpoint: string;
-}

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

@@ -26,7 +26,6 @@ export * from './upload.service';
 export * from './dynamic-component-mapper.service';
 export * from './highlight-transform.service';
 export * from './deleted-nodes-api.service';
-export * from './favorites-api.service';
 export * from './nodes-api.service';
 export * from './people-content.service';
 export * from './people-process.service';
@@ -37,7 +36,6 @@ export * from './comment-content.service';
 export * from './login-dialog.service';
 export * from './external-alfresco-api.service';
 export * from './download-zip.service';
-export * from './lock.service';
 export * from './automation.service';
 export * from './automation.service';
 export * from './download.service';