diff --git a/libs/angular-integration-interface/src/index.ts b/libs/angular-integration-interface/src/index.ts index ff49a027..6d81b829 100644 --- a/libs/angular-integration-interface/src/index.ts +++ b/libs/angular-integration-interface/src/index.ts @@ -2,6 +2,7 @@ export * from './lib/services/app-state.service' export * from './lib/services/configuration.service' export * from './lib/services/user.service' +export * from './lib/services/portal-message.service' export * from './lib/services/theme.service' export * from './lib/services/translation-cache.service' diff --git a/libs/portal-integration-angular/src/lib/services/portal-message.service.spec.ts b/libs/angular-integration-interface/src/lib/services/portal-message.service.spec.ts similarity index 100% rename from libs/portal-integration-angular/src/lib/services/portal-message.service.spec.ts rename to libs/angular-integration-interface/src/lib/services/portal-message.service.spec.ts index 7aaaced4..724f612a 100644 --- a/libs/portal-integration-angular/src/lib/services/portal-message.service.spec.ts +++ b/libs/angular-integration-interface/src/lib/services/portal-message.service.spec.ts @@ -1,7 +1,7 @@ import { TestBed, fakeAsync } from '@angular/core/testing' -import { PortalMessageService } from './portal-message.service' import { TranslateTestingModule } from 'ngx-translate-testing' import { Message } from '@onecx/integration-interface' +import { PortalMessageService } from './portal-message.service' describe('PortalMessageService', () => { const origAddEventListener = window.addEventListener diff --git a/libs/portal-integration-angular/src/lib/services/portal-message.service.ts b/libs/angular-integration-interface/src/lib/services/portal-message.service.ts similarity index 100% rename from libs/portal-integration-angular/src/lib/services/portal-message.service.ts rename to libs/angular-integration-interface/src/lib/services/portal-message.service.ts index ac3bf25d..b4e60a9a 100644 --- a/libs/portal-integration-angular/src/lib/services/portal-message.service.ts +++ b/libs/angular-integration-interface/src/lib/services/portal-message.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core' import { TranslateService } from '@ngx-translate/core' -import { MessageTopic } from '@onecx/integration-interface' import { combineLatest, of } from 'rxjs' +import { MessageTopic } from '@onecx/integration-interface' export type Message = { summaryKey?: string diff --git a/libs/portal-integration-angular/mocks/portal-message-service-mock.ts b/libs/portal-integration-angular/mocks/portal-message-service-mock.ts index 1630c1f3..3b0ad82c 100644 --- a/libs/portal-integration-angular/mocks/portal-message-service-mock.ts +++ b/libs/portal-integration-angular/mocks/portal-message-service-mock.ts @@ -2,9 +2,9 @@ import { Injectable, Optional } from '@angular/core' import { TranslateService } from '@ngx-translate/core' import { combineLatest, of } from 'rxjs' // eslint-disable-next-line -import { Message, PortalMessageService } from '@onecx/portal-integration-angular' -import { FakeTopic } from './fake-topic' +import { Message, PortalMessageService } from '@onecx/angular-integration-interface' import { Message as TopicMessage } from '@onecx/integration-interface' +import { FakeTopic } from './fake-topic' export function providePortalMessageServiceMock() { return [ diff --git a/libs/portal-integration-angular/src/index.ts b/libs/portal-integration-angular/src/index.ts index f9f906d4..58eddb72 100644 --- a/libs/portal-integration-angular/src/index.ts +++ b/libs/portal-integration-angular/src/index.ts @@ -48,7 +48,6 @@ export * from './lib/core/components/lifecycle/lifecycle.component' export * from './lib/services/app.menu.service' export * from './lib/services/menu-api.service' export * from './lib/services/portal-api.service' -export * from './lib/services/portal-message.service' export * from './lib/services/initialize-module-guard.service' export * from './lib/services/userprofile-api.service' export * from './lib/services/portal-dialog.service' diff --git a/libs/portal-integration-angular/src/lib/core/components/help-item-editor/help-item-editor.component.spec.ts b/libs/portal-integration-angular/src/lib/core/components/help-item-editor/help-item-editor.component.spec.ts index bcef2699..524f287a 100644 --- a/libs/portal-integration-angular/src/lib/core/components/help-item-editor/help-item-editor.component.spec.ts +++ b/libs/portal-integration-angular/src/lib/core/components/help-item-editor/help-item-editor.component.spec.ts @@ -4,9 +4,8 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations' import { TranslateTestingModule } from 'ngx-translate-testing' import { DialogModule } from 'primeng/dialog' -import { ConfigurationService } from '@onecx/angular-integration-interface' +import { ConfigurationService, PortalMessageService } from '@onecx/angular-integration-interface' import { HelpItemEditorComponent } from './help-item-editor.component' -import { PortalMessageService } from '../../../services/portal-message.service' describe('HelpItemEditorComponent', () => { let component: HelpItemEditorComponent diff --git a/libs/portal-integration-angular/src/lib/core/components/help-item-editor/help-item-editor.component.ts b/libs/portal-integration-angular/src/lib/core/components/help-item-editor/help-item-editor.component.ts index 6371fca0..e90a9b51 100644 --- a/libs/portal-integration-angular/src/lib/core/components/help-item-editor/help-item-editor.component.ts +++ b/libs/portal-integration-angular/src/lib/core/components/help-item-editor/help-item-editor.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core' import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms' +import { PortalMessageService } from '@onecx/angular-integration-interface' import { HelpData } from '../../../model/help-data' -import { PortalMessageService } from '../../../services/portal-message.service' @Component({ selector: 'ocx-help-item-editor', diff --git a/libs/portal-integration-angular/src/lib/core/components/portal-viewport/portal-viewport.component.ts b/libs/portal-integration-angular/src/lib/core/components/portal-viewport/portal-viewport.component.ts index 6b76d3f8..a01ecac1 100644 --- a/libs/portal-integration-angular/src/lib/core/components/portal-viewport/portal-viewport.component.ts +++ b/libs/portal-integration-angular/src/lib/core/components/portal-viewport/portal-viewport.component.ts @@ -5,14 +5,13 @@ import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy' import { catchError, combineLatest, filter, first, map, mergeMap, Observable, of, withLatestFrom } from 'rxjs' import { MenuItem, MessageService, PrimeNGConfig } from 'primeng/api' import { DialogService } from 'primeng/dynamicdialog' -import { AppStateService, UserService, ThemeService } from '@onecx/angular-integration-interface' +import { AppStateService, UserService, ThemeService, PortalMessageService } from '@onecx/angular-integration-interface' import { SupportTicketApiService } from './../../../services/support-ticket-api.service' import { PortalUIService } from '../../../services/portal-ui.service' import { SupportTicket } from '../../../model/support-ticket' import { HelpData } from '../../../model/help-data' import { NoHelpItemComponent } from '../no-help-item/no-help-item.component' import { HelpPageAPIService } from '../../../services/help-api-service' -import { PortalMessageService } from '../../../services/portal-message.service' @Component({ selector: 'ocx-portal-viewport',