From 698287e5decc9767c4c5f664ce46a3efa5cb95fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Mon, 20 Jun 2022 21:05:54 +0300 Subject: [PATCH] WIP --- README.md | 17 ++++++++++------- src/lib/common-ui.module.ts | 3 +-- .../workflow/models/entity-wrapper.model.ts | 2 +- src/lib/listing/workflow/workflow.component.ts | 4 ++-- .../confirmation-dialog.component.html | 4 ++-- .../confirmation-dialog.component.ts | 4 ++-- src/lib/utils/pruning-translation-loader.ts | 3 ++- 7 files changed, 20 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 20728eb..12025a9 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,12 @@ -# common-ui +## Installation -### Setup: +Install submodule at `libs/common-ui`. -* `yarn add keycloak-angular ngx-toastr @biesbjerg/ngx-translate-extract-marker @ngx-translate/core @ngx-translate/http-loader dayjs lodash-es ngx-translate-messageformat-compiler` -* `yarn add @types/lodash-es -D` -* `ng add @angular/material` +Install dependencies: + +- `yarn add keycloak-angular keycloak-js ngx-toastr @biesbjerg/ngx-translate-extract-marker @ngx-translate/core @ngx-translate/http-loader dayjs lodash-es ngx-translate-messageformat-compiler` +- `yarn add @types/lodash-es -D` +- `ng add @angular/material` In `app.module.ts` add: @@ -35,14 +37,15 @@ export function httpLoaderFactory(httpClient: HttpClient, configService: ConfigS }) ``` -Update `tsconfig.json`: +Rename `tsconfig.json` in root directory to `tsconfig.base.json`, and add the following to the `compilerOptions` +section: ``` "compilerOptions": { ... "paths": { ... - "@iqser/common-ui": ["projects/common-ui/src/index.ts"] + "@iqser/common-ui": ["libs/common-ui/src/index.ts"] }, "allowSyntheticDefaultImports": true }, diff --git a/src/lib/common-ui.module.ts b/src/lib/common-ui.module.ts index a7cea88..302e2c7 100644 --- a/src/lib/common-ui.module.ts +++ b/src/lib/common-ui.module.ts @@ -70,5 +70,4 @@ const pipes = [SortByPipe, HumanizePipe, CapitalizePipe, LogPipe]; imports: [CommonModule, ...matModules, ...modules, FormsModule, ReactiveFormsModule, KeycloakAngularModule], exports: [...components, ...pipes, ...modules, LogPipe], }) -export class CommonUiModule { -} +export class CommonUiModule {} diff --git a/src/lib/listing/workflow/models/entity-wrapper.model.ts b/src/lib/listing/workflow/models/entity-wrapper.model.ts index 8155e7e..874905a 100644 --- a/src/lib/listing/workflow/models/entity-wrapper.model.ts +++ b/src/lib/listing/workflow/models/entity-wrapper.model.ts @@ -19,7 +19,7 @@ export class EntityWrapper { classes[key] = this._itemClasses[key](entity); } } - classes.item = true; + classes['item'] = true; return classes; } } diff --git a/src/lib/listing/workflow/workflow.component.ts b/src/lib/listing/workflow/workflow.component.ts index 9eeb534..ec291fd 100644 --- a/src/lib/listing/workflow/workflow.component.ts +++ b/src/lib/listing/workflow/workflow.component.ts @@ -25,7 +25,7 @@ import { WorkflowColumn } from './models/workflow-column.model'; import { EntityWrapper } from './models/entity-wrapper.model'; @Component({ - selector: 'iqser-workflow [itemTemplate] [config]', + selector: 'iqser-workflow [itemTemplate] [config] [addElementIcon]', templateUrl: './workflow.component.html', styleUrls: ['./workflow.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, @@ -35,7 +35,7 @@ export class WorkflowComponent extends Au @Input() itemTemplate!: TemplateRef; @Input() config!: WorkflowConfig; @Input() itemClasses!: Record boolean>; - @Input() addElementIcon?: string; + @Input() addElementIcon!: string; @Input() addElementColumn?: K; @Input() noDataText?: string; @Input() noDataIcon?: string; diff --git a/src/lib/misc/confirmation-dialog/confirmation-dialog.component.html b/src/lib/misc/confirmation-dialog/confirmation-dialog.component.html index 971c592..c54b86b 100644 --- a/src/lib/misc/confirmation-dialog/confirmation-dialog.component.html +++ b/src/lib/misc/confirmation-dialog/confirmation-dialog.component.html @@ -3,7 +3,7 @@ {{ config.title }} -
+
@@ -34,8 +34,8 @@ (click)="confirm(ConfirmOptions.CONFIRM)" [disabled]="(config.requireInput && confirmationDoesNotMatch()) || config.disableConfirm" color="primary" - mat-flat-button id="confirm" + mat-flat-button > {{ config.confirmationText }} diff --git a/src/lib/misc/confirmation-dialog/confirmation-dialog.component.ts b/src/lib/misc/confirmation-dialog/confirmation-dialog.component.ts index efa6357..a8b92e9 100644 --- a/src/lib/misc/confirmation-dialog/confirmation-dialog.component.ts +++ b/src/lib/misc/confirmation-dialog/confirmation-dialog.component.ts @@ -19,7 +19,7 @@ export enum ConfirmOptions { interface CheckBox { value: boolean; label: string; - extraContent?: TemplateRef; + extraContent: TemplateRef | null; extraContentData?: Record; } @@ -35,7 +35,7 @@ export class ConfirmationDialogInput { disableConfirm?: boolean; denyText?: string; translateParams?: Record; - checkboxes?: CheckBox[]; + checkboxes: CheckBox[]; toastMessage?: string; constructor(options?: ConfirmationDialogInput) { diff --git a/src/lib/utils/pruning-translation-loader.ts b/src/lib/utils/pruning-translation-loader.ts index f618ac6..b9b0985 100644 --- a/src/lib/utils/pruning-translation-loader.ts +++ b/src/lib/utils/pruning-translation-loader.ts @@ -8,7 +8,8 @@ interface T { } export class PruningTranslationLoader implements TranslateLoader { - constructor(private _http: HttpClient, private _prefix: string, private _suffix: string) {} + constructor(private _http: HttpClient, private _prefix: string, private _suffix: string) { + } getTranslation(lang: string): Observable { return this._http.get(`${this._prefix}${lang}${this._suffix}`).pipe(map(result => this._process(result as T)));