@chat21/chat21-ionic 3.4.32-rc2 → 3.4.32-rc5

package/CHANGELOG.md

@@ -8,6 +8,14 @@
 ### **Copyrigth**: 
 *Tiledesk SRL*
 
+# 3.4.32-rc5
+- **added**: conversations-list — on init, fetches all projects via `getProjects` and stores them in AppStorageService under `all_projects`; before saving, checks that the key does not already contain each project (avoids duplicates).
+- **changed**: conversations-list `onConversationLoaded` — project name and id are now resolved from the `all_projects` storage key instead of per-project localStorage entries.
+
+# 3.4.32-rc4
+- **changed**: unassigned conversations page — `onImageLoaded` and `onConversationLoaded` are now invoked for each conversation in the list (avatar URLs, last message formatting, project name).
+- **bug-fixed**: navbar project dropdown — descenders (letters like g, p, q) were being clipped; added `line-height: 1.4` and vertical padding to prevent clipping.
+
 # 3.4.32-rc3
 - **bug-fixed**: unassigned conversations list was reset on each WebSocket subscription; conversations from other projects were lost when subscribing to multiple online projects. Added `skipClear` parameter to `subscriptionToWsConversations` so the list is cleared only once when subscribing to all online projects.
 - **changed**: unassigned conversations empty state — centered the "no conversations" label both vertically and horizontally within the full viewport height.

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@chat21/chat21-ionic",
     "author": "Tiledesk SRL",
