@chat21/chat21-ionic 3.4.27-rc8 → 3.4.28

package/src/app/components/conversation-detail/message-text-area/message-text-area.component.html

@@ -22,13 +22,6 @@
           {{translationMap?.get('WHATSAPP.LABEL_TEMPLATES')}}
         </ion-button>
       </div>
-      <!-- OPEN TICKET -->
-      <div *ngIf="ticketSection" class="section-option" id="template" tooltip="{{translationMap?.get('TICKET.OPEN_TICKET')}}" placement="top">
-        <ion-button fill="clear" [class.active]="section==='ticket'" (click)="onOpenSection('ticket')" [disabled]="channelType === 'direct'">
-          <ion-icon name="ticket"></ion-icon>
-          {{translationMap?.get('TICKET.OPEN_TICKET')}}
-        </ion-button>
-      </div>
     </div>
 
     <div class="footerContainerAlert">
@@ -57,22 +50,6 @@
     </ion-col>
   </ion-row>
 
-  <ion-row id="ticket" [style.display]="section==='ticket'? 'flex': 'none'">
-    <ion-col col-auto>
-      <div class="placeholder">{{translationMap.get('TICKET.DESCRIPTION')}}</div>
-      <div class="buttons-container">
-          <ion-button name="add" size="small" (click)="onClickTicket('open')">
-            <ion-icon name="add"></ion-icon>
-            {{translationMap?.get('TICKET.CONFIRM')}}
-          </ion-button>
-          <ion-button size="small" color="danger" (click)="onClickTicket('close')">
-            <ion-icon name="close"></ion-icon>
-            {{translationMap?.get('TICKET.CLOSE')}}
-          </ion-button>
-      </div>
-    </ion-col>
-  </ion-row>
-
   <ion-row id="message-text-area" [style.display]="section==='chat' || section ==='templates' || section ==='copilot'? 'flex': 'none'">
 
     <ion-col col-auto style="display: flex;">
@@ -80,7 +57,7 @@
       <div class="buttons-left">
 
         <!-- CANNED RESPONSES -->
-        <ng-container *ngIf="areVisibleCAR && supportMode && cannedSection">
+        <ng-container *ngIf="areVisibleCAR && supportMode">
           <div class="canned-responses-btn-wpr" tooltip="{{translationMap?.get('CANNED_RESPONSES')}}" placement="top">
             <ion-button ion-button fill="clear" class="canned-responses-btn" (click)="openCannedResponses()"
               [disabled]="!conversationWith?.startsWith(CHANNEL_TYPE.SUPPORT_GROUP) || disableTextarea">

package/src/app/components/conversation-detail/message-text-area/message-text-area.component.scss

@@ -183,36 +183,6 @@
     }
 }
 
-#ticket{
-    text-align: center;
-    font-size: 12px;
-
-    .buttons-container{
-        display: flex;
-        justify-content: center;
-        gap: 10px;
-
-        ion-button{
-            font-size: 12px;
-            --padding-top: 4px;
-            --padding-bottom: 4px;
-            --padding-start: 6px;
-            --padding-end: 6px;
-            --ripple-color: transparent;
-            text-transform: unset;
-            height: auto;
-
-            ion-icon{
-                margin-right: 4px;
-            }
-
-            &[name="add"]{
-                --background: var(--basic-blue);
-            }
-        }
-    }
-}
-
 #fileInput {
     position: absolute;
     opacity: 0;

package/src/app/components/conversation-detail/message-text-area/message-text-area.component.ts

@@ -26,7 +26,6 @@ import { CopilotService } from 'src/app/services/copilot/copilot.service';
 import { BRAND_BASE_INFO } from 'src/app/utils/utils-resources';
 import { ProjectService } from 'src/app/services/projects/project.service';
 import { Project } from 'src/chat21-core/models/projects';
