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

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # chat21-ionic ver 3.0
 
-### 3.0.65-rc.1 - LATEST
+
+### 3.0.65-rc2 - LATEST
+- changed: behaviour of is_new of a conversation (not update 'is_new' conversation property if conv is the selected one or if sender is me)
+
+### 3.0.65-rc1 - LATEST
 - added: improves chat performance by caching conversations
 - added: Displays balloon messages with a light orange background for "internal notes" type message
 - added: the html component

package/deploy_prod.sh

@@ -8,7 +8,7 @@ echo 'URL_VER: ---->'$URL_VER
 if [ "$version" != "" ]; then
     git tag -a "$version" -m "`git log -1 --format=%s`"
     echo "Created a new tag, $version"
-    git push --tags
+    git push remoteTiledesk--tags
     npm publish
 fi
 

package/package.json

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

package/src/app/components/conversation-detail/header-conversation-detail/header-conversation-detail.component.html

@@ -1,8 +1,8 @@
 <ion-header no-border class="ion-no-border">
   <ion-toolbar style="height:60px">
-    <ion-buttons slot="start" style="height:60px">
+    <ion-buttons slot="start" style="height:60px" *ngIf="isMobile">
       <!-- (click)="pushPage('conversations-list')" defaultHref="/conversations-list" -->
-      <ion-back-button style="display: block;" text="" *ngIf="isMobile" (click)="goBackToConversationList()">
+      <ion-back-button style="display: block;" text=""  (click)="goBackToConversationList()">
       </ion-back-button>
     </ion-buttons>
 
@@ -12,7 +12,9 @@
         <!-- [ngStyle] = "{ 'left': platformName === 'ios' ? '55px' : ''  }" -->
         <div *ngIf="conversationAvatar" class="avatar-container" (click)="onOpenCloseInfoConversation()" style="cursor: pointer"
           [ngClass]="{ 'avatar-container-ios': platformName === 'ios' }">
-          <app-avatar-profile [itemAvatar]=conversationAvatar></app-avatar-profile>
+          <app-avatar-profile 
+            [itemAvatar]=conversationAvatar>
+          </app-avatar-profile>
         </div>
         <!-- [ngStyle] = "{ 'left': platformName === 'ios' ? '63px' : ''  }" -->
         <div *ngIf="isDirect" class="user-presence" [ngClass]="{ 'user-presence-ios': platformName === 'ios' }">

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

@@ -327,10 +327,10 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         this.logger.log('[CONVS-DETAIL] subscribe to  BSConversationsChange showButtonToBottom ', this.showButtonToBottom)
         // UPDATE THE CONVERSATION TO 'READ' IF IT IS ME WHO WRITES THE LAST MESSAGE OF THE CONVERSATION
         // AND IF THE POSITION OF THE SCROLL IS AT THE END
-        if (!this.showButtonToBottom && conv.is_new) {
-          // ARE AT THE END
-          this.updateConversationBadge()
-        }
+        // if (!this.showButtonToBottom && conv.is_new) {
+        //   // ARE AT THE END
+        //   this.updateConversationBadge()
+        // }
         if(conv.uid && conv.uid === this.conversationWith){
           this.conversationAvatar = setConversationAvatar(conv.conversation_with,conv.conversation_with_fullname,conv.channel_type)
         }

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

