Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: TT-344 fix bug when modifying/adding/deleting entries
  • Loading branch information
bytesantiago committed Sep 22, 2021
commit adcc8762657b1d0c1cb72afad316b53e72c21de9
18 changes: 4 additions & 14 deletions src/app/modules/time-entries/pages/time-entries.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ import { CalendarView } from 'angular-calendar';
})
export class TimeEntriesComponent implements OnInit, OnDestroy, AfterViewInit {
dtOptions: any = {
order: [[ 0, 'desc' ]]
order: [[ 0, 'desc' ]],
destroy: true,
};
dtTrigger: Subject<any> = new Subject();
@ViewChild(DataTableDirective, { static: false })
Expand Down Expand Up @@ -76,30 +77,19 @@ export class TimeEntriesComponent implements OnInit, OnDestroy, AfterViewInit {
this.store.dispatch(new entryActions.LoadEntries(this.selectedMonth, this.selectedYear));
});
this.rerenderTableSubscription = this.timeEntriesDataSource$.subscribe((ds) => {
this.rerenderDataTable();
this.dtTrigger.next();
});
}

ngAfterViewInit(): void {
this.rerenderDataTable();
this.dtTrigger.next();
}

ngOnDestroy(): void {
this.rerenderTableSubscription.unsubscribe();
this.entriesSubscription.unsubscribe();
}

private rerenderDataTable(): void {
if (this.dtElement && this.dtElement.dtInstance) {
this.dtElement.dtInstance.then((dtInstance: DataTables.Api) => {
dtInstance.destroy();
this.dtTrigger.next();
});
} else {
this.dtTrigger.next();
}
}

newEntry() {
if (this.wasEditingExistingTimeEntry) {
this.entry = null;
Expand Down