@chat21/chat21-ionic 3.0.68 → 3.0.70-rc.1

package/README.md

@@ -6,6 +6,9 @@
 
 Chat21 is the core of the open source live chat platform [Tiledesk.com](http://www.tiledesk.com).
 
+## Community? Questions? Support?
+If you need help or just want to hang out, come, say hi on our [<img width="15" alt="Tiledesk discord" src="https://seeklogo.com/images/D/discord-color-logo-E5E6DFEF80-seeklogo.com.png"> Discord](https://discord.gg/WQPfqShJ) server.
+
 # Features #
 With Chat21-ionic you can:
 * Send a direct message to a user (one to one message)
@@ -185,5 +188,4 @@ To auto login pass the JWT token as a query parameter of your Chat url as in the
 
 "http://localhost:8100/#/conversation-detail?jwt=<JWT_TOKEN>"
 
-```
-
+```

package/config.xml

@@ -18,10 +18,10 @@
     <preference name="SplashMaintainAspectRatio" value="true" />
     <preference name="FadeSplashScreenDuration" value="300" />
     <preference name="SplashShowOnlyFirstTime" value="false" />
-    <preference name="SplashScreen" value="assets/logo.png" />
+    <preference name="SplashScreen" value="screen" />
     <preference name="SplashScreenDelay" value="3000" />
     <platform name="android">
-        <edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application" xmlns:android="http://schemas.android.com/apk/res/android">
+        <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application" xmlns:android="http://schemas.android.com/apk/res/android">
             <application android:networkSecurityConfig="@xml/network_security_config" />
         </edit-config>
         <resource-file src="resources/android/xml/network_security_config.xml" target="res/xml/network_security_config.xml" />
@@ -99,7 +99,6 @@
         <splash height="1792" src="resources/ios/splash/Default-1792h~iphone.png" width="828" />
         <splash height="828" src="resources/ios/splash/Default-Landscape-1792h~iphone.png" width="1792" />
     </platform>
-    <engine name="android" spec="^6.2.3" />
     <engine name="browser" spec="^5.0.4" />
     <engine name="ios" spec="6.1.1" />
     <plugin name="cordova-android-support-gradle-release" spec="^3.0.1">

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@chat21/chat21-ionic",
     "author": "Tiledesk SRL",
-    "version": "3.0.68",
+    "version": "3.0.70-rc.1",
     "license": "AGPL-3.0",
     "homepage": "https://tiledesk.com/",
     "repository": {
@@ -44,7 +44,6 @@
         "@ngx-translate/http-loader": "^4.0.0",
         "angular2-moment": "^1.9.0",
         "autolinker": "^3.14.2",
-        "cordova-android": "^6.2.3",
         "cordova-android-support-gradle-release": "^3.0.1",
         "cordova-browser": "^5.0.4",
         "cordova-ios": "6.1.1",
@@ -84,6 +83,7 @@
         "@types/jasmine": "~3.3.8",
         "@types/jasminewd2": "~2.0.3",
         "codelyzer": "^5.0.0",
+        "cordova-android": "^9.1.0",
         "cordova-plugin-add-swift-support": "^2.0.2",
         "jasmine-core": "~3.4.0",
         "jasmine-spec-reporter": "~4.2.1",
@@ -114,9 +114,9 @@
             "cordova-plugin-network-information": {}
         },
         "platforms": [
-            "android",
             "browser",
-            "ios"
+            "ios",
+            "android"
         ]
     }
-}
+}

package/resources/android/xml/network_security_config.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">localhost</domain>
+    </domain-config>
+</network-security-config>

package/src/app/app.component.ts

@@ -102,6 +102,7 @@ export class AppComponent implements OnInit {
   public missingConnectionToast: any
   public executedInitializeAppByWatchConnection: boolean = false;
   private isInitialized: boolean = false;
+  private hasToSoundUnservedRequestCount: boolean = false;
   private version: string;
   IS_ONLINE: boolean;
   IS_ON_MOBILE_DEVICE: boolean;
@@ -863,7 +864,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)
+    this.logger.debug('[APP-COMP] manageTabNotification can saund?', this.isInitialized, this.isSoundEnabled)
     if(this.isInitialized && this.isSoundEnabled) this.soundMessage()
   }
 
@@ -1123,6 +1124,8 @@ export class AppComponent implements OnInit {
 
     if (hasClickedLogout === true) {
       this.appStorageService.removeItem('conversations')
+      this.isInitialized = false;
+      this.hasToSoundUnservedRequestCount = false;
       // ----------------------------------------------
       // PUSH NOTIFICATIONS
       // ----------------------------------------------
@@ -1139,13 +1142,21 @@ export class AppComponent implements OnInit {
             // that.presentToast();
           }
         });
+      } else {
+        this.removePresenceAndLogout()
       }
     }
   }
 
   subscribeUnservedRequestCount = (unservedRequestCount) => {
     if(unservedRequestCount && unservedRequestCount > 0){
-      this.manageTabNotification(unservedRequestCount) //sound and alternate title
+      console.log("hasToSoundUnservedRequestCount::::", this.hasToSoundUnservedRequestCount, this.isInitialized)
+      if(this.hasToSoundUnservedRequestCount){
+        this.manageTabNotification(unservedRequestCount) //sound and alternate title
+      } else {
+        //not sound the first time
+        this.hasToSoundUnservedRequestCount = true
+      }
     }
   }
 
