From 0b4c860354c45fb188f47d808e59fe5a56fff1c2 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com>
Date: Fri, 11 Dec 2020 01:19:49 -0800
Subject: [PATCH] refactoring
---
.../filter-dropdown/filter-dropdown.component.html | 6 +++---
.../filter-dropdown/filter-dropdown.component.ts | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
index fad1b6663..6e73b31a7 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.html
@@ -2,9 +2,9 @@
<button class="btn btn-outline-primary btn-sm" id="dropdown{{title}}" ngbDropdownToggle>{{title}}</button>
<div class="dropdown-menu quick-filter shadow" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
<div class="list-group list-group-flush">
- <input class="list-group-item form-control form-control-sm" type="text" [(ngModel)]="filterText" placeholder="Filter {{title}}" #filterTextInput>
- <ng-container *ngIf="(items | filter: filterText).length > 0">
- <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let item of items | filter: filterText; let i = index" (click)="toggleItem(item)">
+ <input class="list-group-item form-control form-control-sm" type="text" [(ngModel)]="listFilterText" placeholder="Filter {{title}}" #listFilterTextInput>
+ <ng-container *ngIf="(items | filter: listFilterText).length > 0">
+ <button class="list-group-item list-group-item-action d-flex align-items-center" role="menuitem" *ngFor="let item of items | filter: listFilterText; let i = index" (click)="toggleItem(item)">
<div class="selected-icon mr-1">
<svg *ngIf="itemsActive.includes(item)" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 0 1 1.071 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 0 1 .02-.022z"/>
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
index 625c72be8..a57543424 100644
--- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown.component.ts
@@ -17,12 +17,12 @@ export class FilterDropdownComponent implements OnInit {
@Output()
toggle = new EventEmitter()
- @ViewChild('filterTextInput') filterTextInput: ElementRef
+ @ViewChild('listFilterTextInput') listFilterTextInput: ElementRef
items: ObjectWithId[] = []
itemsActive: ObjectWithId[] = []
title: string
- filterText: string
+ listFilterText: string
display: string
ngOnInit(): void {
@@ -38,7 +38,7 @@ export class FilterDropdownComponent implements OnInit {
dropdownOpenChange(open: boolean): void {
if (open) {
setTimeout(() => {
- this.filterTextInput.nativeElement.focus();
+ this.listFilterTextInput.nativeElement.focus();
}, 0);
} else {
this.filterText = ''