From 137117eda246f7e23db704687f6062d94afa0b4b Mon Sep 17 00:00:00 2001
From: Nicola Lanzilotto <nicola@tiledesk.com>
Date: Mon, 16 Oct 2023 19:14:13 +0200
Subject: [PATCH] Improvements and bug fixing

---
 src/app/auth/autologin/autologin.component.ts |  74 +++++++-
 src/app/auth/signin/signin.component.html     |   2 +-
 src/app/auth/signin/signin.component.ts       |  12 +-
 src/app/auth/signup/signup.component.ts       |  12 +-
 src/app/core/auth.guard.ts                    |  10 +
 src/app/core/auth.service.ts                  |  49 +----
 .../create-project-gs.component.ts            |   5 +-
 src/app/home/home.component.ts                |  12 +-
 .../knowledge-bases.component.ts              | 171 +++++++++++++++++-
 src/app/projects/projects.component.ts        |   4 +-
 10 files changed, 282 insertions(+), 69 deletions(-)

diff --git a/src/app/auth/autologin/autologin.component.ts b/src/app/auth/autologin/autologin.component.ts
index a1df8dfc1010..2f82eb02628e 100755
--- a/src/app/auth/autologin/autologin.component.ts
+++ b/src/app/auth/autologin/autologin.component.ts
@@ -11,6 +11,7 @@ import { AppConfigService } from '../../services/app-config.service';
 import { environment } from '../../../environments/environment';
 import { ProjectService } from '../../services/project.service';
 import { LoggerService } from '../../services/logger/logger.service';
