@chat21/chat21-ionic 3.4.30-rc3 → 3.4.31

package/src/app/pages/conversation-detail/conversation-detail.page.ts

@@ -83,12 +83,8 @@ import { WebsocketService } from 'src/app/services/websocket/websocket.service';
 import { Project } from 'src/chat21-core/models/projects';
 import { Globals } from 'src/app/utils/globals';
 import { ProjectService } from 'src/app/services/projects/project.service';
+import { getOSCode } from 'src/app/utils/utils';
 import { UploadService } from 'src/chat21-core/providers/abstract/upload.service';
-import { ProjectUsersService } from 'src/app/services/project_users/project-users.service';
-import { ProjectUser } from 'src/chat21-core/models/projectUsers';
-import { getOSCode, hasRole } from 'src/app/utils/utils';
-import { PERMISSIONS } from 'src/app/utils/permissions.constants';
-import { TriggerEvents } from 'src/app/services/triggerEvents/triggerEvents';
 
 @Component({
   selector: 'app-conversation-detail',
@@ -113,7 +109,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   private subscriptions: Array<any>
   public tenant: string;
   public loggedUser: UserModel
-  public projectUser: ProjectUser;
   public conversationWith: string
   public conversationWithFullname: string
   public messages: Array<MessageModel> = []
@@ -143,7 +138,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   public tagsCannedFilter: Array<any> = [];
   public SHOW_CANNED_RESPONSES: boolean = false
   public canShowCanned: boolean = true
-  public rolesCanned: { [key: string]: boolean }
 
   public SHOW_COPILOT_SUGGESTIONS: boolean = false;
 
@@ -178,10 +172,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   copilotQuestion: string = '';
   /**COPILOT : end */
 
-  /** TICKET: start */
-  isTicketEnabled: boolean = false;
-  /** TICKET: end */
-
   isMine = isMine
   isInfo = isInfo
   isFirstMessage = isFirstMessage
@@ -252,20 +242,18 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     public toastController: ToastController,
     public tiledeskService: TiledeskService,
     public projectService: ProjectService,
-    public projectUsersService: ProjectUsersService,
     private networkService: NetworkService,
     private events: EventsService,
     private webSocketService: WebsocketService,
     public projectPlanUtils: ProjectPlanUtils,
-    public triggerEvents: TriggerEvents,
     private g: Globals,
   ) {
     // Change list on date change
     this.route.paramMap.subscribe((params) => {
       this.logger.log('[CONVS-DETAIL] - constructor -> params: ', params)
       this.conversationWith = params.get('IDConv')
-      this.conversationWithFullname = decodeURIComponent(params.get('FullNameConv'))
-      this.conv_type = decodeURIComponent(params.get('Convtype'))
+      this.conversationWithFullname = params.get('FullNameConv')
+      this.conv_type = params.get('Convtype')
 
       this.events.publish('supportconvid:haschanged', this.conversationWith)
     })
@@ -432,8 +420,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   ionViewDidEnter() {
     this.logger.log('[CONVS-DETAIL] > ionViewDidEnter')
     // this.info_content_child_enabled = true;
-    // Scroll to bottom to show the last message without animation
-    this.scrollToLastMessage()
   }
 
   // Unsubscibe when new page transition end
@@ -493,7 +479,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     this.messages = [] // list messages of conversation
     this.isFileSelected = false // indicates if a file has been selected (image to upload)
     this.isEmailEnabled = (this.appConfigProvider.getConfig().emailSection === 'true' || this.appConfigProvider.getConfig().emailSection === true) ? true : false;
-    this.isTicketEnabled = (this.appConfigProvider.getConfig().ticketSection === 'true' || this.appConfigProvider.getConfig().ticketSection === true) ? true : false;
     this.isWhatsappTemplatesEnabled = (this.appConfigProvider.getConfig().whatsappTemplatesSection === 'true' || this.appConfigProvider.getConfig().whatsappTemplatesSection === true) ? true : false;
     this.fileUploadAccept = this.appConfigProvider.getConfig().fileUploadAccept
     
@@ -553,6 +538,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         this.logger.log('[CONVS-DETAIL] - GET PROJECTID BY CONV RECIPIENT * COMPLETE *',)
       })
     }else {
+      this.canShowCanned = false;
       this.offlineMsgEmail = false;
     }
     
