@chat21/chat21-web-widget 5.1.0-rc10 → 5.1.0-rc12

package/CHANGELOG.md

@@ -6,6 +6,12 @@
 ### **Copyrigth**: 
 *Tiledesk SRL*
 
+# 5.1.0-rc12
+- **added**: ability to get all my request from Tiledesk API
+
+# 5.1.0-rc11
+- **bug-fixed**: removed private note msgs
+
 # 5.1.0-rc10
 - **bug-fixed**: minor fix allowed urls
 
@@ -30,6 +36,15 @@
 
 # 5.1.0-rc2
 - **added**: angular 17
+# 5.0.99
+
+# 5.0.99-rc1
+- **bug-fixed**: audio duration not showed in mobile browser
+
+# 5.0.98
+- **bug-fixed**: meta info not rendered correctly
+
+# 5.0.97
 
 # 5.0.96
 

package/angular.json

@@ -24,7 +24,7 @@
             "index": "src/index.html",
             "polyfills": [
               "src/polyfills.ts",
-              "@angular/localize/init",
+              "@angular/localize/init"
             ],
             "tsConfig": "tsconfig.app.json",
             "assets": [
@@ -51,7 +51,7 @@
             ],
             "scripts": [
               "src/assets/js/mqtt/4.2.6/mqtt.min.js",
-              "node_modules/bootstrap/dist/js/bootstrap.min.js",
+              "node_modules/bootstrap/dist/js/bootstrap.min.js"
             ],
             "extractLicenses": false,
             "allowedCommonJsDependencies": [

package/deploy_beta.sh

@@ -4,6 +4,16 @@ echo "version $version"
 echo "____________WIDGET-V5______________"
 echo "CREATING TAG ON GIT FOR version: $version"
 
+# Get curent branch name
+current_branch=$(git rev-parse --abbrev-ref HEAD)
+remote_name=$(git config --get branch.$current_branch.remote)
+
+## Push commit to git
+git add .
+git commit -m "version added: ### $version"
+git push "$remote_name" "$current_branch"
+
+
 # Get curent branch name
 current_branch=$(git rev-parse --abbrev-ref HEAD)
 remote_name=$(git config --get branch.$current_branch.remote)

package/deploy_prod.sh

@@ -13,6 +13,15 @@ git add .
 git commit -m "version added: ### $version"
 git push "$remote_name" "$current_branch"
 
+# Get curent branch name
+current_branch=$(git rev-parse --abbrev-ref HEAD)
+remote_name=$(git config --get branch.$current_branch.remote)
+
+## Push commit to git
+git add .
+git commit -m "version added: ### $version"
+git push "$remote_name" "$current_branch"
+
 if [ "$version" != "" ]; then
     git tag -a "$version" -m "`git log -1 --format=%s`"
     echo "Created a new tag, $version"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chat21/chat21-web-widget",
   "author": "Tiledesk SRL",
-  "version": "5.1.0-rc10",
+  "version": "5.1.0-rc12",
   "license": "MIT",
   "homepage": "https://www.tiledesk.com",
   "repository": {

package/src/app/component/conversation-detail/conversation/conversation.component.ts

@@ -363,14 +363,21 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
     // this.logger.debug('[CONV-COMP] ------ 5: updateConversationbage ------ ');
     // this.updateConversationBadge();
 
-    this.logger.debug('[CONV-COMP] ------ 6: getConversationDetail ------ ', this.conversationId);
-    this.getConversationDetail((isConversationArchived) => {
-      this.logger.debug('[CONV-COMP] ------ 6: updateConversationbage ------ ');
-      this.updateConversationBadge();
-      return;
-    }) //check if conv is archived or not
+    
+    // this.getConversationDetail((isConversationArchived) => {
+    //   this.logger.debug('[CONV-COMP] ------ 6: updateConversationbage ------ ');
+    //   this.updateConversationBadge();
+    //   return;
+    // }) //check if conv is archived or not
     // this.checkListMessages();
 
+    this.logger.debug('[CONV-COMP] ------ 5: getConversationDetail ------ ', this.conversationId);
+    await this.getConversationDetail();
+    
+    
+    this.logger.debug('[CONV-COMP] ------ 6: updateConversationBadge ------ ');
+    this.updateConversationBadge();
+
     if(this.g.customAttributes){
       this.updateUserInfo(this.g.customAttributes)
     }
@@ -384,7 +391,7 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
    * @param callback
    * @returns isConversationArchived (status conversation archived: boolean) 
    */
-  getConversationDetail(callback:(isConversationArchived: boolean)=>void){
+  getConversationDetail_old(callback:(isConversationArchived: boolean)=>void){
     // if(!this.isConversationArchived){ 
     //get conversation from 'conversations' firebase node
     this.logger.debug('[CONV-COMP] getConversationDetail: isConversationArchived???', this.isConversationArchived, this.conversationWith)
@@ -414,39 +421,60 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
         })
       }
     });
