Skip to content

Tt 286 handle error message client width #704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 14, 2021
Merged

Tt 286 handle error message client width #704

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89b3e64
fix: TT-283 added try catch to handle method rerenderDataTable
kevinjlope Jul 6, 2021
fe687d2
fix: TT-283 removal code smell
kevinjlope Jul 6, 2021
719f14b
fix: TT-286 fixed error by adding an unsubscription routine
bytesantiago Jul 9, 2021
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
fix: TT-286 fixed error by adding an unsubscription routine
  • Loading branch information
@bytesantiago
bytesantiago committed Jul 9, 2021
commit 719f14be6f375f835da12e2ad18b792f148581d3
10 changes: 4 additions & 6 deletions src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild} from '@angular/
import { select, Store } from '@ngrx/store';
import { DataTableDirective } from 'angular-datatables';
import * as moment from 'moment';
import { Observable, Subject } from 'rxjs';
import { Observable, Subject, Subscription } from 'rxjs';
import { Entry } from 'src/app/modules/shared/models';
import { DataSource } from 'src/app/modules/shared/models/data-source.model';
import { EntryState } from '../../../time-clock/store/entry.reducer';
Expand Down Expand Up @@ -60,13 +60,14 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn
dtElement: DataTableDirective;
isLoading$: Observable<boolean>;
reportDataSource$: Observable<DataSource<Entry>>;
rerenderTableSubscription: Subscription;

constructor(private store: Store<EntryState>) {
this.reportDataSource$ = this.store.pipe(select(getReportDataSource));
}

ngOnInit(): void {
this.reportDataSource$.subscribe((ds) => {
this.rerenderTableSubscription = this.reportDataSource$.subscribe((ds) => {
this.rerenderDataTable();
});
}
Expand All @@ -76,21 +77,18 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn
}

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

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

Expand Down