Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

package-lock.json

@@ -2224,9 +2224,9 @@
       "integrity": "sha512-xkkmRLlFcg1dM0WfblxKwcKFjcfBQ04yWYX0ubD/n5QfQjLCCb8GbAHlorqIyt2j4PUvSAb0ERLyL89hpKlh2w=="
     },
     "@capacitor/push-notifications": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@capacitor/push-notifications/-/push-notifications-1.0.7.tgz",
-      "integrity": "sha512-vbvAptFq5cI6xKYYWMb7tsWvA88/PTG4v6ptxN0Ygtc1fQ4l/AzONQiYqdtFpbBhF2fML2kXQ/5eSAfn8HY9aw=="
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@capacitor/push-notifications/-/push-notifications-1.0.9.tgz",
+      "integrity": "sha512-NaH+drTYjOGgFMHl/2Jn1/+2rlgomtwP2NfK20E0i7+QoRze1ArcSThJ4vSF0m7VkYBsH3MgbXkWfNSSPaYrtw=="
     },
     "@capacitor/share": {
       "version": "1.0.7",

package.json

@@ -45,7 +45,7 @@
     "@capacitor/keyboard": "^1.1.2",
     "@capacitor/local-notifications": "^1.1.0",
     "@capacitor/network": "^1.0.6",
-    "@capacitor/push-notifications": "^1.0.7",
+    "@capacitor/push-notifications": "^1.0.9",
     "@capacitor/share": "^1.0.7",
     "@capacitor/storage": "^1.2.3",
     "@fortawesome/angular-fontawesome": "^0.9.0",

src/app/services/chat/room.service.ts

@@ -48,6 +48,7 @@ export class RoomService {
     private platform: Platform,
     private sqlservice: SqliteService,
     private NativeNotificationService: NativeNotificationService,
+    private sortService: SortService,
   ) {
     this.NativeNotificationService.askForPermission()
   }
@@ -90,11 +91,11 @@ export class RoomService {
 
         if(SessionStore.user.RochetChatUser != ChatMessage.u.username) {
           this.NativeNotificationService.sendNotificationChat({
-            message: message.msg, 
+            message: message.msg,
             title: this.name
           });
         }
-        
+
         // save to ionic storage
         this.storage.get('chatmsg' + this.id).then((messages: any) => {
           const newListMessages = messages.push(ChatMessage)
@@ -110,8 +111,6 @@ export class RoomService {
 
 
     this.WsChatService.receiveStreamNotifyRoom((message) => {
-      
-      console.log(message.fields)
 
       if(message.fields.eventName == this.id+'/'+'typing') {
 
@@ -167,7 +166,7 @@ export class RoomService {
 
     const lastIsTyping = this.isTyping
     if(text.length >= 1) {
-      this.isTyping = true  
+      this.isTyping = true
     } else {
       this.isTyping = false
     }
@@ -175,7 +174,7 @@ export class RoomService {
     if(lastIsTyping != this.isTyping) {
       this.WsChatService.sendStreamNotifyRoom(this.id, SessionStore.user.RochetChatUser, 'typing', this.isTyping)
     }
-    
+
 
     this.lastMessageTxt = this.message
     this.typingWatch()
@@ -187,13 +186,13 @@ export class RoomService {
       const now = new Date().getTime()
 
       if((now - this.lastTimeType) >= 2888) {
-        
+
         if(this.isTyping == true) {
           this.isTyping = false
           this.WsChatService.sendStreamNotifyRoom(this.id, SessionStore.user.RochetChatUser, 'typing', this.isTyping)
         }
       } else {
-        console.log(now - this.lastTimeType)
+        //console.log(now - this.lastTimeType)
       }
 
     }, 3000)
@@ -280,7 +279,7 @@ export class RoomService {
 
     if (this.hasLoadHistory) { return false }
 
-    this.storage.get('chatmsg' + this.id).then((messages = [])=>{
+    this.storage.get('chatmsg' + this.id).then((messages = []) => {
 
       let localMessages = []
 
@@ -296,9 +295,9 @@ export class RoomService {
 
     this.WsChatService.loadHistory(this.id, limit).then((chatHistory:chatHistory) => {
       console.log('loadHistory', chatHistory)
-      
 
       let localMessages = []
+      //const sortedRoomList = this.sortService.sortDate(chatHistory.result.messages, "_updatedAt.$date")
       chatHistory.result.messages.reverse().forEach(message => {
 
         message = this.fix_updatedAt(message)
@@ -309,9 +308,11 @@ export class RoomService {
 
       this.messages = localMessages
 
-      this.storage.set('chatmsg' + this.id, chatHistory.result.messages.reverse())
+      console.log(chatHistory.result.messages);
 
 
+      this.storage.set('chatmsg' + this.id, chatHistory.result.messages.reverse())
+
     })
 
      /*  this.WsChatService.loadHistory(this.id, limit).then(async (chatHistory: chatHistory) => {

src/app/services/chat/ws-chat-methods.service.ts

@@ -63,8 +63,8 @@ export class WsChatMethodsService {
             }, 100)
 
           }
-          
-        } 
+
+        }
 
         if(message.msg =='changed' && message.collection == "stream-notify-room") {
           if(message.fields.eventName.includes('deleteMessage')){
@@ -82,13 +82,15 @@ export class WsChatMethodsService {
     await rooms.result.update.forEach( async (roomData: room) => {
       await this.prepareRoom(roomData);
     });
-    
+
     this._dm = this.sortService.sortDate(this._dm,'_updatedAt').reverse()
     this._group = this.sortService.sortDate(this._group,'_updatedAt').reverse()
 
     this.loadingWholeList = false
   }
 
+
+
   subscribeToRoom() {
 
     for (const id in this.dm) {
@@ -119,13 +121,13 @@ export class WsChatMethodsService {
 
 
   subscribeToRoomUpdate(id, roomData) {
-    this.WsChatService.streamRoomMessages(id).then((subscription)=>{
+    this.WsChatService.streamRoomMessages(id).then((subscription)=> {
        console.log('streamRoomMessages', subscription)
     })
-    this.WsChatService.streamRoomMessages(id).then((subscription)=>{
+    this.WsChatService.streamRoomMessages(id).then((subscription) => {
       console.log('streamRoomMessages', subscription)
     })
-    this.WsChatService.streamNotifyLogged().then((subscription=>{
+    this.WsChatService.streamNotifyLogged().then((subscription=> {
       console.log('streamRoomMessages', subscription)
     }))
     this.WsChatService.streamNotifyRoomDeleteMessage(id).then((subscription)=>{
@@ -138,10 +140,10 @@ export class WsChatMethodsService {
 
   }
 
-  prepareRoom(roomData){
+  prepareRoom(roomData) {
     let room:RoomService;
 
-    room = new RoomService(this.WsChatService, new MessageService(this.storage), this.storage, this.platform, this.sqlservice, this.NativeNotificationService)
+    room = new RoomService(this.WsChatService, new MessageService(this.storage), this.storage, this.platform, this.sqlservice, this.NativeNotificationService, this.sortService)
 
     room.setData({
       customFields: roomData.customFields,
@@ -158,8 +160,6 @@ export class WsChatMethodsService {
     let roomId = this.getRoomId(roomData)
 
     if(this.isIndividual(roomData)) {
-      console.log(room);
-
       this.dm[roomId] = room
       this._dm.push(room)
       this.dmCount++

src/app/services/chat/ws-chat.service.ts

@@ -302,7 +302,7 @@ export class WsChatService {
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
         if(message.id == requestId || deepFind(message,'result.id') == requestId) { // same request send
-          resolve('')
+          resolve(message)
           return true
         }
       }})
@@ -331,7 +331,7 @@ export class WsChatService {
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
         if(message.id == requestId ) { // same request send
-          resolve('')
+          resolve(message)
           return true
         }
       }})
@@ -349,7 +349,7 @@ export class WsChatService {
         }
     }})
   }
-  
+
   loadHistory(roomId, limit: number = 50) {
 
     const requestId =  uuidv4()
@@ -517,7 +517,7 @@ updateRoomEventss(roomId, collection:string, funx: Function, ) {
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
         if(message.id == requestId || deepFind(message,'result.id') == requestId) { // same request send
-          resolve('')
+          resolve(message)
           return true
         }
       }})

src/app/services/functions/object.service.ts

@@ -8,11 +8,11 @@ export class ObjectService {
   constructor() { }
 
 
-  deepFind(obj, path) {
+  deepFind(obj, path):any {
     var paths = path.split('.')
       , current = obj
       , i;
-  
+
     for (i = 0; i < paths.length; ++i) {
       if (current[paths[i]] == undefined) {
         return undefined;

src/app/shared/chat/messages/messages.page.ts

@@ -283,7 +283,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   changeInput() {
     this.wsChatMethodsService.getDmRoom(this.roomId).typing()
   }
-  
+
   async openViewDocumentModal(file: any) {
     let task = {
       serialNumber: '',