Browse Source

Refactor portfolio filter form: remove output events and simplify button actions

pull/5618/head
Germán Martín 2 weeks ago
parent
commit
08a694fd73
  1. 11
      libs/ui/src/lib/assistant/assistant.html
  2. 1
      libs/ui/src/lib/portfolio-filter-form/portfolio-filter-form.component.html
  3. 16
      libs/ui/src/lib/portfolio-filter-form/portfolio-filter-form.component.ts

11
libs/ui/src/lib/assistant/assistant.html

@ -188,10 +188,8 @@
[formControl]="portfolioFilterFormControl" [formControl]="portfolioFilterFormControl"
[holdings]="holdings" [holdings]="holdings"
[tags]="tags" [tags]="tags"
(applyFilters)="onApplyFilters()" />
(resetFilters)="onResetFilters()" <div class="d-flex w-100">
>
<div class="d-flex w-100" gfPortfolioFilterActions>
<button <button
i18n i18n
mat-button mat-button
@ -199,7 +197,7 @@
[disabled]=" [disabled]="
!portfolioFilterForm.hasFilters() || portfolioFilterForm.disabled !portfolioFilterForm.hasFilters() || portfolioFilterForm.disabled
" "
(click)="portfolioFilterForm.onResetFilters()" (click)="onResetFilters()"
> >
Reset Filters Reset Filters
</button> </button>
@ -213,12 +211,11 @@
!portfolioFilterForm.filterForm.dirty || !portfolioFilterForm.filterForm.dirty ||
portfolioFilterForm.disabled portfolioFilterForm.disabled
" "
(click)="portfolioFilterForm.onApplyFilters()" (click)="onApplyFilters()"
> >
Apply Filters Apply Filters
</button> </button>
</div> </div>
</gf-portfolio-filter-form>
</div> </div>
} }
</div> </div>

1
libs/ui/src/lib/portfolio-filter-form/portfolio-filter-form.component.html

@ -72,5 +72,4 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
<ng-content select="[gfPortfolioFilterActions]" />
</form> </form>

16
libs/ui/src/lib/portfolio-filter-form/portfolio-filter-form.component.ts

@ -8,12 +8,10 @@ import {
ChangeDetectionStrategy, ChangeDetectionStrategy,
ChangeDetectorRef, ChangeDetectorRef,
Component, Component,
EventEmitter,
Input, Input,
OnChanges, OnChanges,
OnDestroy, OnDestroy,
OnInit, OnInit,
Output,
forwardRef forwardRef
} from '@angular/core'; } from '@angular/core';
import { import {
@ -63,9 +61,6 @@ export class GfPortfolioFilterFormComponent
@Input() tags: Filter[] = []; @Input() tags: Filter[] = [];
@Input() disabled = false; @Input() disabled = false;
@Output() applyFilters = new EventEmitter<void>();
@Output() resetFilters = new EventEmitter<void>();
public filterForm: FormGroup; public filterForm: FormGroup;
// eslint-disable-next-line @typescript-eslint/no-empty-function // eslint-disable-next-line @typescript-eslint/no-empty-function
@ -134,17 +129,6 @@ export class GfPortfolioFilterFormComponent
this.changeDetectorRef.markForCheck(); this.changeDetectorRef.markForCheck();
} }
public onApplyFilters() {
this.filterForm.markAsPristine();
this.onChange(this.filterForm.value as PortfolioFilterFormValue);
this.applyFilters.emit();
}
public onResetFilters() {
this.filterForm.reset({}, { emitEvent: true });
this.resetFilters.emit();
}
public registerOnChange(fn: (value: PortfolioFilterFormValue) => void) { public registerOnChange(fn: (value: PortfolioFilterFormValue) => void) {
this.onChange = fn; this.onChange = fn;
} }

Loading…
Cancel
Save