@chat21/chat21-ionic 3.0.58 → 3.0.59-rc4

package/src/app/services/websocket/websocket.service.ts

@@ -0,0 +1,274 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+import { WebSocketJs } from "./websocket-js";
+import { AppConfigProvider } from '../app-config';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { map } from 'rxjs/operators';
+import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
+import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class WebsocketService {
+  private apiUrl: string;
+  public currentProjectUserAvailability$: BehaviorSubject<[]> = new BehaviorSubject<[]>([])
+
+  wsService: WebSocketJs;
+  wsRequestsList: any;
+  public wsRequestsList$: BehaviorSubject<Request[]> = new BehaviorSubject<Request[]>([]);
+
+  private logger: LoggerService = LoggerInstance.getInstance();
+
+  constructor(
+    public webSocketJs: WebSocketJs,
+    public http: HttpClient,
+    public appConfigProvider: AppConfigProvider
+
+  ) {
+    this.apiUrl = appConfigProvider.getConfig().apiUrl;
+    // SERVER_BASE_URL: 'https://tiledesk-server-pre.herokuapp.com/'
+    // CHAT IONIC API URL https://tiledesk-server-pre.herokuapp.com/"
+  }
+
+
+  subscriptionToWsCurrentProjectUserAvailability(projectid, prjctuserid) {
+    var self = this;
+    const path = '/' + projectid + '/project_users/' + prjctuserid
+    this.logger.log('[WS-SERV] - SUBSCR (REF) TO WS CURRENT USERS PATH: ', path);
+
+    return new Promise(function (resolve, reject) {
+
+      self.webSocketJs.ref(path, 'subscriptionToWsCurrentUser_allProject',
+        function (data, notification) {
+          // console.log("[WS-SERV] SUBSCR TO WS CURRENT PROJECT-USER AVAILABILITY - CREATE - data ", data);
+          resolve(data)
+          // self.currentUserWsAvailability$.next(data.user_available);
+          self.currentProjectUserAvailability$.next(data)
+
+        }, function (data, notification) {
+          resolve(data)
+          // console.log("[WS-SERV] SUBSCR TO WS CURRENT PROJECT-USER AVAILABILITY - UPDATE - data ", data);
+          self.currentProjectUserAvailability$.next(data)
+
+        }, function (data, notification) {
+          resolve(data)
+          if (data) {
+            // console.log("[WS-SERV] SUBSCR TO WS CURRENT PROJECT-USER AVAILABILITY - UPDATE - data", data);
+          }
+        });
+
+    })
+  }
+
+  public updateCurrentUserAvailability(token: string, projectId: string, user_is_available: boolean) {
+    const httpOptions = {
+      headers: new HttpHeaders({
+        'Accept': 'application/json',
+        'Content-Type': 'application/json',
+        Authorization: token
+      })
+    };
+
+    const body = { 'user_available': user_is_available };
+
+    const url = this.apiUrl + projectId + '/project_users/';
+
+    this.logger.log('[WS-SERV] - UPDATE CURRENT PROJECT-USER AVAILABILITY (PUT) URL ', url);
+    return this.http
+      .put(url, body, httpOptions)
+      .pipe(map((res: any) => {
+        this.logger.log('[WS-SERV] - UPDATE CURRENT PROJECT-USER AVAILABILITY (PUT) ', res);
+        return res
+      }))
+  }
+
+  subscriptionToWsConversations(project_id) {
+    this.logger.log("[WS-SERV] - CALLED SUBSC TO WS CONVS - PROJECT ID ", project_id);
+    var self = this;
+    this.wsRequestsList = [];
+
+    this.webSocketJs.ref('/' + project_id + '/requests', 'getCurrentProjectAndSubscribeTo_WsRequests',
+
+      function (data, notification) {
+        // self.logger.log("[WS-SERV] - CONVS - CREATE DATA ", data);
+        if (data) {
+          // ------------------------------------------------
+          // @ Agents - pass in data agents get from snapshot
+          // ------------------------------------------------
+          if (data.snapshot && data.snapshot.agents) {
+
+            data.agents = data['snapshot']["agents"]
+          } else if (data.agents) {
+            // ---------------------------------------------------------------
+            // @ Agents - else (if exist agents in data) pass agents from data
+            // ---------------------------------------------------------------
+            data.agents = data.agents
+          }
+
+          // ---------------------------------------------
+          // @ Lead - pass in data lead get from snapshot
+          // ----------------------------------------------
+          if (data.snapshot && data.snapshot.lead) {
+
+            data.lead = data['snapshot']["lead"];
+
+          } else {
+            // ---------------------------------------------------------------------
+            // @ Lead - else (if exist lead in attributes) pass lead from attributes
+            // ---------------------------------------------------------------------
+            if (data['attributes'] && data['attributes'] !== undefined) {
+
+              if (data['attributes']['userFullname'] && data['attributes']['userEmail'] && data['attributes']['requester_id']) {
+                data.lead = { 'fullname': data['attributes']['userFullname'], 'email': data['attributes']['userEmail'], 'lead_id': data['attributes']['requester_id'] }
+              }
+              // ---------------------------------------------------------
+              // @ Lead - else (if exist lead in data) pass lead from data
+              // ---------------------------------------------------------
+              else if (data.lead) {
+                data.lead = data.lead
+              }
+            } else if (data.lead) {
+              data.lead = data.lead;
+            }
+          }
+
+          // -----------------------------------------------------
+          // @ Requester pass in data requester get from snapshot
+          // -----------------------------------------------------
+          if (data.snapshot && data.snapshot.requester) {
+
+            data.requester = data['snapshot']["requester"]
+
+          } else if (data.requester) {
+            // ---------------------------------------------------------------------
+            // @ Lead - else (if exist requester in data) pass requester from data
+            // ---------------------------------------------------------------------
+            data.requester = data.requester
+          }
+
+          // ------------------------------------------------------
+          // @ Department pass in data department get from snapshot
+          // ------------------------------------------------------
+          if (data.snapshot && data.snapshot.department) {
+
+            data.department = data['snapshot']["department"]
+
+          } else if (data.department) {
+            // ----------------------------------------------------------------------------
+            // @ Department - else (if exist department in data) pass department from data
+            // ----------------------------------------------------------------------------
+            data.department = data.department
+          }
+        }
+
+        // https://stackoverflow.com/questions/36719477/array-push-and-unique-items
+        const index = self.wsRequestsList.findIndex((e) => e.id === data.id);
+
+        if (index === -1) {
+          self.addWsRequests(data)
+          // self.logger.log("[WS-REQUESTS-SERV] - CREATE - ADD REQUESTS");
+        } else {
+          // self.logger.log("[WS-REQUESTS-SERV] - CREATE - REQUEST ALREADY EXIST - NOT ADD");
+        }
+
+      }, function (data, notification) {
+
+        // self.logger.log("[WS-SERV] - CONVS - UPDATE DATA ", data);
+
+        // -------------------------------------------------------
+        // @ Agents (UPDATE) pass in data agents get from snapshot
+        // -------------------------------------------------------
+        if (data.snapshot && data.snapshot.agents) {
+          data.agents = data['snapshot']["agents"]
+        } else if (data.agents) {
+          // ---------------------------------------------------------------
+          // @ Agents - else (if exist agents in data) pass agents from data
+          // ---------------------------------------------------------------
+          data.agents = data.agents
+        }
+        self.updateWsRequests(data)
+
+
+      }, function (data, notification) {
+        // self.logger.log("[WS-SERV] - CONVS  - ON-DATA - DATA ", data);
+
+      }
+    );
+  }
+
+  /**
+  * REQUESTS publish @ the CREATE
+  * 
+  * @param request 
+  */
+  addWsRequests(request: Request) {
+    if (request !== null && request !== undefined) {
+      this.wsRequestsList.push(request);
+    }
+
+    if (this.wsRequestsList) {
+      // -----------------------------------------------------------------------------------------------------
+      // publish all REQUESTS 
+      // -----------------------------------------------------------------------------------------------------
+        this.wsRequestsList$.next(this.wsRequestsList);
+    }
+  }
+
+  /**
+  * REQUESTS - publish @ the UPDATE
+  * overwrite the request in the requests-list with the upcoming request if the id is the same
+  * remove the request from the requests-list if the status is === 1000 (i.e. archived request)
+  * 
+  * @param request 
+  */
+  updateWsRequests(request: any) {
+
+    // QUANDO UNA RICHIESTA VIENE EMESSA CON preflight = true non passa dal ON CREATE
+    // sull ON UPDATE VENGONO AGGIORNATE SOLO LE RICHIESTE CHE VERIFICANO LA condizione request._id === this.wsRequestsList[i]._id
+    // PER PUBBLICARE LE RICHIESTE CHE LA CUI PROPRIETà preflight = true E AGGIORNATA A FALSE (E CHE QUINDI è DA VISUALIZZARE) CERCO
+    // L'ESISTENZA DELL'ID NELLA wsRequestsList
+    // const hasFound = this.wsRequestsList.filter((obj: any) => {
+    //   return obj._id === request._id;
+    // });
+    // this.logger.log("% »»» WebSocketJs WF +++++ ws-requests--- service ON-UPATE hasFound IN wsRequestsList: ", hasFound , 'THE REQUEST ID', request._id);
+
+    const index = this.wsRequestsList.findIndex((e) => e.id === request.id);
+    if (index === -1) {
+
+      this.wsRequestsList.push(request);
+      this.wsRequestsList$.next(this.wsRequestsList);
+
+    } else {
+      this.logger.log("[WS-SERV] - ON-UPATE - THE CONV NOT EXIST ");
+    }
+
+
+    for (let i = 0; i < this.wsRequestsList.length; i++) {
+      if (request._id === this.wsRequestsList[i]._id) {
+
+        if (request.status !== 1000) {
+
+          // --------------------------
+          // UPATE AN EXISTING REQUESTS
+          // --------------------------
+          this.logger.log("[WS-SERV] - UPDATE AN EXISTING CONV ");
+
+          this.wsRequestsList[i] = request
+
+        } else if (request.status === 1000) {
+
+          this.wsRequestsList.splice(i, 1);
+
+        }
+
+        if (this.wsRequestsList) {
+          this.wsRequestsList$.next(this.wsRequestsList);
+          this.logger.log("[WS-SERV] -  ON-UPATE CONVS LIST ", this.wsRequestsList);
+        }
+      }
+    }
+  }
+
+
+}

