diff --git a/src/lib/common-ui.module.ts b/src/lib/common-ui.module.ts index 7c4ff51..db1f558 100644 --- a/src/lib/common-ui.module.ts +++ b/src/lib/common-ui.module.ts @@ -6,8 +6,6 @@ import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@ang import { CommonUiOptions, IqserAppConfig, ModuleOptions } from './utils'; import { ToastComponent } from './shared'; import { ConnectionStatusComponent, FullPageErrorComponent } from './error'; -import { IqserListingModule } from './listing'; -import { IqserFiltersModule } from './filtering'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; @@ -15,7 +13,7 @@ import { MatLegacyProgressBarModule as MatProgressBarModule } from '@angular/mat import { ConfirmationDialogComponent } from './dialog'; import { MatTooltipModule } from '@angular/material/tooltip'; import { ApiPathInterceptor, DefaultUserPreferenceService, IqserConfigService, IqserUserPreferenceService } from './services'; -import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http'; +import { HTTP_INTERCEPTORS } from '@angular/common/http'; import { MatDialogModule } from '@angular/material/dialog'; import { CircleButtonComponent, IconButtonComponent } from './buttons'; import { DomSanitizer } from '@angular/platform-browser'; @@ -32,7 +30,6 @@ const matModules = [ MatTooltipModule, MatProgressBarModule, ]; -const modules = [IqserListingModule, IqserFiltersModule, HttpClientModule]; const components = [ConnectionStatusComponent, FullPageErrorComponent, ConfirmationDialogComponent, ToastComponent]; @NgModule({ @@ -40,7 +37,6 @@ const components = [ConnectionStatusComponent, FullPageErrorComponent, Confirmat imports: [ CommonModule, ...matModules, - ...modules, FormsModule, ReactiveFormsModule, TranslateModule, @@ -48,7 +44,7 @@ const components = [ConnectionStatusComponent, FullPageErrorComponent, Confirmat CircleButtonComponent, StopPropagationDirective, ], - exports: [...components, ...modules], + exports: [...components], providers: [ { provide: HTTP_INTERCEPTORS, diff --git a/src/lib/error/connection-status/connection-status.component.ts b/src/lib/error/connection-status/connection-status.component.ts index fab4848..a70a323 100644 --- a/src/lib/error/connection-status/connection-status.component.ts +++ b/src/lib/error/connection-status/connection-status.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { connectionStatusTranslations } from '../../translations/connection-status-translations'; +import { connectionStatusTranslations } from '../../translations'; import { animate, state, style, transition, trigger } from '@angular/animations'; import { ErrorService } from '../error.service'; diff --git a/src/lib/permissions/directives/permissions.directive.ts b/src/lib/permissions/directives/permissions.directive.ts index 4ab7084..496a04b 100644 --- a/src/lib/permissions/directives/permissions.directive.ts +++ b/src/lib/permissions/directives/permissions.directive.ts @@ -37,7 +37,7 @@ export abstract class IqserPermissionsDirective implements OnDestroy, OnInit { protected readonly _subscription = new Subscription(); protected readonly _if = new BehaviorSubject | Observable>(of(true)); - protected constructor() { + constructor() { const ifCondition$ = this._if.pipe(switchMap(condition => condition)); this._subscription = combineLatest([ifCondition$, this._updateView]) diff --git a/src/lib/translations/iqser-translate.module.ts b/src/lib/translations/iqser-translate.module.ts index a32ee3f..b1242b6 100644 --- a/src/lib/translations/iqser-translate.module.ts +++ b/src/lib/translations/iqser-translate.module.ts @@ -4,11 +4,13 @@ import { TranslateMessageFormatCompiler } from 'ngx-translate-messageformat-comp import { pruningTranslationLoaderFactory } from './http-loader-factory'; import { IqserTranslateModuleOptions } from './iqser-translate-module-options'; import { IqserTranslateParser } from './iqser-translate-parser.service'; +import { HttpClientModule } from '@angular/common/http'; const translateLoaderToken = 'translateLoader'; @NgModule({ imports: [ + HttpClientModule, TranslateModule.forRoot({ loader: { provide: TranslateLoader,