@@ -648,8 +648,10 @@ export class ConversationListPage implements OnInit {
       let conversationSelected
       if (conversationType === 'active') {
         conversationSelected = this.conversations.find((item) => item.uid === this.uidConvSelected)
+        this.conversationsHandlerService.uidConvSelected = conversationSelected.uid
       } else if (conversationType === 'archived') { 
         conversationSelected = this.archivedConversations.find((item) => item.uid === this.uidConvSelected) 
+        this.archivedConversationsHandlerService.uidConvSelected = conversationSelected.uid
       }
       if (conversationSelected) {
         this.logger.log('[CONVS-LIST-PAGE] conversationSelected', conversationSelected)
@@ -664,10 +666,12 @@ export class ConversationListPage implements OnInit {
     this.logger.log('onConversationSelected conversation', conversation)
     if (conversation.archived) {
       this.navigateByUrl('archived', conversation.uid)
+      this.archivedConversationsHandlerService.uidConvSelected = conversation.uid
       this.logger.log('[CONVS-LIST-PAGE] onConversationSelected archived conversation.uid ', conversation.uid,
       )
     } else {
       this.navigateByUrl('active', conversation.uid)
+      this.conversationsHandlerService.uidConvSelected = conversation.uid
       this.logger.log('[CONVS-LIST-PAGE] onConversationSelected active conversation.uid ', conversation.uid)
     }
   }

package/src/assets/js/chat21client.js

@@ -1,14 +1,14 @@
 /*
     Chat21Client
 
-    v0.1.10
+    v0.1.11
 
     @Author Andrea Sponziello
     (c) Tiledesk 2020
 */
 
-// let mqtt = require('mqtt');
-// let axios = require('axios');
+//let mqtt = require('mqtt');
+//let axios = require('axios');
 
 const _CLIENTADDED = "/clientadded"
 const _CLIENTUPDATED = "/clientupdated"
@@ -141,7 +141,7 @@ class Chat21Client {
         const payload = JSON.stringify(outgoing_message)
         this.client.publish(dest_topic, payload, null, (err) => {
             callback(err, outgoing_message)
-        })
+        });
     }
 
     updateMessageStatus(messageId, conversWith, status, callback) {
@@ -236,10 +236,6 @@ class Chat21Client {
                 group_members: members
             },
             method: 'POST'
-            // url: options.url,
-        // headers: options.headers,
-        // json: options.json,
-        // method: options.method
         }
         Chat21Client.myrequest(options, (err, response, json) => {
             if (err) {
@@ -249,23 +245,6 @@ class Chat21Client {
                 callback(null, json);
             }
         }, this.log);
-        // var xmlhttp = new XMLHttpRequest();
-        // xmlhttp.open("POST", URL, true);
-        // xmlhttp.setRequestHeader("authorization", this.jwt);
-        // xmlhttp.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
-        // xmlhttp.onreadystatechange = function() {
-        //     if (callback && xmlhttp.readyState == 4 && xmlhttp.status == 200 && xmlhttp.responseText) {
-        //         try {
-        //             const json = JSON.parse(xmlhttp.responseText)
-        //             callback(null, json.result)
-        //         }
-        //         catch (err) {
-        //             console.log("parsing json ERROR", err)
-        //             callback(err, null)
-        //         }
-        //     }
-        // };
-        // xmlhttp.send(JSON.stringify(data));
     }
 
     groupData(group_id, callback) {
@@ -590,7 +569,7 @@ class Chat21Client {
                         }
                         // map.forEach((value, key, map) =>)
                         this.onConversationUpdatedCallbacks.forEach((callback, handler, map) => {
-                            callback(JSON.parse(message.toString()), topic)
+                            callback(JSON.parse(message.toString()), _topic)
                         });
                     }
                 }
@@ -602,7 +581,7 @@ class Chat21Client {
                             console.log("conversation deleted! /conversations/, topic:", topic, message.toString() );
                         }
                         this.onConversationDeletedCallbacks.forEach((callback, handler, map) => {
-                            callback(JSON.parse(message.toString()), topic)
+                            callback(JSON.parse(message.toString()), _topic)
                         });
                     }
                 }
@@ -611,7 +590,7 @@ class Chat21Client {
                     if (topic.includes("/archived_conversations/") && topic.endsWith(_CLIENTADDED)) {
                         // map.forEach((value, key, map) =>)
                         this.onArchivedConversationAddedCallbacks.forEach((callback, handler, map) => {
-                            callback(JSON.parse(message.toString()), topic)
+                            callback(JSON.parse(message.toString()), _topic)
                         });
                     }
                 }
