@chat21/chat21-ionic 3.0.82-rc.3 → 3.0.82-rc.7

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # chat21-ionic ver 3.0
 
+### 3.0.82-rc.7
+- bug-fixed: do not disable textArea if is a direct archived conversation
+- bug-fixed: canned item not fire click event on Firefox browser
+
+### 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

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@chat21/chat21-ionic",
     "author": "Tiledesk SRL",
-    "version": "3.0.82-rc.3",
+    "version": "3.0.82-rc.7",
     "license": "MIT License",
     "homepage": "https://tiledesk.com/",
     "repository": {
@@ -42,6 +42,7 @@
         "@ng-select/ng-select": "^3.7.3",
         "@ngx-translate/core": "^12.1.2",
         "@ngx-translate/http-loader": "^4.0.0",
+        "@types/marked": "^1.1.0",
         "angular2-moment": "^1.9.0",
         "autolinker": "^3.14.2",
         "cordova-android": "9.1.0",
@@ -59,7 +60,7 @@
         "core-js": "^2.5.4",
         "file-saver": "^2.0.5",
         "firebase": "^8.6.7",
-        "marked": "^2.0.1",
+        "marked": "^2.1.3",
         "material-icons": "^1.11.2",
         "moment": "^2.24.0",
         "moment-timezone": "^0.5.28",

package/src/app/components/canned-response/canned-response.component.html

@@ -5,8 +5,8 @@
       *ngFor="let canned of tagsCannedFilter; let i = index;"
       (click)="onClickCannedFN(canned, $event)">
       <div class="cannedContent">
-        <ion-input [(ngModel)]="canned.title" class="title" id="{{'titleCanned_'+canned._id}}" [disabled]="canned.disabled"></ion-input>
-        <ion-input [(ngModel)]="canned.text" *ngIf="canned.text" class="text truncate" [disabled]="canned.disabled"></ion-input>
+        <ion-input [class.readonly]="canned?.disabled" type="text" [(ngModel)]="canned.title" class="title" id="{{'titleCanned_'+canned._id}}"></ion-input>
+        <ion-input [class.readonly]="canned?.disabled" type="text" [(ngModel)]="canned.text"  class="text truncate"></ion-input>
       </div>
       <ion-icon class="canned-item-icon"  name="checkmark-sharp" slot=end *ngIf="canned.createdBy === loggedUser.uid && !canned.disabled" (click)="onConfirmEditCanned(canned, $event)"></ion-icon>
       <ion-icon class="canned-item-icon"  name="pencil-sharp" slot=end *ngIf="canned.createdBy === loggedUser.uid && canned.disabled" (click)="onEditCanned(canned, $event)"></ion-icon>

package/src/app/components/canned-response/canned-response.component.scss

@@ -104,15 +104,20 @@
         &.title {
             font-weight: 500;
         }
+
+        &.readonly{
+            cursor: pointer;
+            pointer-events: none;
+        }
     }
-    .native-input[disabled] {
-        opacity: 10 !important;
-        cursor: pointer;
-    }
-    .native-textarea[disabled] {
-        opacity: 10 !important;
-        cursor: pointer;
-    }
+    // .native-input[disabled] {
+    //     opacity: 10 !important;
+    //     cursor: pointer;
+    // }
+    // .native-textarea[disabled] {
+    //     opacity: 10 !important;
+    //     cursor: pointer;
+    // }
     ion-icon {
         zoom: 0.7;
     }

package/src/app/components/conversation-detail/message-text-area/message-text-area.component.html

@@ -112,9 +112,16 @@
 
       <div class="text-message" [ngClass]="{'text-message-no-cr': areVisibleCAR === false || supportMode === false}">
         <ion-textarea id="ion-textarea" #messageTextArea #message_text_area #textArea rows="1"
-          [placeholder]="translationMap?.get('LABEL_ENTER_MSG_SHORT')" autosize="false" auto-grow="true" autofocus="true" [value]=""
-          [(ngModel)]="messageString" (ionChange)="ionChange($event);" [disabled]="disableTextarea"
-          (keydown.enter)="onKeydown($event, messageString)" (paste)="onPaste($event)">
+          [placeholder]="translationMap?.get('LABEL_ENTER_MSG_SHORT')" 
+          autosize="false" 
+          auto-grow="true" 
+          autofocus="true" 
+          [value]=""
+          [disabled]="disableTextarea"
+          [(ngModel)]="messageString" 
+          (ionChange)="ionChange($event);" 
+          (keydown.enter)="onKeydown($event, messageString)" 
+          (paste)="onPaste($event)">
         </ion-textarea>
       </div>
 

package/src/app/components/conversation-info/info-content/info-content.component.html

@@ -1,17 +1,20 @@
 <ion-content [style.display]="openInfoConversation ? 'block' : 'none'">
 
-  <app-info-direct *ngIf="panelType === 'direct-panel'" 
+  <app-info-direct
+    [style.display]="panelType === 'direct-panel' ? 'content' : 'none'"
     [member]=member 
     [translationMap]=translationMap
     [conversationWith]= "conversationWith">
   </app-info-direct>
 
-  <app-info-group *ngIf="panelType === 'group-panel' && IS_GROUP_PANEL === true"
+  <app-info-group
+    [style.display]="panelType === 'group-panel' && IS_GROUP_PANEL === true ? 'content' : 'none'"
     [groupDetail]="groupDetail"
     [isMobile]="isMobile">
   </app-info-group>
 
