@chat21/chat21-ionic 3.0.65-rc2 → 3.0.67

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

@@ -1,4 +1,3 @@
-import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 
@@ -13,17 +12,11 @@ import 'firebase/storage';
 // models
 import { ConversationModel } from '../../models/conversation';
 
-// services
-import { ConversationsHandlerService } from '../abstract/conversations-handler.service';
-
-
 // utils
 import { avatarPlaceholder, getColorBck } from '../../utils/utils-user';
 import { compareValues, getFromNow, searchIndexInArrayForUid, archivedConversationsPathForUserId, isGroup } from '../../utils/utils';
-import { ImageRepoService } from '../abstract/image-repo.service';
-import { FirebaseImageRepoService } from './firebase-image-repo';
 import { ArchivedConversationsHandlerService } from '../abstract/archivedconversations-handler.service';
-import { CustomLogger } from '../logger/customLogger';
+import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
 
 
@@ -35,11 +28,10 @@ export class FirebaseArchivedConversationsHandler extends ArchivedConversationsH
 
     // BehaviorSubject
     BSConversationDetail: BehaviorSubject<ConversationModel>;
+    archivedConversationAdded: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
+    archivedConversationChanged: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
+    archivedConversationRemoved: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
     // readAllMessages: BehaviorSubject<string>;
-    archivedConversationAdded: BehaviorSubject<ConversationModel>;
-    archivedConversationChanged: BehaviorSubject<ConversationModel>;
-    archivedConversationRemoved: BehaviorSubject<ConversationModel>;
-    loadedConversationsStorage: BehaviorSubject<ConversationModel[]>;
 
     // public params
     archivedConversations: Array<ConversationModel> = [];
@@ -54,6 +46,8 @@ export class FirebaseArchivedConversationsHandler extends ArchivedConversationsH
     private logger: LoggerService = LoggerInstance.getInstance()
     private ref: firebase.database.Query;
 