-    // } else { //get conversation from 'conversations' firebase node
-    //   this.archivedConversationsHandlerService.getConversationDetail(this.conversationId, (conv)=>{
-    //     this.logger.debug('[CONV-COMP] archivedConversationsHandlerService getConversationDetail', this.conversationId, conv, this.isConversationArchived)
-    //     if(conv){
-    //       this.conversation = conv;
-    //       this.isConversationArchived = true;
-    //       callback(this.isConversationArchived) 
-    //     }
-    //     if(!conv){
-    //       this.conversationsHandlerService.getConversationDetail(this.conversationId, (conv)=>{
-    //         this.logger.debug('[CONV-COMP] conversationsHandlerService getConversationDetail', this.conversationId, conv, this.isConversationArchived)
-    //         conv? this.isConversationArchived = false : null  
-    //         this.conversation = conv;
-    //         callback(this.isConversationArchived) 
-    //       })
-    //     }
-    //   })
-    // }
-    
-    // if(!this.isConversationArchived){ //get conversation from 'conversations' firebase node
-    //   this.conversationsHandlerService.getConversationDetail(this.conversationId, (conv)=>{
-    //     this.logger.debug('[CONV-COMP] conversationsHandlerService getConversationDetail', this.conversationId, conv)
-    //     this.conversation = conv;
-    //     callback(this.isConversationArchived)    
-    //   })
-    // }else { //get conversation from 'conversations' firebase node
-    //   this.archivedConversationsHandlerService.getConversationDetail(this.conversationId, (conv)=>{
-    //     this.logger.debug('[CONV-COMP] archivedConversationsHandlerService getConversationDetail', this.conversationId, conv)
-    //     this.conversation = conv;   
-    //     callback(this.isConversationArchived)   
-    //   })
-    // }
-    // this.updateConversationBadge()
+  }
+
+  /**
+   * @description get detail of conversation by uid and then return callback with conversation status
+   * @param callback
+   * @returns isConversationArchived (status conversation archived: boolean) 
+   */
+  async getConversationDetail(): Promise<boolean | null> {
+    this.logger.debug('[CONV-COMP] getConversationDetail: isConversationArchived???', this.isConversationArchived, this.conversationWith);
+  
+    const conv = await new Promise<any>((resolve) => {
+      this.conversationsHandlerService.getConversationDetail(this.conversationWith, resolve);
+    });
+
+    if (conv) {
+      this.logger.debug('[CONV-COMP] getConversationDetail: conversationsHandlerService ', this.conversationWith, conv, this.isConversationArchived);
+      this.conversation = conv;
+      this.isConversationArchived = false;
+      return this.isConversationArchived;
+    }
+  
+    this.logger.debug('[CONV-COMP] getConversationDetail: conv not exist --> search in archived list', this.isConversationArchived, this.conversationWith);
+  
+    const archivedConv = await new Promise<any>((resolve) => {
+      this.archivedConversationsHandlerService.getConversationDetail(this.conversationWith, resolve);
+    });
+  
+    if (archivedConv) {
+      this.logger.debug('[CONV-COMP] getConversationDetail: archivedConversationsHandlerService', this.conversationWith, archivedConv, this.isConversationArchived);
+      this.conversation = archivedConv;
+      this.isConversationArchived = true;
+      return this.isConversationArchived;
+    }
+
+    //FALLBACK TO TILEDESK
+    const requests_list = await this.tiledeskRequestService.getMyRequests().catch(err => {
+      this.logger.error('[CONV-COMP] getConversationDetail: error getting request from Tiledesk', err);
+      this.isConversationArchived=true
+      return { requests: [] }
+    });
+    if (requests_list && requests_list.requests.length > 0) {
+      this.logger.debug('[CONV-COMP] getConversationDetail: request exist on Tiledesk', requests_list);
+      let conversation = requests_list.requests.find((request)=> request.request_id === this.conversationId)
+      if(conversation){
+        this.isConversationArchived = false
+        return this.isConversationArchived
+      }
+      this.logger.debug('[CONV-COMP] getConversationDetail: request NOT EXIST on Tiledesk', requests_list);
+      this.isConversationArchived = true
+      return this.isConversationArchived
+    }
+
+    this.isConversationArchived = true;
+    return null;
   }
 
   /**
@@ -744,6 +772,7 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
       subscribtion = this.conversationHandlerService.messageAdded.pipe(takeUntil(this.unsubscribe$)).subscribe((msg: MessageModel) => {
         this.logger.debug('[CONV-COMP] ***** DETAIL messageAdded *****', msg);
         if (msg) {
+
           that.newMessageAdded(msg);
           this.checkMessagesLegntForTranscriptDownloadMenuOption();
           this.resetTimeout();

package/src/app/component/conversation-detail/conversation-audio-recorder/conversation-audio-recorder.component.scss

@@ -74,6 +74,7 @@ button {
     display: inline-flex;
     justify-content: center;
     align-items: center;
+    padding: 0px;
   }
   
   .mic-button svg {

package/src/chat21-core/providers/firebase/firebase-conversation-handler.ts

@@ -15,7 +15,7 @@ import { LoggerService } from '../abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
 
 // utils
-import { MSG_STATUS_RECEIVED, TYPE_DIRECT, MESSAGE_TYPE_INFO, INFO_MESSAGE_TYPE } from '../../utils/constants';
+import { MSG_STATUS_RECEIVED, TYPE_DIRECT, MESSAGE_TYPE_INFO, INFO_MESSAGE_TYPE, MESSAGE_TYPE_PRIVATE } from '../../utils/constants';
 import { compareValues, searchIndexInArrayForUid, conversationMessagesRef } from '../../utils/utils';
 import { v4 as uuidv4 } from 'uuid';
 import { messageType, checkIfIsMemberJoinedGroup, hideInfoMessage, isJustRecived, isSender, infoMessageType } from '../../utils/utils-message';
@@ -230,6 +230,12 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
     private addedNew(message:MessageModel){
         const msg = this.messageCommandGenerate(message);
         if(this.isValidMessage(msg)){
+
+            // do not add 'private' msg in widget array messages
+            let isPrivateMessage = messageType(MESSAGE_TYPE_PRIVATE, msg)
+            if(isPrivateMessage){
+                return;
+            }
             // msg.attributes && msg.attributes['subtype'] === 'info'
             let isInfoMessage = messageType(MESSAGE_TYPE_INFO, msg)
             if(isInfoMessage){

package/src/chat21-core/providers/mqtt/mqtt-conversation-handler.ts

@@ -15,7 +15,7 @@ import { UserModel } from '../../models/user';
 import { ConversationHandlerService } from '../abstract/conversation-handler.service';
 
 // utils
-import { MSG_STATUS_RECEIVED, TYPE_DIRECT, MESSAGE_TYPE_INFO, INFO_MESSAGE_TYPE } from '../../utils/constants';
+import { MSG_STATUS_RECEIVED, TYPE_DIRECT, MESSAGE_TYPE_INFO, INFO_MESSAGE_TYPE, MESSAGE_TYPE_PRIVATE } from '../../utils/constants';
 import { compareValues, searchIndexInArrayForUid } from '../../utils/utils';
 import { messageType, checkIfIsMemberJoinedGroup, hideInfoMessage, isJustRecived, isSender, infoMessageType } from '../../utils/utils-message';
 import { v4 as uuidv4 } from 'uuid';
@@ -262,6 +262,13 @@ export class MQTTConversationHandler extends ConversationHandlerService {
     /** */
     private addedMessage(messageSnapshot: MessageModel): Promise<boolean> {
         const msg = this.messageGenerate(messageSnapshot);
+
+        // do not add 'private' msg in widget array messages
+        let isPrivateMessage = messageType(MESSAGE_TYPE_PRIVATE, msg)
+        if(isPrivateMessage){
+            return;
+        }
+
         let isInfoMessage = messageType(MESSAGE_TYPE_INFO, msg)
         if(isInfoMessage){
             this.messageInfo.next(msg)

package/src/chat21-core/providers/tiledesk/tiledesk-requests.service.ts

@@ -68,4 +68,18 @@ export class TiledeskRequestsService {
       return res
     })
   }
