some fixes
This commit is contained in:
parent
edf2e5cc93
commit
cb8a0ddcf9
@ -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,
|
||||
|
||||
@ -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';
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@ export abstract class IqserPermissionsDirective implements OnDestroy, OnInit {
|
||||
protected readonly _subscription = new Subscription();
|
||||
protected readonly _if = new BehaviorSubject<Promise<boolean> | Observable<boolean>>(of(true));
|
||||
|
||||
protected constructor() {
|
||||
constructor() {
|
||||
const ifCondition$ = this._if.pipe(switchMap(condition => condition));
|
||||
|
||||
this._subscription = combineLatest([ifCondition$, this._updateView])
|
||||
|
||||
@ -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,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user