diff --git a/src/atlasComponents/sapi/sapi.service.ts b/src/atlasComponents/sapi/sapi.service.ts index 4b15127bc86984b6cb7855335b03037bb1b81357..02703bd902d20e24ed4d2a3c0e6d558cb22b39b1 100644 --- a/src/atlasComponents/sapi/sapi.service.ts +++ b/src/atlasComponents/sapi/sapi.service.ts @@ -1,7 +1,7 @@ import { Injectable } from "@angular/core"; import { HttpClient } from '@angular/common/http'; import { catchError, map, shareReplay, switchMap, take, tap } from "rxjs/operators"; -import { getExportNehuba } from "src/util/fn"; +import { getExportNehuba, noop } from "src/util/fn"; import { MatSnackBar } from "@angular/material/snack-bar"; import { AtlasWorkerService } from "src/atlasViewer/atlasViewer.workerService.service"; import { EnumColorMapName } from "src/util/colorMaps"; @@ -110,8 +110,7 @@ export class SAPI{ .then(flag => { if (flag) rs(endpt) }) - // eslint-disable-next-line @typescript-eslint/no-empty-function - .catch(() => {}) + .catch(noop) } }) try { diff --git a/src/messaging/service.spec.ts b/src/messaging/service.spec.ts index 8ba8cad4e3cdaf0d776fd5ff2f1e1cc0958c8b08..05da2a3999f7c350a304b3fca3e997029bec624e 100644 --- a/src/messaging/service.spec.ts +++ b/src/messaging/service.spec.ts @@ -1,5 +1,5 @@ import { TestBed } from "@angular/core/testing" -import { MockStore, provideMockStore } from "@ngrx/store/testing" +import { provideMockStore } from "@ngrx/store/testing" import { AtlasWorkerService } from "src/atlasViewer/atlasViewer.workerService.service" import { AngularMaterialModule } from "src/sharedModules" import { getUuid } from "src/util/fn" @@ -9,6 +9,7 @@ import { MANAGED_METHODS } from './service' import { of, Subject } from "rxjs" import { ConfirmDialogComponent } from "src/components/confirmDialog/confirmDialog.component" import { TYPE as NATIVE_TYPE } from './native' +import { ApiService } from "src/api" describe('> service.ts', () => { describe('> MessagingService', () => { @@ -34,6 +35,17 @@ describe('> service.ts', () => { { provide: WINDOW_MESSAGING_HANDLER_TOKEN, useValue: windowMessagehandler + }, + { + provide: ApiService, + useValue: { + booth: { + handshake(){} + }, + broadcastCh: { + addListener(){} + } + } } ] }) @@ -118,7 +130,7 @@ describe('> service.ts', () => { it('> pong', async () => { const result = await mService.handleMessage({ data: { - method: `${IAV_POSTMESSAGE_NAMESPACE}ping` + method: `ping` }, origin: 'foobar' }) diff --git a/src/messaging/service.ts b/src/messaging/service.ts index 7d19de8d2b261debedda472948a6bad7153978b5..3e9ecc6183f6bd5cde06737929f39c423f4d6809 100644 --- a/src/messaging/service.ts +++ b/src/messaging/service.ts @@ -1,10 +1,7 @@ import { Inject, Injectable, Optional } from "@angular/core"; import { Observable } from "rxjs"; import { MatDialog } from "@angular/material/dialog"; -import { MatSnackBar } from "@angular/material/snack-bar"; - -import { getUuid } from "src/util/fn"; -import { AtlasWorkerService } from "src/atlasViewer/atlasViewer.workerService.service"; +import { getUuid, noop } from "src/util/fn"; import { ConfirmDialogComponent } from "src/components/confirmDialog/confirmDialog.component"; import { IMessagingActions, IMessagingActionTmpl, WINDOW_MESSAGING_HANDLER_TOKEN, IWindowMessaging } from './types' @@ -45,8 +42,6 @@ export class MessagingService { constructor( private dialog: MatDialog, - private snackbar: MatSnackBar, - private worker: AtlasWorkerService, private apiService: ApiService, @Optional() @Inject(WINDOW_MESSAGING_HANDLER_TOKEN) private messagingHandler: IWindowMessaging, ){ @@ -80,9 +75,10 @@ export class MessagingService { try { const result = await this.handleMessage({ data, origin }) if (!this.originListenerMap.has(origin)) { - const listener = new WindowOpenerListener(() => { - this.apiService.broadcastCh.listeners - }, val => src.postMessage(val, origin)) + const listener = new WindowOpenerListener( + noop, + val => src.postMessage(val, origin) + ) const visitor = this.apiService.booth.handshake() this.originListenerMap.set(origin, {listener, visitor}) diff --git a/src/util/fn.ts b/src/util/fn.ts index 08bfb5c0f57818c4f59e98fefcab23e6510d3e59..9c1d188f7aea4e807406b45dfb82491f23d9543b 100644 --- a/src/util/fn.ts +++ b/src/util/fn.ts @@ -17,6 +17,9 @@ export function getDebug() { return (window as any).__DEBUG__ } +// eslint-disable-next-line @typescript-eslint/no-empty-function +export function noop(){} + export async function getExportNehuba() { // eslint-disable-next-line no-constant-condition while (true) {