Merge branch 'feature/Feature-Angular' of…

Merge branch 'feature/Feature-Angular' of ssh://git.oneit.com.au:40022/PerformaInvestments into qa/qa_matchd/angular

frontend/angular/src/app/components/admin-portal/admin-portal-layout/admin-portal-layout.component.ts

@@ -67,10 +67,6 @@ export class AdminPortalLayoutComponent implements OnInit, OnDestroy {
                     return;
                 }
 
-                if (message.name !== 'HiringTeamChat' || message.message === null) {
-                    return;
-                }
-
                 if (message.name === 'HiringTeamChat' && message.message === null) {
                     this.jobId = null;
                     this.loggedIn = null;
@@ -79,11 +75,13 @@ export class AdminPortalLayoutComponent implements OnInit, OnDestroy {
                     return;
                 }
 
+                if (message.name !== 'HiringTeamChat' || message.message === null) {
+                    return;
+                }
+
                 const msg = JSON.parse(message.message);
-                console.log('Admin Parsed', msg);
                 this.jobId = msg.JobApplicationID;
                 this.loggedIn = msg.CandidateID;
-                console.log('Admin Values:', this.jobId, this.loggedIn);
                 // Show Chat bubble if message service allows
                 this.showBubble = true;
             }

frontend/angular/src/app/components/message-engine-applicant-view/message-engine-applicant-view.component.ts

@@ -67,7 +67,6 @@ export class MessageEngineApplicantViewComponent extends BaseComponent implement
     ngOnInit(): void {
         this.utilsService.resetCounter();
         this.showLoader = true;
-        console.log('Job', this.jobId);
 
         this.subscriptions.push(
             this.appService.getTypes('SentVia')
@@ -77,21 +76,18 @@ export class MessageEngineApplicantViewComponent extends BaseComponent implement
                     if (this.embedded) {
                         if (this.adminPortalLayoutService.userData) {
                             this.loggedInId = this.adminPortalLayoutService.userData.CompanyUser.User;
-                            console.log('Already Engine -> User', this.loggedInId);
                             this.initComponent();
                         } else {
                             this.subscriptions.push(this.adminPortalLayoutService.userDataUpdated
                                 .first()
                                 .subscribe(() => {
                                     this.loggedInId = this.adminPortalLayoutService.userData.CompanyUser.User;
-                                    console.log('Engine -> User', this.loggedInId);
                                     this.initComponent();
                                 }));
                         }
                     } else {
                         // For applicant
                         this.embedded = false;
-                        console.log('Applicant Engine -> User', this.loggedInId);
                         this.initComponent();
                         // Use candidate ID fetched from iFrameService
                     }