+
+  public getMyRequests(): Promise<{ requests: Array<any>}> {
+    this.tiledeskToken = this.appStorage.getItem('tiledeskToken')
+    const url = this.URL_TILEDESK_REQUEST + '/me?preflight=true'
+    this.logger.log('[TILEDESK-SERVICE] - GET REQUEST url ', url);
+    const httpOptions = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+        Authorization: this.tiledeskToken
+      })
+    }
+    
+    return this.http.get<{ requests: Array<any>}>(url, httpOptions).toPromise()
+  }
 }

package/src/chat21-core/utils/constants.ts

@@ -71,6 +71,8 @@ export const TYPE_POPUP_DETAIL_MESSAGE = 'DETAIL_MESSAGE';
 export const MESSAGE_TYPE_INFO = 'INFO';
 export const MESSAGE_TYPE_MINE = 'MINE';
 export const MESSAGE_TYPE_OTHERS = 'OTHERS';
+export const MESSAGE_TYPE_PRIVATE = 'PRIVATE';
+
 
 export enum INFO_MESSAGE_TYPE {
     CHAT_REOPENED = 'CHAT_REOPENED',

package/src/chat21-core/utils/utils-message.ts

@@ -7,7 +7,8 @@ import {
   MESSAGE_TYPE_OTHERS,
   MAX_WIDTH_IMAGES,
   INFO_MESSAGE_TYPE,
-  CHANNEL_TYPE
+  CHANNEL_TYPE,
+  MESSAGE_TYPE_PRIVATE
 } from '../../chat21-core/utils/constants';
 /** */
 export function isCarousel(message: any) {
@@ -103,10 +104,20 @@ export function isFirstMessage(messages, senderId, index):boolean{
   return false;
 }
 
+export function isPrivate(message: any) {
+  if (message && message.attributes && message.attributes.subtype === 'private') {
+    return true;
+  }
+  return false;
+}
+
 
 /** */
 export function messageType(msgType: string, message: any) {
 
+    if (msgType === MESSAGE_TYPE_PRIVATE) {
+      return isPrivate(message);
+    }
     if (msgType === MESSAGE_TYPE_INFO) {
       return isInfo(message);
     }