@@ -563,13 +549,10 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       this.logger.log('[CONVS-DETAIL] - GET PROJECTID BY CONV RECIPIENT RES', project)
       if (project) {
         const projectId = project.id_project
-        this.projectUser = await this.projectUsersService.getProjectUserByProjectId(project._id)
+        this.canShowCanned = this.projectPlanUtils.checkPlanIsExpired(project)
         this.offlineMsgEmail = this.checkOfflineMsgEmailIsEnabled(project)
         this.isCopilotEnabled = this.projectPlanUtils.checkProjectProfileFeature(project, 'copilot');
         this.fileUploadAccept = this.checkAcceptedUploadFile(project)
-        this.rolesCanned = this.checkCannedResponsesRoles()
-        this.canShowCanned = this.checkCannedResponses(project)
-        this.logger.log('[CONVS-DETAIL] this.rolesCanned ', this.canShowCanned)
       }
     }, (error) => {
       this.logger.error('[CONVS-DETAIL] - GET PROJECTID BY CONV RECIPIENT - ERROR  ', error)
@@ -607,40 +590,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     return this.appConfigProvider.getConfig().fileUploadAccept
   }
 
-  checkCannedResponses(project: Project): boolean {
-    let expires = this.projectPlanUtils.checkPlanIsExpired(project)
-    this.logger.log('[CONVS-DETAIL] checkCannedResponses expires ', expires)
-    if(expires){
-      return false
-    }
-
-    let hasRoleToShowCanned = this.rolesCanned[PERMISSIONS.CANNED_RESPONSES_READ]
-    this.logger.log('[CONVS-DETAIL] checkCannedResponses hasRoleToShowCanned ', hasRoleToShowCanned)
-    if(!hasRoleToShowCanned){
-      return false
-    }
-
-    return true
-  }
-
-  checkCannedResponsesRoles(): { [key: string]: boolean } {
-    const permissionKeys = [
-      'CANNED_RESPONSES_CREATE',
-      'CANNED_RESPONSES_READ',
-      'CANNED_RESPONSES_UPDATE',
-      'CANNED_RESPONSES_DELETE',
-    ] as const;
-
-    const roles: { [key: string]: boolean } = {};
-    for (const key of permissionKeys) {
-      const permission = PERMISSIONS[key];
-      roles[permission] = hasRole(this.projectUser, permission);
-    }
-
-    return roles;
-
-  }
-
   // getProjectIdSelectedConversation(conversationWith: string): string{
   //   const conversationWith_segments = conversationWith.split('-')
   //   // Removes the last element of the array if is = to the separator
@@ -724,11 +673,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       "WHATSAPP.ERROR_WHATSAPP_NOT_INSTALLED",
       "WHATSAPP.ERROR_WHATSAPP_GENERIC_ERROR",
 
-      "TICKET.OPEN_TICKET",
-      "TICKET.DESCRIPTION",
-      "TICKET.CONFIRM",
-      "TICKET.CLOSE",
-
       "COPILOT.ASK_AI",
       "COPILOT.NO_SUGGESTIONS_PRESENT",
 
@@ -1944,11 +1888,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   }
 
 
-  onOpenTicket(event) {
-    this.logger.debug('[CONVS-DETAIL] openTicketOnExternalService - conversationWith ', this.conversationWith)
-    const detailOBJ = { event: 'onOpenTicketExternally', request_id: this.conversationWith, conversation: this.conversation }
-    this.triggerEvents.triggerOnOpenTicketExternally(detailOBJ)
-  }
   // -------------- START SCROLL/RESIZE  -------------- //
   /** */
   resizeTextArea() {
@@ -1992,29 +1931,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     }
   }
 
-  /**
-   * Scroll to last message without animation using requestAnimationFrame
-   * This is a best practice alternative to setTimeout
-   */
-  private scrollToLastMessage() {
-    this.showIonContent = true
-    if (this.ionContentChatArea) {
-      // Use requestAnimationFrame for better performance
-      requestAnimationFrame(() => {
-        requestAnimationFrame(() => {
-          // Double RAF ensures DOM is fully rendered
-          this.ionContentChatArea.scrollToBottom(0).then(() => {
-            this.logger.log('[CONVS-DETAIL] scroll posizionato all\'ultimo messaggio')
-          }).catch((error) => {
-            this.logger.error('[CONVS-DETAIL] errore durante lo scroll:', error)
-          })
-        })
-      })
-    } else {
-      this.logger.warn('[CONVS-DETAIL] ionContentChatArea non disponibile')
-    }
-  }
-
   /**
    * detectBottom
    */

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

@@ -7,8 +7,6 @@
     [sound_btn]="sound_btn"
     [isMobile]="isMobile"
     [isVisibleTKT]="isVisibleTKT"
-    [isVisibleCNT]="isVisibleCNT"
-    [roles]="rolesHeader"
     (onSoundChange)="onSoundChange($event)"
     (openContactsDirectory)=openContactsDirectory($event) 
     (openProfileInfo)=openProfileInfo($event)>

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);
-        }
-    }
-
     
 }