@@ -1228,10 +1239,10 @@ export class AppComponent implements OnInit {
     // reset timer and save conversation on storage after 2s
     clearTimeout(this.setTimeoutConversationsEvent);
     this.setTimeoutConversationsEvent = setTimeout(() => {
-      // that.logger.debug('[APP-COMP] updateConversationsOnStorage: reset timer and save conversations -> ', this.conversationsHandlerService.conversations.length)
-      // that.appStorageService.setItem('conversations', JSON.stringify(that.conversationsHandlerService.conversations))
+      that.logger.debug('[APP-COMP] updateConversationsOnStorage: reset timer and save conversations -> ', this.conversationsHandlerService.conversations.length)
+      that.appStorageService.setItem('conversations', JSON.stringify(that.conversationsHandlerService.conversations))
       that.isInitialized = true;
-    }, 2000);
+    }, 10000);
   }
 
   private initArchivedConversationsHandler(userId: string) {

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/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

@@ -237,7 +237,6 @@ export class ConversationListPage implements OnInit {
     this.logger.log('Called ionViewDidEnter')
     this.logger.log('[CONVS-LIST-PAGE] ionViewWillEnter uidConvSelected',this.uidConvSelected )
     this.listnerStart()
-    // this.conversations = this.manageStoredConversations()
     // exit from app with hardware back button
     this.subscription = this.platform.backButton.subscribe(() => {
       navigator['app'].exitApp()
@@ -349,6 +348,7 @@ export class ConversationListPage implements OnInit {
   // ------------------------------------------------------------------ //
   initConversationsHandler() {
     // this.conversations = this.manageStoredConversations()
+    // this.manageStoredConversations()
     this.conversations = this.conversationsHandlerService.conversations
     this.logger.log('[CONVS-LIST-PAGE] - CONVERSATIONS ', this.conversations.length, this.conversations)
     // save conversationHandler in chatManager
@@ -356,18 +356,19 @@ export class ConversationListPage implements OnInit {
     this.showPlaceholder = false
   }
 
-  private manageStoredConversations(): ConversationModel[] {
-    let conversationsStored = []
-    if(this.appStorageService.getItem('conversations')){
-      conversationsStored = JSON.parse(this.appStorageService.getItem('conversations'))
-      if(conversationsStored && conversationsStored.length > 0) {
-        // this.conversationsHandlerService.conversations = conversationsStored
-        this.logger.log('[CONVS-LIST-PAGE] retrive conversations from storage --> ', conversationsStored.length)
-        this.events.publish('appcompSubscribeToConvs:loadingIsActive', false);
-      }
-    }
-    return conversationsStored
-  }
+  // private manageStoredConversations() {
+  //   let conversationsStored = []
+  //   if(this.appStorageService.getItem('conversations')){
+  //     conversationsStored = JSON.parse(this.appStorageService.getItem('conversations'))
+  //     if(conversationsStored && conversationsStored.length > 0) {
+  //       // this.conversationsHandlerService.conversations = conversationsStored
+  //       this.logger.log('[CONVS-LIST-PAGE] retrive conversations from storage --> ', conversationsStored.length)
+  //       this.events.publish('appcompSubscribeToConvs:loadingIsActive', false);
+  //       this.conversations.push(...conversationsStored)
+  //     }
+  //   }
+  //   // this.conversations = this.conversationsHandlerService.conversations
+  // }
 
   initArchivedConversationsHandler() {
     const keysConversation = ['CLOSED', 'Resolve']
@@ -898,8 +899,7 @@ export class ConversationListPage implements OnInit {
       }
 
       if (conversationWith_segments.length === 4) {
-        const lastArrayElement =
-          conversationWith_segments[conversationWith_segments.length - 1]
+        const lastArrayElement = conversationWith_segments[conversationWith_segments.length - 1]
         this.logger.log('[CONVS-LIST-PAGE] - lastArrayElement ',lastArrayElement)
         this.logger.log('[CONVS-LIST-PAGE] - lastArrayElement length',lastArrayElement.length)
         // if (lastArrayElement.length !== 32) {
@@ -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() {

package/src/chat-config-native-mqtt.json

@@ -1,5 +1,5 @@
 {
-    "t2y12PruGU9wUtEGzBJfolMIgK": "CAR:T",
+    "t2y12PruGU9wUtEGzBJfolMIgK": "CAR:T-PAY:T-ANA:T-ACT:T-APP:T",
     "chatEngine": "mqtt",
     "uploadEngine": "native",
     "pushEngine":"mqtt",
@@ -25,6 +25,6 @@
     },
     "apiUrl": "https://console.native.tiledesk.com/api/",
     "baseImageUrl": "https://console.native.tiledesk.com/api/",
-    "authPersistence": "LOCAL",
-    "car":true
+    "dashboardUrl": "https://console.native.tiledesk.com/dashboard/",
+    "authPersistence": "LOCAL"
 }