Browse Source

fix(ui): resolve type errors

pull/7325/head
KenTandrian 3 days ago
parent
commit
c5c798f2f3
  1. 8
      apps/client/src/app/components/home-holdings/home-holdings.component.ts
  2. 14
      libs/ui/src/lib/treemap-chart/treemap-chart.component.ts

8
apps/client/src/app/components/home-holdings/home-holdings.component.ts

@ -58,7 +58,7 @@ export class GfHomeHoldingsComponent implements OnInit {
protected hasImpersonationId: boolean; protected hasImpersonationId: boolean;
protected hasPermissionToAccessHoldingsChart: boolean; protected hasPermissionToAccessHoldingsChart: boolean;
protected hasPermissionToCreateActivity: boolean; protected hasPermissionToCreateActivity: boolean;
protected holdings: PortfolioPosition[]; protected holdings: PortfolioPosition[] | undefined;
protected holdingType: HoldingType = 'ACTIVE'; protected holdingType: HoldingType = 'ACTIVE';
protected readonly holdingTypeOptions: ToggleOption[] = [ protected readonly holdingTypeOptions: ToggleOption[] = [
{ label: $localize`Active`, value: 'ACTIVE' }, { label: $localize`Active`, value: 'ACTIVE' },
@ -181,8 +181,8 @@ export class GfHomeHoldingsComponent implements OnInit {
this.viewModeFormControl.setValue( this.viewModeFormControl.setValue(
this.deviceType === 'mobile' this.deviceType === 'mobile'
? GfHomeHoldingsComponent.DEFAULT_HOLDINGS_VIEW_MODE ? GfHomeHoldingsComponent.DEFAULT_HOLDINGS_VIEW_MODE
: this.user?.settings?.holdingsViewMode || : (this.user?.settings?.holdingsViewMode ??
GfHomeHoldingsComponent.DEFAULT_HOLDINGS_VIEW_MODE, GfHomeHoldingsComponent.DEFAULT_HOLDINGS_VIEW_MODE),
{ emitEvent: false } { emitEvent: false }
); );
} else if (this.holdingType === 'CLOSED') { } else if (this.holdingType === 'CLOSED') {
@ -192,7 +192,7 @@ export class GfHomeHoldingsComponent implements OnInit {
); );
} }
this.holdings = []; this.holdings = undefined;
this.fetchHoldings() this.fetchHoldings()
.pipe(takeUntilDestroyed(this.destroyRef)) .pipe(takeUntilDestroyed(this.destroyRef))

14
libs/ui/src/lib/treemap-chart/treemap-chart.component.ts

@ -56,7 +56,7 @@ export class GfTreemapChartComponent
@Input() colorScheme: ColorScheme; @Input() colorScheme: ColorScheme;
@Input() cursor: string; @Input() cursor: string;
@Input() dateRange: DateRange; @Input() dateRange: DateRange;
@Input() holdings: PortfolioPosition[]; @Input() holdings: PortfolioPosition[] | undefined;
@Input() locale = getLocale(); @Input() locale = getLocale();
@Output() treemapChartClicked = new EventEmitter<AssetProfileIdentifier>(); @Output() treemapChartClicked = new EventEmitter<AssetProfileIdentifier>();
@ -70,15 +70,11 @@ export class GfTreemapChartComponent
Chart.register(LinearScale, Tooltip, TreemapController, TreemapElement); Chart.register(LinearScale, Tooltip, TreemapController, TreemapElement);
} }
public ngAfterViewInit() { public ngAfterViewInit() {
if (this.holdings) { this.initialize();
this.initialize();
}
} }
public ngOnChanges() { public ngOnChanges() {
if (this.holdings) { this.initialize();
this.initialize();
}
} }
public ngOnDestroy() { public ngOnDestroy() {
@ -159,6 +155,10 @@ export class GfTreemapChartComponent
} }
private initialize() { private initialize() {
if (!this.holdings) {
return;
}
this.isLoading = true; this.isLoading = true;
const { endDate, startDate } = getIntervalFromDateRange({ const { endDate, startDate } = getIntervalFromDateRange({

Loading…
Cancel
Save