diff --git a/.eslintrc.json b/.eslintrc.json index 2c42ec2..33f9645 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -90,3 +90,4 @@ } ] } + diff --git a/README.md b/README.md index 24f8268..6fe41db 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Install dependencies: In `app.module.ts` add: -``` +```ts export function httpLoaderFactory(httpClient: HttpClient, configService: ConfigService): PruningTranslationLoader { return new PruningTranslationLoader(httpClient, '/assets/i18n/', `.json?version=${configService.values.FRONTEND_APP_VERSION}`); } @@ -52,3 +52,28 @@ section: ``` Make sure `noImplicitOverride` is **not** set to `true`. + +Include the common-ui assets in the `assets` section of `angular.json`: + +```json +{ + "glob": "**/*", + "input": "{libs,projects}/common-ui/src/assets/", + "output": "/assets/" +} +``` + +Update `styles` and `stylePreprocessorOptions` in `angular.json`: + +``` +"styles": [ + ... + "{libs,projects}/common-ui/src/assets/styles/common-styles.scss" +], +"stylePreprocessorOptions": { + "includePaths": [ + ... + "./{libs,projects}/common-ui/src/assets/styles" + ] +} +``` diff --git a/src/lib/dialog/confirmation-dialog.service.ts b/src/lib/dialog/confirmation-dialog.service.ts index 2664376..8cd68e3 100644 --- a/src/lib/dialog/confirmation-dialog.service.ts +++ b/src/lib/dialog/confirmation-dialog.service.ts @@ -17,12 +17,12 @@ export class ConfirmationDialogService extends DialogService { }, }; - constructor(protected override readonly _dialog: MatDialog) { + constructor(protected readonly _dialog: MatDialog) { super(_dialog); } // @ts-ignore - override openDialog(data?: { disableConfirm: boolean; [key: string]: unknown }): MatDialogRef { + openDialog(data?: { disableConfirm: boolean; [key: string]: unknown }): MatDialogRef { return super.openDialog( 'confirm', null, @@ -32,7 +32,7 @@ export class ConfirmationDialogService extends DialogService { details: _('confirmation-dialog.unsaved-changes.details'), confirmationText: _('confirmation-dialog.unsaved-changes.confirmation-text'), discardChangesText: _('confirmation-dialog.unsaved-changes.discard-changes-text'), - disableConfirm: data.disableConfirm, + disableConfirm: data?.disableConfirm, titleColor: TitleColors.WARN, }), ); diff --git a/src/lib/listing/services/entities.service.ts b/src/lib/listing/services/entities.service.ts index 7af6064..06a590a 100644 --- a/src/lib/listing/services/entities.service.ts +++ b/src/lib/listing/services/entities.service.ts @@ -26,9 +26,9 @@ export class EntitiesService extends GenericService< private readonly _all$ = new BehaviorSubject([]); constructor( - protected override readonly _injector: Injector, + protected readonly _injector: Injector, @Optional() @Inject(ENTITY_CLASS) private readonly _entityClass: new (entityInterface: I, ...args: unknown[]) => E, - @Optional() @Inject(ENTITY_PATH) protected override readonly _defaultModelPath = '', + @Optional() @Inject(ENTITY_PATH) protected readonly _defaultModelPath = '', ) { super(_injector, _defaultModelPath); this.all$ = this._all$.asObservable().pipe(shareDistinctLast());