+    private subscribe: any;
+
     constructor(
         //public databaseProvider: DatabaseProvider
     ) {
@@ -183,23 +177,33 @@ export class FirebaseArchivedConversationsHandler extends ArchivedConversationsH
             // this.BSConversationDetail.next(conversationSelected);
         } else {
             // const urlNodeFirebase = '/apps/' + this.tenant + '/users/' + this.loggedUserId + '/archived_conversations/' + conversationId;
-            const urlNodeFirebase = archivedConversationsPathForUserId(this.tenant, this.loggedUserId) + '/' + conversationId;
+            const urlNodeFirebase = archivedConversationsPathForUserId(this.tenant, this.loggedUserId) // + '/' + conversationId;
             this.logger.log('[FIREBASEArchivedConversationsHandlerSERVICE] urlNodeFirebase conversationDetail *****', urlNodeFirebase)
             const firebaseMessages = firebase.database().ref(urlNodeFirebase);
-            firebaseMessages.on('value', (childSnapshot) => {
-                const childData: ConversationModel = childSnapshot.val();
-                this.logger.log('[FIREBASEArchivedConversationsHandlerSERVICE] childData *****', childData)
-                // if (childSnapshot && childSnapshot.key && childData.uid) {
-                if (childSnapshot && childSnapshot.key && childData) {
-                    childData.uid = childSnapshot.key;
-                    const conversation = this.completeConversation(childData);
-                    if (conversation) {
-                        callback(conversation)
-                    } else {
-                        callback(null)
+            if(this.subscribe){
+                this.logger.log('[FIREBASEArchivedConversationsHandlerSERVICE] getConversationDetail ALREADY SUBSCRIBED')
+                return;
+            }
+            
+            this.subscribe = firebaseMessages.on('value', (snap) => {
+                const childSnapshot = snap.child('/'+conversationId)
+                if(!childSnapshot.exists()){
+                    this.logger.log('[FIREBASEArchivedConversationsHandlerSERVICE] getConversationDetail archived conversation NOT exist', conversationId)
+                    callback(null)
+                } else {
+                    const childData: ConversationModel = childSnapshot.val();
+                    this.logger.log('[FIREBASEArchivedConversationsHandlerSERVICE] getConversationDetail archived conversation exist', childData)
+                    if (childSnapshot && childSnapshot.key && childData) {
+                        childData.uid = childSnapshot.key;
+                        const conversation = this.completeConversation(childData);
+                        if (conversation) {
+                            callback(conversation)
+                        } else {
+                            callback(null)
+                        }
                     }
+                    // this.BSConversationDetail.next(conversation);
                 }
-                // this.BSConversationDetail.next(conversation);
             });
         }
     }

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

@@ -40,9 +40,8 @@ export class FirebaseAuthService extends MessagingAuthService {
 
 
   // BehaviorSubject
-  BSAuthStateChanged: BehaviorSubject<any>;
-  BSSignOut: BehaviorSubject<any>;
-  // firebaseSignInWithCustomToken: BehaviorSubject<any>;
+  BSAuthStateChanged: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+  BSSignOut: BehaviorSubject<any> = new BehaviorSubject<any>(null);
 
   // public params
   // private persistence: string;

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

@@ -32,10 +32,10 @@ import { messageType, isEmojii } from 'src/chat21-core/utils/utils-message';
 export class FirebaseConversationHandler extends ConversationHandlerService {
 
     // BehaviorSubject
-    messageAdded: BehaviorSubject<MessageModel>;
-    messageChanged: BehaviorSubject<MessageModel>;
-    messageRemoved: BehaviorSubject<string>;
-    isTyping: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+    messageAdded: BehaviorSubject<MessageModel> = new BehaviorSubject<MessageModel>(null);;
+    messageChanged: BehaviorSubject<MessageModel> = new BehaviorSubject<MessageModel>(null);;
+    messageRemoved: BehaviorSubject<string> = new BehaviorSubject<string>(null);
+    messageWait: BehaviorSubject<any> = new BehaviorSubject<string>(null);
 
     // public variables
     public attributes: any;

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

@@ -31,12 +31,11 @@ import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 export class FirebaseConversationsHandler extends ConversationsHandlerService {
 
     // BehaviorSubject
-    BSConversationDetail: BehaviorSubject<ConversationModel>;
+    BSConversationDetail: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
+    conversationAdded: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
+    conversationChanged: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
+    conversationRemoved: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
     // readAllMessages: BehaviorSubject<string>;
-    conversationAdded: BehaviorSubject<ConversationModel>;
-    conversationChanged: BehaviorSubject<ConversationModel>;
-    conversationRemoved: BehaviorSubject<ConversationModel>;
-    loadedConversationsStorage: BehaviorSubject<ConversationModel[]>;
 
     // public params
     conversations: Array<ConversationModel> = [];
@@ -53,6 +52,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
     private BASE_URL: string;
     // private audio: any;
     // private setTimeoutSound: any;
+    private subscribe: any
 
     constructor(
         //public databaseProvider: DatabaseProvider
@@ -121,62 +121,47 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
         this.ref = firebase.database().ref(urlNodeFirebase).orderByChild('timestamp').limitToLast(200);
         
         // this.ref.once('value').then(snapshot => {
-        //     snapshot.forEach(childSnapshot => {
-        //         const childData: ConversationModel = childSnapshot.val();
-        //         childData.uid = childSnapshot.key
-        //         that.added(childData)
-        //         lastConversationTimestamp = childData.timestamp
-        //     });
+        //     if(snapshot && snapshot.val()){
+                
+                
+        //         snapshot.forEach(childSnapshot => {
+        //             // const childData: ConversationModel = childSnapshot.val();
+        //             // childData.uid = childSnapshot.key
+        //             // that.added(childData)
+        //             // lastConversationTimestamp = childData.timestamp
+        //             that.added(childSnapshot)
+        //         });
+        //         this.logger.debug('[FIREBASEConversationsHandlerSERVICE] # of remote conversations on Firebase:', Object.keys(snapshot.val()).length)
+        //         this.logger.debug('[FIREBASEConversationsHandlerSERVICE] # of conversation added:', that.conversations)
+        //         callback(that.conversations)
+        //         return lastConversationTimestamp
+        //     }
             
-        //     callback(that.conversations)
-        //     return lastConversationTimestamp
-        // }).then((timestamp)=> {
-        //     console.log('timestampppppp',timestamp)
-        //     this.ref.startAt(timestamp).on('child_changed', (childSnapshot) => {
-        //         const conv: ConversationModel = childSnapshot.val();
-        //         conv.uid = childSnapshot.key
-        //         that.changed(conv);
+        // }).then(()=> {
+        //     this.ref.on('child_changed', (childSnapshot) => {
+        //         that.changed(childSnapshot);
         //     });
-        //     this.ref.startAt(timestamp).on('child_removed', (childSnapshot) => {
-        //         const conv: ConversationModel = childSnapshot.val();
-        //         conv.uid = childSnapshot.key
-        //         that.removed(conv);
+        //     this.ref.on('child_removed', (childSnapshot) => {
+        //         that.removed(childSnapshot);
         //     });
-        //     this.ref.startAt(timestamp).on('child_added', (childSnapshot) => {
-        //         const conv: ConversationModel = childSnapshot.val();
-        //         console.log('addedddd', conv)
-        //         conv.uid = childSnapshot.key
-        //         that.added(conv);
+        //     this.ref.on('child_added', (childSnapshot) => {
+        //         that.added(childSnapshot);
         //     });
-        // });
-        // this.ref.on('value', (snaps) => {
-        //     if(snaps){
-        //         console.log('convvvvvv', snaps.val(), snaps.val().length)
-        //         for(let item=0; item<snaps.val().length; item++){
-        //             that.added(snaps.val()[item])
-        //         }
-        //         callback(this.conversations)
-        //     }
         // })
-        this.ref.startAt(lastConversationTimestamp).on('child_changed', (childSnapshot) => {
+        
+        this.ref.on('child_changed', (childSnapshot) => {
             that.changed(childSnapshot);
         });
-        this.ref.startAt(lastConversationTimestamp).on('child_removed', (childSnapshot) => {
+        this.ref.on('child_removed', (childSnapshot) => {
             that.removed(childSnapshot);
         });
-        this.ref.startAt(lastConversationTimestamp).on('child_added', (childSnapshot) => {
+        this.ref.on('child_added', (childSnapshot) => {
             that.added(childSnapshot);
         });
 
-        
-
         setTimeout(() => {
             callback()
         }, 2000);
-        // SET AUDIO
-        // this.audio = new Audio();
-        // this.audio.src = URL_SOUND;
-        // this.audio.load();
     }
 
     /**
@@ -316,24 +301,44 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
         } else {
             this.logger.log('[FIREBASEConversationsHandlerSERVICE]  getConversationDetail ***** ELSE')
             // const urlNodeFirebase = '/apps/' + this.tenant + '/users/' + this.loggedUserId + '/conversations/' + conversationId;
-            const urlNodeFirebase = conversationsPathForUserId(this.tenant, this.loggedUserId) + '/' + conversationId;
+            const urlNodeFirebase = conversationsPathForUserId(this.tenant, this.loggedUserId) // + '/' + conversationId;
             this.logger.log('[FIREBASEConversationsHandlerSERVICE] conversationDetail urlNodeFirebase *****', urlNodeFirebase)
             const firebaseMessages = firebase.database().ref(urlNodeFirebase);
-            firebaseMessages.on('value', (childSnapshot) => {
-                const childData: ConversationModel = childSnapshot.val();
-                this.logger.log('[FIREBASEConversationsHandlerSERVICE] conversationDetail childSnapshot.val() *****', childSnapshot.val());
-                this.logger.log('[FIREBASEConversationsHandlerSERVICE] conversationDetail childSnapshot *****', childSnapshot)
-                // && childData.uid
-                if (childSnapshot && childSnapshot.key && childData) {
-                    childData.uid = childSnapshot.key;
-                    const conversation = this.completeConversation(childData);
-                    if (conversation) {
-                        callback(conversation)
-                    } else {
-                        callback(null)
-                    }
+            if(this.subscribe){
+                this.logger.log('[FIREBASEConversationsHandlerSERVICE] getConversationDetail ALREADY SUBSCRIBED')
+                return;
+            }
 
+            this.subscribe = firebaseMessages.on('value', (snap) => {
+                const childSnapshot = snap.child('/'+conversationId)
+                if(!childSnapshot.exists()){
+                    this.logger.log('[FIREBASEConversationsHandlerSERVICE] getConversationDetail conversation NOT exist', conversationId)
+                    callback(null)
+                } else {
+                    const childData: ConversationModel = childSnapshot.val();
+                    this.logger.debug('[FIREBASEConversationsHandlerSERVICE] getConversationDetail conversation exist', childSnapshot.val(), childSnapshot.key)
+                    if (childSnapshot && childSnapshot.key && childData) {
+                        childData.uid = childSnapshot.key;
+                        const conversation = this.completeConversation(childData);
+                        if (conversation) {
+                            callback(conversation)
+                        } else {
+                            callback(null)
+                        }
+                    }
+                    // this.BSConversationDetail.next(conversation);
                 }
+                // const childData: ConversationModel = childSnapshot.val();
+                // this.logger.debug('[FIREBASEConversationsHandlerSERVICE] conversationDetail childSnapshot *****', childSnapshot.val())
+                // if (childSnapshot && childSnapshot.key && childData) {
+                //     childData.uid = childSnapshot.key;
+                //     const conversation = this.completeConversation(childData);
+                //     if (conversation) {
+                //         callback(conversation)
+                //     } else {
+                //         callback(null)
+                //     }
+                // }
                 // this.BSConversationDetail.next(conversation);
             });
         }
@@ -656,3 +661,4 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
     // END PRIVATE FUNCTIONS
     // ---------------------------------------------------------- //
 }
+

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

@@ -31,11 +31,11 @@ import { LoggerInstance } from '../logger/loggerInstance';
 export class FirebaseGroupsHandler extends GroupsHandlerService {
 
     // BehaviorSubject
-    BSgroupDetail: BehaviorSubject<GroupModel>;
-    SgroupDetail: Subject<GroupModel>;
-    groupAdded: BehaviorSubject<GroupModel>;
-    groupChanged: BehaviorSubject<GroupModel>;
-    groupRemoved: BehaviorSubject<GroupModel>;
+    BSgroupDetail: BehaviorSubject<GroupModel> = new BehaviorSubject<GroupModel>(null); 
+    SgroupDetail: Subject<GroupModel> = new BehaviorSubject<GroupModel>(null);
+    groupAdded: BehaviorSubject<GroupModel> = new BehaviorSubject<GroupModel>(null);
+    groupChanged: BehaviorSubject<GroupModel> = new BehaviorSubject<GroupModel>(null);
+    groupRemoved: BehaviorSubject<GroupModel> = new BehaviorSubject<GroupModel>(null);
 
     // public params
     conversations: Array<ConversationModel> = [];

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

@@ -23,9 +23,8 @@ import { LoggerInstance } from '../logger/loggerInstance';
 export class FirebasePresenceService extends PresenceService {
 
   // BehaviorSubject
-  // BSIsOnline: BehaviorSubject<any>;
-  BSIsOnline: BehaviorSubject<any>;
-  BSLastOnline: BehaviorSubject<any>;
+  BSIsOnline: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+  BSLastOnline: BehaviorSubject<any> = new BehaviorSubject<any>(null);
 
   // public tenant: string;
 

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

@@ -32,8 +32,8 @@ export class TypingModel {
 export class FirebaseTypingService extends TypingService {
 
   // BehaviorSubject
-  BSIsTyping: BehaviorSubject<any>;
-  BSSetTyping: BehaviorSubject<any>;
+  BSIsTyping: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+  BSSetTyping: BehaviorSubject<any> = new BehaviorSubject<any>(null);
 
   // public params
   // public tenant: string;

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

@@ -24,7 +24,7 @@ import { UploadModel } from '../../models/upload';
 export class FirebaseUploadService extends UploadService {
 
   // BehaviorSubject
-  BSStateUpload: BehaviorSubject<any>;
+  BSStateUpload: BehaviorSubject<any> = new BehaviorSubject<any>(null);
 
   //private
   private url: string;

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

@@ -22,13 +22,10 @@ export class MQTTArchivedConversationsHandler extends ArchivedConversationsHandl
 
     // BehaviorSubject
     BSConversationDetail: BehaviorSubject<ConversationModel>;
+    archivedConversationAdded: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
+    archivedConversationChanged: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
+    archivedConversationRemoved: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);
     // readAllMessages: BehaviorSubject<string>;
-    archivedConversationAdded: BehaviorSubject<ConversationModel>;
-    archivedConversationChanged: BehaviorSubject<ConversationModel>;
-    archivedConversationRemoved: BehaviorSubject<ConversationModel>;
-    loadedConversationsStorage: BehaviorSubject<ConversationModel[]>;
-    BSConversations: BehaviorSubject<ConversationModel[]>
-    // imageRepo: ImageRepoService;
 
     // public variables
     archivedConversations: Array<ConversationModel> = [];

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

@@ -25,11 +25,11 @@ import { AppStorageService } from '../abstract/app-storage.service';
 
 
 @Injectable({ providedIn: 'root' })
-
 export class MQTTAuthService extends MessagingAuthService {
   
-  BSAuthStateChanged: BehaviorSubject<any>;
-  BSSignOut: BehaviorSubject<any>;
+  // BehaviorSubject
+  BSAuthStateChanged: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+  BSSignOut: BehaviorSubject<any> = new BehaviorSubject<any>(null);
 
   SERVER_BASE_URL: string;
 

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

@@ -30,10 +30,10 @@ import { messageType } from '../../utils/utils-message';
 export class MQTTConversationHandler extends ConversationHandlerService {
 
     // BehaviorSubject
-    messageAdded: BehaviorSubject<MessageModel>;
-    messageChanged: BehaviorSubject<MessageModel>;
-    messageRemoved: BehaviorSubject<string>;
-    isTypings: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+    messageAdded: BehaviorSubject<MessageModel> = new BehaviorSubject<MessageModel>(null);;
+    messageChanged: BehaviorSubject<MessageModel> = new BehaviorSubject<MessageModel>(null);;
+    messageRemoved: BehaviorSubject<string> = new BehaviorSubject<string>(null);
+    messageWait: BehaviorSubject<any> = new BehaviorSubject<string>(null);
 
     // public variables
     public attributes: any;

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

@@ -23,15 +23,20 @@ import { THIS_EXPR } from '@angular/compiler/src/output/output_ast';
 @Injectable({ providedIn: 'root' })
 export class MQTTConversationsHandler extends ConversationsHandlerService {
 
-    BSConversationDetail: BehaviorSubject<ConversationModel>;
-    conversationAdded: BehaviorSubject<ConversationModel>;
-    conversationChanged: BehaviorSubject<ConversationModel>;
-    conversationRemoved: BehaviorSubject<ConversationModel>;
-    loadedConversationsStorage: BehaviorSubject<ConversationModel[]>;
+    // BehaviorSubject
+    BSConversationDetail: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);;
+    conversationAdded: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);;
+    conversationChanged: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);; 
+    conversationRemoved: BehaviorSubject<ConversationModel> = new BehaviorSubject<ConversationModel>(null);;
     BSConversations: BehaviorSubject<ConversationModel[]>
+    // readAllMessages: BehaviorSubject<string>;
+    
+    // public variables
     conversations: Array<ConversationModel> = [];
     uidConvSelected: string;
     tenant: string;
+
+    // private variables
     private loggedUserId: string;
     private translationMap: Map<string, string>;
     private isConversationClosingMap: Map<string, boolean>;

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

@@ -14,11 +14,11 @@ import { avatarPlaceholder, getColorBck } from 'src/chat21-core/utils/utils-user
   export class MQTTGroupsHandler extends GroupsHandlerService {
     
     // BehaviorSubject
-    BSgroupDetail: BehaviorSubject<GroupModel>;
-    SgroupDetail: Subject<GroupModel>;
-    groupAdded: BehaviorSubject<GroupModel>;
-    groupChanged: BehaviorSubject<GroupModel>;
-    groupRemoved: BehaviorSubject<GroupModel>;
+    BSgroupDetail: BehaviorSubject<GroupModel> = new BehaviorSubject<GroupModel>(null); 
+    SgroupDetail: Subject<GroupModel> = new BehaviorSubject<GroupModel>(null);
+    groupAdded: BehaviorSubject<GroupModel> = new BehaviorSubject<GroupModel>(null);
+    groupChanged: BehaviorSubject<GroupModel> = new BehaviorSubject<GroupModel>(null);
+    groupRemoved: BehaviorSubject<GroupModel> = new BehaviorSubject<GroupModel>(null);
 
     // private params
     private tenant: string;

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

@@ -21,8 +21,9 @@ import { environment } from '../../../environments/environment';
 })
 export class MQTTPresenceService extends PresenceService {
 
-  BSIsOnline: BehaviorSubject<any>;
-  BSLastOnline: BehaviorSubject<any>;
+  // BehaviorSubject
+  BSIsOnline: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+  BSLastOnline: BehaviorSubject<any> = new BehaviorSubject<any>(null);
 
   // private params
   private tenant: string;

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

@@ -14,6 +14,7 @@ import { LoggerInstance } from '../logger/loggerInstance';
 import { setLastDate } from '../../utils/utils';
 import { environment } from '../../../environments/environment';
 import { TypingService } from '../abstract/typing.service';
+import { BehaviorSubject } from 'rxjs';
 
 export class TypingModel {
 
@@ -31,6 +32,10 @@ export class TypingModel {
 
 export class MQTTTypingService extends TypingService {
 
+  // BehaviorSubject
+  BSIsTyping: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+  BSSetTyping: BehaviorSubject<any> = new BehaviorSubject<any>(null);
+  
   // private params
   private tenant: string;
   private urlNodeTypings: string;

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

@@ -11,16 +11,9 @@ import { LoggerInstance } from '../logger/loggerInstance';
 @Injectable()
 export class NativeUploadService extends UploadService {
 
+    BSStateUpload: BehaviorSubject<any> = new BehaviorSubject<any>(null)
 
-
-    BSStateUpload: BehaviorSubject<any>;
-
-    // private persistence: string;
-    SERVER_BASE_URL: string;
-
-    public token: any;
-    public tiledeskToken: any;
-
+    private tiledeskToken: string;
     private URL_TILEDESK_IMAGES: string;
     private URL_TILEDESK_FILE: string;
     private logger: LoggerService = LoggerInstance.getInstance()

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

@@ -14,7 +14,6 @@ import { LoggerInstance } from '../logger/loggerInstance';
 })
 export class TiledeskAuthService {
 
-  // public isOnline$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(null);
   // private persistence: string;
   public SERVER_BASE_URL: string;
 

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

@@ -110,7 +110,7 @@ export const LogLevel = {
     'DEBUG': 3
 }
 
-export const tranlatedLanguage = ['it', 'en', 'de', 'es', 'pt', 'fr', 'ru', 'tr', 'sr']
+export const tranlatedLanguage = ['it', 'en', 'de', 'es', 'pt', 'fr', 'ru', 'tr', 'sr', 'ar', 'uk']
 
 
 

package/src/global.scss

@@ -25,7 +25,7 @@
 @import "~@ionic/angular/css/text-transformation.css";
 @import "~@ionic/angular/css/flex-utils.css";
 
-@import "~material-design-icons/iconfont/material-icons.css";
+@import 'material-icons/iconfont/material-icons.css';
 @import "variables.scss";
 
 // http://ionicframework.com/docs/v2/theming/
@@ -974,7 +974,7 @@ ul.dropdown-menu > li > a {
 
 .sidebar .nav i {
     // font-size: 20px;
-    float: left;
+    // float: left;
     // margin-right: 15px;
     // line-height: 30px;
     width: 60px;

package/deploy_prod.sh

@@ -1,14 +0,0 @@
-# npm version patch
-version=`node -e 'console.log(require("./package.json").version)'`
-echo "version $version"
-
-URL_VER=${version//[.]//}
-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 remoteTiledesk--tags
-    npm publish
-fi
-