Skip to content

Commit 03ea30e

Browse files
committed
[NAE-1745] Autocomplete new filter "include"
- implement
1 parent c568d6a commit 03ea30e

File tree

5 files changed

+18
-7
lines changed

5 files changed

+18
-7
lines changed

projects/netgrif-components-core/src/lib/data-fields/enumeration-field/enumeration-autocomplete-select-field/abstract-enumeration-autocomplete-select-field.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {EnumerationField, EnumerationFieldValidation, EnumerationFieldValue} fro
66
import {WrappedBoolean} from '../../data-field-template/models/wrapped-boolean';
77
import {TranslateService} from '@ngx-translate/core';
88
import {MatAutocompleteSelectedEvent} from '@angular/material/autocomplete';
9-
import {MultichoiceFieldValue} from '../../multichoice-field/models/multichoice-field';
9+
import {EnumerationAutocompleteFilterProperty} from './enumeration-autocomplete-filter-property';
1010

1111
@Component({
1212
selector: 'ncc-abstract-enumeration-autocomplete-field',
@@ -71,11 +71,11 @@ export abstract class AbstractEnumerationAutocompleteSelectFieldComponent implem
7171
}
7272

7373
protected _filter(value: string): Array<EnumerationFieldValue> {
74-
let filterType = this.filterType().toLowerCase()
74+
let filterType = this.filterType()?.toLowerCase()
7575
switch (filterType) {
76-
case "include":
76+
case EnumerationAutocompleteFilterProperty.SUBSTRING:
7777
return this._filterInclude(value);
78-
case "indexof":
78+
case EnumerationAutocompleteFilterProperty.PREFIX:
7979
return this._filterIndexOf(value);
8080
default:
8181
return this._filterIndexOf(value);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export enum EnumerationAutocompleteFilterProperty {
2+
PREFIX='prefix',
3+
SUBSTRING='substring'
4+
}

projects/netgrif-components-core/src/lib/data-fields/multichoice-field/multichoice-autocomplete-field/abstract-multichoice-autocomplete-field-component.component.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {COMMA, ENTER} from '@angular/cdk/keycodes';
66
import {MatChipInputEvent} from '@angular/material/chips';
77
import {Observable, of} from 'rxjs';
88
import {map, startWith} from 'rxjs/operators';
9+
import {MultichoiceAutocompleteFilterProperty} from './multichoice-autocomplete-filter-property';
910

1011
@Component({
1112
selector: 'ncc-abstract-multichoice-autocomplete-field',
@@ -76,11 +77,11 @@ export abstract class AbstractMultichoiceAutocompleteFieldComponentComponent imp
7677
}
7778

7879
protected _filter(value: string): Array<MultichoiceFieldValue> {
79-
let filterType = this.filterType().toLowerCase()
80+
let filterType = this.filterType()?.toLowerCase()
8081
switch (filterType) {
81-
case "include":
82+
case MultichoiceAutocompleteFilterProperty.SUBSTRING:
8283
return this._filterInclude(value);
83-
case "indexof":
84+
case MultichoiceAutocompleteFilterProperty.PREFIX:
8485
return this._filterIndexOf(value);
8586
default:
8687
return this._filterIndexOf(value);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export enum MultichoiceAutocompleteFilterProperty {
2+
PREFIX='prefix',
3+
SUBSTRING='substring'
4+
}

projects/netgrif-components-core/src/lib/data-fields/public-api.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ export * from './filter-field/models/filter-field-injection-token';
8080
/* Enums */
8181
export * from './models/template-appearance';
8282
export * from './models/material-appearance';
83+
export * from './enumeration-field/enumeration-autocomplete-select-field/enumeration-autocomplete-filter-property'
84+
export * from './multichoice-field/multichoice-autocomplete-field/multichoice-autocomplete-filter-property'
8385

8486
/* Services */
8587
export * from './i18n-field/language-icons.service';

0 commit comments

Comments
 (0)