diff --git a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts index 581160752..129bf1958 100644 --- a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts +++ b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts @@ -36,6 +36,7 @@ export class ImportActivitiesDialog implements OnDestroy { public mode: 'DIVIDEND'; public selectedActivities: Activity[] = []; public uniqueAssetForm: FormGroup; + public isAnyActivityDuplicate: boolean = false; private unsubscribeSubject = new Subject(); @@ -228,6 +229,12 @@ export class ImportActivitiesDialog implements OnDestroy { this.isFileSelected = true; this.snackBar.dismiss(); this.changeDetectorRef.markForCheck(); + this.activities.some((activity) => { + if (activity.isDuplicate) { + this.isAnyActivityDuplicate = true; + return; + } + }); } }; }; @@ -236,7 +243,9 @@ export class ImportActivitiesDialog implements OnDestroy { } public updateSelection(data: Activity[]) { - this.selectedActivities = data; + this.selectedActivities = data.filter((activity) => { + return !activity.isDuplicate; + }); } public ngOnDestroy() { diff --git a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html index 3e47b966f..e1926e923 100644 --- a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html +++ b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html @@ -71,6 +71,7 @@ [hasPermissionToExportActivities]="false" [hasPermissionToFilter]="false" [hasPermissionToOpenDetails]="false" + [isAnyActivityDuplicate]="isAnyActivityDuplicate" [locale]="data?.user?.settings?.locale" [pageSize]="maxSafeInteger" [showActions]="false" diff --git a/libs/ui/src/lib/activities-table/activities-table.component.html b/libs/ui/src/lib/activities-table/activities-table.component.html index 45551305b..550c484dc 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.html +++ b/libs/ui/src/lib/activities-table/activities-table.component.html @@ -77,7 +77,12 @@ diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts index 0ba6e4f58..d66b8b5c3 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.ts +++ b/libs/ui/src/lib/activities-table/activities-table.component.ts @@ -45,6 +45,7 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy, OnInit { @Input() showCheckbox = false; @Input() showFooter = true; @Input() showNameColumn = true; + @Input() isAnyActivityDuplicate = false; @Output() activityDeleted = new EventEmitter(); @Output() activityToClone = new EventEmitter();