@chat21/chat21-ionic 3.0.107-rc.1 → 3.0.107-rc.2

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # chat21-ionic ver 3.0
 
+### 3.0.107.rc.2
+- added: moved eventTrigger method from conversation-deatil and conversation-list pages to app.component.ts
+
 ### 3.0.107.rc.1
 - added: globals and globals-settings services to manage env and option variables globally
 - added: eventTrigger service to expose custom chat event to parent chat-iframe container

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@chat21/chat21-ionic",
     "author": "Tiledesk SRL",
-    "version": "3.0.107-rc.1",
+    "version": "3.0.107-rc.2",
     "license": "MIT License",
     "homepage": "https://tiledesk.com/",
     "repository": {

package/src/app/app.component.ts

@@ -8,7 +8,7 @@ import { Subscription } from 'rxjs';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 import { WebSocketJs } from './services/websocket/websocket-js';
-import { checkPlatformIsMobile, getParameterByName, isOnMobileDevice } from 'src/chat21-core/utils/utils';
+import { checkPlatformIsMobile, getDateDifference, getParameterByName, isOnMobileDevice } from 'src/chat21-core/utils/utils';
 import { EventsService } from './services/events-service';
 import { NavProxyService } from './services/nav-proxy.service';
 import { TiledeskAuthService } from 'src/chat21-core/providers/tiledesk/tiledesk-auth.service';
@@ -40,6 +40,7 @@ import { Deeplinks } from '@ionic-native/deeplinks/ngx';
 import { TriggerEvents } from './services/triggerEvents/triggerEvents';
 import { Globals } from './utils/globals';
 import { GlobalSettingsService } from './services/global-settings/global-settings.service';
+import { commandToMessage, conversationToMessage, isSender } from 'src/chat21-core/utils/utils-message';
 
 @Component({
   selector: 'app-root',
@@ -738,7 +739,7 @@ export class AppComponent implements OnInit {
           }
         }, 1000)
       }else{
-        this.goToDashboardLogin()
+        // this.goToDashboardLogin()
       }
     }
   }
@@ -1006,8 +1007,9 @@ export class AppComponent implements OnInit {
     this.events.subscribe('convList:onConversationSelected', this.subscribeConversationSelected)
     this.conversationsHandlerService.conversationAdded.subscribe((conversation: ConversationModel) => {
       this.logger.log('[APP-COMP] ***** subscribeConversationAdded *****', conversation);
-      if (conversation && conversation.is_new === true) {
+      if (conversation && conversation.is_new === true && this.isInitialized) {
         this.manageTabNotification('conv_added', conversation.sound)
+        this.manageEventNewConversation(conversation)
       }
       if(conversation) this.updateConversationsOnStorage()
     });
@@ -1015,7 +1017,6 @@ export class AppComponent implements OnInit {
     this.conversationsHandlerService.conversationChanged.subscribe((conversation: ConversationModel) => {
       // console.log('[APP-COMP] ***** subscribeConversationChanged conversation: ', conversation);
       if(conversation)  this.updateConversationsOnStorage();
-      const currentUser = this.tiledeskAuthService.getCurrentUser()
     });
 
     this.conversationsHandlerService.conversationChangedDetailed.subscribe((changes: {value: ConversationModel, previousValue: ConversationModel}) => {
@@ -1030,6 +1031,7 @@ export class AppComponent implements OnInit {
             this.manageTabNotification('new_message', true);
           }
         }
+        this.manageEventNewMessage(changes.value)
       }
     });
 
@@ -1512,6 +1514,23 @@ export class AppComponent implements OnInit {
   }
 
 
+  private manageEventNewMessage(conversation: ConversationModel){
+    const currentUser = this.tiledeskAuthService.getCurrentUser();
+    let message = conversationToMessage(conversation, currentUser.uid)
+    let duration = getDateDifference(message.timestamp, Date.now())
+    if(duration.minutes > 1) return;
+    if(message.isSender){
+      this.triggerEvents.triggerAfterSendMessageEvent(message)
+    }else if(!message.isSender){
+      this.triggerEvents.triggerAfterMessageReceived(message)
+    }
+  }
+
+  private manageEventNewConversation(conversation){
+    this.triggerEvents.triggerOnNewConversationInit(conversation)
+  }
+
+
   @HostListener('document:visibilitychange', [])
   visibilitychange() {
     // this.logger.debug("document TITLE", document.hidden, document.title);

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

@@ -243,7 +243,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     private webSocketService: WebsocketService,
     private sanitizer: DomSanitizer,
     private g: Globals,
-    private triggerEvents: TriggerEvents
   ) {
     // Change list on date change
     this.route.paramMap.subscribe((params) => {
@@ -1180,7 +1179,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         this.logger.log('[CONVS-DETAIL] subscribe to messageAdded - msg ', msg)
         if (msg) {
           that.newMessageAdded(msg)
-          that.manageEvent(msg)
           // this.setHeaderContent()
         }
       })
@@ -1336,14 +1334,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     }
   }
 
-  manageEvent(msg: MessageModel){
-    if(msg.isSender){
-      this.triggerEvents.triggerAfterSendMessageEvent(msg)
-    }else if(!msg.isSender){
-      this.triggerEvents.triggerAfterMessageReceived(msg)
-    }
-  }
-
   // ----------------------------------------------------------------
   // @ Unsubscribe all subscribed events (called in ionViewWillLeave)
   // ----------------------------------------------------------------

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

@@ -19,6 +19,7 @@ import {
   convertMessage,
   isGroup,
   getParameterValue,
+  getDateDifference,
 } from '../../../chat21-core/utils/utils'
 
 import { EventsService } from '../../services/events-service'
@@ -50,6 +51,7 @@ import { getProjectIdSelectedConversation } from 'src/chat21-core/utils/utils-me
 import { WebsocketService } from 'src/app/services/websocket/websocket.service';
 import { Globals } from 'src/app/utils/globals';
 import { TriggerEvents } from 'src/app/services/triggerEvents/triggerEvents';
+import { MessageModel } from 'src/chat21-core/models/message';
 
 @Component({
   selector: 'app-conversations-list',
@@ -129,7 +131,6 @@ export class ConversationListPage implements OnInit {
     public platform: Platform,
     public wsService: WebsocketService,
     private g: Globals,
-    private triggerEvents: TriggerEvents
   ) {
     this.checkPlatform();
     this.translations();
@@ -572,7 +573,6 @@ export class ConversationListPage implements OnInit {
         if (conversation) {
           this.onImageLoaded(conversation)
           this.onConversationLoaded(conversation)
-          conversation.is_new && this.isInitialized? this.manageEvent(conversation) : null
           // conversation.is_new && this.isInitialized? this.segmentNewConversationAdded(conversation) : null;
         }
     })
@@ -647,10 +647,6 @@ export class ConversationListPage implements OnInit {
     // }
   }
 
-  manageEvent(conversation){
-    this.triggerEvents.triggerOnNewConversationInit(conversation)
-  }
-
   // ------------------------------------------------------------------//
   // END SUBSCRIPTIONS
   // ------------------------------------------------------------------//