Browse Source

Unsubscribe subscriptions

pull/117/head
Thomas 4 years ago
parent
commit
10de56ab9c
  1. 23
      apps/client/src/app/app.component.ts
  2. 13
      apps/client/src/app/pages/about/about-page.component.ts
  3. 30
      apps/client/src/app/pages/account/account-page.component.ts
  4. 31
      apps/client/src/app/pages/accounts/accounts-page.component.ts
  5. 9
      apps/client/src/app/pages/admin/admin-page.component.ts
  6. 13
      apps/client/src/app/pages/analysis/analysis-page.component.ts
  7. 55
      apps/client/src/app/pages/home/home-page.component.ts
  8. 11
      apps/client/src/app/pages/pricing/pricing-page.component.ts
  9. 31
      apps/client/src/app/pages/transactions/transactions-page.component.ts
  10. 19
      apps/client/src/app/pages/zen/zen-page.component.ts

23
apps/client/src/app/app.component.ts

@ -73,16 +73,19 @@ export class AppComponent implements OnDestroy, OnInit {
this.isLoggedIn = !!this.tokenStorageService.getToken();
if (this.isLoggedIn) {
this.userService.get().subscribe((user) => {
this.user = user;
this.canCreateAccount = hasPermission(
this.user.permissions,
permissions.createUserAccount
);
this.cd.markForCheck();
});
this.userService
.get()
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe((user) => {
this.user = user;
this.canCreateAccount = hasPermission(
this.user.permissions,
permissions.createUserAccount
);
this.cd.markForCheck();
});
} else {
this.user = null;
}

13
apps/client/src/app/pages/about/about-page.component.ts

@ -44,11 +44,14 @@ export class AboutPageComponent implements OnInit {
.onChangeHasToken()
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe(() => {
this.userService.get().subscribe((user) => {
this.user = user;
this.cd.markForCheck();
});
this.userService
.get()
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe((user) => {
this.user = user;
this.cd.markForCheck();
});
});
}

30
apps/client/src/app/pages/account/account-page.component.ts

@ -50,16 +50,19 @@ export class AccountPageComponent implements OnDestroy, OnInit {
.onChangeHasToken()
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe(() => {
this.userService.get().subscribe((user) => {
this.user = user;
this.userService
.get()
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe((user) => {
this.user = user;
this.hasPermissionToUpdateUserSettings = hasPermission(
this.user.permissions,
permissions.updateUserSettings
);
this.hasPermissionToUpdateUserSettings = hasPermission(
this.user.permissions,
permissions.updateUserSettings
);
this.cd.markForCheck();
});
this.cd.markForCheck();
});
});
}
@ -82,11 +85,14 @@ export class AccountPageComponent implements OnDestroy, OnInit {
.subscribe(() => {
this.userService.remove();
this.userService.get().subscribe((user) => {
this.user = user;
this.userService
.get()
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe((user) => {
this.user = user;
this.cd.markForCheck();
});
this.cd.markForCheck();
});
});
}

31
apps/client/src/app/pages/accounts/accounts-page.component.ts

@ -81,20 +81,23 @@ export class AccountsPageComponent implements OnInit {
.onChangeHasToken()
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe(() => {
this.userService.get().subscribe((user) => {
this.user = user;
this.hasPermissionToCreateAccount = hasPermission(
user.permissions,
permissions.createAccount
);
this.hasPermissionToDeleteAccount = hasPermission(
user.permissions,
permissions.deleteAccount
);
this.cd.markForCheck();
});
this.userService
.get()
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe((user) => {
this.user = user;
this.hasPermissionToCreateAccount = hasPermission(
user.permissions,
permissions.createAccount
);
this.hasPermissionToDeleteAccount = hasPermission(
user.permissions,
permissions.deleteAccount
);
this.cd.markForCheck();
});
});
this.fetchAccounts();

9
apps/client/src/app/pages/admin/admin-page.component.ts

@ -49,9 +49,12 @@ export class AdminPageComponent implements OnInit {
.onChangeHasToken()
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe(() => {
this.userService.get().subscribe((user) => {
this.user = user;
});
this.userService
.get()
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe((user) => {
this.user = user;
});
});
}

13
apps/client/src/app/pages/analysis/analysis-page.component.ts

@ -85,11 +85,14 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
.onChangeHasToken()
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe(() => {
this.userService.get().subscribe((user) => {
this.user = user;
this.cd.markForCheck();
});
this.userService
.get()
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe((user) => {
this.user = user;
this.cd.markForCheck();
});
});
}

55
apps/client/src/app/pages/home/home-page.component.ts

@ -82,32 +82,35 @@ export class HomePageComponent implements OnDestroy, OnInit {
.onChangeHasToken()
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe(() => {
this.userService.get().subscribe((user) => {
this.user = user;
this.hasPermissionToAccessFearAndGreedIndex = hasPermission(
user.permissions,
permissions.accessFearAndGreedIndex
);
if (this.hasPermissionToAccessFearAndGreedIndex) {
this.dataService
.fetchSymbolItem('GF.FEAR_AND_GREED_INDEX')
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe(({ marketPrice }) => {
this.fearAndGreedIndex = marketPrice;
this.cd.markForCheck();
});
}
this.hasPermissionToReadForeignPortfolio = hasPermission(
user.permissions,
permissions.readForeignPortfolio
);
this.cd.markForCheck();
});
this.userService
.get()
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe((user) => {
this.user = user;
this.hasPermissionToAccessFearAndGreedIndex = hasPermission(
user.permissions,
permissions.accessFearAndGreedIndex
);
if (this.hasPermissionToAccessFearAndGreedIndex) {
this.dataService
.fetchSymbolItem('GF.FEAR_AND_GREED_INDEX')
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe(({ marketPrice }) => {
this.fearAndGreedIndex = marketPrice;
this.cd.markForCheck();
});
}
this.hasPermissionToReadForeignPortfolio = hasPermission(
user.permissions,
permissions.readForeignPortfolio
);
this.cd.markForCheck();
});
});
}

11
apps/client/src/app/pages/pricing/pricing-page.component.ts

@ -40,11 +40,14 @@ export class PricingPageComponent implements OnInit {
.onChangeHasToken()
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe(() => {
this.userService.get().subscribe((user) => {
this.user = user;
this.userService
.get()
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe((user) => {
this.user = user;
this.cd.markForCheck();
});
this.cd.markForCheck();
});
});
}

31
apps/client/src/app/pages/transactions/transactions-page.component.ts

@ -81,20 +81,23 @@ export class TransactionsPageComponent implements OnInit {
.onChangeHasToken()
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe(() => {
this.userService.get().subscribe((user) => {
this.user = user;
this.hasPermissionToCreateOrder = hasPermission(
user.permissions,
permissions.createOrder
);
this.hasPermissionToDeleteOrder = hasPermission(
user.permissions,
permissions.deleteOrder
);
this.cd.markForCheck();
});
this.userService
.get()
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe((user) => {
this.user = user;
this.hasPermissionToCreateOrder = hasPermission(
user.permissions,
permissions.createOrder
);
this.hasPermissionToDeleteOrder = hasPermission(
user.permissions,
permissions.deleteOrder
);
this.cd.markForCheck();
});
});
this.fetchOrders();

19
apps/client/src/app/pages/zen/zen-page.component.ts

@ -43,16 +43,19 @@ export class ZenPageComponent implements OnDestroy, OnInit {
.onChangeHasToken()
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe(() => {
this.userService.get().subscribe((user) => {
this.user = user;
this.userService
.get()
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe((user) => {
this.user = user;
this.hasPermissionToReadForeignPortfolio = hasPermission(
user.permissions,
permissions.readForeignPortfolio
);
this.hasPermissionToReadForeignPortfolio = hasPermission(
user.permissions,
permissions.readForeignPortfolio
);
this.cd.markForCheck();
});
this.cd.markForCheck();
});
});
}

Loading…
Cancel
Save