From f8462a66852b4aa06b0acc232203065822a1f7d3 Mon Sep 17 00:00:00 2001 From: Isaac Ivins Date: Tue, 2 Dec 2025 11:41:32 -0500 Subject: [PATCH] removed broadcast service --- .../tools/send-v2/send-v2.component.spec.ts | 24 ------------------ .../app/tools/send-v2/send-v2.component.ts | 25 ++----------------- 2 files changed, 2 insertions(+), 47 deletions(-) diff --git a/apps/desktop/src/app/tools/send-v2/send-v2.component.spec.ts b/apps/desktop/src/app/tools/send-v2/send-v2.component.spec.ts index 8923c847a1a..68027fa22c3 100644 --- a/apps/desktop/src/app/tools/send-v2/send-v2.component.spec.ts +++ b/apps/desktop/src/app/tools/send-v2/send-v2.component.spec.ts @@ -4,7 +4,6 @@ import { BehaviorSubject } from "rxjs"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; -import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; @@ -69,7 +68,6 @@ describe("SendV2Component", () => { { provide: ToastService, useValue: mock() }, { provide: PolicyService, useValue: mockPolicyService }, { provide: AccountService, useValue: mockAccountService }, - { provide: BroadcasterService, useValue: mock() }, ], }) .overrideComponent(SendV2Component, { @@ -468,26 +466,4 @@ describe("SendV2Component", () => { }); }); }); - - describe("Sync Completion Handling", () => { - it("subscribes to broadcaster on init", () => { - const broadcasterService = TestBed.inject(BroadcasterService); - - component.ngOnInit(); - - expect(broadcasterService.subscribe).toHaveBeenCalledWith( - "SendV2Component", - expect.any(Function), - ); - }); - - it("unsubscribes from broadcaster on destroy", () => { - const broadcasterService = TestBed.inject(BroadcasterService); - - component.ngOnInit(); - component.ngOnDestroy(); - - expect(broadcasterService.unsubscribe).toHaveBeenCalledWith("SendV2Component"); - }); - }); }); diff --git a/apps/desktop/src/app/tools/send-v2/send-v2.component.ts b/apps/desktop/src/app/tools/send-v2/send-v2.component.ts index 56ec9434f37..41df610bb3c 100644 --- a/apps/desktop/src/app/tools/send-v2/send-v2.component.ts +++ b/apps/desktop/src/app/tools/send-v2/send-v2.component.ts @@ -7,18 +7,14 @@ import { signal, viewChild, AfterViewInit, - OnInit, - OnDestroy, - NgZone, } from "@angular/core"; -import { takeUntilDestroyed , toSignal } from "@angular/core/rxjs-interop"; +import { takeUntilDestroyed, toSignal } from "@angular/core/rxjs-interop"; import { firstValueFrom, map, switchMap } from "rxjs"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; -import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; @@ -39,7 +35,7 @@ import { AddEditComponent } from "../send/add-edit.component"; templateUrl: "send-v2.component.html", changeDetection: ChangeDetectionStrategy.OnPush, }) -export class SendV2Component implements OnInit, AfterViewInit, OnDestroy { +export class SendV2Component implements AfterViewInit { protected readonly sendType = SendType; protected readonly addEditComponent = viewChild(AddEditComponent); protected readonly filteredSends = toSignal(this.sendItemsService.filteredAndSortedSends$, { @@ -84,8 +80,6 @@ export class SendV2Component implements OnInit, AfterViewInit, OnDestroy { private toastService: ToastService, private policyService: PolicyService, private accountService: AccountService, - private broadcasterService: BroadcasterService, - private ngZone: NgZone, private destroyRef: DestroyRef, ) { // Check if DisableSend enterprise policy applies to current user @@ -102,17 +96,6 @@ export class SendV2Component implements OnInit, AfterViewInit, OnDestroy { }); } - ngOnInit(): void { - // Subscribe to sync completion events to refresh send list - this.broadcasterService.subscribe("SendV2Component", (message: any) => { - void this.ngZone.run(async () => { - if (message.command === "syncCompleted") { - // SendItemsService automatically refreshes via observable - } - }); - }); - } - ngAfterViewInit(): void { // Handle pending add operation after view initializes if (this.action() === "add" && this.pendingAddType() !== null) { @@ -121,10 +104,6 @@ export class SendV2Component implements OnInit, AfterViewInit, OnDestroy { } } - ngOnDestroy(): void { - this.broadcasterService.unsubscribe("SendV2Component"); - } - // Select a Send to view/edit protected async selectSend(sendId: string): Promise { if (sendId === this.sendId() && this.action() === "edit") {