@chat21/chat21-ionic 3.0.68-rc.2 → 3.0.69-rc1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # chat21-ionic ver 3.0
 
+### 3.0.69-rc1
+- changed: restored lookup behaviour for old conversations with 3 segment and without project id inside it
+
+### 3.0.68 in PROD
+
+### 3.0.68-rc3
+- bug-fixed: not sound with unservedRequest if WebSocket restart again (every 3/5min)
+
 ### 3.0.68-rc2
  - bug-fixed: removed lookup API call for old requests
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@chat21/chat21-ionic",
     "author": "Tiledesk SRL",
-    "version": "3.0.68-rc.2",
+    "version": "3.0.69-rc1",
     "license": "AGPL-3.0",
     "homepage": "https://tiledesk.com/",
     "repository": {

package/src/app/app.component.ts

@@ -863,6 +863,7 @@ export class AppComponent implements OnInit {
     if(sound_status && sound_status !== 'undefined'){
       this.isSoundEnabled = sound_status === 'enabled'? true: false
     }
+    // this.logger.debug('[APP-COMP] manageTabNotification can saund?', this.isInitialized, this.isSoundEnabled)
     if(this.isInitialized && this.isSoundEnabled) this.soundMessage()
   }
 
@@ -1138,6 +1139,8 @@ export class AppComponent implements OnInit {
             // that.presentToast();
           }
         });
+      } else {
+        this.removePresenceAndLogout()
       }
     }
   }

package/src/app/components/conversation-info/info-content/info-content.component.ts