-import { ProjectUser } from 'src/chat21-core/models/projectUsers';
 
 
 @Component({
@@ -50,7 +49,6 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
   @ViewChild('fileInput', { static: false }) fileInput: any;
 
   @Input() loggedUser: UserModel;
-  @Input() projectUser: ProjectUser;
   @Input() conversationWith: string;
   @Input() channelType: string;
   @Input() channel: string;
@@ -63,20 +61,16 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
   @Input() emailSection: boolean;
   @Input() offlineMsgEmail: boolean;
   @Input() whatsappTemplatesSection: boolean;
-  @Input() ticketSection: boolean
   @Input() isOpenInfoConversation: boolean;
-  @Input() cannedSection: boolean;
   @Input() stylesMap: Map<string, string>;
   @Input() translationMap: Map<string, string>;
   @Input() dropEvent: any;
   @Input() disableTextarea: boolean;
-  @Input() roles: Array<string>;
   @Output() eventChangeTextArea = new EventEmitter<{msg: string, offsetHeight: number}>();
   @Output() eventSendMessage = new EventEmitter<{msg: string, type: string, metadata?: Object, attributes?: Object}>();
   @Output() onClickOpenCannedResponses = new EventEmitter<boolean>();
   @Output() onPresentModalScrollToBottom = new EventEmitter<boolean>();
   @Output() onOpenFooterSection = new EventEmitter<string>();
-  @Output() onOpenTicket = new EventEmitter<boolean>();
 
   public project: Project;
   public conversationEnabled = false;
@@ -294,17 +288,6 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
     this.prensentTemplateModal();
   }
 
-  onClickTicket(option: "open" | "close"){
-    this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] - onClickTicket', option);
-    switch(option){
-      case "open":
-        this.onOpenTicket.emit();
-      case "close":   
-        this.section = 'chat'
-    }
-
-  }
-
 
   /**
  * 
@@ -548,6 +531,10 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
     e.preventDefault(); // Prevent press enter from creating new line 
     // console.log("[CONVS-DETAIL] replaceTagInMessage onKeydown in msg-texarea * event: ", e);
 
+    if(this.showAlertEmoji || this.showAlertUrl){
+      return; 
+    }
+
     this.countClicks++;
     this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] onKeydown - countClicks: ', this.countClicks);
     this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] onKeydown - event: ', e);
@@ -580,10 +567,8 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
       if (!text.includes("/")) {
         this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] onKeydown - SEND MESSAGE 1 message: ', message);
         this.logger.log("[CONVS-DETAIL] replaceTagInMessage onKeydown in msg-texarea  SEND MESSAGE 1 message: ", message);
-        
+        this.messageString = '';
         this.sendMessage(text);
-        // this.messageString = '';
-
         this.countClicks = 0
       } else if (text.includes("/") && pos === 0 && this.countClicks > 1 && this.tagsCannedFilter.length > 0) {
         this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] onKeydown - tagsCannedFilter.length 2: ', this.tagsCannedFilter.length);
@@ -595,10 +580,9 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
         this.logger.log("[CONVS-DETAIL] replaceTagInMessage onKeydown in msg-texarea SEND MESSAGE 2 this.countClicks: ", this.countClicks);
         this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] onKeydown in msg-texarea SEND MESSAGE 2 this.countClicks: ", this.countClicks);
         this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] onKeydown - SEND MESSAGE 2 message: ', message);
-        
-        this.sendMessage(text);
-        // this.messageString = '';
+        this.messageString = '';
 
+        this.sendMessage(text);
         this.countClicks = 0
       } else if (text.includes("/") && pos > 0 && this.countClicks > 1 && this.tagsCannedFilter.length > 0 && text.substr(-1) !== '/') {
         this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] onKeydown - tagsCannedFilter.length 3: ', this.tagsCannedFilter.length);
@@ -610,19 +594,17 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
         this.logger.log("[CONVS-DETAIL] replaceTagInMessage onKeydown in msg-texarea SEND MESSAGE 2 this.countClicks: ", this.countClicks);
         this.logger.log("[CONVS-DETAIL][MSG-TEXT-AREA] onKeydown in msg-texarea SEND MESSAGE 2 this.countClicks: ", this.countClicks);
         this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] onKeydown - SEND MESSAGE 2 message: ', message);
-        
-        this.sendMessage(text);
-        // this.messageString = '';
+        this.messageString = '';
 
+        this.sendMessage(text);
         this.countClicks = 0
       } else if (text.includes("/") && this.tagsCannedFilter.length === 0) {
         this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] onKeydown - tagsCannedFilter.length 3: ', this.tagsCannedFilter.length);
         this.logger.log('[CONVS-DETAIL][MSG-TEXT-AREA] onKeydown - SEND MESSAGE 3 message: ', message);
         this.logger.log("[CONVS-DETAIL] replaceTagInMessage onKeydown in msg-texarea SEND MESSAGE 3 message: ", message);
-        
-        this.sendMessage(text);
-        // this.messageString = '';
+        this.messageString = '';
 
+        this.sendMessage(text);
         this.countClicks = 0
 
       }
@@ -652,6 +634,11 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
       return
     }
 
+    let check = this.checkForEmojii(text)
+    if(!check){
+      return;
+    }
+
     this.messageString = '';
     // text = text.replace(/(\r\n|\n|\r)/gm, '');
 

package/src/app/components/copilot-popover/copilot-popover.component.html

@@ -18,7 +18,7 @@
   </ion-content>
   <ion-footer class="ion-no-border">
     <ion-button fill="clear" (click)="onClickCopilot()">
-      <ion-icon src="assets/images/icons/copilot.svg"></ion-icon>
+      <ion-icon src="assets/img/icons/copilot.svg"></ion-icon>
       {{translationsMap.get('COPILOT.ASK_AI') }}
     </ion-button>
   </ion-footer>

package/src/app/components/navbar/navbar.component.html

@@ -5,7 +5,7 @@
       </div>
       <div class="navbar-right">
         <!-- test site -->
-        <ng-container *ngIf="project && roles?.[PERMISSIONS.SIMULATE_CONV]">
+        <ng-container *ngIf="project">
           <button class="btn simulate-visitor-btn" (click)="testWidgetPage()">
             <i class="material-icons">play_arrow</i>
             <!-- {{translationsMap?.get('NAVBAR.SIMULATE_VISITOR')}} -->
@@ -23,7 +23,7 @@
         </ng-container>
 
         <!--  ------ PROJECTS  DROPDOWN ------ -->
-        <ng-container *ngIf="project && roles?.[PERMISSIONS.CHANGE_PROJECT]">
+        <ng-container *ngIf="project">
             <li>
               <button class="btn dropdown-toggle project-dropdown" (click)="openDropdownProjects = !openDropdownProjects">
                 <span class="project-dropdown" style="text-transform: none"> {{ project?.id_project?.name }} </span>
@@ -49,7 +49,7 @@
                 </li>
   
                 <!--  ADD PROJECT -->
-                <li id="navbar_create_prjct" *ngIf="isVisibleMT" (click)="onClickDropdownOption('addProject')" class="add-project">
+                <li id="navbar_create_prjct" *ngIf="MT === true" (click)="onClickDropdownOption('addProject')" class="add-project">
                   <a>
                     <i class="material-icons">add_circle_outline </i>
                     {{translationsMap?.get('NAVBAR.ADD_PROJECT')}}

package/src/app/components/navbar/navbar.component.ts

@@ -7,10 +7,6 @@ import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 import { Project } from 'src/chat21-core/models/projects';
 import { CustomTranslateService } from 'src/chat21-core/providers/custom-translate.service';
-import { ProjectUsersService } from 'src/app/services/project_users/project-users.service';
-import { ProjectUser } from 'src/chat21-core/models/projectUsers';
-import { PERMISSIONS } from 'src/app/utils/permissions.constants';
-import { getOSCode, hasRole } from 'src/app/utils/utils';
 
 @Component({
   selector: 'app-navbar',
@@ -34,14 +30,10 @@ export class NavbarComponent implements OnInit {
   public openDropdownProjects: boolean = false
   private public_Key: string;
   public isVisible: boolean;
-  public isVisibleMT: boolean;
+  public MT: boolean;
 
-  public projectUser: ProjectUser;
-  public roles: { [key: string]: boolean }
-  PERMISSIONS = PERMISSIONS;
   constructor(
     private projectService: ProjectService,
-    public projectUsersService: ProjectUsersService,
     private tiledeskAuthService: TiledeskAuthService,
     private appConfigProvider: AppConfigProvider,
     private translateService: CustomTranslateService, 
@@ -104,14 +96,11 @@ export class NavbarComponent implements OnInit {
   }
 
   getStoredProjectAndUserRole() {
-    this.events.subscribe('storage:last_project',async (project) =>{
+    this.events.subscribe('storage:last_project',project =>{
       this.logger.log('[NAVBAR] stored_project ', project)
       if (project && project !== 'undefined') {
         this.project = project;
         this.USER_ROLE = project.role;
-        this.projectUser = await this.projectUsersService.getProjectUserByProjectId(project.id_project.id)
-        this.roles = this.checkRoles()
-        console.log('[SIDEBAR] roles ', this.roles)
       }
     })
   }
@@ -119,24 +108,44 @@ export class NavbarComponent implements OnInit {
   getOSCODE() {
     this.public_Key = this.appConfigProvider.getConfig().t2y12PruGU9wUtEGzBJfolMIgK;
     this.logger.log('[NAVBAR] AppConfigService getAppConfig public_Key', this.public_Key)
-    
-    this.isVisibleMT = getOSCode("MTT", this.public_Key);
-
-  }
-
-  checkRoles(): { [key: string]: boolean } {
-    const permissionKeys = [
-      'CHANGE_PROJECT',
-      'SIMULATE_CONV',
-    ] as const;
+    this.logger.log('[NAVBAR] public_Key', this.public_Key)
+
+    let keys = this.public_Key.split("-");
+    // this.logger.log('PUBLIC-KEY (Navbar) - public_Key keys', keys)
+
+    keys.forEach(key => {
+        // this.logger.log('NavbarComponent public_Key key', key)
+        if (key.includes("PAY")) {
+            // this.logger.log('PUBLIC-KEY (Navbar) - key', key);
+            let pay = key.split(":");
+            // this.logger.log('PUBLIC-KEY (Navbar) - pay key&value', pay);
+            if (pay[1] === "F") {
+                this.isVisible = false;
+                // this.logger.log('PUBLIC-KEY (Navbar) - pay isVisible', this.isVisible);
+            } else {
+                this.isVisible = true;
+                // this.logger.log('PUBLIC-KEY (Navbar) - pay isVisible', this.isVisible);
+            }
+        }
+
+        if (key.includes("MTT")) {
+            // this.logger.log('PUBLIC-KEY (Navbar) - key', key);
+            let mt = key.split(":");
+            // this.logger.log('PUBLIC-KEY (Navbar) - mt key&value', mt);
+            if (mt[1] === "F") {
+                this.MT = false;
+                // this.logger.log('PUBLIC-KEY (Navbar) - mt is', this.MT);
+            } else {
+                this.MT = true;
+                // this.logger.log('PUBLIC-KEY (Navbar) - mt is', this.MT);
+            }
+        }
+    });
 
-    const roles: { [key: string]: boolean } = {};
-    for (const key of permissionKeys) {
-      const permission = PERMISSIONS[key];
-      roles[permission] = hasRole(this.projectUser, permission);
+    if (!this.public_Key.includes("MTT")) {
+        this.MT = false;
+        // this.logger.log('PUBLIC-KEY (Navbar) - mt is', this.MT);
     }
-    
-    return roles;
 
   }
 

package/src/app/components/project-item/project-item.component.ts

@@ -15,6 +15,8 @@ import { AppConfigProvider } from 'src/app/services/app-config';
 import { ConvertRequestToConversation } from 'src/chat21-core/utils/convertRequestToConversation';
 import { compareValues } from 'src/chat21-core/utils/utils';
 import { ProjectService } from 'src/app/services/projects/project.service';
+import { ProjectUser } from 'src/chat21-core/models/project_user';
+import { Project } from 'src/chat21-core/models/projects';
 
 @Component({
   selector: 'app-project-item',
@@ -85,17 +87,17 @@ export class ProjectItemComponent implements OnInit {
 
   connetWebsocket(tiledeskToken) {
 
-    // this.logger.log('[WEBSOCKET-JS] connetWebsocket called in [PROJECT-ITEM] tiledeskToken ', tiledeskToken)
-    // const appconfig = this.appConfigProvider.getConfig();
-    // this.logger.log('[WEBSOCKET-JS] connetWebsocket called in [PROJECT-ITEM] wsUrl ', appconfig.wsUrl)
-    // const WS_URL = appconfig.wsUrl + '?token=' + tiledeskToken
-    // this.logger.log('[WEBSOCKET-JS] connetWebsocket called in [PROJECT-ITEM] wsUrl ', WS_URL)
-    // this.webSocketJs.init(
-    //   WS_URL,
-    //   undefined,
-    //   undefined,
-    //   undefined
-    // );
+    this.logger.log('[WEBSOCKET-JS] connetWebsocket called in [PROJECT-ITEM] tiledeskToken ', tiledeskToken)
+    const appconfig = this.appConfigProvider.getConfig();
+    this.logger.log('[WEBSOCKET-JS] connetWebsocket called in [PROJECT-ITEM] wsUrl ', appconfig.wsUrl)
+    const WS_URL = appconfig.wsUrl + '?token=' + tiledeskToken
+    this.logger.log('[WEBSOCKET-JS] connetWebsocket called in [PROJECT-ITEM] wsUrl ', WS_URL)
+    this.webSocketJs.init(
+      WS_URL,
+      undefined,
+      undefined,
+      undefined
+    );
 
     this.getLastProjectStoredAndSubscToWSAvailabilityAndConversations();
   }
@@ -164,63 +166,68 @@ export class ProjectItemComponent implements OnInit {
     }
   }
 
-  getLastProjectStoredAndSubscToWSAvailabilityAndConversations() {
-    let stored_project = ''
+  getStoredProject(): ProjectUser | null {
     try {
-      stored_project = localStorage.getItem('last_project')
-      this.logger.log('PROJECT-ITEM - THERE IS A STORED PROJECT ', stored_project)
+      const raw = localStorage.getItem('last_project');
+
+      if (!raw) {
+        return null;
+      }
+
+      const parsed = JSON.parse(raw);
+
+      if (this.isValidStoredProject(parsed)) {
+        return parsed;
+      }
+
+      // modello sbagliato → pulizia
+      this.logger.warn('[PROJECT-ITEM] Invalid stored project schema, clearing storage');
+      localStorage.removeItem('last_project');
+      return null;
+
     } catch (err) {
-      this.logger.error('Get local storage LAST PROJECT ', err)
+      this.logger.error('[PROJECT-ITEM] Error parsing stored project', err);
+      localStorage.removeItem('last_project');
+      return null;
     }
+  }
+
+  getLastProjectStoredAndSubscToWSAvailabilityAndConversations() {
 
+    let stored_project = this.getStoredProject();
 
-    if (!stored_project || stored_project === 'undefined') {
-      this.logger.log('PROJECT-ITEM - THERE IS NOT STORED LAST PROJECT OR IS UNDEFINED ', stored_project)
+    if (!stored_project) {
+      this.logger.log('[PROJECT-ITEM] No valid stored project, fetching remote');
       this.projectService.getProjects().subscribe(projects => {
-        this.logger.log('[PROJECT-ITEM - GET PROJECTS - RES', projects);
-
-        this.logger.log('[INFO-CONTENT-COMP] - GET PROJECTS - RES this.project', this.project);
-
-        if(this.projectID){
-          const project = projects.find(prjct => prjct.id_project._id === this.projectID)
-          if(project){
-            this.project = project
-            this.logger.log('[PROJECT-ITEM] - GET PROJECTS - project found with this.projectID', this.project);
-            localStorage.setItem('last_project', JSON.stringify(this.project))
-            this.doProjectSubscriptions(this.project)
-            return
-          }else{
-            this.logger.log('[PROJECT-ITEM] - GET PROJECTS - project NOT found with this.projectID', this.projectID);
-          }
+        let project: Project | undefined;
+
+        if (this.projectID) {
+          project = projects.find( p => p.id_project?._id === this.projectID );
         }
 
-        if (projects[0]) {
-          localStorage.setItem('last_project', JSON.stringify(projects[0]))
-          this.project = projects[0];
-          this.doProjectSubscriptions(this.project)
+        if (!project) {
+          project = projects[0];
         }
 
-      }, (error) => {
-        this.logger.error('[PROJECT-ITEM] - GET PROJECTS - ERROR  ', error);
+        if (!project) {
+          this.logger.warn('[PROJECT-ITEM] No projects returned from API');
+          return;
+        }
 
-      }, () => {
-        this.logger.log('[INFO-CONTENT-COMP] - GET PROJECTS * COMPLETE *');
+        this.project = project;
+        localStorage.setItem('last_project', JSON.stringify(project));
+        this.doProjectSubscriptions(project);
 
+      }, error => {
+        this.logger.error('[PROJECT-ITEM] GET PROJECTS ERROR', error);
       });
-    }
-
 
-    if (stored_project && stored_project !== 'undefined') {
-      this.logger.log('PROJECT-ITEM - THERE IS STORED LAST PROJECT ', stored_project)
-      if (stored_project) {
-        this.project = JSON.parse(stored_project)
-      }
-      this.doProjectSubscriptions(this.project)
-      this.logger.log('[PROJECT-ITEM] - LAST PROJECT PARSED ', this.project)
+      return;
     }
 
-    
-
+    // ✅ stored project valido
+    this.project = stored_project;
+    this.doProjectSubscriptions(stored_project);
 
   }
 
@@ -345,6 +352,17 @@ export class ProjectItemComponent implements OnInit {
     }
   }
 
+  isValidStoredProject(obj: any): obj is ProjectUser {
+    return (
+      obj &&
+      typeof obj === 'object' &&
+      obj.id_project &&
+      typeof obj.id_project === 'object' &&
+      typeof obj.id_project._id === 'string' &&
+      typeof obj._id === 'string' &&
+      typeof obj.role === 'string'
+    );
+  }