diff --git a/integration/base_ver_2_app/src/app/app.module.ts b/integration/base_ver_2_app/src/app/app.module.ts index 6071b837c5..21f8f02c2d 100644 --- a/integration/base_ver_2_app/src/app/app.module.ts +++ b/integration/base_ver_2_app/src/app/app.module.ts @@ -79,7 +79,6 @@ const appRoutes: Routes = [ DocumentlistComponent, StartProcessComponent ], - providers: [], bootstrap: [AppComponent] }) export class AppModule { } diff --git a/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.ts b/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.ts index fa1b9c8bbc..ef7fc05d32 100644 --- a/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.ts +++ b/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.ts @@ -18,7 +18,7 @@ import { Component, Input, OnChanges, OnInit, SimpleChanges, SimpleChange, ViewEncapsulation } from '@angular/core'; import { MinimalNodeEntryEntity } from 'alfresco-js-api'; import { Observable } from 'rxjs/Observable'; -import { CardViewItem, CardViewUpdateService, NodesApiService, LogService } from '@alfresco/adf-core'; +import { CardViewItem, NodesApiService, LogService, CardViewUpdateService } from '@alfresco/adf-core'; import { ContentMetadataService } from '../../services/content-metadata.service'; import { CardViewGroup } from '../../interfaces/content-metadata.interfaces'; @@ -27,8 +27,7 @@ import { CardViewGroup } from '../../interfaces/content-metadata.interfaces'; templateUrl: './content-metadata.component.html', styleUrls: ['./content-metadata.component.scss'], host: { 'class': 'adf-content-metadata' }, - encapsulation: ViewEncapsulation.None, - providers: [ CardViewUpdateService ] + encapsulation: ViewEncapsulation.None }) export class ContentMetadataComponent implements OnChanges, OnInit { diff --git a/lib/content-services/content-metadata/content-metadata.module.ts b/lib/content-services/content-metadata/content-metadata.module.ts index 1d2a8c14cd..4be0a1aed3 100644 --- a/lib/content-services/content-metadata/content-metadata.module.ts +++ b/lib/content-services/content-metadata/content-metadata.module.ts @@ -23,11 +23,6 @@ import { MaterialModule } from '../material.module'; import { CardViewModule } from '@alfresco/adf-core'; import { ContentMetadataComponent } from './components/content-metadata/content-metadata.component'; import { ContentMetadataCardComponent } from './components/content-metadata-card/content-metadata-card.component'; -import { PropertyDescriptorsService } from './services/property-descriptors.service'; -import { ContentMetadataConfigFactory } from './services/config/content-metadata-config.factory'; -import { BasicPropertiesService } from './services/basic-properties.service'; -import { ContentMetadataService } from './services/content-metadata.service'; -import { PropertyGroupTranslatorService } from './services/property-groups-translator.service'; @NgModule({ imports: [ @@ -44,13 +39,6 @@ import { PropertyGroupTranslatorService } from './services/property-groups-trans declarations: [ ContentMetadataComponent, ContentMetadataCardComponent - ], - providers: [ - ContentMetadataService, - PropertyDescriptorsService, - ContentMetadataConfigFactory, - BasicPropertiesService, - PropertyGroupTranslatorService ] }) export class ContentMetadataModule {} diff --git a/lib/content-services/content-metadata/public-api.ts b/lib/content-services/content-metadata/public-api.ts index 9c9987ce43..5106171501 100644 --- a/lib/content-services/content-metadata/public-api.ts +++ b/lib/content-services/content-metadata/public-api.ts @@ -15,5 +15,12 @@ * limitations under the License. */ -export * from './components/content-metadata-card/content-metadata-card.component'; -export * from './services/content-metadata.service'; +export { ContentMetadataCardComponent } from './components/content-metadata-card/content-metadata-card.component'; +export { BasicPropertiesService } from './services/basic-properties.service'; +export { ContentMetadataService } from './services/content-metadata.service'; +export { PropertyDescriptorsService } from './services/property-descriptors.service'; +export { PropertyGroupTranslatorService } from './services/property-groups-translator.service'; +export { AspectOrientedConfigService } from './services/config/aspect-oriented-config.service'; +export { ContentMetadataConfigFactory } from './services/config/content-metadata-config.factory'; +export { IndifferentConfigService } from './services/config/indifferent-config.service'; +export { LayoutOrientedConfigService } from './services/config/layout-oriented-config.service'; diff --git a/lib/content-services/content.module.ts b/lib/content-services/content.module.ts index e4fa82a884..482e2055ae 100644 --- a/lib/content-services/content.module.ts +++ b/lib/content-services/content.module.ts @@ -37,6 +37,12 @@ import { DialogModule } from './dialogs/dialog.module'; import { FolderDirectiveModule } from './folder-directive/folder-directive.module'; import { ContentMetadataModule } from './content-metadata/content-metadata.module'; import { PermissionManagerModule } from './permission-manager/permission-manager.module'; +import { RatingService } from './social/services/rating.service'; +import { ContentMetadataService } from './content-metadata/services/content-metadata.service'; +import { PropertyDescriptorsService } from './content-metadata/services/property-descriptors.service'; +import { ContentMetadataConfigFactory } from './content-metadata/services/config/content-metadata-config.factory'; +import { BasicPropertiesService } from './content-metadata/services/basic-properties.service'; +import { PropertyGroupTranslatorService } from './content-metadata/services/property-groups-translator.service'; @NgModule({ imports: [ @@ -69,7 +75,13 @@ import { PermissionManagerModule } from './permission-manager/permission-manager name: 'adf-content-services', source: 'assets/adf-content-services' } - } + }, + RatingService, + ContentMetadataService, + PropertyDescriptorsService, + ContentMetadataConfigFactory, + BasicPropertiesService, + PropertyGroupTranslatorService ], exports: [ CoreModule, diff --git a/lib/content-services/dialogs/dialog.module.ts b/lib/content-services/dialogs/dialog.module.ts index 5128382cda..4c9c6a8328 100644 --- a/lib/content-services/dialogs/dialog.module.ts +++ b/lib/content-services/dialogs/dialog.module.ts @@ -25,7 +25,6 @@ import { ShareDialogComponent } from './share.dialog'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { NodesApiService, NotificationService, TranslationService } from '@alfresco/adf-core'; @NgModule({ imports: [ @@ -40,11 +39,6 @@ import { NodesApiService, NotificationService, TranslationService } from '@alfre FolderDialogComponent, ShareDialogComponent ], - providers: [ - NodesApiService, - NotificationService, - TranslationService - ], exports: [ DownloadZipDialogComponent, FolderDialogComponent, diff --git a/lib/content-services/site-dropdown/sites-dropdown.module.ts b/lib/content-services/site-dropdown/sites-dropdown.module.ts index 0f4aea7ad9..cac757251d 100644 --- a/lib/content-services/site-dropdown/sites-dropdown.module.ts +++ b/lib/content-services/site-dropdown/sites-dropdown.module.ts @@ -36,7 +36,6 @@ import { DropdownSitesComponent } from './sites-dropdown.component'; ], declarations: [ DropdownSitesComponent - ], - providers: [] + ] }) export class SitesDropdownModule {} diff --git a/lib/content-services/social/like.component.ts b/lib/content-services/social/like.component.ts index 8bdd6dc300..5dcaa557d2 100644 --- a/lib/content-services/social/like.component.ts +++ b/lib/content-services/social/like.component.ts @@ -22,7 +22,6 @@ import { RatingService } from './services/rating.service'; selector: 'adf-like', styleUrls: ['./like.component.scss'], templateUrl: './like.component.html', - providers: [RatingService], encapsulation: ViewEncapsulation.None }) export class LikeComponent implements OnChanges { diff --git a/lib/content-services/social/rating.component.ts b/lib/content-services/social/rating.component.ts index 887e8cc1f7..19c7f5c551 100644 --- a/lib/content-services/social/rating.component.ts +++ b/lib/content-services/social/rating.component.ts @@ -22,7 +22,6 @@ import { RatingService } from './services/rating.service'; selector: 'adf-rating', styleUrls: ['./rating.component.scss'], templateUrl: './rating.component.html', - providers: [RatingService], encapsulation: ViewEncapsulation.None }) export class RatingComponent implements OnChanges { diff --git a/lib/content-services/social/social.module.ts b/lib/content-services/social/social.module.ts index 64872b5ff6..d32e37b8ae 100644 --- a/lib/content-services/social/social.module.ts +++ b/lib/content-services/social/social.module.ts @@ -19,7 +19,6 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MaterialModule } from '../material.module'; -import { RatingService } from './services/rating.service'; import { LikeComponent } from './like.component'; import { RatingComponent } from './rating.component'; @@ -35,9 +34,6 @@ import { RatingComponent } from './rating.component'; declarations: [ RatingComponent, LikeComponent - ], - providers: [ - RatingService ] }) export class SocialModule {} diff --git a/lib/process-services/app-list/apps-list.module.ts b/lib/process-services/app-list/apps-list.module.ts index e24801ec43..1ff9578646 100644 --- a/lib/process-services/app-list/apps-list.module.ts +++ b/lib/process-services/app-list/apps-list.module.ts @@ -37,7 +37,6 @@ import { SelectAppsDialogComponent } from './select-apps-dialog-component'; AppsListComponent, SelectAppsDialogComponent ], - providers: [], exports: [ AppsListComponent, SelectAppsDialogComponent diff --git a/lib/process-services/process-list/process-list.module.ts b/lib/process-services/process-list/process-list.module.ts index 6dc219970d..908851274e 100644 --- a/lib/process-services/process-list/process-list.module.ts +++ b/lib/process-services/process-list/process-list.module.ts @@ -23,7 +23,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { FormModule } from '@alfresco/adf-core'; import { MaterialModule } from '../material.module'; -import { CardViewModule, CardViewUpdateService, DataColumnModule, DataTableModule, DirectiveModule, PipeModule } from '@alfresco/adf-core'; +import { CardViewModule, DataColumnModule, DataTableModule, DirectiveModule, PipeModule } from '@alfresco/adf-core'; import { TaskListModule } from '../task-list/task-list.module'; import { PeopleModule } from '../people/people.module'; import { CommentsModule } from '../comments/comments.module'; @@ -70,8 +70,7 @@ import { ProcessFilterService } from './services/process-filter.service'; ], providers: [ ProcessService, - ProcessFilterService, - CardViewUpdateService + ProcessFilterService ], exports: [ ProcessInstanceListComponent, diff --git a/lib/process-services/task-list/components/task-details.component.ts b/lib/process-services/task-list/components/task-details.component.ts index c79e60e3ea..a3caea38e7 100644 --- a/lib/process-services/task-list/components/task-details.component.ts +++ b/lib/process-services/task-list/components/task-details.component.ts @@ -48,10 +48,7 @@ import { AttachFileWidgetComponent, AttachFolderWidgetComponent } from '../../co @Component({ selector: 'adf-task-details', templateUrl: './task-details.component.html', - styleUrls: ['./task-details.component.scss'], - providers: [ - CardViewUpdateService - ] + styleUrls: ['./task-details.component.scss'] }) export class TaskDetailsComponent implements OnInit, OnChanges {