diff --git a/apps/client/src/app/services/import-activities.service.ts b/apps/client/src/app/services/import-activities.service.ts index da120217b..18868c919 100644 --- a/apps/client/src/app/services/import-activities.service.ts +++ b/apps/client/src/app/services/import-activities.service.ts @@ -79,8 +79,8 @@ export class ImportActivitiesService { }) ) .subscribe({ - next: (importedActivities) => { - resolve(importedActivities.activities); + next: (data) => { + resolve(data.activities); } }); }); 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 2518ba1be..315717cab 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.ts +++ b/libs/ui/src/lib/activities-table/activities-table.component.ts @@ -164,9 +164,11 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy { } ngOnInit() { - this.selectedRows.changed.subscribe((selectedRows) => { - this.selectedActivities.emit(selectedRows.source.selected); - }); + this.selectedRows.changed + .pipe(takeUntil(this.unsubscribeSubject)) + .subscribe((selectedRows) => { + this.selectedActivities.emit(selectedRows.source.selected); + }); } public onChangePage(page: PageEvent) {