diff --git a/docs/README.md b/docs/README.md index fa3261c9c6..9d0a95c6a9 100644 --- a/docs/README.md +++ b/docs/README.md @@ -210,8 +210,8 @@ for more information about installing and using the source code. | [Discovery Api service](core/services/discovery-api.service.md) | Gets version and license information for Process Services and Content Services. | [Source](../lib/core/src/lib/services/discovery-api.service.ts) | | [Download zip service](core/services/download-zip.service.md) | Creates and manages downloads. | [Source](../lib/core/src/lib/services/download-zip.service.ts) | | [Ecm User service](core/services/ecm-user.service.md) | Gets information about a Content Services user. | [Source](../lib/core/src/lib/services/ecm-user.service.ts) | -| [Favorites Api service](core/services/favorites-api.service.md) | Gets a list of items a user has marked as their favorites. | [Source](../lib/core/src/lib/services/favorites-api.service.ts) | -| [Form Rendering service](core/services/form-rendering.service.md) | Maps a form field type string onto the corresponding form widget component type. | [Source](../lib/core/src/lib/form/services/form-rendering.service.ts) | +| [Favorites Api service](core/services/favorites-api.service.md) | Gets a list of items a user has marked as their favorites. | [Source](lib/content-services/src/lib/common/services/favorites-api.service.ts) | +| [Form Rendering service](core/services/form-rendering.service.md) | Maps a form field type string onto the corresponding form widget component type. | [Source](../lib/core/form/services/form-rendering.service.ts) | | [Form service](core/services/form.service.md) | Implements Process Services form methods | [Source](../lib/core/src/lib/form/services/form.service.ts) | | [Highlight Transform service](core/services/highlight-transform.service.md) | Adds HTML to a string to highlight chosen sections. | [Source](../lib/core/src/lib/services/highlight-transform.service.ts) | | [Identity Group service](core/services/identity-group.service.md) | Performs CRUD operations on identity groups. | [Source](../lib/process-services-cloud/src/lib/group/services/identity-group.service.ts) | @@ -361,7 +361,7 @@ for more information about installing and using the source code. | ---- | ----------- | ----------- | | [Audit Service](content-services/services/audit.service.md) | Manages Audit apps and entries. | [Source](../lib/content-services/src/lib/audit/audit.service.ts) | | [Card View Content Update Service](content-services/services/card-view-content-update.service.md) | Manages Card View properties in the content services environment. | | -| Implements BaseCardViewContentUpdate. | [Source](../lib/content-services/src/lib/services/card-view-content-update.service.ts) | | +| Implements BaseCardViewContentUpdate. | [Source](lib/content-services/src/lib/common/services/card-view-content-update.service.ts) | | | [Content Node Dialog service](content-services/services/content-node-dialog.service.md) | Displays and manages dialogs for selecting content to open, copy or upload. | [Source](../lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts) | | [Custom Resources service](content-services/services/custom-resources.service.md) | Manages Document List information that is specific to a user. | [Source](../lib/content-services/src/lib/document-list/services/custom-resources.service.ts) | | [Document Actions service](content-services/services/document-actions.service.md) | Implements the document menu actions for the Document List component. | [Source](../lib/content-services/src/lib/document-list/services/document-actions.service.ts) | diff --git a/docs/content-services/interfaces/base-card-view-content-update.interface.md b/docs/content-services/interfaces/base-card-view-content-update.interface.md index 243589eb05..940c64ce71 100644 --- a/docs/content-services/interfaces/base-card-view-content-update.interface.md +++ b/docs/content-services/interfaces/base-card-view-content-update.interface.md @@ -7,7 +7,7 @@ Last reviewed: 2022-11-25 # [Base Card View Content Update interface](../../../lib/content-services/src/lib/interfaces/base-card-view-content-update.interface.ts "Defined in base-card-view-content-update.interface.ts") -Specifies required properties and methods for [Card View Content Update service](../../../lib/content-services/src/lib/services/card-view-content-update.service.ts). +Specifies required properties and methods for [Card View Content Update service](lib/content-services/src/lib/common/services/card-view-content-update.service.ts). Extends from [`BaseCardViewUpdate`](../../../lib/core/src/lib/card-view/interfaces/base-card-view-update.interface.ts). ## Basic usage diff --git a/docs/content-services/services/card-view-content-update.service.md b/docs/content-services/services/card-view-content-update.service.md index b01aa82442..0db0da8b2f 100644 --- a/docs/content-services/services/card-view-content-update.service.md +++ b/docs/content-services/services/card-view-content-update.service.md @@ -5,7 +5,7 @@ Status: Active Last reviewed: 2022-11-25 --- -# [Card View Content Update Service](../../../lib/content-services/src/lib/services/card-view-content-update.service.ts "Defined in card-view-content-update.service.ts") +# [Card View Content Update Service](lib/content-services/src/lib/common/services/card-view-content-update.service.ts "Defined in card-view-content-update.service.ts") Manages Card View properties in the content services environment. Implements [`BaseCardViewContentUpdate`](../../../lib/content-services/src/lib/interfaces/base-card-view-content-update.interface.ts). diff --git a/docs/content-services/services/sites.service.md b/docs/content-services/services/sites.service.md index c309e4743f..5897c312d1 100644 --- a/docs/content-services/services/sites.service.md +++ b/docs/content-services/services/sites.service.md @@ -5,7 +5,7 @@ Status: Active Last reviewed: 2018-11-13 --- -# [Sites service](../../../lib/content-services/src/lib/services/sites.service.ts "Defined in sites.service.ts") +# [Sites service](lib/content-services/src/lib/common/services/sites.service.ts "Defined in sites.service.ts") Accesses and manipulates sites from a Content Services repository. diff --git a/docs/core/services/app-config.service.md b/docs/core/services/app-config.service.md index 160d2fbcaa..2016fdaf64 100644 --- a/docs/core/services/app-config.service.md +++ b/docs/core/services/app-config.service.md @@ -30,10 +30,10 @@ Supports app configuration settings, stored server side. - **load**(): [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)``
Loads the config file. - **Returns** [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)`` - Notification when loading is complete -- **loadWellKnown**(hostIdp: `string`): [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)`<`[`OpenidConfiguration`](../../../lib/core/src/lib/services/openid-configuration.interface.ts)`>`
+- **loadWellKnown**(hostIdp: `string`): [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)`<`[`OpenidConfiguration`](lib/core/src/lib/auth/interfaces/openid-configuration.interface.ts)`>`
Call the discovery API to fetch configuration - _hostIdp:_ `string` - - - **Returns** [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)`<`[`OpenidConfiguration`](../../../lib/core/src/lib/services/openid-configuration.interface.ts)`>` - Discovery configuration + - **Returns** [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)`<`[`OpenidConfiguration`](lib/core/src/lib/auth/interfaces/openid-configuration.interface.ts)`>` - Discovery configuration - **select**(property: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)``
Requests notification of a property value when it is loaded. - _property:_ `string` - The desired property value diff --git a/docs/core/services/favorites-api.service.md b/docs/core/services/favorites-api.service.md index f955268201..5dd8450db3 100644 --- a/docs/core/services/favorites-api.service.md +++ b/docs/core/services/favorites-api.service.md @@ -5,7 +5,7 @@ Status: Active Last reviewed: 2018-05-04 --- -# [Favorites Api service](../../../lib/core/src/lib/services/favorites-api.service.ts "Defined in favorites-api.service.ts") +# [Favorites Api service](lib/content-services/src/lib/common/services/favorites-api.service.ts "Defined in favorites-api.service.ts") Gets a list of items a user has marked as their favorites. diff --git a/docs/upgrade-guide/upgrade50-60.md b/docs/upgrade-guide/upgrade50-60.md index 129c66ce04..dc4b261e99 100644 --- a/docs/upgrade-guide/upgrade50-60.md +++ b/docs/upgrade-guide/upgrade50-60.md @@ -126,6 +126,8 @@ v6.0.0 and after: | [`NodeFavoriteDirective`](../content-services/directives/node-favorite.directive.md)| `@alfresco/adf-core` | `@alfresco/adf-content-services` | | [`NodeRestoreDirective`](../content-services/directives/node-restore.directive.md)| `@alfresco/adf-core` | `@alfresco/adf-content-services` | | [`AppsProcessService`] | `@alfresco/adf-core` | `@alfresco/adf-process-services` | +| `LockService` | `@alfresco/adf-core` | `@alfresco/adf-process-services` | +| `FavoritesApiService` | `@alfresco/adf-core` | `@alfresco/adf-process-services` | ### Update Data-table a data change diff --git a/lib/content-services/src/lib/aspect-list/services/node-aspect.service.spec.ts b/lib/content-services/src/lib/aspect-list/services/node-aspect.service.spec.ts index 8325bcdf33..db7ef63150 100644 --- a/lib/content-services/src/lib/aspect-list/services/node-aspect.service.spec.ts +++ b/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', () => { diff --git a/lib/content-services/src/lib/aspect-list/services/node-aspect.service.ts b/lib/content-services/src/lib/aspect-list/services/node-aspect.service.ts index c41bba4c16..e3fb0b569a 100644 --- a/lib/content-services/src/lib/aspect-list/services/node-aspect.service.ts +++ b/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' diff --git a/lib/content-services/src/lib/services/index.ts b/lib/content-services/src/lib/common/index.ts similarity index 100% rename from lib/content-services/src/lib/services/index.ts rename to lib/content-services/src/lib/common/index.ts diff --git a/lib/content-services/src/lib/services/public-api.ts b/lib/content-services/src/lib/common/public-api.ts similarity index 80% rename from lib/content-services/src/lib/services/public-api.ts rename to lib/content-services/src/lib/common/public-api.ts index b880065686..50e3424741 100644 --- a/lib/content-services/src/lib/services/public-api.ts +++ b/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'; diff --git a/lib/content-services/src/lib/services/card-view-content-update.service.spec.ts b/lib/content-services/src/lib/common/services/card-view-content-update.service.spec.ts similarity index 100% rename from lib/content-services/src/lib/services/card-view-content-update.service.spec.ts rename to lib/content-services/src/lib/common/services/card-view-content-update.service.spec.ts diff --git a/lib/content-services/src/lib/services/card-view-content-update.service.ts b/lib/content-services/src/lib/common/services/card-view-content-update.service.ts similarity index 94% rename from lib/content-services/src/lib/services/card-view-content-update.service.ts rename to lib/content-services/src/lib/common/services/card-view-content-update.service.ts index cc57bbcb99..4c052ddf8a 100644 --- a/lib/content-services/src/lib/services/card-view-content-update.service.ts +++ b/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' diff --git a/lib/core/src/lib/services/favorites-api.service.ts b/lib/content-services/src/lib/common/services/favorites-api.service.ts similarity index 95% rename from lib/core/src/lib/services/favorites-api.service.ts rename to lib/content-services/src/lib/common/services/favorites-api.service.ts index ea5eddda3d..ab9a685539 100644 --- a/lib/core/src/lib/services/favorites-api.service.ts +++ b/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({ diff --git a/lib/content-services/src/lib/services/sites.service.spec.ts b/lib/content-services/src/lib/common/services/sites.service.spec.ts similarity index 100% rename from lib/content-services/src/lib/services/sites.service.spec.ts rename to lib/content-services/src/lib/common/services/sites.service.spec.ts diff --git a/lib/content-services/src/lib/services/sites.service.ts b/lib/content-services/src/lib/common/services/sites.service.ts similarity index 100% rename from lib/content-services/src/lib/services/sites.service.ts rename to lib/content-services/src/lib/common/services/sites.service.ts diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts index 0e82dcf2c1..70508655ca 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts +++ b/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; diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts index 444da6dd7a..6af9114d2e 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts +++ b/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 = ', '; diff --git a/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.spec.ts b/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.spec.ts index 2af86cad8b..2f1ebdf1d7 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.spec.ts +++ b/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: { diff --git a/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts b/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts index 8ba17e34f9..29024f425f 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts +++ b/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' diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component-search.spec.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component-search.spec.ts index b4a6b9ff34..faec1ddebd 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component-search.spec.ts +++ b/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: { diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.spec.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.spec.ts index dbaf09a4b8..6144b6dc47 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.spec.ts +++ b/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: { diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.ts index 7d5d1b5eb5..79e755ba55 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.ts +++ b/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; diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts index 9891d73111..4bc76362ea 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts +++ b/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; diff --git a/lib/content-services/src/lib/dialogs/library/library.dialog.spec.ts b/lib/content-services/src/lib/dialogs/library/library.dialog.spec.ts index 16d7caa54a..572dcbeb32 100644 --- a/lib/content-services/src/lib/dialogs/library/library.dialog.spec.ts +++ b/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; diff --git a/lib/content-services/src/lib/dialogs/library/library.dialog.ts b/lib/content-services/src/lib/dialogs/library/library.dialog.ts index 5f07786789..b84acf2a3e 100644 --- a/lib/content-services/src/lib/dialogs/library/library.dialog.ts +++ b/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', diff --git a/lib/content-services/src/lib/directives/library-membership.directive.spec.ts b/lib/content-services/src/lib/directives/library-membership.directive.spec.ts index e5f760f361..611cb988ee 100644 --- a/lib/content-services/src/lib/directives/library-membership.directive.spec.ts +++ b/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; diff --git a/lib/content-services/src/lib/directives/library-membership.directive.ts b/lib/content-services/src/lib/directives/library-membership.directive.ts index 446cfcd346..98c893ecde 100644 --- a/lib/content-services/src/lib/directives/library-membership.directive.ts +++ b/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]', diff --git a/lib/content-services/src/lib/document-list/components/document-list.component.ts b/lib/content-services/src/lib/document-list/components/document-list.component.ts index c5399870f7..94702b07f9 100644 --- a/lib/content-services/src/lib/document-list/components/document-list.component.ts +++ b/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'; diff --git a/lib/content-services/src/lib/document-list/public-api.ts b/lib/content-services/src/lib/document-list/public-api.ts index 5e56de9760..d516b99a3a 100644 --- a/lib/content-services/src/lib/document-list/public-api.ts +++ b/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'; diff --git a/lib/core/src/lib/services/lock.service.spec.ts b/lib/content-services/src/lib/document-list/services/lock.service.spec.ts similarity index 97% rename from lib/core/src/lib/services/lock.service.spec.ts rename to lib/content-services/src/lib/document-list/services/lock.service.spec.ts index 63c6afb204..93346aee43 100644 --- a/lib/core/src/lib/services/lock.service.spec.ts +++ b/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'; diff --git a/lib/core/src/lib/services/lock.service.ts b/lib/content-services/src/lib/document-list/services/lock.service.ts similarity index 97% rename from lib/core/src/lib/services/lock.service.ts rename to lib/content-services/src/lib/document-list/services/lock.service.ts index 0fc06002ad..9a06a64591 100644 --- a/lib/core/src/lib/services/lock.service.ts +++ b/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({ diff --git a/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.spec.ts b/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.spec.ts index 8f13f07c84..3c917f4817 100644 --- a/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.spec.ts +++ b/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: { diff --git a/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.ts b/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.ts index 3ca809c5cc..6426943b00 100644 --- a/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.ts +++ b/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 */ diff --git a/lib/content-services/src/public-api.ts b/lib/content-services/src/public-api.ts index 2d280d6942..fd875879ef 100644 --- a/lib/content-services/src/public-api.ts +++ b/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'; diff --git a/lib/core/src/lib/app-config/app-config.service.ts b/lib/core/src/lib/app-config/app-config.service.ts index dd49dc67e6..1cbba21630 100644 --- a/lib/core/src/lib/app-config/app-config.service.ts +++ b/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 diff --git a/lib/core/src/lib/auth/index.ts b/lib/core/src/lib/auth/index.ts index f72c00d0d3..a7e30cc675 100644 --- a/lib/core/src/lib/auth/index.ts +++ b/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'; diff --git a/lib/core/src/lib/auth/services/openid-configuration.interface.ts b/lib/core/src/lib/auth/interfaces/openid-configuration.interface.ts similarity index 100% rename from lib/core/src/lib/auth/services/openid-configuration.interface.ts rename to lib/core/src/lib/auth/interfaces/openid-configuration.interface.ts diff --git a/lib/core/src/lib/auth/public-api.ts b/lib/core/src/lib/auth/public-api.ts new file mode 100644 index 0000000000..c59ee3c35a --- /dev/null +++ b/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'; + diff --git a/lib/core/src/lib/services/alfresco-api.service.ts b/lib/core/src/lib/services/alfresco-api.service.ts index 6a7d53a075..a4abee6b75 100644 --- a/lib/core/src/lib/services/alfresco-api.service.ts +++ b/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' diff --git a/lib/core/src/lib/services/openid-configuration.interface.ts b/lib/core/src/lib/services/openid-configuration.interface.ts deleted file mode 100644 index 2d8b6c4089..0000000000 --- a/lib/core/src/lib/services/openid-configuration.interface.ts +++ /dev/null @@ -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; -} diff --git a/lib/core/src/lib/services/public-api.ts b/lib/core/src/lib/services/public-api.ts index 16bcbb3c90..c588fb0edd 100644 --- a/lib/core/src/lib/services/public-api.ts +++ b/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';