Browse Source

Feature/extend menu in activities table component

- Reuse onClickActivity() method for navigation
- Add entry to changelog
David Requeno 3 days ago
parent
commit
6ffb7a274a
  1. 13
      libs/ui/src/lib/activities-table/activities-table.component.html
  2. 16
      libs/ui/src/lib/activities-table/activities-table.component.ts

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

@ -437,12 +437,7 @@
class="no-max-width" class="no-max-width"
xPosition="before" xPosition="before"
> >
@if ( @if (canClickActivity(element)) {
hasPermissionToOpenDetails &&
isExcludedFromAnalysis(element) === false &&
element.isDraft === false &&
['BUY', 'DIVIDEND', 'SELL'].includes(element.type)
) {
<button mat-menu-item (click)="onClickActivity(element)"> <button mat-menu-item (click)="onClickActivity(element)">
<span class="align-items-center d-flex"> <span class="align-items-center d-flex">
<ion-icon class="mr-2" name="wallet-outline" /> <ion-icon class="mr-2" name="wallet-outline" />
@ -492,11 +487,7 @@
*matRowDef="let row; columns: displayedColumns" *matRowDef="let row; columns: displayedColumns"
mat-row mat-row
[ngClass]="{ [ngClass]="{
'cursor-pointer': 'cursor-pointer': canClickActivity(row)
hasPermissionToOpenDetails &&
isExcludedFromAnalysis(row) === false &&
row.isDraft === false &&
['BUY', 'DIVIDEND', 'SELL'].includes(row.type)
}" }"
(click)="onClickActivity(row)" (click)="onClickActivity(row)"
></tr> ></tr>

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

@ -246,12 +246,7 @@ export class GfActivitiesTableComponent
if (!activity.error) { if (!activity.error) {
this.selectedRows.toggle(activity); this.selectedRows.toggle(activity);
} }
} else if ( } else if (this.canClickActivity(activity)) {
this.hasPermissionToOpenDetails &&
this.isExcludedFromAnalysis(activity) === false &&
activity.isDraft === false &&
['BUY', 'DIVIDEND', 'SELL'].includes(activity.type)
) {
this.activityClicked.emit({ this.activityClicked.emit({
dataSource: activity.SymbolProfile.dataSource, dataSource: activity.SymbolProfile.dataSource,
symbol: activity.SymbolProfile.symbol symbol: activity.SymbolProfile.symbol
@ -259,6 +254,15 @@ export class GfActivitiesTableComponent
} }
} }
public canClickActivity(activity: Activity) {
return (
this.hasPermissionToOpenDetails &&
this.isExcludedFromAnalysis(activity) === false &&
activity.isDraft === false &&
['BUY', 'DIVIDEND', 'SELL'].includes(activity.type)
);
}
public onCloneActivity(aActivity: OrderWithAccount) { public onCloneActivity(aActivity: OrderWithAccount) {
this.activityToClone.emit(aActivity); this.activityToClone.emit(aActivity);
} }

Loading…
Cancel
Save