diff --git a/package-lock.json b/package-lock.json index ce7dd162..347aa390 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@pega/angular-sdk-components", - "version": "24.1.10", + "version": "24.2.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@pega/angular-sdk-components", - "version": "24.1.10", + "version": "24.2.10", "license": "SEE LICENSE IN LICENSE", "dependencies": { "@angular/animations": "^18.2.12", diff --git a/package.json b/package.json index d48eca1a..20b69fde 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@pega/angular-sdk-components", - "version": "24.1.10", + "version": "24.2.10", "description": "Angular SDK packaging: bridge and components, overrides", "main": "index.ts", "private": true, diff --git a/packages/angular-sdk-components/package.json b/packages/angular-sdk-components/package.json index ba99c5a2..d5f1d917 100644 --- a/packages/angular-sdk-components/package.json +++ b/packages/angular-sdk-components/package.json @@ -1,9 +1,9 @@ { "name": "@pega/angular-sdk-components", - "version": "24.1.10", + "version": "24.2.10", "peerDependencies": { - "@angular/common": "^17.3.12", - "@angular/core": "^17.3.12" + "@angular/common": "^18.2.12", + "@angular/core": "^18.2.12" }, "dependencies": { "tslib": "^2.6.2" diff --git a/packages/angular-sdk-components/src/lib/_messages/get-login-status.service.spec.ts b/packages/angular-sdk-components/src/lib/_messages/get-login-status.service.spec.ts deleted file mode 100644 index 7648997a..00000000 --- a/packages/angular-sdk-components/src/lib/_messages/get-login-status.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { GetLoginStatusService } from './get-login-status.service'; - -describe('GetLoginStatusService', () => { - let service: GetLoginStatusService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(GetLoginStatusService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/packages/angular-sdk-components/src/lib/_messages/get-login-status.service.ts b/packages/angular-sdk-components/src/lib/_messages/get-login-status.service.ts deleted file mode 100644 index 5e4b98a9..00000000 --- a/packages/angular-sdk-components/src/lib/_messages/get-login-status.service.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Observable, Subject } from 'rxjs'; - -@Injectable({ - providedIn: 'root' -}) -export class GetLoginStatusService { - private subject = new Subject(); - - sendMessage(sLoginStatus: string) { - this.subject.next({ loginStatus: sLoginStatus }); - } - - clearMessage() { - this.subject.next(); - } - - getMessage(): Observable { - return this.subject.asObservable(); - } -} diff --git a/packages/angular-sdk-components/src/lib/_messages/oauth-response.service.spec.ts b/packages/angular-sdk-components/src/lib/_messages/oauth-response.service.spec.ts deleted file mode 100644 index 5cd70301..00000000 --- a/packages/angular-sdk-components/src/lib/_messages/oauth-response.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { OAuthResponseService } from './oauth-response.service'; - -describe('OAuthResponseService', () => { - let service: OAuthResponseService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(OAuthResponseService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/packages/angular-sdk-components/src/lib/_messages/oauth-response.service.ts b/packages/angular-sdk-components/src/lib/_messages/oauth-response.service.ts deleted file mode 100644 index 41ec607c..00000000 --- a/packages/angular-sdk-components/src/lib/_messages/oauth-response.service.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Observable, Subject } from 'rxjs'; - -@Injectable({ - providedIn: 'root' -}) -export class OAuthResponseService { - private subject = new Subject(); - - /** - * Function to pass the OAuth token - * @param oToken - token - */ - sendMessage(oToken: any) { - this.subject.next({ token: oToken }); - } - - clearMessage() { - this.subject.next(); - } - - getMessage(): Observable { - return this.subject.asObservable(); - } -} diff --git a/packages/angular-sdk-components/src/lib/_messages/reset-pconnect.service.spec.ts b/packages/angular-sdk-components/src/lib/_messages/reset-pconnect.service.spec.ts deleted file mode 100644 index 9312af2c..00000000 --- a/packages/angular-sdk-components/src/lib/_messages/reset-pconnect.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ResetPConnectService } from './reset-pconnect.service'; - -describe('ResetPConnectService', () => { - let service: ResetPConnectService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ResetPConnectService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/packages/angular-sdk-components/src/lib/_messages/reset-pconnect.service.ts b/packages/angular-sdk-components/src/lib/_messages/reset-pconnect.service.ts deleted file mode 100644 index 2017b91f..00000000 --- a/packages/angular-sdk-components/src/lib/_messages/reset-pconnect.service.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Observable, Subject } from 'rxjs'; - -@Injectable({ - providedIn: 'root' -}) -export class ResetPConnectService { - private subject = new Subject(); - - /** - * function to reset pConnect - * @param bReset - true: reset pconnect, false - do nothing - * @param sType - what causing the reset, so far (cancel, finishAssignment) - */ - sendMessage(bReset: boolean, sType: string) { - this.subject.next({ reset: bReset, type: sType }); - } - - clearMessage() { - this.subject.next(); - } - - getMessage(): Observable { - return this.subject.asObservable(); - } -} diff --git a/packages/angular-sdk-components/src/public-api.ts b/packages/angular-sdk-components/src/public-api.ts index 8678c82c..00ebfb26 100644 --- a/packages/angular-sdk-components/src/public-api.ts +++ b/packages/angular-sdk-components/src/public-api.ts @@ -142,10 +142,7 @@ export * from './lib/_helpers/filter-utils'; export * from './lib/_helpers/instructions-utils'; export * from './lib/_messages/error-messages.service'; -export * from './lib/_messages/get-login-status.service'; -export * from './lib/_messages/oauth-response.service'; export * from './lib/_messages/progress-spinner.service'; -export * from './lib/_messages/reset-pconnect.service'; export * from './lib/_messages/update-worklist.service'; export * from './lib/_types/PConnProps.interface'; diff --git a/packages/angular-sdk-overrides/package.json b/packages/angular-sdk-overrides/package.json index c9a103f2..abe167f5 100644 --- a/packages/angular-sdk-overrides/package.json +++ b/packages/angular-sdk-overrides/package.json @@ -1,6 +1,6 @@ { "name": "@pega/angular-sdk-overrides", - "version": "24.1.10", + "version": "24.2.10", "description": "Angular SDK - Code for overriding components", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" diff --git a/projects/angular-test-app/src/app/_samples/embedded/mc-main-content/mc-main-content.component.ts b/projects/angular-test-app/src/app/_samples/embedded/mc-main-content/mc-main-content.component.ts index 6374a0d4..acc92727 100644 --- a/projects/angular-test-app/src/app/_samples/embedded/mc-main-content/mc-main-content.component.ts +++ b/projects/angular-test-app/src/app/_samples/embedded/mc-main-content/mc-main-content.component.ts @@ -12,7 +12,7 @@ import { ComponentMapperComponent } from '../../../../../../../packages/angular- export class MCMainContentComponent implements OnInit { @Input() pConn$: typeof PConnect; - sComponentName$: string; + sComponentName$: string | undefined; ngOnInit(): void { if (this.pConn$) { diff --git a/projects/angular-test-app/src/app/_samples/embedded/mc-nav/mc-nav.component.ts b/projects/angular-test-app/src/app/_samples/embedded/mc-nav/mc-nav.component.ts index de947e0f..8f38052d 100644 --- a/projects/angular-test-app/src/app/_samples/embedded/mc-nav/mc-nav.component.ts +++ b/projects/angular-test-app/src/app/_samples/embedded/mc-nav/mc-nav.component.ts @@ -5,11 +5,10 @@ import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatToolbarModule } from '@angular/material/toolbar'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; -import { Subscription, interval } from 'rxjs'; +import { Subscription } from 'rxjs'; import { loginIfNecessary, logout, sdkSetAuthHeader } from '@pega/auth/lib/sdk-auth-manager'; import { ProgressSpinnerService } from '../../../../../../../packages/angular-sdk-components/src/lib/_messages/progress-spinner.service'; -import { ResetPConnectService } from '../../../../../../../packages/angular-sdk-components/src/lib/_messages/reset-pconnect.service'; import { UpdateWorklistService } from '../../../../../../../packages/angular-sdk-components/src/lib/_messages/update-worklist.service'; import { endpoints } from '../../../../../../../packages/angular-sdk-components/src/lib/_services/endpoints'; import { ServerConfigService } from '../../../../../../../packages/angular-sdk-components/src/lib/_services/server-config.service'; @@ -45,14 +44,12 @@ export class MCNavComponent implements OnInit, OnDestroy { isProgress$ = false; progressSpinnerSubscription: Subscription; - resetPConnectSubscription: Subscription; bootstrapShell: any; constructor( private cdRef: ChangeDetectorRef, private psservice: ProgressSpinnerService, - private rpcservice: ResetPConnectService, private uwservice: UpdateWorklistService, private titleService: Title, private scservice: ServerConfigService @@ -66,7 +63,6 @@ export class MCNavComponent implements OnInit, OnDestroy { ngOnDestroy() { this.progressSpinnerSubscription.unsubscribe(); - this.resetPConnectSubscription.unsubscribe(); } async initialize() { @@ -79,24 +75,6 @@ export class MCNavComponent implements OnInit, OnDestroy { this.showHideProgress(message.show); }); - this.resetPConnectSubscription = this.rpcservice.getMessage().subscribe(message => { - if (message.reset) { - this.bPConnectLoaded$ = false; - - /// window.PCore = null; - - const timer = interval(1000).subscribe(() => { - // this.getPConnectAndUpdate(); - window.myLoadMashup('app-root', false); - - // update the worklist - this.uwservice.sendMessage(true); - - timer.unsubscribe(); - }); - } - }); - // Add event listener for when logged in and constellation bootstrap is loaded document.addEventListener('SdkConstellationReady', () => { this.bLoggedIn$ = true; diff --git a/projects/angular-test-app/src/app/_samples/simple-portal/navigation/navigation.component.ts b/projects/angular-test-app/src/app/_samples/simple-portal/navigation/navigation.component.ts index 23c9f976..7a727ca0 100644 --- a/projects/angular-test-app/src/app/_samples/simple-portal/navigation/navigation.component.ts +++ b/projects/angular-test-app/src/app/_samples/simple-portal/navigation/navigation.component.ts @@ -48,7 +48,6 @@ export class NavigationComponent implements OnInit, OnDestroy { userName$ = ''; isProgress$ = false; progressSpinnerSubscription: Subscription; - resetPConnectSubscription: Subscription; constructor( private uwservice: UpdateWorklistService, @@ -64,7 +63,6 @@ export class NavigationComponent implements OnInit, OnDestroy { ngOnDestroy() { this.progressSpinnerSubscription.unsubscribe(); - this.resetPConnectSubscription.unsubscribe(); PCore.getPubSubUtils().unsubscribe(PCore.getConstants().PUB_SUB_EVENTS.EVENT_CANCEL, 'cancelAssignment'); diff --git a/projects/angular-test-app/src/app/_samples/simple-portal/side-bar/side-bar.component.ts b/projects/angular-test-app/src/app/_samples/simple-portal/side-bar/side-bar.component.ts index ca4c902b..442ded65 100644 --- a/projects/angular-test-app/src/app/_samples/simple-portal/side-bar/side-bar.component.ts +++ b/projects/angular-test-app/src/app/_samples/simple-portal/side-bar/side-bar.component.ts @@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common'; import { HttpParams } from '@angular/common/http'; import { MatButtonModule } from '@angular/material/button'; import { Subscription } from 'rxjs'; -import { GetLoginStatusService } from '../../../../../../../packages/angular-sdk-components/src/lib/_messages/get-login-status.service'; import { ProgressSpinnerService } from '../../../../../../../packages/angular-sdk-components/src/lib/_messages/progress-spinner.service'; import { UpdateWorklistService } from '../../../../../../../packages/angular-sdk-components/src/lib/_messages/update-worklist.service'; import { CaseService } from '../../../../../../../packages/angular-sdk-components/src/lib/_services/case.service'; @@ -25,7 +24,6 @@ export class SideBarComponent implements OnInit, OnDestroy { constructor( private psservice: ProgressSpinnerService, - private glsservice: GetLoginStatusService, private uwservice: UpdateWorklistService, private dpservice: DatapageService, private cservice: CaseService @@ -67,7 +65,6 @@ export class SideBarComponent implements OnInit, OnDestroy { }, err => { alert(`Errors from get casetypes:${err.errors}`); - this.glsservice.sendMessage('LoggedOff'); } ); }