From a803d58c52903937065e16184b6553f0e942fbbf Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Tue, 7 Dec 2021 22:16:47 +0000 Subject: [PATCH] Fix components trying to use anglar bradcastservice vs interface (#1326) --- src/app/layouts/organization-layout.component.ts | 3 +-- src/app/organizations/vault/vault.component.ts | 2 +- src/app/send/send.component.ts | 2 +- src/app/settings/settings.component.ts | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/app/layouts/organization-layout.component.ts b/src/app/layouts/organization-layout.component.ts index bb7a488014..b9e0a63f5e 100644 --- a/src/app/layouts/organization-layout.component.ts +++ b/src/app/layouts/organization-layout.component.ts @@ -7,8 +7,7 @@ import { import { ActivatedRoute } from '@angular/router'; -import { BroadcasterService } from 'jslib-angular/services/broadcaster.service'; - +import { BroadcasterService } from 'jslib-common/abstractions/broadcaster.service'; import { UserService } from 'jslib-common/abstractions/user.service'; import { Organization } from 'jslib-common/models/domain/organization'; diff --git a/src/app/organizations/vault/vault.component.ts b/src/app/organizations/vault/vault.component.ts index 715453fdff..7326c941c5 100644 --- a/src/app/organizations/vault/vault.component.ts +++ b/src/app/organizations/vault/vault.component.ts @@ -14,13 +14,13 @@ import { import { first } from 'rxjs/operators'; +import { BroadcasterService } from 'jslib-common/abstractions/broadcaster.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { SyncService } from 'jslib-common/abstractions/sync.service'; import { UserService } from 'jslib-common/abstractions/user.service'; -import { BroadcasterService } from 'jslib-angular/services/broadcaster.service'; import { ModalService } from 'jslib-angular/services/modal.service'; import { Organization } from 'jslib-common/models/domain/organization'; diff --git a/src/app/send/send.component.ts b/src/app/send/send.component.ts index f9d42d8c4d..a50dd5a98a 100644 --- a/src/app/send/send.component.ts +++ b/src/app/send/send.component.ts @@ -11,6 +11,7 @@ import { SendComponent as BaseSendComponent } from 'jslib-angular/components/sen import { AddEditComponent } from './add-edit.component'; +import { BroadcasterService } from 'jslib-common/abstractions/broadcaster.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { LogService } from 'jslib-common/abstractions/log.service'; @@ -20,7 +21,6 @@ import { SearchService } from 'jslib-common/abstractions/search.service'; import { SendService } from 'jslib-common/abstractions/send.service'; import { UserService } from 'jslib-common/abstractions/user.service'; -import { BroadcasterService } from 'jslib-angular/services/broadcaster.service'; import { ModalService } from 'jslib-angular/services/modal.service'; const BroadcasterSubscriptionId = 'SendComponent'; diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts index 4f89fe9aad..ebc036a76f 100644 --- a/src/app/settings/settings.component.ts +++ b/src/app/settings/settings.component.ts @@ -5,12 +5,11 @@ import { OnInit, } from '@angular/core'; +import { BroadcasterService } from 'jslib-common/abstractions/broadcaster.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { TokenService } from 'jslib-common/abstractions/token.service'; import { UserService } from 'jslib-common/abstractions/user.service'; -import { BroadcasterService } from 'jslib-angular/services/broadcaster.service'; - const BroadcasterSubscriptionId = 'SettingsComponent'; @Component({