@chat21/chat21-ionic 3.0.64-rc1 → 3.0.65-rc2

package/src/chat-config-pre.json

@@ -3,14 +3,7 @@
     "chatEngine": "firebase",
     "uploadEngine": "firebase",
     "pushEngine": "firebase",
-    "logLevel": "info",
-    "fileUploadAccept":"*/*",
-    "authPersistence": "LOCAL",
-    "supportMode": true,
-    "writeToButton": true,
-    "archivedButton": true,
     "firebaseConfig": {
-        "tenant": "tilechat",
         "apiKey": "AIzaSyCoWXHNvP1-qOllCpTshhC6VjPXeRTK0T4",
         "authDomain": "chat21-pre-01.firebaseapp.com",
         "databaseURL": "https://chat21-pre-01.firebaseio.com",
@@ -19,17 +12,20 @@
         "messagingSenderId": "269505353043",
         "appId": "1:269505353043:web:b82af070572669e3707da6",
         "chat21ApiUrl": "https://us-central1-chat21-pre-01.cloudfunctions.net",
-        "vapidKey": "BOsgS2ADwspKdWAmiFDZXEYqY1HSYADVfJT3j67wsySh3NxaViJqoabPJH8WM02wb5r8cQIm5TgM0UK047Z1D1c"
+        "tenant":"tilechat"
     },
     "chat21Config": {
         "appId": "tilechat",
         "MQTTendpoint": "ws://99.80.197.164:15675/ws",
-        "APIendpoint": "http://99.80.197.164:8004/api",
-        "loginServiceEndpoint": "http://99.80.197.164:/tilechat/signin"
+        "APIendpoint": "http://99.80.197.164:8004/api"
     },
     "apiUrl": "https://tiledesk-server-pre.herokuapp.com/",
     "baseImageUrl": "https://firebasestorage.googleapis.com/v0/b/",
-    "dashboardUrl": "/dashboard/",
+    "dashboardUrl": "https://support-pre.tiledesk.com/dashboard/",
+    "logLevel": "DEBUG",
+    "authPersistence": "LOCAL",
+    "supportMode": true,
+    "archivedButton": true,
+    "writeToButton": true,
     "wsUrl": "wss://tiledesk-server-pre.herokuapp.com/"
-}
-
+}

package/src/chat21-core/models/conversation.ts

@@ -17,7 +17,7 @@ export class ConversationModel {
     public status: string,
     public timestamp: number,
     public time_last_message: string,
-    public selected: boolean,
+    // public selected: boolean,
     public color: string,
     public avatar: string,
     public archived: boolean,

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

@@ -505,7 +505,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
      * @param conv
      */
     private completeConversation(conv): ConversationModel {
-        conv.selected = false;
+        // conv.selected = false;
         if (!conv.sender_fullname || conv.sender_fullname === 'undefined' || conv.sender_fullname.trim() === '') {
             conv.sender_fullname = conv.sender;
         }
@@ -532,6 +532,15 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
                 this.translateInfoSupportMessages(conv);
             }
         }
+        /** START: UPDATE CONVERSATIONS is_new IF conv is selected or sender is me */
+        if(conv.uid === this.uidConvSelected){
+            conv.is_new = false
+        }
+        if(conv.sender === this.loggedUserId){
+            conv.is_new = false
+        }
+        /** END: UPDATE CONVERSATIONS is_new IF conv is selected or sender is me */
+
         // Fixes the bug: if a snippet of code is pasted and sent it is not displayed correctly in the convesations list
         // conv.time_last_message = this.getTimeLastMessage(conv.timestamp);
         conv.conversation_with = conversation_with;

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

@@ -59,18 +59,15 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
         // 1 search local array
         // 2 search remote
         // callback
-        console.log("SEARCHING CONV:", conversationWith);
+        
         const conversation = this.conversations.find(conv => conv.conversation_with === conversationWith);
