Browse Source

feat(ui): resolve type errors in activities table component

pull/6295/head
KenTandrian 3 days ago
parent
commit
177fe7fc96
  1. 2
      libs/common/src/lib/interfaces/activities.interface.ts
  2. 12
      libs/ui/src/lib/activities-table/activities-table.component.html
  3. 4
      libs/ui/src/lib/activities-table/activities-table.component.ts

2
libs/common/src/lib/interfaces/activities.interface.ts

@ -8,7 +8,7 @@ export interface Activity extends Order {
error?: ActivityError; error?: ActivityError;
feeInAssetProfileCurrency: number; feeInAssetProfileCurrency: number;
feeInBaseCurrency: number; feeInBaseCurrency: number;
SymbolProfile?: EnhancedSymbolProfile; SymbolProfile: EnhancedSymbolProfile;
tagIds?: string[]; tagIds?: string[];
tags?: Tag[]; tags?: Tag[];
unitPriceInAssetProfileCurrency: number; unitPriceInAssetProfileCurrency: number;

12
libs/ui/src/lib/activities-table/activities-table.component.html

@ -21,7 +21,7 @@
<mat-menu #activitiesMenu="matMenu" class="no-max-width" xPosition="before"> <mat-menu #activitiesMenu="matMenu" class="no-max-width" xPosition="before">
<button <button
mat-menu-item mat-menu-item
[disabled]="dataSource?.data.length === 0" [disabled]="dataSource.data.length === 0"
(click)="onImportDividends()" (click)="onImportDividends()"
> >
<span class="align-items-center d-flex"> <span class="align-items-center d-flex">
@ -33,7 +33,7 @@
<button <button
class="align-items-center d-flex" class="align-items-center d-flex"
mat-menu-item mat-menu-item
[disabled]="dataSource?.data.length === 0" [disabled]="dataSource.data.length === 0"
(click)="onExport()" (click)="onExport()"
> >
<span class="align-items-center d-flex"> <span class="align-items-center d-flex">
@ -60,7 +60,7 @@
class="align-items-center d-flex" class="align-items-center d-flex"
mat-menu-item mat-menu-item
[disabled]=" [disabled]="
dataSource?.data.length === 0 || !hasPermissionToDeleteActivity dataSource.data.length === 0 || !hasPermissionToDeleteActivity
" "
(click)="onDeleteActivities()" (click)="onDeleteActivities()"
> >
@ -388,7 +388,7 @@
@if (hasPermissionToCreateActivity) { @if (hasPermissionToCreateActivity) {
<button <button
mat-menu-item mat-menu-item
[disabled]="dataSource?.data.length === 0" [disabled]="dataSource.data.length === 0"
(click)="onImportDividends()" (click)="onImportDividends()"
> >
<span class="align-items-center d-flex"> <span class="align-items-center d-flex">
@ -403,7 +403,7 @@
<button <button
class="align-items-center d-flex" class="align-items-center d-flex"
mat-menu-item mat-menu-item
[disabled]="dataSource?.data.length === 0" [disabled]="dataSource.data.length === 0"
(click)="onExport()" (click)="onExport()"
> >
<span class="align-items-center d-flex"> <span class="align-items-center d-flex">
@ -524,7 +524,7 @@
@if ( @if (
!hasActivities && !hasActivities &&
dataSource?.data.length === 0 && dataSource.data.length === 0 &&
hasPermissionToCreateActivity && hasPermissionToCreateActivity &&
!isLoading !isLoading
) { ) {

4
libs/ui/src/lib/activities-table/activities-table.component.ts

@ -132,7 +132,7 @@ export class GfActivitiesTableComponent
@ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort; @ViewChild(MatSort) sort: MatSort;
public displayedColumns = []; public displayedColumns: string[] = [];
public endOfToday = endOfToday(); public endOfToday = endOfToday();
public hasDrafts = false; public hasDrafts = false;
public hasErrors = false; public hasErrors = false;
@ -241,7 +241,7 @@ export class GfActivitiesTableComponent
public isExcludedFromAnalysis(activity: Activity) { public isExcludedFromAnalysis(activity: Activity) {
return ( return (
activity.account?.isExcluded || activity.account?.isExcluded ??
activity.tags?.some(({ id }) => { activity.tags?.some(({ id }) => {
return id === TAG_ID_EXCLUDE_FROM_ANALYSIS; return id === TAG_ID_EXCLUDE_FROM_ANALYSIS;
}) })

Loading…
Cancel
Save