-    "version": "3.4.32-rc2",
+    "version": "3.4.32-rc5",
     "license": "MIT License",
     "homepage": "https://tiledesk.com/",
     "repository": {

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

@@ -94,12 +94,18 @@ ion-navbar{
     overflow: hidden;
     text-overflow: ellipsis;
     font-family: var(--header-font-family);
-    
+    line-height: 1.4;
+
     .material-icons{
         font-size: 20px;
     }
 }
 
+button.btn.project-dropdown {
+    padding-top: 4px;
+    padding-bottom: 4px;
+}
+
 li{
     position: relative;
     display: block

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

@@ -58,6 +58,8 @@ 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';
 
+const PROJECTS_STORAGE_KEY = 'all_projects';
+
 @Component({
   selector: 'app-conversations-list',
   templateUrl: './conversations-list.page.html',
@@ -142,6 +144,7 @@ export class ConversationListPage implements OnInit {
     public platform: Platform,
     public wsService: WebsocketService,
     public g: Globals,
+    public appStorageService: AppStorageService,
   ) {
     this.checkPlatform();
     this.translations();
@@ -215,8 +218,45 @@ export class ConversationListPage implements OnInit {
   // @ Lifehooks
   // -----------------------------------------------
   ngOnInit() {
-    this.getAppConfigToHideDiplayBtns()
+    this.getAppConfigToHideDiplayBtns();
     this.getOSCODE();
+    this.loadAndStoreProjects();
+  }
+
+  /**
+   * Recupera tutti i progetti con getProjects e li salva in AppStorage.
+   * Prima di salvare verifica che la chiave non esista già e che non contenga già ogni singolo progetto.
+   */
+  private loadAndStoreProjects() {
+    const token = this.tiledeskAuthService.getTiledeskToken();
+    if (!token) return;
+    this.tiledeskService.getProjects(token).subscribe((projects: Project[]) => {
+        if (!projects?.length) return;
+        let projectsMap: Record<string, Project> = {};
+        const stored = this.appStorageService.getItem(PROJECTS_STORAGE_KEY);
+        if (stored) {
+          try {
+            projectsMap = JSON.parse(stored) || {};
+          } catch (e) {
+            this.logger.warn('[CONVS-LIST-PAGE] loadAndStoreProjects - failed to parse stored projects', e);
+          }
+        }
+        let hasChanges = false;
+        projects.forEach((project) => {
+          const projectId =  project.id_project?._id || project.id_project?.id;
+          if (!projectId) return;
+          if (!projectsMap[projectId]) {
+            projectsMap[projectId] = project.id_project;
+            hasChanges = true;
+          }
+        });
+        if (hasChanges) {
+          this.appStorageService.setItem(PROJECTS_STORAGE_KEY, JSON.stringify(projectsMap));
+          this.logger.log('[CONVS-LIST-PAGE] loadAndStoreProjects - saved', Object.keys(projectsMap).length, 'projects');
+        }
+      },
+      (err) => this.logger.error('[CONVS-LIST-PAGE] loadAndStoreProjects - error', err)
+    );
   }
 
   ngOnChanges() {
@@ -862,22 +902,32 @@ export class ConversationListPage implements OnInit {
       }
     }
     
-    if(conversation.attributes && conversation.attributes['projectId']){
-      let project = localStorage.getItem(conversation.attributes['projectId'])
-      if(project){
-        project = JSON.parse(project)
-        conversation.attributes.project_name = project['name']
-      }
-    }else if(conversation.attributes){
-      const projectId = getProjectIdSelectedConversation(conversation.uid)
-      let project = localStorage.getItem(projectId)
-      if(project){
-        project = JSON.parse(project)
-        conversation.attributes.projectId = project['_id']
-        conversation.attributes.project_name = project['name']
-      }
+    const project = this.getProjectFromStorage(conversation);
+    if (project) {
+      if (!conversation.attributes) conversation.attributes = {};
+      conversation.attributes.projectId = project._id;
+      conversation.attributes.project_name = project.name;
     }
+  }
 
+  /** Recupera il progetto dalla chiave di storage (all_projects) */
+  private getProjectFromStorage(conversation: ConversationModel): Project | null {
+    let projectId: string | undefined;
+    if (conversation.attributes?.['projectId']) {
+      projectId = conversation.attributes['projectId'];
+    } else if (conversation.attributes) {
+      projectId = getProjectIdSelectedConversation(conversation.uid);
+    }
+    if (!projectId) return null;
+    const stored = this.appStorageService.getItem(PROJECTS_STORAGE_KEY);
+    this.logger.log('[CONVS-LIST-PAGE] getProjectFromStorage - stored', stored);
+    if (!stored) return null;
+    try {
+      const projectsMap: Record<string, Project> = JSON.parse(stored);
+      return projectsMap[projectId] || null;
+    } catch {
+      return null;
+    }
   }
 
   // isMarkdownLink(last_message_text) {

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

@@ -1,4 +1,4 @@
-import { Component, Input, OnInit, SecurityContext } from '@angular/core';
+import { Component, Input, OnChanges, OnInit, SecurityContext, SimpleChanges } from '@angular/core';
 import { AlertController, ModalController } from '@ionic/angular';
 import { Router } from '@angular/router';
 import { NavProxyService } from 'src/app/services/nav-proxy.service';
@@ -11,6 +11,11 @@ import { EventsService } from 'src/app/services/events-service';
 import { ConversationModel } from 'src/chat21-core/models/conversation';
 import { TiledeskAuthService } from 'src/chat21-core/providers/tiledesk/tiledesk-auth.service';
 import { TiledeskService } from 'src/app/services/tiledesk/tiledesk.service';
+import { getProjectIdSelectedConversation, isGroup } from 'src/chat21-core/utils/utils';
+import { ImageRepoService } from 'src/chat21-core/providers/abstract/image-repo.service';
+import { Project } from 'src/chat21-core/models/projects';
+
+const PROJECTS_STORAGE_KEY = 'all_projects';
 
 
 @Component({
@@ -18,7 +23,7 @@ import { TiledeskService } from 'src/app/services/tiledesk/tiledesk.service';
   templateUrl: './unassigned-conversations.page.html',
   styleUrls: ['./unassigned-conversations.page.scss'],
 })
-export class UnassignedConversationsPage implements OnInit {
+export class UnassignedConversationsPage implements OnInit, OnChanges {
 
   @Input() iframe_URL: any;
   @Input() callerBtn: string;
@@ -35,6 +40,7 @@ export class UnassignedConversationsPage implements OnInit {
   // @Input() unassigned_convs_url: any;
 
   iframe_url_sanitized: any;
+  private loggedUserUid: string;
   private logger: LoggerService = LoggerInstance.getInstance();
   // has_loaded: boolean;
   ion_content: any;
@@ -52,8 +58,14 @@ export class UnassignedConversationsPage implements OnInit {
     private translateService: CustomTranslateService,
     private events: EventsService,
     private tiledeskAuthService: TiledeskAuthService,
-    private tiledeskService: TiledeskService
-  ) { }
+    private tiledeskService: TiledeskService,
+    public imageRepoService: ImageRepoService,
+    public appStorageService: AppStorageService,
+  ) {
+    if (this.tiledeskAuthService.getCurrentUser()) {
+      this.loggedUserUid = this.tiledeskAuthService.getCurrentUser().uid;
+    }
+  }
 
   ngOnInit() {
     const keys = [
@@ -63,6 +75,7 @@ export class UnassignedConversationsPage implements OnInit {
       'LABEL_MSG_PUSH_START_CHAT'
     ];
     this.translationMap = this.translateService.translateLanguage(keys);
+
     this.unassignedConversationsList = this.unassignedConversations ?? [];
     if (!this.stylesMap) {
       this.stylesMap = new Map([['themeColor', '#165CEE']]);
@@ -71,16 +84,100 @@ export class UnassignedConversationsPage implements OnInit {
       this.translationMapConversation = this.translateService.translateLanguage(['CLOSED', 'Resolve']);
     }
     this.logger.log('[UNASSIGNED-CONVS-PAGE] unassignedConversationsList', this.unassignedConversationsList);
+    this.processConversationsForDisplay();
+    this.loadAndStoreProjects();
     // this.buildIFRAME();
     this.listenToPostMsg();
     this.hideHotjarFeedbackBtn();
     this.events.subscribe('style', (data)=>this.loadStyle(data))
   }
 
+  ngOnChanges(changes: SimpleChanges) {
+    if (changes['unassignedConversations'] && changes['unassignedConversations'].currentValue) {
+      this.unassignedConversationsList = this.unassignedConversations ?? [];
+      this.processConversationsForDisplay();
+    }
+  }
+
   ngOnDestroy(){
     this.logger.log('[UNASSIGNED-CONVS-PAGE] - onDestroy called', this.iframe_URL);
   }
 
+  /** Chiama onImageLoaded e onConversationLoaded per ogni conversazione in lista */
+  private processConversationsForDisplay() {
+    if (!this.unassignedConversationsList?.length) return;
+    this.unassignedConversationsList.forEach((conv) => {
+      this.onImageLoaded(conv);
+      this.onConversationLoaded(conv);
+    });
+  }
+
+  /**
+   * Recupera tutti i progetti con getProjects e li salva in AppStorage.
+   * Se la chiave esiste già nello storage, salta la chiamata remota e usa i dati in cache.
+   * Al termine richiama processConversationsForDisplay per aggiornare i project_name.
+   */
+  private loadAndStoreProjects() {
+    const stored = this.appStorageService.getItem(PROJECTS_STORAGE_KEY);
+    if (stored) {
+      this.processConversationsForDisplay();
+      return;
+    }
+    const token = this.tiledeskAuthService.getTiledeskToken();
+    if (!token) return;
+    this.tiledeskService.getProjects(token).subscribe(
+      (projects: Project[]) => {
+        if (!projects?.length) return;
+        let projectsMap: Record<string, Project> = {};
+        const stored = this.appStorageService.getItem(PROJECTS_STORAGE_KEY);
+        if (stored) {
+          try {
+            projectsMap = JSON.parse(stored) || {};
+          } catch (e) {
+            this.logger.warn('[UNASSIGNED-CONVS-PAGE] loadAndStoreProjects - failed to parse stored projects', e);
+          }
+        }
+        let hasChanges = false;
+        projects.forEach((project) => {
+          const projectId = project.id_project?._id || project.id_project?.id || project._id;
+          if (!projectId) return;
+          if (!projectsMap[projectId]) {
+            projectsMap[projectId] = project.id_project || project;
+            hasChanges = true;
+          }
+        });
+        if (hasChanges) {
+          this.appStorageService.setItem(PROJECTS_STORAGE_KEY, JSON.stringify(projectsMap));
+          this.logger.log('[UNASSIGNED-CONVS-PAGE] loadAndStoreProjects - saved', Object.keys(projectsMap).length, 'projects');
+        }
+        this.processConversationsForDisplay();
+      },
+      (err) => {
+        this.logger.error('[UNASSIGNED-CONVS-PAGE] loadAndStoreProjects - error', err);
+        this.processConversationsForDisplay();
+      }
+    );
+  }
+
+  /** Recupera il progetto dalla chiave di storage (all_projects); se non trovato restituisce null */
+  private getProjectFromStorage(conversation: ConversationModel): Project | null {
+    let projectId: string | undefined;
+    if (conversation.attributes?.['projectId']) {
+      projectId = conversation.attributes['projectId'];
+    } else if (conversation.attributes) {
+      projectId = getProjectIdSelectedConversation(conversation.uid);
+    }
+    if (!projectId) return null;
+    const stored = this.appStorageService.getItem(PROJECTS_STORAGE_KEY);
+    if (!stored) return null;
+    try {
+      const projectsMap: Record<string, Project> = JSON.parse(stored);
+      return projectsMap[projectId] || null;
+    } catch {
+      return null;
+    }
+  }
+
   hideHotjarFeedbackBtn() {
     const hotjarFeedbackBtn = <HTMLElement>document.querySelector("#_hj_feedback_container > div > button")
     if (hotjarFeedbackBtn) {
@@ -165,8 +262,7 @@ export class UnassignedConversationsPage implements OnInit {
         }, {
           text: 'Ok',
           handler: () => {
-            let user = this.tiledeskAuthService.getCurrentUser();
-            this.tiledeskService.addParticipant(request.uid, user.uid, request.attributes.projectId).subscribe((res: any) => {
+            this.tiledeskService.addParticipant(request.uid, this.loggedUserUid, request.attributes.projectId).subscribe((res: any) => {
               this.logger.log('[APP-COMP] addParticipant - RES ', res);
               this.onClose(request);
             }, (error) => {
@@ -280,12 +376,77 @@ export class UnassignedConversationsPage implements OnInit {
     this.presentAlertConfirmJoinRequest(conversation)
   }
 
-  onImageLoaded(conversation: ConversationModel) {
-    this.logger.log('[UNASSIGNED-CONVS-PAGE] onImageLoaded', conversation);
+  onImageLoaded(conversation: any) {
+    // this.logger.log('[CONVS-LIST-PAGE] onImageLoaded', conversation)
+    let conversation_with_fullname = conversation.sender_fullname
+    let conversation_with = conversation.sender
+    if (conversation.sender === this.loggedUserUid) {
+      conversation_with = conversation.recipient
+      conversation_with_fullname = conversation.recipient_fullname
+    } else if (isGroup(conversation)) {
+      // conversation_with_fullname = conv.sender_fullname;
+      // conv.last_message_text = conv.last_message_text;
+      conversation_with = conversation.recipient
+      conversation_with_fullname = conversation.recipient_fullname
+    }
+    if (!conversation_with.startsWith('support-group')) {
+      conversation.image = this.imageRepoService.getImagePhotoUrl(conversation_with)
+    }
   }
 
   onConversationLoaded(conversation: ConversationModel) {
-    this.logger.log('[UNASSIGNED-CONVS-PAGE] onConversationLoaded', conversation);
+    this.logger.log('[CONVS-LIST-PAGE] onConversationLoaded ', conversation)
+    // this.logger.log('[CONVS-LIST-PAGE] onConversationLoaded is new? ', conversation.is_new)
+    // if (conversation.is_new === false) {
+    //   this.ionContentConvList.scrollToTop(0);
+    // }
+
+    const keys = ['YOU', 'SENT_AN_IMAGE', 'SENT_AN_ATTACHMENT']
+    const translationMap = this.translateService.translateLanguage(keys)
+    // Fixes the bug: if a snippet of code is pasted and sent it is not displayed correctly in the convesations list
+
+    var regex = /<br\s*[\/]?>/gi
+    if (conversation ) { //&& conversation.last_message_text
+      conversation.last_message_text = conversation.last_message_text.replace(regex, '',)
+
+      //FIX-BUG: 'YOU: YOU: YOU: text' on last-message-text in conversation-list
+      if (conversation.sender === this.loggedUserUid && !conversation.last_message_text.includes(': ')) {
+        // this.logger.log('[CONVS-LIST-PAGE] onConversationLoaded', conversation)
+
+        if (conversation.type !== 'image' && conversation.type !== 'file') {
+          conversation.last_message_text = translationMap.get('YOU') + ': ' + conversation.last_message_text
+        } else if (conversation.type === 'image') {
+          // this.logger.log('[CONVS-LIST-PAGE] HAS SENT AN IMAGE');
+          // this.logger.log("[CONVS-LIST-PAGE] translationMap.get('YOU')")
+          const SENT_AN_IMAGE = (conversation['last_message_text'] = translationMap.get('SENT_AN_IMAGE'))
+
+          conversation.last_message_text = translationMap.get('YOU') + ': ' + SENT_AN_IMAGE
+        } else if (conversation.type === 'file') {
+          // this.logger.log('[CONVS-LIST-PAGE] HAS SENT FILE')
+          const SENT_AN_ATTACHMENT = (conversation['last_message_text'] = translationMap.get('SENT_AN_ATTACHMENT'))
+          conversation.last_message_text = translationMap.get('YOU') + ': ' + SENT_AN_ATTACHMENT
+        }
+      } else {
+        if (conversation.type === 'image') {
+          // this.logger.log('[CONVS-LIST-PAGE] HAS SENT AN IMAGE');
+          // this.logger.log("[CONVS-LIST-PAGE] translationMap.get('YOU')")
+          const SENT_AN_IMAGE = (conversation['last_message_text'] = translationMap.get('SENT_AN_IMAGE'))
+
+          conversation.last_message_text = SENT_AN_IMAGE
+        } else if (conversation.type === 'file') {
+          // this.logger.log('[CONVS-LIST-PAGE] HAS SENT FILE')
+          const SENT_AN_ATTACHMENT = (conversation['last_message_text'] = translationMap.get('SENT_AN_ATTACHMENT'))
+          conversation.last_message_text = SENT_AN_ATTACHMENT
+        }
+      }
+    }
+    
+    const project = this.getProjectFromStorage(conversation);
+    if (project) {
+      if (!conversation.attributes) conversation.attributes = {};
+      conversation.attributes.projectId = project._id;
+      conversation.attributes.project_name = project.name;
+    }
   }
 
   async onClose(conversation?: ConversationModel) {

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

@@ -7,6 +7,8 @@ import { map } from 'rxjs/operators';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 import { AppStorageService } from 'src/chat21-core/providers/abstract/app-storage.service';
+import { Project } from 'src/chat21-core/models/projects';
+import { Observable } from 'rxjs';
 
 
 @Injectable({
@@ -93,6 +95,39 @@ export class TiledeskService {
     }))
   }
 
+  public getProjects(token: string): Observable<Project[]> {
+    const url = this.SERVER_BASE_URL + 'projects/';
+    this.logger.log('[TILEDESK-SERVICE] - GET PROJECTS URL', url);
+
+    const httpOptions = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+        Authorization: token
+      })
+    };
+
+    return this.http.get(url, httpOptions).pipe(map((projects: Project[]) => {
+      this.logger.log('[TILEDESK-SERVICE] GET PROJECTS - RES ', projects);
+      return projects
+    }))
+  }
+
+  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);