@chat21/chat21-ionic 3.0.90-rc.2 → 3.0.90-rc.4

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

@@ -99,7 +99,10 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         }
         this.chat21Service.chatClient.lastMessages(this.conversationWith, (err, messages) => {
             if (!err) {
-                messages.forEach(msg => {
+                messages.forEach(message => {
+                    const msg: MessageModel = message;        
+                    msg.uid = message.message_id;
+
                     this.addedMessage(msg);
                 });
             }
@@ -107,7 +110,10 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         const handler_message_added = this.chat21Service.chatClient.onMessageAddedInConversation(
             this.conversationWith, (message, topic) => {
                 this.logger.log('[MQTTConversationHandler] message added:', message, 'on topic:', topic);
-                this.addedMessage(message);
+                const msg: MessageModel = message;        
+                msg.uid = message.message_id;
+
+                this.addedMessage(msg);
         });
         const handler_message_updated = this.chat21Service.chatClient.onMessageUpdatedInConversation(
             this.conversationWith,  (message, topic) => {
@@ -231,20 +237,14 @@ export class MQTTConversationHandler extends ConversationHandlerService {
     /** */
     private addedMessage(messageSnapshot: any) {
         const msg = this.messageGenerate(messageSnapshot);
-        msg.uid = msg.message_id;
+        
         if(this.skipInfoMessage && messageType(MESSAGE_TYPE_INFO, msg)){
             return;
         }
         if(!this.skipInfoMessage && messageType(MESSAGE_TYPE_INFO, msg)){
             this.messageInfo.next(msg)
         }
-        // imposto il giorno del messaggio per visualizzare o nascondere l'header data
-        msg.headerDate = null;
-        const headerDate = setHeaderDate(this.translationMap, msg.timestamp);
-        if (headerDate !== this.lastDate) {
-            this.lastDate = headerDate;
-            msg.headerDate = headerDate;
-        }
+
         this.logger.log('[MQTTConversationHandler] adding message:' + JSON.stringify(msg));
         // this.logger.log('childSnapshot.message_id:' + msg.message_id);
         // this.logger.log('childSnapshot.key:' + msg.key);
@@ -287,7 +287,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         // const msg: MessageModel = childSnapshot.val();
         this.logger.log("[MQTTConversationHandler] childSnapshot >" + JSON.stringify(childSnapshot));
         const msg = childSnapshot;
-        msg.uid = childSnapshot.key;
+        // msg.uid = childSnapshot.key;
         msg.text = msg.text.trim() //remove black msg with only spaces
         // controllo fatto per i gruppi da rifattorizzare
         if (!msg.sender_fullname || msg.sender_fullname === 'undefined') {
@@ -301,10 +301,8 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         this.logger.log("[MQTTConversationHandler] ****>msg.sender:" + msg.sender);
         msg.isSender = this.isSender(msg.sender, this.loggedUser.uid);
         // traduco messaggi se sono del server
-        if (msg.attributes && msg.attributes.subtype) {
-            if (msg.attributes.subtype === 'info' || msg.attributes.subtype === 'info/support') {
-                this.translateInfoSupportMessages(msg);
-            }
+        if (messageType(MESSAGE_TYPE_INFO, msg)) {
+            this.translateInfoSupportMessages(msg);
         }
         return msg;
     }

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

@@ -61,7 +61,6 @@ 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_DATE = 'DATE';
 
 export const CHAT_REOPENED = 'CHAT_REOPENED';
 export const CHAT_CLOSED = 'CHAT_CLOSED';

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

@@ -2,7 +2,6 @@ import {
   MESSAGE_TYPE_INFO,
   MESSAGE_TYPE_MINE,
   MESSAGE_TYPE_OTHERS,
-  MESSAGE_TYPE_DATE,
   MAX_WIDTH_IMAGES,
   CHANNEL_TYPE_GROUP,
   TYPE_SUPPORT_GROUP
@@ -65,12 +64,7 @@ export function isMine(message: any) {
 
 /** */
 export function messageType(msgType: string, message: any) {
-  if (msgType === MESSAGE_TYPE_DATE) {
-    if (message.headerDate && message.headerDate !== '') {
-      return true;
-    }
-    return false;
-  }
+  
   if (msgType === MESSAGE_TYPE_INFO) {
     return isInfo(message);
   }

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

@@ -187,6 +187,9 @@ export function setHeaderDate_old(translate, timestamp, lastDate?): string {
   }
 }
 
+/**
+ * @deprecated
+ */
 export function setHeaderDate(translate, timestamp): string {
   // const LABEL_TODAY = translate.get('LABEL_TODAY');
   // const LABEL_TOMORROW = translate.get('LABEL_TOMORROW');

package/src/global.scss

@@ -748,6 +748,17 @@ ul.dropdown-menu > li > a {
 //MODALS
 .modal-wrapper{
     border-radius: 16px !important;
+
+}
+
+.json-modal-class .modal-wrapper{
+    --height: 90%;
+    --width: 70%;
+    span.key{ color: red; }
+    span.number { color:#6eb4bc; }
+    span.boolean { color:#a693e0; }
+    span.null { color:#e09393; }
+    span.key { color: #a9d18f; }
 }
 
 
@@ -760,3 +771,10 @@ ul.dropdown-menu > li > a {
     }
 }
 
+
+//POPOVER
+.info-popover{
+    .popover-content{ 
+        width: 250px; 
+    }
+}

package/src/variables.scss

@@ -50,4 +50,6 @@ body {
     --sidebar-width: 60px;
     --nav-bar-heigth: 60px;
 
+    --icon-color: rgb(135, 150, 175)
+
 }