package/src/app/shared/shared.module.ts

@@ -17,6 +17,7 @@ import { IonicModule } from '@ionic/angular';
 
 import { AvatarProfileComponent } from 'src/app/components/utils/avatar-profile/avatar-profile.component';
 import { DdpHeaderComponent } from 'src/app/components/ddp-header/ddp-header.component';
+
 import { UserPresenceComponent } from 'src/app/components/utils/user-presence/user-presence.component';
 import { UserTypingComponent } from 'src/chat21-core/utils/user-typing/user-typing.component';
 import { ListConversationsComponent } from '../chatlib/list-conversations-component/list-conversations/list-conversations.component';
@@ -37,6 +38,8 @@ import { InfoGroupComponent } from '../components/conversation-info/info-group/i
 import { TooltipModule } from 'ng2-tooltip-directive';
 import { OptionHeaderComponent } from '../components/conversation-detail/option-header/option-header.component';
 import { MessageAttachmentComponent } from '../chatlib/conversation-detail/message/message-attachment/message-attachment.component';
+import { ImageViewerComponent } from '../components/image-viewer/image-viewer.component';
+import { ProjectItemComponent } from '../components/project-item/project-item.component';
 
 @NgModule({
   declarations: [
@@ -46,7 +49,8 @@ import { MessageAttachmentComponent } from '../chatlib/conversation-detail/messa
     UserTypingComponent,
     ListConversationsComponent,
     IonListConversationsComponent,
-
+    ImageViewerComponent,
+    ProjectItemComponent,
     IonConversationDetailComponent,
     ConversationContentComponent,
     AvatarComponent,
@@ -79,6 +83,8 @@ import { MessageAttachmentComponent } from '../chatlib/conversation-detail/messa
     AutofocusDirective,
     AvatarProfileComponent,
     DdpHeaderComponent,
+    ImageViewerComponent,
+    ProjectItemComponent,
     UserPresenceComponent,
     UserTypingComponent,
     ListConversationsComponent,

package/src/assets/i18n/en.json

@@ -179,5 +179,12 @@
   "CONTACT_ID": "Contact ID",
   "USER_ID": "User ID",
   "CLOSE_TOAST": "Close",
-  "WAITING_FOR_NETWORK": "Waiting for network"
+  "WAITING_FOR_NETWORK": "Waiting for network",
+  "Available": "Available",
+  "Unavailable": "Unavailable",
+  "Busy": "Busy",
+  "YouAreAboutToJoinThisChat":"You are about to join this chat",
+  "Cancel": "Cancel",
+  "AreYouSure":"Are you sure?",
+  "UnassignedConversations":"Unassigned Conversations"
 }

package/src/assets/i18n/it.json

@@ -187,5 +187,12 @@
     "CONTACT_ID": "ID contatto",
     "USER_ID": "ID utente",
     "CLOSE_TOAST": "Chiudi",
-    "WAITING_FOR_NETWORK": "In attesa di rete"
+    "WAITING_FOR_NETWORK": "In attesa di rete",
+    "Available": "Disponibile",
+    "Unavailable": "Non disponibile",
+    "Busy": "Occupato",
+    "YouAreAboutToJoinThisChat":"Stai per entrare in questa chat",
+    "Cancel": "Annulla",
+    "AreYouSure":"Sei sicuro?",
+    "UnassignedConversations":"Conversazioni non assegnate"
 }

package/src/chat21-core/providers/chat-manager.ts

@@ -46,7 +46,7 @@ export class ChatManager {
   initialize() {
     const appconfig = this.appConfigProvider.getConfig();
     this.tenant = appconfig.firebaseConfig.tenant;
-    this.logger.info('[CHAT MANAGER] - initialize -> firebaseConfig tenant ', this.tenant);
+    this.logger.log('[CHAT MANAGER] - initialize -> firebaseConfig tenant ', this.tenant);
     this.handlers = [];
     this.openInfoConversation = true;
     this.currentUser = null;
@@ -57,7 +57,7 @@ export class ChatManager {
    * setTiledeskToken
    */
   public setTiledeskToken(tiledeskToken: string) {
-    this.logger.info('initialize FROM [APP-COMP] - [CHAT MANAGER] - initialize -> firebaseConfig tenant ', this.tenant);
+    this.logger.log('initialize FROM [APP-COMP] - [CHAT MANAGER] - initialize -> firebaseConfig tenant ', this.tenant);
     this.tiledeskToken = tiledeskToken;
   }
 
@@ -72,7 +72,7 @@ export class ChatManager {
    * setCurrentUser
    */
   public setCurrentUser(currentUser: UserModel) {
-    this.logger.info('initialize FROM [APP-COMP] - [CHAT MANAGER] setCurrentUser currentUser ', currentUser)
+    this.logger.log('initialize FROM [APP-COMP] - [CHAT MANAGER] setCurrentUser currentUser ', currentUser)
     this.currentUser = currentUser;
   }
 

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

@@ -64,7 +64,7 @@ export class FirebaseArchivedConversationsHandler extends ArchivedConversationsH
      * inizializzo conversations handler
      */
     initialize(tenant: string, userId: string, translationMap: Map<string, string>) {
-        this.logger.info('initialize FROM [APP-COMP] - FIREBASEArchivedConversationsHandlerSERVICE] tenant ', tenant, ' - userId: ', userId, ' - translationMap: ', translationMap)
+        this.logger.log('initialize FROM [APP-COMP] - FIREBASEArchivedConversationsHandlerSERVICE] tenant ', tenant, ' - userId: ', userId, ' - translationMap: ', translationMap)
         this.tenant = tenant;
         this.loggedUserId = userId;
         this.translationMap = translationMap;

package/src/chat21-core/providers/firebase/firebase-auth-service.ts

@@ -75,10 +75,10 @@ export class FirebaseAuthService extends MessagingAuthService {
    *
    */
   initialize() {
-    console.log('initialize FROM [APP-COMP] [FIREBASEAuthSERVICE]')
+    this.logger.log('initialize FROM [APP-COMP] [FIREBASEAuthSERVICE]')
     this.SERVER_BASE_URL = this.getBaseUrl();
     this.URL_TILEDESK_CREATE_CUSTOM_TOKEN = this.SERVER_BASE_URL + 'chat21/firebase/auth/createCustomToken';
-    this.logger.info('[FIREBASEAuthSERVICE] - initialize URL_TILEDESK_CREATE_CUSTOM_TOKEN ', this.URL_TILEDESK_CREATE_CUSTOM_TOKEN)
+    this.logger.log('[FIREBASEAuthSERVICE] - initialize URL_TILEDESK_CREATE_CUSTOM_TOKEN ', this.URL_TILEDESK_CREATE_CUSTOM_TOKEN)
 
 
     let firebasePersistence;
@@ -102,7 +102,7 @@ export class FirebaseAuthService extends MessagingAuthService {
       }
     }
     firebase.auth().setPersistence(firebasePersistence).then(async () => {
-      console.log('[FIREBASEAuthSERVICE] firebasePersistence ', firebasePersistence)
+      this.logger.log('[FIREBASEAuthSERVICE] firebasePersistence ', firebasePersistence)
       // this.onAuthStateChanged(); // commented for new-login
     })
       .catch((error) => {
@@ -203,12 +203,12 @@ export class FirebaseAuthService extends MessagingAuthService {
     // Only one subscriber x application allowed
     // ---------------------------------------------------------------------------------------------------
     if (this.unsubscribe) {
-      console.log('initialize FROM [APP-COMP] - [FIREBASEAuthSERVICE] onAuthStateChanged ALREADY SUBSCRIBED')
+      this.logger.log('initialize FROM [APP-COMP] - [FIREBASEAuthSERVICE] onAuthStateChanged ALREADY SUBSCRIBED')
       return
     }
 
     this.unsubscribe = firebase.auth().onAuthStateChanged(user => {
-      console.log('initialize FROM [APP-COMP] - [FIREBASEAuthSERVICE] onAuthStateChanged', user)
+      this.logger.log('initialize FROM [APP-COMP] - [FIREBASEAuthSERVICE] onAuthStateChanged', user)
 
       
       if (!user) {
@@ -351,7 +351,7 @@ export class FirebaseAuthService extends MessagingAuthService {
     // }
     // return firebase.auth().setPersistence(firebasePersistence).then(async () => {
     return firebase.auth().signInWithCustomToken(token).then(async (user) => {
-      console.log('[FIREBASEAuthSERVICE] signInWithCustomToken user: ', user);
+      this.logger.log('[FIREBASEAuthSERVICE] signInWithCustomToken user: ', user);
       if (user) {
         this.BSAuthStateChanged.next('online');
       }

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

@@ -65,7 +65,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
      * inizializzo conversation handler
      */
     initialize(recipientId: string,recipientFullName: string,loggedUser: UserModel,tenant: string,translationMap: Map<string, string>) {
-        this.logger.info('[FIREBASEConversationHandlerSERVICE] initWithRecipient',recipientId, recipientFullName, loggedUser, tenant, translationMap)
+        this.logger.log('[FIREBASEConversationHandlerSERVICE] initWithRecipient',recipientId, recipientFullName, loggedUser, tenant, translationMap)
         this.recipientId = recipientId;
         this.recipientFullname = recipientFullName;
         this.loggedUser = loggedUser;

package/src/chat21-core/providers/firebase/firebase-notifications.ts

@@ -26,7 +26,7 @@ export class FirebaseNotifications extends NotificationsService {
     initialize(tenant: string, vapId: string): void {
         this.tenant = tenant
         this.vapidkey = vapId
-        this.logger.info('[FIREBASE-NOTIFICATIONS] initialize - tenant ', this.tenant)
+        this.logger.log('[FIREBASE-NOTIFICATIONS] initialize - tenant ', this.tenant)
 
 
         if (!('serviceWorker' in navigator)) {

package/src/chat21-core/providers/firebase/firebase-presence.service.ts

@@ -49,7 +49,7 @@ export class FirebasePresenceService extends PresenceService {
   public initialize(tenant: string) {
     // this.tenant = this.getTenant();
     this.tenant = tenant;
-    this.logger.info('[FIREBASEPresenceSERVICE] initialize this.tenant', this.tenant);
+    this.logger.log('[FIREBASEPresenceSERVICE] initialize this.tenant', this.tenant);
     this.urlNodePresence = '/apps/' + this.tenant + '/presence/';
   }
 
@@ -129,7 +129,7 @@ export class FirebasePresenceService extends PresenceService {
    * @param userid
    */
   public setPresence(userid: string): void {
-    this.logger.info('initialize FROM [APP-COMP] - [FIREBASEPresenceSERVICE] - SET PRESENCE userid ', userid) 
+    this.logger.log('initialize FROM [APP-COMP] - [FIREBASEPresenceSERVICE] - SET PRESENCE userid ', userid) 
     this.onlineConnectionsRef = this.referenceOnlineForUser(userid);
     this.lastOnlineConnectionsRef = this.referenceLastOnlineForUser(userid);
     const connectedRefURL = '/.info/connected';

package/src/chat21-core/providers/firebase/firebase-typing.service.ts

@@ -52,7 +52,7 @@ export class FirebaseTypingService extends TypingService {
   public initialize(tenant: string) {
     // this.tenant = this.getTenant();
     this.tenant = tenant;
-    this.logger.info('[FIREBASETypingSERVICE] initialize - tenant ', this.tenant)
+    this.logger.log('[FIREBASETypingSERVICE] initialize - tenant ', this.tenant)
     this.urlNodeTypings = '/apps/' + this.tenant + '/typings/';
   }
 

package/src/chat21-core/providers/firebase/firebase-upload.service.ts

@@ -43,7 +43,7 @@ export class FirebaseUploadService extends UploadService {
   }
 
   public initialize() {
-    this.logger.info('[FIREBASEUploadSERVICE] initialize');
+    this.logger.log('[FIREBASEUploadSERVICE] initialize');
   }
   
   public upload(userId: string, upload: UploadModel): Promise<any> {

package/src/chat21-core/providers/tiledesk/tiledesk-auth.service.ts

@@ -35,7 +35,7 @@ export class TiledeskAuthService {
 
 
   initialize(serverBaseUrl: string) {
-    this.logger.info('[TILEDESK-AUTH-SERV] - initialize serverBaseUrl', serverBaseUrl);
+    this.logger.log('[TILEDESK-AUTH-SERV] - initialize serverBaseUrl', serverBaseUrl);
     this.SERVER_BASE_URL = serverBaseUrl;
     this.URL_TILEDESK_SIGNIN = this.SERVER_BASE_URL + 'auth/signin';
     this.URL_TILEDESK_SIGNIN_ANONYMOUSLY = this.SERVER_BASE_URL + 'auth/signinAnonymously'

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

@@ -497,7 +497,7 @@ export function createConfirm(translate, alertCtrl, events, title, message, acti
         text: LABEL_ANNULLA,
         handler: () => {
           events.publish('PopupConfirmation', LABEL_ANNULLA, action);
-          console.log('Disagree clicked');
+          // console.log('Disagree clicked');
         }
       },
       {