@chat21/chat21-ionic 3.0.82-rc.2 → 3.0.82-rc.6

package/CHANGELOG.md

@@ -1,9 +1,19 @@
 # chat21-ionic ver 3.0
 
+### 3.0.82-rc.6
+- bug-fixed: axios is undefined in chat21Client.js
+- bug-fixed: if userImage not exist in sidebar--user-detail, no info of fillColor exist
+
+### 3.0.82-rc.3
+- bug-fixed: incorrect dashboard urls in navbar
+- changed: used logger in mqtt auth service
+
 ### 3.0.82-rc.2
 - changed: 'force' parameter to /close post as body content
 - changed: enabled MTT 
 - changed: position of 'LogOut' button in sidebar-user-detail component
+- bug-fixed: removed scrollbar on firefox browser in conversation-list, contacts-directory pages
+
 ### 3.0.82-rc.1
 - changed: forceArchive to force while calling /close API URL
 - changed: chat21Client.js from 1.12.1 to 1.12.2

package/package.json

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

package/src/app/components/navbar/navbar.component.ts

@@ -161,12 +161,13 @@ export class NavbarComponent implements OnInit {
     const baseUrl = this.appConfigProvider.getConfig().dashboardUrl
     let url = baseUrl
     if(event === 'projectSettings'){
-      url = baseUrl + 'project/' + this.project.id_project.id + '/project-settings/general'
+      url = baseUrl + '#/project/' + this.project.id_project.id + '/project-settings/general' + '?token=' + this.tiledeskToken
     }else if(event ==='allProjects'){
-      url = baseUrl + 'project/'
+      url = baseUrl + '#/projects/' + '?token=' + this.tiledeskToken
     }else if('addProject'){
-      url = baseUrl + 'create-new-project/' 
+      url = baseUrl + '#/create-new-project/' + '?token=' + this.tiledeskToken
     }
+    console.log('onClickDropdownOption-->', url)
     window.open(url, '_blank');
   }
 
@@ -180,7 +181,7 @@ export class NavbarComponent implements OnInit {
       // this.unsubscribe$.next();
       // this.unsubscribe$.complete();
 
-      const url = this.appConfigProvider.getConfig().dashboardUrl + `/project/${id_project}/home`
+      const url = this.appConfigProvider.getConfig().dashboardUrl + `#/project/${id_project}/home`
       window.open(url, '_blank');
 
     }

package/src/app/components/sidebar-user-details/sidebar-user-details.component.html

@@ -25,9 +25,9 @@
             onerror="this.src='assets/images/no_image_user.png'" />
 
         <div *ngIf="!USER_PHOTO_PROFILE_EXIST" class="user-img-in-sidebar-user-details"
-            [ngStyle]="{'background':  'linear-gradient(rgb(255,255,255) -125%,' + user?.color + ')'}">
+            [ngStyle]="{'background':  'linear-gradient(rgb(255,255,255) -125%,' + user?.fillColour + ')'}">
             <span id="sidebaravatar-altenative-user-avatar" class="sidebar-user-details-altenative-user-avatar">
-                {{ user?.avatar }}
+                {{ user?.fullname_initial }}
             </span>
         </div>
 

package/src/app/components/sidebar-user-details/sidebar-user-details.component.ts

@@ -41,7 +41,7 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
 
   isVisiblePAY: boolean;
   public_Key: any
-  USER_PHOTO_PROFILE_EXIST: boolean;
+  USER_PHOTO_PROFILE_EXIST: boolean = false;
   version: string
   company_name: string = 'Tiledesk'
   DASHBOARD_URL: string;