-        console.log('[MQTTConversationsHandler] getConversationDetail *****:  found locally?', conversation);
+        
         if (conversation) {
-            console.log('[MQTTConversationsHandler] getConversationDetail found LOCALLY!', conversationWith);
+            
             callback(conversation);
         } else {
-            console.log('[MQTTConversationsHandler] getConversationDetail *****: Not found locally, SEARCHING REMOTE ', conversation);
+            
             this.chat21Service.chatClient.conversationDetail(conversationWith, (err, conversation) => {
-                console.log("--REMOTE CONV IS:" + conversation);
-                console.log("--REMOTE CONV IS OBJ:", conversation);
-                console.log("--REMOTE ERR IS:" + err);
                 
                 if (conversation) {
                     if (callback) {
@@ -147,7 +144,8 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
     // ---------------------------------------------------------------------------------
      // New connect - renamed subscribeToConversation
      //----------------------------------------------------------------------------------
-     subscribeToConversations(loaded) {
+     subscribeToConversations(lastTimestamp, loaded) {
+         // lastTimestamp temporarily ignored
         this.logger.debug('[MQTTConversationsHandler] connecting MQTT conversations handler');
         const handlerConversationAdded = this.chat21Service.chatClient.onConversationAdded( (conv) => {
             this.logger.log("onConversationAdded:", conv);
@@ -385,8 +383,7 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
     }
 
     private completeConversation(conv): ConversationModel {
-        console.log("COMPLETING CONVERSATION:", conv);
-        conv.selected = false;
+        // conv.selected = false;
         if (!conv.sender_fullname || conv.sender_fullname === 'undefined' || conv.sender_fullname.trim() === '') {
             conv.sender_fullname = conv.sender;
         }
@@ -414,13 +411,19 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
             conv.last_message_text = conv.text; // building conv with a message
         }
         conv.uid = conv.conversation_with;
+        console.log("uidConvSelected is", this.uidConvSelected);
+        if (conv.uid === this.uidConvSelected) {
+            this.logger.debug("For selected conversation is_new = false");
+            conv.is_new = false;
+        }
+        if (conv.sender === this.loggedUserId) {
+            this.logger.debug("is_new always false if sender it's me")
+            conv.is_new = false;
+        }
         return conv;
     }
 
     private isGroup(conv: ConversationModel) {
-        console.log("CONVIS: " + JSON.stringify(conv));
-        console.log("CONVIS OBJ:", conv);
-        
         if (conv.recipient.startsWith('group-') || conv.recipient.startsWith('support-group')) {
             return true;
         };

package/src/chat-config-pre-test.json

@@ -1,37 +0,0 @@
-{
-    "t2y12PruGU9wUtEGzBJfolMIgK": "CAR:T-PAY:T-ANA:T-ACT:T-APP:T",
-    "chatEngine": "firebase",
-    "uploadEngine": "firebase",
-    "pushEngine": "firebase",
-    "logLevel": "info",
-    "fileUploadAccept":"*/*",
-    "authPersistence": "LOCAL",
-    "supportMode": true,
-    "writeToButton": true,
-    "archivedButton": true,
-    "firebaseConfig": {
-        "tenant": "tilechat",
-        "apiKey": "AIzaSyCoWXHNvP1-qOllCpTshhC6VjPXeRTK0T4",
-        "authDomain": "chat21-pre-01.firebaseapp.com",
-        "databaseURL": "https://chat21-pre-01.firebaseio.com",
-        "projectId": "chat21-pre-01",
-        "storageBucket": "chat21-pre-01.appspot.com",
-        "messagingSenderId": "269505353043",
-        "appId": "1:269505353043:web:b82af070572669e3707da6",
-        "chat21ApiUrl": "https://us-central1-chat21-pre-01.cloudfunctions.net",
-        "vapidKey": "BOsgS2ADwspKdWAmiFDZXEYqY1HSYADVfJT3j67wsySh3NxaViJqoabPJH8WM02wb5r8cQIm5TgM0UK047Z1D1c"
-    },
-    "chat21Config": {
-        "appId": "tilechat",
-        "MQTTendpoint": "ws://99.80.197.164:15675/ws",
-        "APIendpoint": "http://99.80.197.164:8004/api",
-        "loginServiceEndpoint": "http://99.80.197.164:/tilechat/signin"
-    },
-    "apiUrl": "https://tiledesk-server-pre.herokuapp.com/",
-    "baseImageUrl": "https://firebasestorage.googleapis.com/v0/b/",
-    "dashboardUrl": "/dashboard/",
-    "wsUrl": "wss://tiledesk-server-pre.herokuapp.com/",
-    "storage_prefix": "chat_sv5"
-}
-
-