From 0d7115d94d55bd142b9dd7ea6da80b09ed235a84 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Fri, 6 Jun 2025 20:24:05 +0200 Subject: [PATCH] Clean up --- .../symbol-autocomplete.component.stories.ts | 45 ++++++++++++------- .../symbol-autocomplete.component.ts | 9 ++-- 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.stories.ts b/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.stories.ts index 19b6a616b..648d8592a 100644 --- a/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.stories.ts +++ b/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.stories.ts @@ -20,39 +20,52 @@ const DEFAULT_OPTIONS: LookupItem[] = [ assetClass: 'COMMODITY', assetSubClass: 'ETF', currency: 'USD', - dataProviderInfo: { name: 'YAHOO', isPremium: false }, + dataProviderInfo: { + dataSource: 'YAHOO', + isPremium: false + }, dataSource: null, - name: 'Default1', - symbol: 'DEFAULT1' + name: 'Default 1', + symbol: 'D1' }, { assetClass: 'EQUITY', assetSubClass: 'STOCK', currency: 'USD', - dataProviderInfo: { name: 'YAHOO', isPremium: false }, + dataProviderInfo: { + dataSource: 'YAHOO', + isPremium: false + }, dataSource: null, - name: 'Default2', - symbol: 'DEFAULT2' + name: 'Default 2', + symbol: 'D2' } ]; + const FILTERED_OPTIONS: LookupItem[] = [ { assetClass: 'COMMODITY', assetSubClass: 'ETF', currency: 'USD', - dataProviderInfo: { name: 'YAHOO', isPremium: false }, + dataProviderInfo: { + dataSource: 'YAHOO', + isPremium: false + }, dataSource: null, - name: 'Autocomplete1', - symbol: 'AUTOCOMPLETE1' + name: 'Autocomplete 1', + symbol: 'A1' }, { assetClass: 'EQUITY', assetSubClass: 'STOCK', currency: 'USD', - dataProviderInfo: { name: 'YAHOO', isPremium: false }, + dataProviderInfo: { + dataSource: 'YAHOO', + isPremium: false + }, dataSource: null, - name: 'Autocomplete2', - symbol: 'AUTOCOMPLETE2' + name: 'Autocomplete 2', + symbol: 'A2' } ]; @@ -91,13 +104,11 @@ export default { type Story = StoryObj; -export const WithoutDefaults: Story = { - args: { - defaultLookupItems: [] - } +export const Default: Story = { + args: {} }; -export const WithDefaults: Story = { +export const WithDefaultItems: Story = { args: { defaultLookupItems: DEFAULT_OPTIONS } diff --git a/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts b/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts index 052d199b9..4d73e3c53 100644 --- a/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts +++ b/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts @@ -77,12 +77,14 @@ export class GfSymbolAutocompleteComponent implements OnInit, OnDestroy { @Input() public defaultLookupItems: LookupItem[] = []; - @Input() private includeIndices = false; @Input() public isLoading = false; - @ViewChild(MatInput) private input: MatInput; @ViewChild('symbolAutocomplete') public symbolAutocomplete: MatAutocomplete; + @Input() private includeIndices = false; + + @ViewChild(MatInput) private input: MatInput; + public control = new FormControl(); public lookupItems: (LookupItem & { assetSubClassString: string })[] = []; @@ -122,10 +124,11 @@ export class GfSymbolAutocompleteComponent filter((query) => { if (query.length === 0) { this.showDefaultOptions(); + return false; } - return isString(query) && query.length > 1; + return isString(query); }), tap(() => { this.isLoading = true;