|
|
@ -62,9 +62,9 @@ import { |
|
|
import { GfAssistantListItemComponent } from './assistant-list-item/assistant-list-item.component'; |
|
|
import { GfAssistantListItemComponent } from './assistant-list-item/assistant-list-item.component'; |
|
|
import { SearchMode } from './enums/search-mode'; |
|
|
import { SearchMode } from './enums/search-mode'; |
|
|
import { |
|
|
import { |
|
|
IDateRangeOption, |
|
|
DateRangeOption, |
|
|
ISearchResultItem, |
|
|
SearchResultItem, |
|
|
ISearchResults |
|
|
SearchResults |
|
|
} from './interfaces/interfaces'; |
|
|
} from './interfaces/interfaces'; |
|
|
|
|
|
|
|
|
@Component({ |
|
|
@Component({ |
|
|
@ -140,7 +140,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit { |
|
|
public accounts: AccountWithPlatform[] = []; |
|
|
public accounts: AccountWithPlatform[] = []; |
|
|
public assetClasses: Filter[] = []; |
|
|
public assetClasses: Filter[] = []; |
|
|
public dateRangeFormControl = new FormControl<string>(undefined); |
|
|
public dateRangeFormControl = new FormControl<string>(undefined); |
|
|
public dateRangeOptions: IDateRangeOption[] = []; |
|
|
public dateRangeOptions: DateRangeOption[] = []; |
|
|
public holdings: PortfolioPosition[] = []; |
|
|
public holdings: PortfolioPosition[] = []; |
|
|
public isLoading = { |
|
|
public isLoading = { |
|
|
accounts: false, |
|
|
accounts: false, |
|
|
@ -159,7 +159,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit { |
|
|
} |
|
|
} |
|
|
); |
|
|
); |
|
|
public searchFormControl = new FormControl(''); |
|
|
public searchFormControl = new FormControl(''); |
|
|
public searchResults: ISearchResults = { |
|
|
public searchResults: SearchResults = { |
|
|
accounts: [], |
|
|
accounts: [], |
|
|
assetProfiles: [], |
|
|
assetProfiles: [], |
|
|
holdings: [], |
|
|
holdings: [], |
|
|
@ -226,7 +226,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit { |
|
|
assetProfiles: [], |
|
|
assetProfiles: [], |
|
|
holdings: [], |
|
|
holdings: [], |
|
|
quickLinks: [] |
|
|
quickLinks: [] |
|
|
} as ISearchResults; |
|
|
} as SearchResults; |
|
|
|
|
|
|
|
|
if (!searchTerm) { |
|
|
if (!searchTerm) { |
|
|
return of(results).pipe( |
|
|
return of(results).pipe( |
|
|
@ -241,7 +241,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit { |
|
|
); |
|
|
); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
const accounts$: Observable<Partial<ISearchResults>> = |
|
|
const accounts$: Observable<Partial<SearchResults>> = |
|
|
this.searchAccounts(searchTerm).pipe( |
|
|
this.searchAccounts(searchTerm).pipe( |
|
|
map((accounts) => ({ |
|
|
map((accounts) => ({ |
|
|
accounts: accounts.slice( |
|
|
accounts: accounts.slice( |
|
|
@ -251,7 +251,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit { |
|
|
})), |
|
|
})), |
|
|
catchError((error) => { |
|
|
catchError((error) => { |
|
|
console.error('Error fetching accounts for assistant:', error); |
|
|
console.error('Error fetching accounts for assistant:', error); |
|
|
return of({ accounts: [] as ISearchResultItem[] }); |
|
|
return of({ accounts: [] as SearchResultItem[] }); |
|
|
}), |
|
|
}), |
|
|
tap(() => { |
|
|
tap(() => { |
|
|
this.isLoading.accounts = false; |
|
|
this.isLoading.accounts = false; |
|
|
@ -259,7 +259,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit { |
|
|
}) |
|
|
}) |
|
|
); |
|
|
); |
|
|
|
|
|
|
|
|
const assetProfiles$: Observable<Partial<ISearchResults>> = this |
|
|
const assetProfiles$: Observable<Partial<SearchResults>> = this |
|
|
.hasPermissionToAccessAdminControl |
|
|
.hasPermissionToAccessAdminControl |
|
|
? this.searchAssetProfiles(searchTerm).pipe( |
|
|
? this.searchAssetProfiles(searchTerm).pipe( |
|
|
map((assetProfiles) => ({ |
|
|
map((assetProfiles) => ({ |
|
|
@ -273,21 +273,21 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit { |
|
|
'Error fetching asset profiles for assistant:', |
|
|
'Error fetching asset profiles for assistant:', |
|
|
error |
|
|
error |
|
|
); |
|
|
); |
|
|
return of({ assetProfiles: [] as ISearchResultItem[] }); |
|
|
return of({ assetProfiles: [] as SearchResultItem[] }); |
|
|
}), |
|
|
}), |
|
|
tap(() => { |
|
|
tap(() => { |
|
|
this.isLoading.assetProfiles = false; |
|
|
this.isLoading.assetProfiles = false; |
|
|
this.changeDetectorRef.markForCheck(); |
|
|
this.changeDetectorRef.markForCheck(); |
|
|
}) |
|
|
}) |
|
|
) |
|
|
) |
|
|
: of({ assetProfiles: [] as ISearchResultItem[] }).pipe( |
|
|
: of({ assetProfiles: [] as SearchResultItem[] }).pipe( |
|
|
tap(() => { |
|
|
tap(() => { |
|
|
this.isLoading.assetProfiles = false; |
|
|
this.isLoading.assetProfiles = false; |
|
|
this.changeDetectorRef.markForCheck(); |
|
|
this.changeDetectorRef.markForCheck(); |
|
|
}) |
|
|
}) |
|
|
); |
|
|
); |
|
|
|
|
|
|
|
|
const holdings$: Observable<Partial<ISearchResults>> = |
|
|
const holdings$: Observable<Partial<SearchResults>> = |
|
|
this.searchHoldings(searchTerm).pipe( |
|
|
this.searchHoldings(searchTerm).pipe( |
|
|
map((holdings) => ({ |
|
|
map((holdings) => ({ |
|
|
holdings: holdings.slice( |
|
|
holdings: holdings.slice( |
|
|
@ -297,7 +297,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit { |
|
|
})), |
|
|
})), |
|
|
catchError((error) => { |
|
|
catchError((error) => { |
|
|
console.error('Error fetching holdings for assistant:', error); |
|
|
console.error('Error fetching holdings for assistant:', error); |
|
|
return of({ holdings: [] as ISearchResultItem[] }); |
|
|
return of({ holdings: [] as SearchResultItem[] }); |
|
|
}), |
|
|
}), |
|
|
tap(() => { |
|
|
tap(() => { |
|
|
this.isLoading.holdings = false; |
|
|
this.isLoading.holdings = false; |
|
|
@ -305,7 +305,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit { |
|
|
}) |
|
|
}) |
|
|
); |
|
|
); |
|
|
|
|
|
|
|
|
const quickLinks$: Observable<Partial<ISearchResults>> = of( |
|
|
const quickLinks$: Observable<Partial<SearchResults>> = of( |
|
|
this.searchQuickLinks(searchTerm) |
|
|
this.searchQuickLinks(searchTerm) |
|
|
).pipe( |
|
|
).pipe( |
|
|
map((quickLinks) => ({ |
|
|
map((quickLinks) => ({ |
|
|
@ -322,7 +322,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit { |
|
|
|
|
|
|
|
|
return merge(accounts$, assetProfiles$, holdings$, quickLinks$).pipe( |
|
|
return merge(accounts$, assetProfiles$, holdings$, quickLinks$).pipe( |
|
|
scan( |
|
|
scan( |
|
|
(acc: ISearchResults, curr: Partial<ISearchResults>) => ({ |
|
|
(acc: SearchResults, curr: Partial<SearchResults>) => ({ |
|
|
...acc, |
|
|
...acc, |
|
|
...curr |
|
|
...curr |
|
|
}), |
|
|
}), |
|
|
@ -331,7 +331,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit { |
|
|
assetProfiles: [], |
|
|
assetProfiles: [], |
|
|
holdings: [], |
|
|
holdings: [], |
|
|
quickLinks: [] |
|
|
quickLinks: [] |
|
|
} as ISearchResults |
|
|
} as SearchResults |
|
|
) |
|
|
) |
|
|
); |
|
|
); |
|
|
}), |
|
|
}), |
|
|
@ -622,7 +622,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit { |
|
|
}, this.PRESELECTION_DELAY); |
|
|
}, this.PRESELECTION_DELAY); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private searchAccounts(aSearchTerm: string): Observable<ISearchResultItem[]> { |
|
|
private searchAccounts(aSearchTerm: string): Observable<SearchResultItem[]> { |
|
|
return this.dataService |
|
|
return this.dataService |
|
|
.fetchAccounts({ |
|
|
.fetchAccounts({ |
|
|
filters: [ |
|
|
filters: [ |
|
|
@ -652,7 +652,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit { |
|
|
|
|
|
|
|
|
private searchAssetProfiles( |
|
|
private searchAssetProfiles( |
|
|
aSearchTerm: string |
|
|
aSearchTerm: string |
|
|
): Observable<ISearchResultItem[]> { |
|
|
): Observable<SearchResultItem[]> { |
|
|
return this.adminService |
|
|
return this.adminService |
|
|
.fetchAdminMarketData({ |
|
|
.fetchAdminMarketData({ |
|
|
filters: [ |
|
|
filters: [ |
|
|
@ -685,7 +685,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit { |
|
|
); |
|
|
); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private searchHoldings(aSearchTerm: string): Observable<ISearchResultItem[]> { |
|
|
private searchHoldings(aSearchTerm: string): Observable<SearchResultItem[]> { |
|
|
return this.dataService |
|
|
return this.dataService |
|
|
.fetchPortfolioHoldings({ |
|
|
.fetchPortfolioHoldings({ |
|
|
filters: [ |
|
|
filters: [ |
|
|
@ -717,7 +717,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit { |
|
|
); |
|
|
); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private searchQuickLinks(aSearchTerm: string): ISearchResultItem[] { |
|
|
private searchQuickLinks(aSearchTerm: string): SearchResultItem[] { |
|
|
const searchTerm = aSearchTerm.toLowerCase(); |
|
|
const searchTerm = aSearchTerm.toLowerCase(); |
|
|
|
|
|
|
|
|
const allRoutes = Object.values(internalRoutes) |
|
|
const allRoutes = Object.values(internalRoutes) |
|
|
|
Thomas Kaul
2 months ago
GitHub