Skip to content

Fix: Show loading animation for account list. #394

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
timotheeguerin merged 3 commits into from
May 22, 2017
Merged

Fix: Show loading animation for account list. #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05b9a37
Show loading animation for account list.
timotheeguerin May 22, 2017
2fa593a
fix tests
timotheeguerin May 22, 2017
3fa6afd
Merge branch 'master' into feature/account-list-loading-status
timotheeguerin May 22, 2017
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
6 changes: 6 additions & 0 deletions app/components/account/browse/account-list.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { autobind } from "core-decorators";
import { List } from "immutable";
import { Observable } from "rxjs";

import { LoadingStatus } from "app/components/base/loading";
import { AccountResource } from "app/models";
import { AccountService, SubscriptionService } from "app/services";
import { Filter, FilterBuilder, FilterMatcher, Operator } from "app/utils/filter-builder";
Expand All @@ -22,6 +23,7 @@ export class AccountListComponent {
public get filter(): Filter { return this._filter; }

public displayedAccounts: Observable<List<AccountResource>>;
public loadingStatus: LoadingStatus = LoadingStatus.Loading;

private _filter: Filter = FilterBuilder.none();

Expand All @@ -31,6 +33,10 @@ export class AccountListComponent {
sidebarManager: SidebarManager,
subscriptionService: SubscriptionService) {
this._updateDisplayedAccounts();

this.accountService.accountsLoaded.filter(x => x).first().subscribe(() => {
this.loadingStatus = LoadingStatus.Ready;
});
}

@autobind()
Expand Down
1 change: 1 addition & 0 deletions app/components/account/browse/account-list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ <h4 bl-quick-list-item-title>{{account.name}}</h4>
</div>
</bl-quick-list-item>
</bl-quick-list>
<bl-loading [status]="loadingStatus"></bl-loading>
1 change: 1 addition & 0 deletions app/services/account.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export class AccountService {
private subscriptionService: SubscriptionService) {

this.accountLoaded = this._accountLoaded.asObservable();
this.accountsLoaded = this._accountsLoaded.asObservable();
this._accountLoaded.next(true);
this.accounts = this._accounts.asObservable();
this._currentAccount.subscribe((selection) => {
Expand Down
1 change: 1 addition & 0 deletions test/app/components/account/browse/account-list.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ describe("AccountListComponent", () => {

beforeEach(() => {
accountService = {
accountsLoaded: Observable.of(true),
accounts: Observable.of([
Fixtures.account.create({ id: "acc-1", name: "Batch 1", location: "westus", subscription: sub1 }),
Fixtures.account.create({ id: "acc-2", name: "Account 2", location: "eastus", subscription: sub1 }),
Expand Down