@@ -100,12 +100,12 @@ export class InfoContentComponent implements OnInit {
       this.logger.log('[INFO-CONTENT-COMP] - paramMap.subscribe conversationWith_segments: ', conversationWith_segments);
 
       if (this.conversationWith.startsWith("support-group")) {
-        // if (conversationWith_segments.length === 4) {
+        if (conversationWith_segments.length === 4) {
           this.project_id = conversationWith_segments[2];
           this.selectInfoContentTypeInfoSupportGroup();
-        // } else {
-        //   this.getProjectIdByConversationWith(this.conversationWith)
-        // }
+        } else {
+          this.getProjectIdByConversationWith(this.conversationWith)
+        }
       } else {
         this.selectInfoContentTypeDirectAndGroup(this.conversationWith);
       }
@@ -115,25 +115,25 @@ export class InfoContentComponent implements OnInit {
 
   }
 
-  // getProjectIdByConversationWith(conversationWith: string) {
-  //   const tiledeskToken = this.tiledeskAuthService.getTiledeskToken();
+  getProjectIdByConversationWith(conversationWith: string) {
+    const tiledeskToken = this.tiledeskAuthService.getTiledeskToken();
 
-  //   this.tiledeskService.getProjectIdByConvRecipient(tiledeskToken, conversationWith).subscribe(res => {
-  //     this.logger.log('[INFO-CONTENT-COMP] - GET PROJECTID BY CONV RECIPIENT RES', res);
+    this.tiledeskService.getProjectIdByConvRecipient(tiledeskToken, conversationWith).subscribe(res => {
+      this.logger.log('[INFO-CONTENT-COMP] - GET PROJECTID BY CONV RECIPIENT RES', res);
 
-  //     if (res) {
-  //       this.project_id = res.id_project
-  //       this.logger.log('[INFO-CONTENT-COMP] - GET PROJECTID BY CONV RECIPIENT  this.project_id', this.project_id);
-  //     }
+      if (res) {
+        this.project_id = res.id_project
+        this.logger.log('[INFO-CONTENT-COMP] - GET PROJECTID BY CONV RECIPIENT  this.project_id', this.project_id);
+      }
 
-  //   }, (error) => {
-  //     this.logger.error('[INFO-CONTENT-COMP] - GET PROJECTID BY CONV RECIPIENT - ERROR  ', error);
+    }, (error) => {
+      this.logger.error('[INFO-CONTENT-COMP] - GET PROJECTID BY CONV RECIPIENT - ERROR  ', error);
 
-  //   }, () => {
-  //     this.logger.log('[INFO-CONTENT-COMP] - GET PROJECTID BY CONV RECIPIENT * COMPLETE *');
-  //     this.selectInfoContentTypeInfoSupportGroup();
-  //   });
-  // }
+    }, () => {
+      this.logger.log('[INFO-CONTENT-COMP] - GET PROJECTID BY CONV RECIPIENT * COMPLETE *');
+      this.selectInfoContentTypeInfoSupportGroup();
+    });
+  }
 
   ngOnInit() {
     this.logger.log('>>> N INFO-CONTENT-COMP CALLING ngOnInit');

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

@@ -278,11 +278,9 @@ export class ProjectItemComponent implements OnInit {
     available = !available
     this.logger.log('[PROJECT-ITEM] - changeAvailabilityState projectid', projectid, ' available: ', available);
 
-    this.wsService.updateCurrentUserAvailability(this.tiledeskToken, projectid, available)
-      .subscribe((projectUser: any) => {
+    this.wsService.updateCurrentUserAvailability(this.tiledeskToken, projectid, available).subscribe((projectUser: any) => {
 
         this.logger.log('[PROJECT-ITEM] - PROJECT-USER UPDATED ', projectUser)
-
         // NOTIFY TO THE USER SERVICE WHEN THE AVAILABLE / UNAVAILABLE BUTTON IS CLICKED
         // this.usersService.availability_btn_clicked(true)
 
@@ -312,8 +310,11 @@ export class ProjectItemComponent implements OnInit {
             }
           }
         });
-        this.unservedRequestCount = count;
-        this.events.publish('unservedRequest:count', this.unservedRequestCount)
+        //not sound if unservedRequest is already chached and web-sk is closed and restart again
+        if(this.unservedRequestCount < count){  
+          this.unservedRequestCount = count;
+          this.events.publish('unservedRequest:count', this.unservedRequestCount)
+        }
       }
     }, error => {
       this.logger.error('[PROJECT-ITEM] UNSERVED REQUEST COUNT * error * ', error)

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

@@ -1232,33 +1232,33 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     this.logger.log('[CONVS-DETAIL] - loadTagsCanned conversationWith_segments ', conversationWith_segments)
     let projectId = ''
 
-    // if (conversationWith_segments.length === 4) {
+    if (conversationWith_segments.length === 4) {
       projectId = conversationWith_segments[2]
       this.logger.log('[CONVS-DETAIL] - loadTagsCanned projectId ', projectId)
       this.getAndShowCannedResponses(strSearch, projectId)
-    // } else {
-      // this.getProjectIdByConversationWith(strSearch, this.conversationWith)
-    // }
+    } else {
+      this.getProjectIdByConversationWith(strSearch, this.conversationWith)
+    }
   }
 
-  // getProjectIdByConversationWith(strSearch, conversationWith: string) {
-  //   const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
-
-  //   this.tiledeskService.getProjectIdByConvRecipient(tiledeskToken, conversationWith).subscribe((res) => {
-  //     this.logger.log('[CONVS-DETAIL] - loadTagsCanned - GET PROJECTID BY CONV RECIPIENT RES', res)
-  //     if (res) {
-  //       const projectId = res.id_project
-  //       this.logger.log('[CONVS-DETAIL] - loadTagsCanned - GET PROJECTID BY CONV RECIPIENT projectId ', projectId)
-  //       if (projectId) {
-  //         this.getAndShowCannedResponses(strSearch, projectId)
-  //       }
-  //     }
-  //   }, (error) => {
-  //     this.logger.error('[CONVS-DETAIL] - loadTagsCanned - GET PROJECTID BY CONV RECIPIENT - ERROR  ', error)
-  //   }, () => {
-  //     this.logger.log('[CONVS-DETAIL] - loadTagsCanned - GET PROJECTID BY CONV RECIPIENT * COMPLETE *')
-  //   })
-  // }
+  getProjectIdByConversationWith(strSearch, conversationWith: string) {
+    const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
+
+    this.tiledeskService.getProjectIdByConvRecipient(tiledeskToken, conversationWith).subscribe((res) => {
+      this.logger.log('[CONVS-DETAIL] - loadTagsCanned - GET PROJECTID BY CONV RECIPIENT RES', res)
+      if (res) {
+        const projectId = res.id_project
+        this.logger.log('[CONVS-DETAIL] - loadTagsCanned - GET PROJECTID BY CONV RECIPIENT projectId ', projectId)
+        if (projectId) {
+          this.getAndShowCannedResponses(strSearch, projectId)
+        }
+      }
+    }, (error) => {
+      this.logger.error('[CONVS-DETAIL] - loadTagsCanned - GET PROJECTID BY CONV RECIPIENT - ERROR  ', error)
+    }, () => {
+      this.logger.log('[CONVS-DETAIL] - loadTagsCanned - GET PROJECTID BY CONV RECIPIENT * COMPLETE *')
+    })
+  }
 
   getAndShowCannedResponses(strSearch, projectId) {
     const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()

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

@@ -909,37 +909,37 @@ export class ConversationListPage implements OnInit {
 
       if (conversationId.startsWith('support-group')) {
         let project_id = ''
-        // if (conversationWith_segments.length === 4) {
+        if (conversationWith_segments.length === 4) {
           project_id = conversationWith_segments[2]
 
           const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
           this.archiveSupportGroupConv(tiledeskToken,project_id,conversationId,)
-        // } else {
-          // this.getProjectIdByConversationWith(conversationId)
-        // }
+        } else {
+          this.getProjectIdByConversationWith(conversationId)
+        }
       } else {
         this.conversationsHandlerService.archiveConversation(conversationId)
       }
     }
   }
 
-  // getProjectIdByConversationWith(conversationId: string) {
-  //   const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
+  getProjectIdByConversationWith(conversationId: string) {
+    const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
 
-  //   this.tiledeskService.getProjectIdByConvRecipient(tiledeskToken, conversationId).subscribe((res) => {
-  //     this.logger.log('[CONVS-LIST-PAGE] - GET PROJECTID BY CONV RECIPIENT RES',res)
+    this.tiledeskService.getProjectIdByConvRecipient(tiledeskToken, conversationId).subscribe((res) => {
+      this.logger.log('[CONVS-LIST-PAGE] - GET PROJECTID BY CONV RECIPIENT RES',res)
 
-  //     if (res) {
-  //       const project_id = res.id_project
-  //       this.logger.log('[INFO-CONTENT-COMP] - GET PROJECTID BY CONV RECIPIENT  project_id',project_id)
-  //       this.archiveSupportGroupConv(tiledeskToken,project_id,conversationId)
-  //     }
-  //   },(error) => {
-  //     this.logger.error('[CONVS-LIST-PAGE] - GET PROJECTID BY CONV RECIPIENT - ERROR  ',error)
-  //   },() => {
-  //     this.logger.log('[CONVS-LIST-PAGE] - GET PROJECTID BY CONV RECIPIENT * COMPLETE *')
-  //   })
-  // }
+      if (res) {
+        const project_id = res.id_project
+        this.logger.log('[INFO-CONTENT-COMP] - GET PROJECTID BY CONV RECIPIENT  project_id',project_id)
+        this.archiveSupportGroupConv(tiledeskToken,project_id,conversationId)
+      }
+    },(error) => {
+      this.logger.error('[CONVS-LIST-PAGE] - GET PROJECTID BY CONV RECIPIENT - ERROR  ',error)
+    },() => {
+      this.logger.log('[CONVS-LIST-PAGE] - GET PROJECTID BY CONV RECIPIENT * COMPLETE *')
+    })
+  }
 
   archiveSupportGroupConv(tiledeskToken, project_id, conversationId) {
     this.logger.log('[CONVS-LIST-PAGE] - onCloseConversation projectId: ',project_id)

package/src/app/pages/create-canned-response/create-canned-response.page.ts

@@ -107,29 +107,29 @@ export class CreateCannedResponsePage implements OnInit {
     this.logger.log('[CREATE-CANNED-RES] - loadTagsCanned conversationWith_segments ', conversationWith_segments)
     // let projectId = ''
 
-    // if (conversationWith_segments.length === 4) {
+    if (conversationWith_segments.length === 4) {
       this.prjctID = conversationWith_segments[2]
       this.logger.log('[CREATE-CANNED-RES] - loadTagsCanned projectId ', this.prjctID)
-    // } else {
-      // this.getProjectIdByConversationWith(conversation_id, tiledeskToken)
-    // }
+    } else {
+      this.getProjectIdByConversationWith(conversation_id, tiledeskToken)
+    }
   }
 
-  // getProjectIdByConversationWith(conversationWith: string, tiledeskToken: string) {
-  //   // const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
-
-  //   this.tiledeskService.getProjectIdByConvRecipient(tiledeskToken, conversationWith).subscribe((res) => {
-  //     this.logger.log('[CREATE-CANNED-RES] - GET PROJECTID BY CONV RECIPIENT RES', res)
-  //     if (res) {
-  //       this.prjctID = res.id_project
-  //       this.logger.log('[CREATE-CANNED-RES] - GET PROJECTID BY CONV RECIPIENT projectId ', this.prjctID)
-  //     }
-  //   }, (error) => {
-  //     this.logger.error('[CREATE-CANNED-RES] - GET PROJECTID BY CONV RECIPIENT - ERROR  ', error)
-  //   },() => {
-  //     this.logger.log('[CREATE-CANNED-RES] - GET PROJECTID BY CONV RECIPIENT * COMPLETE *',)
-  //   })
-  // }
+  getProjectIdByConversationWith(conversationWith: string, tiledeskToken: string) {
+    // const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
+
+    this.tiledeskService.getProjectIdByConvRecipient(tiledeskToken, conversationWith).subscribe((res) => {
+      this.logger.log('[CREATE-CANNED-RES] - GET PROJECTID BY CONV RECIPIENT RES', res)
+      if (res) {
+        this.prjctID = res.id_project
+        this.logger.log('[CREATE-CANNED-RES] - GET PROJECTID BY CONV RECIPIENT projectId ', this.prjctID)
+      }
+    }, (error) => {
+      this.logger.error('[CREATE-CANNED-RES] - GET PROJECTID BY CONV RECIPIENT - ERROR  ', error)
+    },() => {
+      this.logger.log('[CREATE-CANNED-RES] - GET PROJECTID BY CONV RECIPIENT * COMPLETE *',)
+    })
+  }
 
 
   buildForm() {