-  <app-info-support-group *ngIf="panelType === 'support-group-panel'"
+  <app-info-support-group
+    [style.display]="panelType === 'support-group-panel' ? 'block' : 'none'"
     [urlConversationSupportGroup]="urlConversationSupportGroup">
   </app-info-support-group>
 

package/src/app/components/conversation-info/info-content/info-content.component.ts

@@ -63,9 +63,6 @@ export class InfoContentComponent implements OnInit {
     public tiledeskService: TiledeskService
 
   ) {
-    this.logger.log('[INFO-CONTENT-COMP] HELLO (CONSTUCTOR) !!!!!');
-    // this.loggedUser = this.authService.getCurrentUser();
-    // this.logger.log('INFO-CONTENT-COMP loggedUser: ', this.loggedUser);
 
     const appconfig = appConfigProvider.getConfig()
     // this.tenant = appconfig.tenant;
@@ -76,7 +73,6 @@ export class InfoContentComponent implements OnInit {
     this.route.paramMap.subscribe(params => {
       this.logger.log('[INFO-CONTENT-COMP] initialize params: ', params);
       this.conversationWith = params.get('IDConv');
-      this.logger.log('[INFO-CONTENT-COMP] - paramMap.subscribe conversationWith: ', this.conversationWith);
       this.conversationWithFullname = params.get('FullNameConv');
       this.conv_type = params.get('Convtype');
 

package/src/app/components/conversation-info/info-direct/info-direct.component.html

@@ -29,10 +29,12 @@
 
 
 
-  <app-advanced-info-accordion 
-  [advancedAttributes]="advancedAttributes"
-  [translationMap]="translationMap">
-  </app-advanced-info-accordion>
+  <div class="info-accordion-container">
+    <app-advanced-info-accordion class="info-accordion"
+      [advancedAttributes]="advancedAttributes"
+      [translationMap]="translationMap">
+    </app-advanced-info-accordion>
+  </div>
 
 
 </ion-content>

package/src/app/components/conversation-info/info-direct/info-direct.component.scss

@@ -59,4 +59,27 @@
 .member-email  {
     text-align: center;
     margin-top: 8px;
+}
+
+.info-accordion-container{
+    margin-left: 8px !important;
+    margin-right: 8px !important;
+
+    margin-top: 12px !important;
+    background-color: #fff;
+    border-radius: 4px;
+    box-shadow: rgba(0, 27, 71, 0.08) 0px 3px;
+
+    display: flex;
+    .info-accordion{
+        padding: 16px 12px !important;
+        cursor: pointer;
+        position: relative;
+        transition: all 0.2s ease-in-out 0s;
+
+        &:hover{
+            background-color: #f5f7f9;
+        }
+    }
+
 }

package/src/app/components/conversation-info/info-direct/info-direct.component.ts

@@ -26,8 +26,6 @@ export class InfoDirectComponent implements OnInit, AfterViewInit, OnChanges {
 
   ngOnInit() {
     this.logger.log('InfoDirectComponent - ngOnInit');
-  
-    this.initialize();
   }
 
   ngAfterViewInit() {
@@ -41,12 +39,11 @@ export class InfoDirectComponent implements OnInit, AfterViewInit, OnChanges {
     this.logger.log('InfoDirectComponent - ngOnDestroy ' );
     // this.unsubscribe$.next();
     // this.unsubscribe$.complete();
-   
-
   }
 
   ngOnChanges(){
     if(this.member){
+      this.initialize();
       this.member.imageurl = this.imageRepoService.getImagePhotoUrl(this.conversationWith)
     }
   }

package/src/app/components/conversation-info/info-support-group/info-support-group.component.html

@@ -2,5 +2,6 @@
         height="100%"
         [src]="urlConversationSupportGroup"
         frameborder="0"
-        allowfullscreen>
+        allowfullscreen
+        id="iframeConsole">
 </iframe>

package/src/app/components/conversation-info/info-support-group/info-support-group.component.ts

@@ -23,7 +23,6 @@ export class InfoSupportGroupComponent implements OnInit {
     // this.logger.log('ngOnDestroy ConversationDetailPage: ');
     this.logger.log('InfoSupportGroupComponent - ngOnDestroy ');
 
-
   }
 
 }

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/pages/conversation-detail/conversation-detail.page.ts

@@ -804,7 +804,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
                 conv.attributes['project_name']
               )
               let duration = getDateDifference(conv.timestamp, Date.now())
-              duration.days > 10? this.disableTextarea = true: this.disableTextarea = false
+              duration.days > 10 && conv.channel_type !== TYPE_DIRECT? this.disableTextarea = true: this.disableTextarea = false
             }
           })
         }
@@ -824,7 +824,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
             conv.attributes['project_name']
           )
           let duration = getDateDifference(conv.timestamp, Date.now())
-          duration.days > 10? this.disableTextarea = true: this.disableTextarea = false
+          duration.days > 10 && conv.channel_type !== TYPE_DIRECT? this.disableTextarea = true: this.disableTextarea = false
         }
         if(!conv){
           this.conversationsHandlerService.getConversationDetail(this.conversationWith, (conv) => {

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",