@@ -90,7 +90,8 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
           const currentUser = JSON.parse(storedCurrentUser);
           this.logger.log('[SIDEBAR-USER-DETAILS] - subcribeToAuthStateChanged - currentUser ', currentUser)
           if (currentUser) {
-            this.user = currentUser;
+            this.user = currentUser
+            this.createUserAvatar(this.user);
             this.getCurrentChatLangAndTranslateLabels(this.user);
             this.photo_profile_URL = this.imageRepoService.getImagePhotoUrl(this.user.uid)
             this.logger.log('[SIDEBAR-USER-DETAILS] photo_profile_URL ', this.photo_profile_URL);
@@ -105,7 +106,7 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
 
   checkIfExistPhotoProfile(imageUrl) {
     this.verifyImageURL(imageUrl, (imageExists) => {
-
+      
       if (imageExists === true) {
         this.USER_PHOTO_PROFILE_EXIST = true;
         this.logger.log('[SIDEBAR-USER-DETAILS] photo_profile_URL IMAGE EXIST ', imageExists)
@@ -129,6 +130,23 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
     };
   }
 
+  createUserAvatar(currentUser) {
+    this.logger.log('[SIDEBAR] - createProjectUserAvatar ', currentUser)
+    let fullname = ''
+    if (currentUser && currentUser.firstname && currentUser.lastname) {
+      fullname = currentUser.firstname + ' ' + currentUser.lastname
+      currentUser['fullname_initial'] = avatarPlaceholder(fullname)
+      currentUser['fillColour'] = getColorBck(fullname)
+    } else if (currentUser && currentUser.firstname) {
+      fullname = currentUser.firstname
+      currentUser['fullname_initial'] = avatarPlaceholder(fullname)
+      currentUser['fillColour'] = getColorBck(fullname)
+    } else {
+      currentUser['fullname_initial'] = 'N/A'
+      currentUser['fillColour'] = 'rgb(98, 100, 167)'
+    }
+  }
+
   // listenOpenUserSidebarEvent() {
   //   this.events.subscribe('userdetailsidebar:opened', (openUserDetailsSidebar) => {
   //     this.logger.log('[SIDEBAR-USER-DETAILS] - listenOpenUserSidebarEvent - openUserDetailsSidebar', openUserDetailsSidebar);

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

@@ -41,7 +41,7 @@ export class WebsocketService {
 
       self.webSocketJs.ref(path, 'subscriptionToWsCurrentUser_allProject',
         function (data, notification) {
-          // console.log("[WS-SERV] SUBSCR TO WS CURRENT PROJECT-USER AVAILABILITY - CREATE - data ", data);
+          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)

package/src/assets/js/chat21client.js

@@ -1057,8 +1057,8 @@ class Chat21Client {
 }
 
 function isBrowser() {
-    // return true;
-    return false;
+    return true;
+    // return false;
 }
 
 export { Chat21Client }; // Browser

package/src/chat-config-mqtt-localhost.json

@@ -21,9 +21,9 @@
         "APIendpoint": "http://localhost:8004/api",
         "_log": true
     },
-    "apiUrl": "http://localhost:3000/",
+    "apiUrl": "http://localhost:8081/api/",
     "baseImageUrl": "http://localhost:3000/",
-    "dashboardUrl": "http://localhost:8081/",
+    "dashboardUrl": "http://localhost:8081/dashboard/",
     "testsiteBaseUrl": "http://localhost:8081/widget/assets/twp/index.html",
     "logLevel": "DEBUG",
     "authPersistence": "LOCAL",

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

@@ -64,15 +64,14 @@ export class MQTTAuthService extends MessagingAuthService {
 
   // logout(callback) {
   logout(): Promise<boolean> {
-    this.logger.log("[MQTTAuthService] logout: closing mqtt connection...");
+    this.logger.debug("[MQTTAuthService] logout: closing mqtt connection...");
     return new Promise((resolve, reject) => {
       this.chat21Service.chatClient.close(() => {
-        console.log("[MQTTAuthService] logout: mqtt connection closed. OK");
         // remove
         // this.appStorage.removeItem('tiledeskToken');
         // this.appStorage.removeItem('currentUser');
         this.currentUser = null;
-        console.log("[MQTTAuthService] logout: user removed");
+        this.logger.debug("[MQTTAuthService] logout: mqtt connection closed. user removed. OK");
         this.BSSignOut.next(true);
         this.BSAuthStateChanged.next('offline');
         resolve(true)
@@ -94,7 +93,7 @@ z
 
   /** */
   getToken(): string {
-    this.logger.log('[MQTTAuthService]::getToken');
+    this.logger.debug('[MQTTAuthService]::getToken');
     return this.token;
   }
 
@@ -255,19 +254,19 @@ z
     // const that = this;
     this.http.post(this.URL_TILEDESK_CREATE_CUSTOM_TOKEN, postData, { headers, responseType})
     .subscribe(data =>  {
-      this.logger.log("[MQTTAuthService] connectWithCustomToken: **** data", data)
+      this.logger.debug("[MQTTAuthService] connectWithCustomToken: **** data", data)
       const result = JSON.parse(data);
       this.connectMQTT(result);
     }, error => {
-      this.logger.log(error);
+      this.logger.error(error);
     });
   }
 
   connectMQTT(credentials: any): any {
-    this.logger.log('[MQTTAuthService] connectMQTT: **** credentials:', credentials);
+    this.logger.debug('[MQTTAuthService] connectMQTT: **** credentials:', credentials);
     const userid = credentials.userid;
     this.chat21Service.chatClient.connect(userid, credentials.token, () => {
-      this.logger.log('[MQTTAuthService] connectMQTT: Chat connected.');
+      this.logger.debug('[MQTTAuthService] connectMQTT: Chat connected.');
       this.BSAuthStateChanged.next('online');
     });
   }