Browse Source

ENH: move logic to ActivitiesTableComponent, remove @Input()

pull/1958/head
visrut 2 years ago
parent
commit
884737eb85
  1. 7
      apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts
  2. 1
      apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html
  3. 9
      libs/ui/src/lib/activities-table/activities-table.component.ts

7
apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts

@ -36,7 +36,6 @@ export class ImportActivitiesDialog implements OnDestroy {
public mode: 'DIVIDEND'; public mode: 'DIVIDEND';
public selectedActivities: Activity[] = []; public selectedActivities: Activity[] = [];
public uniqueAssetForm: FormGroup; public uniqueAssetForm: FormGroup;
public isAnyActivityDuplicate: boolean = false;
private unsubscribeSubject = new Subject<void>(); private unsubscribeSubject = new Subject<void>();
@ -229,12 +228,6 @@ export class ImportActivitiesDialog implements OnDestroy {
this.isFileSelected = true; this.isFileSelected = true;
this.snackBar.dismiss(); this.snackBar.dismiss();
this.changeDetectorRef.markForCheck(); this.changeDetectorRef.markForCheck();
this.activities.some((activity) => {
if (activity.isDuplicate) {
this.isAnyActivityDuplicate = true;
return;
}
});
} }
}; };
}; };

1
apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html

@ -71,7 +71,6 @@
[hasPermissionToExportActivities]="false" [hasPermissionToExportActivities]="false"
[hasPermissionToFilter]="false" [hasPermissionToFilter]="false"
[hasPermissionToOpenDetails]="false" [hasPermissionToOpenDetails]="false"
[isAnyActivityDuplicate]="isAnyActivityDuplicate"
[locale]="data?.user?.settings?.locale" [locale]="data?.user?.settings?.locale"
[pageSize]="maxSafeInteger" [pageSize]="maxSafeInteger"
[showActions]="false" [showActions]="false"

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

@ -45,7 +45,6 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy, OnInit {
@Input() showCheckbox = false; @Input() showCheckbox = false;
@Input() showFooter = true; @Input() showFooter = true;
@Input() showNameColumn = true; @Input() showNameColumn = true;
@Input() isAnyActivityDuplicate = false;
@Output() activityDeleted = new EventEmitter<string>(); @Output() activityDeleted = new EventEmitter<string>();
@Output() activityToClone = new EventEmitter<OrderWithAccount>(); @Output() activityToClone = new EventEmitter<OrderWithAccount>();
@ -77,6 +76,7 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy, OnInit {
public selectedRows = new SelectionModel<Activity>(true, []); public selectedRows = new SelectionModel<Activity>(true, []);
public totalFees: number; public totalFees: number;
public totalValue: number; public totalValue: number;
public isAnyActivityDuplicate: boolean = false;
private readonly SEARCH_STRING_SEPARATOR = ','; private readonly SEARCH_STRING_SEPARATOR = ',';
private unsubscribeSubject = new Subject<void>(); private unsubscribeSubject = new Subject<void>();
@ -98,6 +98,13 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy, OnInit {
this.selectedActivities.emit(selectedRows.source.selected); this.selectedActivities.emit(selectedRows.source.selected);
}); });
} }
this.activities.some(({ isDuplicate }) => {
if (isDuplicate) {
this.isAnyActivityDuplicate = true;
return;
}
});
} }
public areAllRowsSelected() { public areAllRowsSelected() {

Loading…
Cancel
Save