From 07090e9382b8699acba6e6b97ce59927870f387a Mon Sep 17 00:00:00 2001 From: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Date: Thu, 3 Nov 2022 08:34:53 +1000 Subject: [PATCH] Fix undefined property error in event logs (#3947) EventService.policies was undefined because the service was erroneously using ngOnInit to subscribe to the policies observable --- apps/web/src/app/core/event.service.ts | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/apps/web/src/app/core/event.service.ts b/apps/web/src/app/core/event.service.ts index 4c4e488ff02..a13e5500f37 100644 --- a/apps/web/src/app/core/event.service.ts +++ b/apps/web/src/app/core/event.service.ts @@ -1,5 +1,4 @@ -import { Injectable, OnDestroy, OnInit } from "@angular/core"; -import { Subject, takeUntil } from "rxjs"; +import { Injectable } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; @@ -10,23 +9,15 @@ import { Policy } from "@bitwarden/common/models/domain/policy"; import { EventResponse } from "@bitwarden/common/models/response/event.response"; @Injectable() -export class EventService implements OnInit, OnDestroy { - private destroy$ = new Subject(); +export class EventService { private policies: Policy[]; - constructor(private i18nService: I18nService, private policyService: PolicyService) {} - - ngOnInit(): void { - this.policyService.policies$.pipe(takeUntil(this.destroy$)).subscribe((policies) => { + constructor(private i18nService: I18nService, policyService: PolicyService) { + policyService.policies$.subscribe((policies) => { this.policies = policies; }); } - ngOnDestroy() { - this.destroy$.next(); - this.destroy$.complete(); - } - getDefaultDateFilters() { const d = new Date(); const end = new Date(d.getFullYear(), d.getMonth(), d.getDate(), 23, 59);