+import { LocalDbService } from 'app/services/users-local-db.service';
 
 @Component({
   selector: 'appdashboard-autologin',
@@ -26,8 +27,7 @@ export class AutologinComponent implements OnInit {
   FCMcurrentToken: string;
   user: any;
   public version: string = environment.VERSION;
-
-
+  public hasSignedInWithGoogle: boolean = false;
 
   constructor(
     private route: ActivatedRoute,
@@ -36,7 +36,8 @@ export class AutologinComponent implements OnInit {
     public sso: SsoService,
     public appConfigService: AppConfigService,
     private projectService: ProjectService,
-    private logger: LoggerService
+    private logger: LoggerService,
+    private localDbService: LocalDbService
   ) {
 
     this.user = auth.user_bs.value;
@@ -59,6 +60,15 @@ export class AutologinComponent implements OnInit {
 
   }
 
+    
+  ngOnInit() {
+    this.logger.log('[AUTOLOGIN] SSO - autologin page');
+    this.detectMobile();
+   
+  }
+
+ 
+
   getJWTAndRouteParamsAndLogin() {
     this.route.params.subscribe((params) => {
       this.logger.log('[AUTOLOGIN] SSO - autologin page params ', params)
@@ -96,11 +106,7 @@ export class AutologinComponent implements OnInit {
     });
   }
 
-  ngOnInit() {
 
-    this.logger.log('[AUTOLOGIN] SSO - autologin page');
-    this.detectMobile();
-  }
 
 
   detectMobile() {
@@ -135,10 +141,10 @@ export class AutologinComponent implements OnInit {
     }
 
     this.sso.getCurrentAuthenticatedUser(JWT).subscribe(auth_user => {
-      this.logger.log('[AUTOLOGIN] SSO - ssoLogin getCurrentAuthenticatedUser RES ', auth_user);
+      // console.log('[AUTOLOGIN] SSO - ssoLogin getCurrentAuthenticatedUser RES ', auth_user);
 
       const user = { firstname: auth_user['firstname'], lastname: auth_user['lastname'], _id: auth_user['_id'], email: auth_user['email'], emailverified: auth_user['emailverified'], token: JWT }
-      this.logger.log('[AUTOLOGIN] SSO - ssoLogin getCurrentAuthenticatedUser user ', user);
+      // console.log('[AUTOLOGIN] SSO - ssoLogin getCurrentAuthenticatedUser user ', user);
 
       localStorage.setItem('user', JSON.stringify(user));
       localStorage.setItem(chatPrefix + '__tiledeskToken', JWT);
@@ -147,6 +153,14 @@ export class AutologinComponent implements OnInit {
 
       this.router.navigate([route]);
 
+      // get if user has used Signin with Google
+      const hasSigninWithGoogle = this.localDbService.getFromStorage('swg')
+      if ( hasSigninWithGoogle ) {
+        this.localDbService.removeFromStorage('swg')
+        // console.log('[AUTOLOGIN] SSO removeFromStorage swg') 
+        this.trackUserHasSignedInWithGoogle(user)
+      }
+
       this.logger.log('[AUTOLOGIN] SSO - ssoLogin JWT before to get permsission ', JWT)
       this.logger.log('[AUTOLOGIN] SSO - ssoLogin storedJWT before to get permsission ', storedJWT)
       if (JWT !== storedJWT) {
@@ -179,6 +193,48 @@ export class AutologinComponent implements OnInit {
     });
   }
 
+  trackUserHasSignedInWithGoogle(user) {
+    if (!isDevMode()) {
+      if (window['analytics']) {
+        // try {
+        //   window['analytics'].page("Auth Page, Sign in with Google", {
+
+        //   });
+        // } catch (err) {
+        //   this.logger.error('Sign in with Google page error', err);
+        // }
+
+        let userFullname = ''
+        if (user.firstname && user.lastname)  {
+          userFullname = user.firstname + ' ' + user.lastname
+        } else if (user.firstname && !user.lastname) {
+          userFullname = user.firstname
+        }
+
+        try {
+          window['analytics'].identify(user._id, {
+            name: userFullname,
+            email: user.email,
+            logins: 5,
+
+          });
+        } catch (err) {
+          this.logger.error('identify Sign in with Google event error', err);
+        }
+        // Segments
+        try {
+          window['analytics'].track('Signed In', {
+            "username": userFullname,
+            "userId": user._id,
+            'method': "Sign in with Google"
+          });
+        } catch (err) {
+          this.logger.error('track Sign in with Google event error', err);
+        }
+      }
+     }
+  }
+
   getProjectFromRemotePublishAndSaveInStorage(project_id) {
 
     this.projectService.getProjects().subscribe((prjcts: any) => {
diff --git a/src/app/auth/signin/signin.component.html b/src/app/auth/signin/signin.component.html
index abe65c7cdf4b..cfe12ef1f570 100755
--- a/src/app/auth/signin/signin.component.html
+++ b/src/app/auth/signin/signin.component.html
@@ -113,7 +113,7 @@ <h2>
 
         <div class="login-container">
 
-        <button type="button" class="google-button" (click)="signinWithGoogle()">
+        <button type="button" rel="opener" class="google-button" (click)="signinWithGoogle()">
             <div style="margin-right: 10px; background: rgb(255, 255, 255); padding: 10px; border-radius: 2px;">
        
               <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 186.69 190.5"
diff --git a/src/app/auth/signin/signin.component.ts b/src/app/auth/signin/signin.component.ts
index 9c89c2a501e1..5bb04474216c 100755
--- a/src/app/auth/signin/signin.component.ts
+++ b/src/app/auth/signin/signin.component.ts
@@ -91,6 +91,12 @@ export class SigninComponent implements OnInit {
     this.buildForm();
     this.getWindowWidthAndHeight();
     this.getStoredRoute()
+    // get if user has used Signin with Google
+    const hasSigninWithGoogle = this.localDbService.getFromStorage('swg')
+    if (hasSigninWithGoogle) {
+      this.localDbService.removeFromStorage('swg')
+      // console.log('[SIGN-IN] removeFromStorage swg')
+    }
   }
 
   getStoredRoute() {
@@ -289,7 +295,7 @@ export class SigninComponent implements OnInit {
             }
 
             let userFullname = ''
-            if (user.firstname && user.lastname)  {
+            if (user.firstname && user.lastname) {
               userFullname = user.firstname + ' ' + user.lastname
             } else if (user.firstname && !user.lastname) {
               userFullname = user.firstname
@@ -445,8 +451,8 @@ export class SigninComponent implements OnInit {
   // }
   goToSignupPage() {
     const storedUser = localStorage.getItem('user');
-    this.logger.log('[SIGN-IN] GO TO SIGNUP PAGE STORED USER ',storedUser) 
-    if(storedUser) {
+    this.logger.log('[SIGN-IN] GO TO SIGNUP PAGE STORED USER ', storedUser)
+    if (storedUser) {
       // localStorage.removeItem('user')
       this.auth.signOut('signin');
     }
diff --git a/src/app/auth/signup/signup.component.ts b/src/app/auth/signup/signup.component.ts
index 6591961ffcff..3716bfc47cdb 100755
--- a/src/app/auth/signup/signup.component.ts
+++ b/src/app/auth/signup/signup.component.ts
@@ -147,8 +147,13 @@ export class SignupComponent implements OnInit, AfterViewInit {
     this.buildForm();
     this.getBrowserLang();
     this.getOSCODE();
-    this.getQueryParamsAndSegmentRecordPageAndIdentify()
-    // 
+    this.getQueryParamsAndSegmentRecordPageAndIdentify();
+    
+    const hasSigninWithGoogle = this.localDbService.getFromStorage('swg')
+    if (hasSigninWithGoogle) {
+      this.localDbService.removeFromStorage('swg')
+      console.log('[SIGN-UP] removeFromStorage swg')
+    }
 
   }
 
@@ -569,7 +574,8 @@ export class SignupComponent implements OnInit, AfterViewInit {
                   "last_name": signupResponse.user.lastname,
                   "email": signupResponse.user.email,
                   "username": userFullname,
-                  'userId': signupResponse.user._id
+                  'userId': signupResponse.user._id,
+                  'method': "Email and Password"
                 });
               } catch (err) {
                 this.logger.error('track signup event error', err);
diff --git a/src/app/core/auth.guard.ts b/src/app/core/auth.guard.ts
index 80309fdfea88..0d9340f7b90e 100755
--- a/src/app/core/auth.guard.ts
+++ b/src/app/core/auth.guard.ts
@@ -350,6 +350,16 @@ export class AuthGuard implements CanActivate {
     const decodeCurrentUrl = decodeURIComponent(url)
     // console.log('[AUTH-GUARD] _decodeCurrentUrl ', decodeCurrentUrl)
 
+    if (decodeCurrentUrl === '/projects') {
+      // get if user has used Signin with Google
+      const hasSigninWithGoogle = this.localDbService.getFromStorage('swg')
+      if (hasSigninWithGoogle) {
+        this.localDbService.removeFromStorage('swg')
+        // console.log('[AUTH-GUARD] removeFromStorage swg')
+      }
+    }
+
+
     const storedRoute = this.localDbService.getFromStorage('wannago')
     // console.log('[AUTH-GUARD] storedRoute getFromStorage ', storedRoute)
 
diff --git a/src/app/core/auth.service.ts b/src/app/core/auth.service.ts
index d889b476fb64..9736a618d901 100755
--- a/src/app/core/auth.service.ts
+++ b/src/app/core/auth.service.ts
@@ -64,6 +64,7 @@ export class AuthService {
   public tilebotSidebarIsOpened: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(null)
   public botsSidebarIsOpened: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(null)
   public isChromeVerGreaterThan100: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(null)
+  
   show_ExpiredSessionPopup: boolean
 
   _user_role: string
@@ -254,6 +255,7 @@ export class AuthService {
   // --------------------------------------------------------------------------------------
   publishSSOloggedUser() {
     const storedUser = localStorage.getItem('user')
+    console.log('[AUTH-SERV] publishSSOloggedUser storedUser ', storedUser)
     if (storedUser !== null) {
       this.user_bs.next(JSON.parse(storedUser))
 
@@ -1332,54 +1334,13 @@ export class AuthService {
   
 
   public siginWithGoogle() {
-
+    console.log('[AUTH-SERV] siginWithGoogle HERE YES!!!')
     // const url = this.SERVER_BASE_PATH + "auth/google"
     const url = "https://eu.rtmv3.tiledesk.com/api/auth/google"
     window.open(url, '_self');
 
-    let storedUser = localStorage.getItem('user')
-    let user = JSON.parse(storedUser);
-
-    if (!isDevMode()) {
-      if (window['analytics']) {
-        try {
-          window['analytics'].page("Auth Page, Sign in with Google", {
-
-          });
-        } catch (err) {
-          this.logger.error('Sign in with Google page error', err);
-        }
-
-        let userFullname = ''
-        if (user.firstname && user.lastname)  {
-          userFullname = user.firstname + ' ' + user.lastname
-        } else if (user.firstname && !user.lastname) {
-          userFullname = user.firstname
-        }
-
-        try {
-          window['analytics'].identify(user._id, {
-            name: userFullname,
-            email: user.email,
-            logins: 5,
-
-          });
-        } catch (err) {
-          this.logger.error('identify Sign in with Google event error', err);
-        }
-        // Segments
-        try {
-          window['analytics'].track('Signed In', {
-            "username": userFullname,
-            "userId": user._id,
-            'method': "Sign in with Google"
-          });
-        } catch (err) {
-          this.logger.error('track Sign in with Google event error', err);
-        }
-      }
-    }
-
+    this.localDbService.setInStorage('swg', 'true')
+  
   }
 
   public siginUpWithGoogle() {
diff --git a/src/app/create-project-wizard/create-project-gs/create-project-gs.component.ts b/src/app/create-project-wizard/create-project-gs/create-project-gs.component.ts
index 4a89aec2bc1c..91b2fb4c0cd2 100644
--- a/src/app/create-project-wizard/create-project-gs/create-project-gs.component.ts
+++ b/src/app/create-project-wizard/create-project-gs/create-project-gs.component.ts
@@ -77,13 +77,14 @@ export class CreateProjectGsComponent implements OnInit {
             }
 
             try {
-              window['analytics'].track("Signed Up with Google ", {
+              window['analytics'].track("Signed Up", {
                 "type": "organic",
                 "first_name": user.firstname,
                 "last_name": user.lastname,
                 "email": user.email,
                 "username": userFullname,
-                'userId': user._id
+                'userId': user._id,
+                'method': "Signup up with Google"
               });
             } catch (err) {
               this.logger.error('track signup event error', err);
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index 771f701c9c35..dcae196ebfe1 100755
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -220,7 +220,8 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
     private logger: LoggerService,
     private projectService: ProjectService,
     public appStoreService: AppStoreService,
-    private departmentService: DepartmentService
+    private departmentService: DepartmentService,
+    public localDbService: LocalDbService
   ) {
     const brand = brandService.getBrand();
     this.company_name = brand['company_name'];
@@ -263,6 +264,13 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
     this.waWizardSteps = [{ step1: false, step2: false, step3: false }]
     this.oneStepWizard = { watsAppConnected: false }
 
+    // get if user has used Signin with Google
+    const hasSigninWithGoogle = this.localDbService.getFromStorage('swg')
+    if (hasSigninWithGoogle) {
+      this.localDbService.removeFromStorage('swg')
+      // console.log('[SIGN-UP] removeFromStorage swg')
+    }
+
   }
 
   ngAfterViewInit() {
@@ -2039,7 +2047,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
         takeUntil(this.unsubscribe$)
       )
       .subscribe((user) => {
-        this.logger.log('[HOME] - USER GET IN HOME ', user)
+        // console.log('[HOME] - USER GET IN HOME ', user)
         // tslint:disable-next-line:no-debugger
         // debugger
         this.user = user;
diff --git a/src/app/knowledge-bases/knowledge-bases.component.ts b/src/app/knowledge-bases/knowledge-bases.component.ts
index 2e17a72ca6c5..260bd3feae85 100644
--- a/src/app/knowledge-bases/knowledge-bases.component.ts
+++ b/src/app/knowledge-bases/knowledge-bases.component.ts
@@ -1,10 +1,14 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit, isDevMode } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { ActivatedRoute } from '@angular/router';
 import { AuthService } from 'app/core/auth.service';
+import { NotifyService } from 'app/core/notify.service';
 import { KB, KbSettings } from 'app/models/kbsettings-model';
+import { Project } from 'app/models/project-model';
 import { KnowledgeBaseService } from 'app/services/knowledge-base.service';
 import { LoggerService } from 'app/services/logger/logger.service';
 import { OpenaiService } from 'app/services/openai.service';
+import { ProjectService } from 'app/services/project.service';
 
 @Component({
   selector: 'appdashboard-knowledge-bases',
@@ -26,6 +30,14 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy {
   addButtonDisabled: boolean = false;
   gptkeyVisible: boolean = false;
 
+  //analytics
+  CURRENT_USER: any;
+  project: Project;
+  project_name: string;
+  id_project: string;
+  profile_name: string;
+  callingPage: string;
+
   kbForm: FormGroup;
   kbsList = [];
 
@@ -59,7 +71,10 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy {
     private formBuilder: FormBuilder,
     private logger: LoggerService,
     private openaiService: OpenaiService,
-    private kbService: KnowledgeBaseService
+    private kbService: KnowledgeBaseService,
+    private projectService: ProjectService,
+    public route: ActivatedRoute,
+    private notify: NotifyService
   ) { }
 
   ngOnInit(): void {
@@ -68,6 +83,75 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy {
     //this.getKnowledgeBases();
     this.getKnowledgeBaseSettings();
     this.kbForm = this.createConditionGroup();
+    this.trackPage();
+    this.getLoggedUser();
+    this.getCurrentProject()
+    this.getRouteParams()
+    this.getRouteParams()
+  }
+
+  getRouteParams() {
+    this.route.params.subscribe((params) => {
+      // this.projectId = params.projectid
+      this.logger.log('[KNOWLEDGE BASES COMP] - GET ROUTE PARAMS ', params);
+      if (params.calledby && params.calledby === 'h') {
+        this.callingPage = 'Home'
+        this.logger.log('[KNOWLEDGE BASES COMP] - GET ROUTE PARAMS callingPage ', this.callingPage);
+      } else if (!params.calledby) {
+        this.callingPage = 'Knowledge Bases'
+        this.logger.log('[KNOWLEDGE BASES COMP] - GET ROUTE PARAMS callingPage ', this.callingPage);
+      }
+    })
+  }
+
+  trackPage() {
+    if (!isDevMode()) {
+      if (window['analytics']) {
+        try {
+          window['analytics'].page("Knowledge Bases Page", {
+
+          });
+        } catch (err) {
+          this.logger.error('Signin page error', err);
+        }
+      }
+    }
+  }
+
+  getLoggedUser() {
+    this.auth.user_bs.subscribe((user) => {
+      this.logger.log('[KNOWLEDGE BASES COMP] - LOGGED USER ', user)
+      if (user) {
+        this.CURRENT_USER = user
+
+      }
+    });
+  }
+  getCurrentProject() {
+    this.auth.project_bs.subscribe((project) => {
+      this.project = project
+      this.logger.log('[KNOWLEDGE BASES COMP] - GET CURRENT PROJECT ', this.project)
+      if (this.project) {
+        this.project_name = project.name;
+        this.id_project = project._id;
+        this.getProjectById(this.id_project)
+        this.logger.log('[KNOWLEDGE BASES COMP] - GET CURRENT PROJECT - PROJECT-NAME ', this.project_name, ' PROJECT-ID ', this.id_project)
+      }
+    });
+  }
+  getProjectById(projectId) {
+    this.projectService.getProjectById(projectId).subscribe((project: any) => {
+      this.logger.log('[KNOWLEDGE BASES COMP] - GET PROJECT BY ID - PROJECT: ', project);
+
+      this.profile_name = project.profile.name
+      this.logger.log('[KNOWLEDGE BASES COMP] - GET PROJECT BY ID - profile_name: ', this.profile_name);
+
+    }, error => {
+      this.logger.error('[KNOWLEDGE BASES COMP] - GET PROJECT BY ID - ERROR ', error);
+    }, () => {
+      this.logger.log('[KNOWLEDGE BASES COMP] - GET PROJECT BY ID * COMPLETE * ');
+
+    });
   }
 
   startPooling() {
@@ -149,6 +233,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy {
     this.newKb.name = this.newKb.url.substring(split_index);
 
     this.kbService.addNewKb(this.kbSettings._id, this.newKb).subscribe((savedSettings: KbSettings) => {
+      // console.log('[KNOWLEDGE BASES COMP] this.kbSettings addNewKb ', this.kbSettings)
       this.getKnowledgeBaseSettings();
       let kb = savedSettings.kbs.find(kb => kb.url === this.newKb.url);
 
@@ -158,7 +243,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy {
         setTimeout(() => {
           this.openMissingGptkeyModal();
         }, 600)
-        
+
       } else {
         this.closeAddKnowledgeBaseModal();
         this.checkStatus(kb).then((status_code) => {
@@ -171,29 +256,104 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy {
       this.logger.error("[KNOWLEDGE BASES COMP] ERROR add new kb: ", error);
     }, () => {
       this.logger.log("[KNOWLEDGE BASES COMP] add new kb *COMPLETED*");
+      let gptkey = "empty"
+      if (this.kbSettings.gptkey !== "") {
+        gptkey = 'filled'
+      }
+      // console.log("[KNOWLEDGE BASES COMP] gptkey ", gptkey)
+      this.trackUserActioOnKB('Added Knowledge Base', gptkey)
     })
   }
 
+  trackUserActioOnKB(event: any, gptkey: string) {
+    if (!isDevMode()) {
+      if (window['analytics']) {
+        let userFullname = ''
+        if (this.CURRENT_USER.firstname && this.CURRENT_USER.lastname) {
+          userFullname = this.CURRENT_USER.firstname + ' ' + this.CURRENT_USER.lastname
+        } else if (this.CURRENT_USER.firstname && !this.CURRENT_USER.lastname) {
+          userFullname = this.CURRENT_USER.firstname
+        }
+
+        try {
+          window['analytics'].identify(this.CURRENT_USER._id, {
+            name: userFullname,
+            email: this.CURRENT_USER.email,
+            plan: this.profile_name
+
+          });
+        } catch (err) {
+          this.logger.error('identify Invite Sent Profile error', err);
+        }
+
+        try {
+          window['analytics'].track(event, {
+            "type": "organic",
+            "username": userFullname,
+            "email": this.CURRENT_USER.email,
+            'userId': this.CURRENT_USER._id,
+            'page': this.callingPage,
+            'gptkey': gptkey
+
+          }, {
+            "context": {
+              "groupId": this.id_project
+            }
+          });
+        } catch (err) {
+          this.logger.error('track Invite Sent event error', err);
+        }
+
+        try {
+          window['analytics'].group(this.id_project, {
+            name: this.project_name,
+            plan: this.profile_name + ' plan',
+          });
+        } catch (err) {
+          this.logger.error('group Invite Sent error', err);
+        }
+      }
+    }
+  }
+
   saveKnowledgeBaseSettings() {
     this.kbService.saveKbSettings(this.kbSettings).subscribe(((savedSettings) => {
+
+      // console.log('[KNOWLEDGE BASES COMP] save kb this.kbSettings > gptkey: ', this.kbSettings.gptkey)
+      // console.log('[KNOWLEDGE BASES COMP] save kb savedSettings: ', savedSettings)
       this.getKnowledgeBaseSettings();
       this.closeSecretsModal();
     }), (error) => {
       this.logger.error("[KNOWLEDGE BASES COMP] ERROR save kb settings: ", error);
     }, () => {
       this.logger.log("[KNOWLEDGE BASES COMP] save kb settings *COMPLETE*");
+      let gptkey = "empty"
+      if (this.kbSettings.gptkey !== "") {
+        gptkey = 'filled'
+      }
+      // console.log("[KNOWLEDGE BASES COMP] gptkey ", gptkey)
+      this.trackUserActioOnKB('Save Knowledge Base GPT-Key', gptkey)
     })
   }
 
   deleteKnowledgeBase(id) {
     this.logger.log("[KNOWLEDGE BASES COMP] kb to delete id: ", id);
     this.kbService.deleteKb(this.kbSettings._id, id).subscribe((response) => {
+
+      // console.log('[KNOWLEDGE BASES COMP] this.kbSettings delete > ', this.kbSettings.gptkey)
+
       this.getKnowledgeBaseSettings();
       this.closeDeleteKnowledgeBaseModal();
     }, (error) => {
       this.logger.error("[KNOWLEDGE BASES COMP] ERROR delete kb: ", error);
     }, () => {
       this.logger.log("[KNOWLEDGE BASES COMP] delete kb *COMPLETE*");
+      let gptkey = "empty"
+      if (this.kbSettings.gptkey !== "") {
+        gptkey = 'filled'
+      }
+      // console.log("[KNOWLEDGE BASES COMP] gptkey ", gptkey)
+      this.trackUserActioOnKB('Deleted Knowledge Base', gptkey)
     })
   }
 
@@ -202,8 +362,11 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy {
       full_url: kb.url,
       gptkey: this.kbSettings.gptkey
     }
-    this.openaiService.startScraping(data).subscribe((response) => {
+    this.openaiService.startScraping(data).subscribe((response: any) => {
       this.logger.log("start scraping response: ", response);
+      if (response.message && response.message === "Invalid Openai API key") {
+        this.notify.showWidgetStyleUpdateNotification("Invalid Openai API key", 4, 'report_problem');
+      }
       setTimeout(() => {
         this.checkStatus(kb).then((status_code: number) => {
           kb.status = status_code;
diff --git a/src/app/projects/projects.component.ts b/src/app/projects/projects.component.ts
index 1eb24fcbfd37..fe650ef61f0c 100755
--- a/src/app/projects/projects.component.ts
+++ b/src/app/projects/projects.component.ts
@@ -138,8 +138,10 @@ export class ProjectsComponent implements OnInit, OnDestroy {
   }
 
   getLoggedUserAndCheckProfilePhoto() {
+    // console.log('window.opener.location ', window.opener.location )
+   
     this.auth.user_bs.subscribe((user) => {
-      this.logger.log('[PROJECTS] - USER  ', user)
+      // console.log('[PROJECTS] - USER  ', user)
       this.user = user;
 
       if (user) {