@@ -620,7 +599,7 @@ class Chat21Client {
                     if (topic.includes("/archived_conversations/") && topic.endsWith(_CLIENTDELETED)) {
                         // map.forEach((value, key, map) =>)
                         this.onArchivedConversationDeletedCallbacks.forEach((callback, handler, map) => {
-                            callback(JSON.parse(message.toString()), topic)
+                            callback(JSON.parse(message.toString()), _topic)
                         });
                     }
                 }
@@ -720,20 +699,20 @@ class Chat21Client {
     }
 
     parseTopic(topic) {
-        var topic_parts = topic.split("/")
+        var topic_parts = topic.split("/");
         // /apps/tilechat/users/(ME)/messages/RECIPIENT_ID/ACTION
         if (topic_parts.length >= 7) {
-            const app_id = topic_parts[1]
-            const sender_id = topic_parts[3]
-            const recipient_id = topic_parts[5]
-            const convers_with = recipient_id
-            const me = sender_id
+            const app_id = topic_parts[1];
+            const sender_id = topic_parts[3];
+            const recipient_id = topic_parts[5];
+            const convers_with = recipient_id;
+            const me = sender_id;
             const parsed = {
                 "conversWith": convers_with
             }
-            return parsed
+            return parsed;
         }
-        return null
+        return null;
     }
 
     lastArchivedConversations(callback) {
@@ -801,27 +780,46 @@ class Chat21Client {
         const URL = `${this.APIendpoint}/${this.appid}/${this.user_id}/${path}/${conversWith}`
         console.log("getting conversation detail:", URL)
         console.log("conversWith:", conversWith)
-        var xmlhttp = new XMLHttpRequest();
-        xmlhttp.open("GET", URL, true);
-        xmlhttp.setRequestHeader("authorization", this.jwt);
-        xmlhttp.onreadystatechange = function() {
-            if (callback && xmlhttp.readyState == 4 && xmlhttp.status == 200 && xmlhttp.responseText) {
-                try {
-                    const json = JSON.parse(xmlhttp.responseText);
-                    if (json && json.result && Array.isArray(json.result) && json.result.length ==1) {
-                        callback(null, json.result[0]);
-                    }
-                    else {
-                        callback({"message": "Incorrect conversation result."}, null);
-                    }
-                }
-                catch (err) {
-                    console.error("parsing json ERROR", err);
-                    callback(err, null);
-                }
+        
+        let options = {
+            url: URL,
+            headers: {
+                "Authorization": this.jwt
+                // "Content-Type": "application/json;charset=UTF-8"
+            },
+            method: 'GET'
+        }
+        Chat21Client.myrequest(options, (err, response, json) => {
+            console.log("JSON...", json)
+            if (json && json.result && Array.isArray(json.result) && json.result.length ==1) {
+                callback(null, json.result[0]);
             }
-        };
-        xmlhttp.send(null);
+            else {
+                callback(null, null);
+            }
+        }, this.log);
+        
+        // var xmlhttp = new XMLHttpRequest();
+        // xmlhttp.open("GET", URL, true);
+        // xmlhttp.setRequestHeader("authorization", this.jwt);
+        // xmlhttp.onreadystatechange = function() {
+        //     if (callback && xmlhttp.readyState == 4 && xmlhttp.status == 200 && xmlhttp.responseText) {
+        //         try {
+        //             const json = JSON.parse(xmlhttp.responseText);
+        //             if (json && json.result && Array.isArray(json.result) && json.result.length ==1) {
+        //                 callback(null, json.result[0]);
+        //             }
+        //             else {
+        //                 callback({"message": "Incorrect conversation result."}, null);
+        //             }
+        //         }
+        //         catch (err) {
+        //             console.error("parsing json ERROR", err);
+        //             callback(err, null);
+        //         }
+        //     }
+        // };
+        // xmlhttp.send(null);
     }
 
     lastMessages(convers_with, callback) {
@@ -1033,8 +1031,8 @@ class Chat21Client {
 
 function isBrowser() {
     return true;
-    // return false;
+    //return false;
 }
 
 export { Chat21Client }; // Browser
-// module.exports = { Chat21Client };
+//module.exports = { Chat21Client };

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;
         };