@chat21/chat21-ionic 3.4.29-rc1 → 3.4.29

package/src/app/pages/conversations-list/conversations-list.page.ts

@@ -53,10 +53,7 @@ import { Globals } from 'src/app/utils/globals';
 import { TriggerEvents } from 'src/app/services/triggerEvents/triggerEvents';
 import { MessageModel } from 'src/chat21-core/models/message';
 import { Project } from 'src/chat21-core/models/projects';
-import { getOSCode, hasRole } from 'src/app/utils/utils';
-import { PERMISSIONS } from 'src/app/utils/permissions.constants';
-import { ProjectUser } from 'src/chat21-core/models/projectUsers';
-import { ProjectUsersService } from 'src/app/services/project_users/project-users.service';
+import { getOSCode } from 'src/app/utils/utils';
 
 @Component({
   selector: 'app-conversations-list',
@@ -85,7 +82,6 @@ export class ConversationListPage implements OnInit {
   public archived_btn: boolean
   public sound_btn: string
   public isVisibleTKT: boolean = true;
-  public isVisibleCNT: boolean = true;;
   public convertMessage = convertMessage
   private isShowMenuPage = false
   private logger: LoggerService = LoggerInstance.getInstance()
@@ -108,9 +104,6 @@ export class ConversationListPage implements OnInit {
   public isMobile: boolean = false;
   public isInitialized: boolean = false;
 
-  public projectUser: ProjectUser;
-  public rolesHeader: { [key: string]: boolean }
-
   // PROJECT AVAILABILITY INFO: start
   project: Project
   profile_name_translated: string;
@@ -137,7 +130,6 @@ export class ConversationListPage implements OnInit {
     private translateService: CustomTranslateService,
     public tiledeskService: TiledeskService,
     public tiledeskAuthService: TiledeskAuthService,
-    public projectUsersService: ProjectUsersService,
     public appConfigProvider: AppConfigProvider,
     public platform: Platform,
     public wsService: WebsocketService,
@@ -379,11 +371,6 @@ export class ConversationListPage implements OnInit {
     // save conversationHandler in chatManager
     this.chatManager.setConversationsHandler(this.conversationsHandlerService)
     this.showPlaceholder = false
-    
-    // Hide loading spinner if there are no conversations
-    if (this.conversations.length === 0) {
-      this.loadingIsActive = false
-    }
   }
 
   // private manageStoredConversations() {
@@ -484,7 +471,7 @@ export class ConversationListPage implements OnInit {
   }
 
   listenToCurrentStoredProject() {
-    this.events.subscribe('storage:last_project', async(projectObjct) => {
+    this.events.subscribe('storage:last_project', projectObjct => {
       if (projectObjct && projectObjct !== 'undefined') {
         this.logger.log('[CONVS-LIST-PAGE] - GET STORED PROJECT ', projectObjct)
 
@@ -509,10 +496,6 @@ export class ConversationListPage implements OnInit {
         } else if (this.project.profile.type === 'payment' && this.project.profile.name === 'enterprise') {
           this.profile_name_translated = this.translationMapHeader.get('PaydPlanNameEnterprise');
         }
-
-        this.projectUser = await this.projectUsersService.getProjectUserByProjectId(this.project._id)
-        this.rolesHeader = this.checkCannedResponsesRoles();
-        this.logger.log('[CONVS-LIST-PAGE] - GET PROJECT USER ROLES ', this.rolesHeader)
       }
     })
   }
@@ -648,24 +631,8 @@ export class ConversationListPage implements OnInit {
     const public_Key = this.appConfigProvider.getConfig().t2y12PruGU9wUtEGzBJfolMIgK
     this.logger.log('[CONVS-LIST-PAGE] AppConfigService getAppConfig public_Key', public_Key)
     this.isVisibleTKT = getOSCode("TKT", public_Key);
-    this.isVisibleCNT = getOSCode("CNT", public_Key);
   }
 
-  checkCannedResponsesRoles(): { [key: string]: boolean } {
-      const permissionKeys = [
-        'LEADS_READ',
-      ] as const;
-  
-      const roles: { [key: string]: boolean } = {};
-      for (const key of permissionKeys) {
-        const permission = PERMISSIONS[key];
-        roles[permission] = hasRole(this.projectUser, permission);
-      }
-  
-      return roles;
-  
-    }
-
   onBackButtonFN(event) {
     this.conversationType = 'active'
 
@@ -916,10 +883,6 @@ export class ConversationListPage implements OnInit {
 
     this.logger.log('[CONVS-LIST-PAGE] navigateByUrl this.uidConvSelected ', this.uidConvSelected)
 
-    const queryParams = this.route.snapshot.queryParams;
-    const queryString = new URLSearchParams(queryParams).toString();
-    
-
     this.setUidConvSelected(uidConvSelected, converationType)
     if (checkPlatformIsMobile()) {
       this.logger.log('[CONVS-LIST-PAGE] checkPlatformIsMobile(): ', checkPlatformIsMobile())
@@ -937,7 +900,6 @@ export class ConversationListPage implements OnInit {
       if (this.conversationSelected && this.conversationSelected.conversation_with_fullname) {
         pageUrl = 'conversation-detail/' + this.uidConvSelected + '/' + encodeURIComponent(this.conversationSelected.conversation_with_fullname) + '/' + converationType
       }
-      pageUrl += queryString ? `?${queryString}` : '';
       this.logger.log('[CONVS-LIST-PAGE] setUidConvSelected navigateByUrl--->: ', pageUrl)
       // replace(/\(/g, '%28').replace(/\)/g, '%29') -> used for the encoder of any round brackets
       this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29'), {replaceUrl: true})

package/src/app/services/global-settings/global-settings.service.ts

@@ -88,14 +88,14 @@ export class GlobalSettingsService {
     this.logger.debug('[GLOBAL-SET] setVariableFromStorage :::::::: SET VARIABLE ---------->', Object.keys(globals));
     for (const key of Object.keys(globals)) {
         const val = this.appStorageService.getItem(key);
-        this.logger.debug('[GLOBAL-SET] setVariableFromStorage SET globals KEY ---------->', key);
-        this.logger.debug('[GLOBAL-SET] setVariableFromStorage SET globals VAL ---------->', val);
+        // this.logger.debug('[GLOBAL-SET] setVariableFromStorage SET globals KEY ---------->', key);
+        // this.logger.debug('[GLOBAL-SET] setVariableFromStorage SET globals VAL ---------->', val);
         if (val && val !== null) {
             // globals.setParameter(key, val);
             globals[key] = stringToBoolean(val);
         }
         // this.logger.debug('[GLOBAL-SET] setVariableFromStorage SET globals == ---------->', globals);
-    }
+    } 
   }
 
   /**
@@ -113,7 +113,6 @@ export class GlobalSettingsService {
     TEMP = getParameterByName(windowContext, 'tiledesk_supportMode');
     if (TEMP) {
         globals.supportMode = stringToBoolean(TEMP);
-        this.appStorageService.setItem('supportMode', String(globals.supportMode))
     }
 
     TEMP = getParameterByName(windowContext, 'tiledesk_lang');
@@ -139,13 +138,6 @@ export class GlobalSettingsService {
     TEMP = getParameterByName(windowContext, 'tiledesk_projectID');
     if (TEMP) {
         globals.projectID = TEMP;
-        this.appStorageService.setItem('projectID', TEMP)
-    }
-
-    TEMP = getParameterByName(windowContext, 'tiledesk_logOut');
-    if (TEMP) {
-        globals.logOut = stringToBoolean(TEMP);
-        this.appStorageService.setItem('logOut', TEMP)
     }
 
 }

package/src/app/services/nav-proxy.service.ts

@@ -4,6 +4,7 @@ import { Router, NavigationExtras } from '@angular/router';
 
 // utils
 import { checkPlatformIsMobile } from '../../chat21-core/utils/utils';
+// import { ConversationDetailPage } from '../pages/conversation-detail/conversation-detail.page';
 
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';

package/src/app/services/tiledesk/tiledesk.service.ts

@@ -93,6 +93,22 @@ export class TiledeskService {
     }))
   }
 
+  public getProjectUsersByProjectId(project_id: string) {
+    const url = this.SERVER_BASE_URL + project_id + '/project_users/';
+    this.logger.log('[TILEDESK-SERVICE] - GET PROJECT-USER URL', url);
+    
+    const httpOptions = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+        Authorization: this.tiledeskToken
+      })
+    };
+    return this.http.get(url, httpOptions).pipe(map((res: any) => {
+      this.logger.log('[TILEDESK-SERVICE] - GET PROJECT-USER RES ', res);
+      return res
+    }))
+  }
+
   public getAllLeadsActiveWithLimit(project_id: string, limit: number) {
     const url = this.SERVER_BASE_URL + project_id + '/leads?limit=' + limit + '&with_fullname=true';
     this.logger.log('[TILEDESK-SERVICE] - GET ALL ACTIVE LEADS (LIMIT 10000) -  URL', url);

package/src/app/services/triggerEvents/triggerEvents.ts

@@ -102,33 +102,5 @@ export class TriggerEvents {
         }
     }
 
-    public triggerOnUpdateNewConversationBadge(detailObj: {}) {
-        this.logger.debug(' ---------------- triggerOnUpdateNewConversationBadge ---------------- ', detailObj);
-        try {
-            const onBeforeInit = new CustomEvent('onUpdateNewConversationBadge', { detail: detailObj });
-            const windowContext = this.windowContext;
-            if (windowContext){
-                // windowContext.document.dispatchEvent(onNewConversation);
-                windowContext.postMessage({type: "onUpdateNewConversationBadge", detail: detailObj }, '*')
-            }
-        } catch (e) {
-            this.logger.error('[TRIGGER-HANDLER] > Error:' + e);
-        }
-    }
-
-    public triggerOnOpenTicketExternally(detailObj: {}) {
-        this.logger.debug(' ---------------- triggerOnOpenTicketExternally ---------------- ', detailObj);
-        try {
-            const onBeforeInit = new CustomEvent('onOpenTicketExternally', { detail: detailObj });
-            const windowContext = this.windowContext;
-            if (windowContext){
-                // windowContext.document.dispatchEvent(onNewConversation);
-                windowContext.postMessage({type: "onOpenTicketExternally", detail: detailObj }, '*')
-            }
-        } catch (e) {
-            this.logger.error('[TRIGGER-HANDLER] > Error:' + e);
-        }
-    }
-
     
 }