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

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

@@ -188,37 +188,34 @@
         [formControl]="portfolioFilterFormControl"
         [holdings]="holdings"
         [tags]="tags"
-        (applyFilters)="onApplyFilters()"
+      />
-        (resetFilters)="onResetFilters()"
+      <div class="d-flex w-100">
-      >
+        <button
-        <div class="d-flex w-100" gfPortfolioFilterActions>
+          i18n
-          <button
+          mat-button
-            i18n
+          type="button"
-            mat-button
+          [disabled]="
-            type="button"
+            !portfolioFilterForm.hasFilters() || portfolioFilterForm.disabled
-            [disabled]="
+          "
-              !portfolioFilterForm.hasFilters() || portfolioFilterForm.disabled
+          (click)="onResetFilters()"
-            "
+        >
-            (click)="portfolioFilterForm.onResetFilters()"
+          Reset Filters
-          >
+        </button>
-            Reset Filters
+        <span class="gf-spacer"></span>
-          </button>
+        <button
-          <span class="gf-spacer"></span>
+          color="primary"
-          <button
+          i18n
-            color="primary"
+          mat-flat-button
-            i18n
+          type="button"
-            mat-flat-button
+          [disabled]="
-            type="button"
+            !portfolioFilterForm.filterForm.dirty ||
-            [disabled]="
+            portfolioFilterForm.disabled
-              !portfolioFilterForm.filterForm.dirty ||
+          "
-              portfolioFilterForm.disabled
+          (click)="onApplyFilters()"
-            "
+        >
-            (click)="portfolioFilterForm.onApplyFilters()"
+          Apply Filters
-          >
+        </button>
-            Apply Filters
+      </div>
-          </button>
-        </div>
-      </gf-portfolio-filter-form>
     </div>
   }
 </div>

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

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

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

@@ -8,12 +8,10 @@ import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
-  EventEmitter,
   Input,
   OnChanges,
   OnDestroy,
   OnInit,
-  Output,
   forwardRef
 } from '@angular/core';
 import {
@@ -63,9 +61,6 @@ export class GfPortfolioFilterFormComponent
   @Input() tags: Filter[] = [];
   @Input() disabled = false;
 
-  @Output() applyFilters = new EventEmitter<void>();
-  @Output() resetFilters = new EventEmitter<void>();
-
   public filterForm: FormGroup;
 
   // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -134,17 +129,6 @@ export class GfPortfolioFilterFormComponent
     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) {
     this.onChange = fn;
   }