From 540d0c58af130b3493094c8810bb4d58f20140b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sinan=20=C3=96zt=C3=BCrk?= Date: Wed, 7 Feb 2024 14:06:45 +0300 Subject: [PATCH 1/4] add formsModule to extensible-form-prop component and enhancement for template / fix classname duplication --- npm/ng-packs/package.json | 2 +- .../extensible-form-prop.component.html | 2 +- .../extensible-form-prop.component.ts | 66 +++++++++++-------- .../extensible-form.component.html | 47 ++++++------- 4 files changed, 60 insertions(+), 57 deletions(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index e7f3932111..a6f61d57a0 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -113,7 +113,7 @@ "postcss-import": "14.1.0", "postcss-preset-env": "7.5.0", "postcss-url": "10.1.3", - "prettier": "2.7.1", + "prettier": "^3.0.0", "protractor": "~7.0.0", "rxjs": "~7.8.0", "should-quote": "^1.0.0", diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html index 4f77dd0cf7..1baffb9030 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html @@ -7,7 +7,7 @@ -
+
) { - this.typeaheadModel = selectedOption || {key: null, value: null}; - const {key, value} = this.typeaheadModel; + this.typeaheadModel = selectedOption || { key: null, value: null }; + const { key, value } = this.typeaheadModel; const [keyControl, valueControl] = this.getTypeaheadControls(); if (valueControl?.value && !value) valueControl.markAsDirty(); keyControl?.setValue(key); @@ -114,10 +122,10 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { search = (text$: Observable) => text$ ? text$.pipe( - debounceTime(300), - distinctUntilChanged(), - switchMap(text => this.prop?.options?.(this.data, text) || of([])), - ) + debounceTime(300), + distinctUntilChanged(), + switchMap(text => this.prop?.options?.(this.data, text) || of([])), + ) : of([]); typeaheadFormatter = (option: ABP.Option) => option.key; @@ -130,7 +138,7 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { } private getTypeaheadControls() { - const {name} = this.prop; + const { name } = this.prop; const extraPropName = `${EXTRA_PROPERTIES_KEY}.${name}`; const keyControl = this.form.get(addTypeaheadTextSuffix(extraPropName)) || @@ -158,9 +166,9 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { return this.service.getType(prop); } - ngOnChanges({prop, data}: SimpleChanges) { + ngOnChanges({ prop, data }: SimpleChanges) { const currentProp = prop?.currentValue as FormProp; - const {options, readonly, disabled, validators, className, template} = currentProp || {}; + const { options, readonly, disabled, validators, className, template } = currentProp || {}; if (template) { this.injectorForCustomComponent = Injector.create({ providers: [ @@ -172,7 +180,7 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { provide: EXTENSIONS_FORM_PROP_DATA, useValue: (data?.currentValue as PropData)?.record, }, - {provide: ControlContainer, useExisting: FormGroupDirective}, + { provide: ControlContainer, useExisting: FormGroupDirective }, ], parent: this.injector, }); @@ -194,6 +202,6 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { const [keyControl, valueControl] = this.getTypeaheadControls(); if (keyControl && valueControl) - this.typeaheadModel = {key: keyControl.value, value: valueControl.value}; + this.typeaheadModel = { key: keyControl.value, value: valueControl.value }; } } diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html index c0cdcbea6d..e146dd4f58 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html @@ -1,33 +1,28 @@ - - - - - -
- - -
- - - - - - - - - - +@if (form) { + @for (groupedProp of groupedPropList.items; track $index) { + +
+ + +
+ + } +} - - + @for (prop of groupedProp.formPropList; let first = $first; track prop.name) { + @if(prop.visible(data)) { - + @@ -40,6 +35,6 @@ [first]="first" > - - + } + } From 6002b7585116d688fe4969adbc67787f199b8692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sinan=20=C3=96zt=C3=BCrk?= Date: Wed, 7 Feb 2024 14:11:31 +0300 Subject: [PATCH 2/4] format --- .../extensible-form.component.html | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html index e146dd4f58..13652996e3 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html @@ -1,17 +1,17 @@ @if (form) { - @for (groupedProp of groupedPropList.items; track $index) { - -
+
+ - - -
- + +
+ } } From 6c5aa4b584c38eea6bc7cad8114665f32e94f531 Mon Sep 17 00:00:00 2001 From: Masum ULU <49063256+masumulu28@users.noreply.github.com> Date: Thu, 8 Feb 2024 11:06:47 +0300 Subject: [PATCH 3/4] Update extensible-form-prop.component.html --- .../extensible-form/extensible-form-prop.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html index 1baffb9030..4f77dd0cf7 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html @@ -7,7 +7,7 @@ -
+
Date: Thu, 8 Feb 2024 11:13:54 +0300 Subject: [PATCH 4/4] Update extensible-form.component.html --- .../extensible-form.component.html | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html index 13652996e3..739fe6a114 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html @@ -1,16 +1,23 @@ @if (form) { @for (groupedProp of groupedPropList.items; track $index) { -
- - -
+ + +
+ } @else { + + + } } }