Skip to content

TT-304 Handle message: the data could not be load #728

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 8 commits into from
Aug 22, 2021
Merged

TT-304 Handle message: the data could not be load #728

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7fbe49a
fix: TT-304 Handle message: the data could not be load
Aug 6, 2021
f4833d2
test: TT-304 Creating an unit test to coverage the new feature
Aug 11, 2021
38b149f
fix: TT-304 Handle message: A new approach for the ticket
Aug 18, 2021
cc6bed4
refactor: TT-304 Handle message: Making readonly variables, new metho…
Aug 19, 2021
2437144
test: TT-304 Handle message: Editind and creating unit tets
Aug 19, 2021
88f1a3c
refactor: TT-304 Handle message: Editing methods and unit tests assoc…
Aug 20, 2021
b927d96
refactor: TT-304 Handle message: Rewriting method and unit tests for …
Aug 20, 2021
9bff779
refactor: TT-304 Handle message: New approach for the ticket
Aug 21, 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
Next Next commit
refactor: TT-304 Handle message: Editing methods and unit tests assoc… 
…iated
  • Loading branch information
Edgar Guaman committed Aug 21, 2021
commit 88f1a3c6b632a83fb107b1f7f161afe068ac5458
4 changes: 2 additions & 2 deletions src/app/modules/time-entries/pages/time-entries.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@
<th class="col"></th>
</tr>
</thead>
<tr *ngIf="checkIfDataSourceIsLoading(dataSource)">
<tr *ngIf="checkIfDataSourceIsLoadingorEmpty(dataSource)">
<td class="text-center" colspan="7">{{NO_DATA_MESSAGE}}</td>
</tr>
<app-loading-bar *ngIf="dataSource.isLoading"></app-loading-bar>
<tbody *ngIf="!dataSource.isLoading">
<tr *ngIf="checkIfDataSourceIsEmpty(dataSource)">
<tr *ngIf="checkIfDataSourceIsLoadingorEmpty(dataSource)">
<td class="text-center" colspan="7">{{NO_DATA_MESSAGE}}</td>
</tr>
<tr class="d-flex" *ngFor="let entry of dataSource.data">
Expand Down
8 changes: 4 additions & 4 deletions src/app/modules/time-entries/pages/time-entries.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,22 +670,22 @@ describe('TimeEntriesComponent', () => {
});

it('checkIfDataSourceIsLoading should be false when dataSource.isLoading is false', () => {
expect(component.checkIfDataSourceIsLoading(state.timeEntriesDataSource)).toBeFalse();
expect(component.checkIfDataSourceIsLoadingorEmpty(state.timeEntriesDataSource)).toBeFalse();
});

it('checkIfDataSourceIsLoading should be true when dataSource.isLoading is true', () => {
state.timeEntriesDataSource.isLoading = true;

expect(component.checkIfDataSourceIsLoading(state.timeEntriesDataSource)).toBeTrue();
expect(component.checkIfDataSourceIsLoadingorEmpty(state.timeEntriesDataSource)).toBeTrue();
});

it('checkIfDataSourceIsEmpty should be false when dataSource.data.length is not empty', () => {
expect(component.checkIfDataSourceIsEmpty(state.timeEntriesDataSource)).toBeFalse();
expect(component.checkIfDataSourceIsLoadingorEmpty(state.timeEntriesDataSource)).toBeFalse();
});

it('checkIfDataSourceIsEmpty should be true when dataSource.data.length is empty', () => {
state.timeEntriesDataSource.data = [];

expect(component.checkIfDataSourceIsEmpty(state.timeEntriesDataSource)).toBeTrue();
expect(component.checkIfDataSourceIsLoadingorEmpty(state.timeEntriesDataSource)).toBeTrue();
});
});
11 changes: 2 additions & 9 deletions src/app/modules/time-entries/pages/time-entries.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,15 +219,8 @@ export class TimeEntriesComponent implements OnInit, OnDestroy {
}
}

checkIfDataSourceIsLoading(data: DataSource<Entry>): boolean {
if (data.isLoading) {
return true;
}
return false;
}

checkIfDataSourceIsEmpty(data: DataSource<Entry>): boolean {
if (data.data.length === 0) {
checkIfDataSourceIsLoadingorEmpty(source?: DataSource<Entry>): boolean {
if (source.isLoading || source.data.length === 0) {
return true;
}
return false;
Expand Down