@chat21/chat21-ionic 3.0.77 → 3.0.78-rc.2

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

@@ -37,10 +37,8 @@
     [idLoggedUser]="loggedUser.uid"
     [conversationUid]="conversationWith"
     [conversationAvatar]="conversationAvatar" 
-    [translationMap]="translationMap"
-    [isOpenInfoConversation]="isOpenInfoConversation" 
-    [conv_type]="conv_type"
-    (eventOpenCloseInfoConversation)="returnOpenCloseInfoConversation($event)">
+    [translationsMap]="translationsHeaderMap"
+    [conv_type]="conv_type">
   </app-header-conversation-detail>
 
   <ion-content id="conv-details">
@@ -125,7 +123,9 @@
                   [senderId]="loggedUser.uid"
                   [baseLocation]="window?.location?.origin"
                   [areVisibleCAR]="areVisibleCAR" 
-                  [supportMode]= "supportMode" 
+                  [supportMode]= "supportMode"
+                  [isMobile]="isMobile" 
+                  [translationMap]="translationsContentMap"
                   [stylesMap]="styleMap"
                   (onBeforeMessageRender)="onBeforeMessageRenderFN($event)"
                   (onAfterMessageRender)="onAfterMessageRenderFN($event)"
@@ -133,7 +133,8 @@
                   (onScrollContent)="returnOnScrollContent($event)" 
                   (onMenuOptionShow)="returnOnMenuOption($event)"
                   (onElementRendered)="onElementRenderedFN($event)"
-                  (onAddUploadingBubble)="addUploadingBubbleEvent($event)">
+                  (onAddUploadingBubble)="addUploadingBubbleEvent($event)"
+                  (onOpenCloseInfoConversation)="onOpenCloseInfoConversation($event)">
                 </ion-conversation-detail>
 
               </ion-content>
@@ -155,7 +156,7 @@
               [conversationWith]="conversationWith"
               [conversationWithFullname]="conversationWithFullname"
               [currentString]="messageStr"
-              [translationMap]="translationMap"
+              [translationMap]="translationsMap"
               (onLoadedCannedResponses)="onLoadedCannedResponses($event)"
               (onClickCanned)="replaceTagInMessage($event)"
               (onClickAddCannedResponse)="presentCreateCannedResponseModal()">
@@ -211,9 +212,9 @@
               [loggedUser]="loggedUser" 
               [conversationWith]="conversationWith" 
               [tagsCannedFilter]="tagsCannedFilter"
-              [translationMap]="translationMap"
+              [translationMap]="translationsMap"
               [fileUploadAccept]="appConfigProvider.getConfig().fileUploadAccept"
-              [isOpenInfoConversation]="isOpenInfoConversation" 
+              [isOpenInfoConversation]="openInfoConversation" 
               [dropEvent]="dropEvent"
               [disableTextarea]="disableTextarea"
               (eventChangeTextArea)="returnChangeTextArea($event)"
@@ -230,7 +231,7 @@
         [ngClass]="{'info-convs-apps-sidebar-wide': appsidebarIsWide === true}">
           <app-info-content 
             [openInfoConversation]="openInfoConversation" 
-            [translationMap]="translationMap"
+            [translationMap]="translationsMap"
             [loggedUser]="loggedUser" 
             [tenant]="tenant" 
             [groupDetail]="groupDetail">

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

@@ -25,8 +25,6 @@
     font-size: 24px;
 }
 
-
-
 #canned > ion-list > ion-item.canned-item.add-canned-response-wpr:hover > span {
     color: #1877f2;
 }

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

@@ -113,14 +113,15 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   public lastConnectionDate: string
   public showMessageWelcome: boolean
   public openInfoConversation = false
-  public openInfoMessage: boolean // check is open info message
   public isMobile = false
   public isLessThan991px = false // nk added
   public isTyping = false
   public nameUserTypingNow: string
 
   public heightMessageTextArea = ''
-  public translationMap: Map<string, string>
+  public translationsMap: Map<string, string> = new Map()
+  public translationsHeaderMap: Map<string, string> = new Map() 
+  public translationsContentMap: Map<string, string> = new Map()
   public conversationAvatar: any
   public membersConversation: any
   public member: UserModel
@@ -148,7 +149,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   //SOUND
   setTimeoutSound: any;
   audio: any;
-  isOpenInfoConversation: boolean;
   USER_HAS_OPENED_CLOSE_INFO_CONV: boolean = false;
   isHovering: boolean = false;
   conversation_count: number;
@@ -336,7 +336,12 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         //   this.updateConversationBadge()
         // }
         if(conv.uid && conv.uid === this.conversationWith){
-          this.conversationAvatar = setConversationAvatar(conv.conversation_with,conv.conversation_with_fullname,conv.channel_type)
+          this.conversationAvatar = setConversationAvatar(
+            conv.conversation_with,
+            conv.conversation_with_fullname,
+            conv.channel_type,
+            conv.attributes['projectId'],
+            conv.attributes['project_name'])
         }
 
       }
@@ -488,7 +493,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
 
     this.messages = [] // list messages of conversation
     this.isFileSelected = false // indicates if a file has been selected (image to upload)
-    this.openInfoMessage = false // indicates whether the info message panel is open
 
     if (checkPlatformIsMobile()) {
       this.isMobile = true
@@ -504,13 +508,11 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       if (checkWindowWidthIsLessThan991px()) {
         this.logger.log('[CONVS-DETAIL] - initialize -> checkWindowWidthIsLessThan991px ', checkWindowWidthIsLessThan991px())
         this.openInfoConversation = false // indica se è aperto il box info conversazione
-        this.isOpenInfoConversation = false
-        this.logger.log('[CONVS-DETAIL] - initialize -> openInfoConversation ', this.openInfoConversation, ' -> isOpenInfoConversation ', this.isOpenInfoConversation)
+        this.logger.log('[CONVS-DETAIL] - initialize -> openInfoConversation ', this.openInfoConversation)
       } else {
         this.logger.log('[CONVS-DETAIL] - initialize -> checkWindowWidthIsLessThan991px ', checkWindowWidthIsLessThan991px())
         this.openInfoConversation = true
-        this.isOpenInfoConversation = true
-        this.logger.log('[CONVS-DETAIL] - initialize -> openInfoConversation ', this.openInfoConversation, ' -> isOpenInfoConversation ', this.isOpenInfoConversation)
+        this.logger.log('[CONVS-DETAIL] - initialize -> openInfoConversation ', this.openInfoConversation)
       }
     }
 
@@ -563,22 +565,12 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     })
   }
 
-  returnOpenCloseInfoConversation(openInfoConversation: boolean) {
-    this.logger.log('[CONVS-DETAIL] returnOpenCloseInfoConversation - openInfoConversation ', openInfoConversation)
-    this.resizeTextArea()
-    this.openInfoMessage = false
-    this.openInfoConversation = openInfoConversation
-    this.isOpenInfoConversation = openInfoConversation
-    this.USER_HAS_OPENED_CLOSE_INFO_CONV = true
-  }
-
   @HostListener('window:resize', ['$event'])
   onResize(event: any) {
     const newInnerWidth = event.target.innerWidth
     if (newInnerWidth < 991) {
       if (this.USER_HAS_OPENED_CLOSE_INFO_CONV === false) {
         this.openInfoConversation = false
-        this.isOpenInfoConversation = false
       }
     }
   }
@@ -616,11 +608,34 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       'THERE_ARE_NO_CANNED_RESPONSES_AVAILABLE',
       'TO_CREATE_THEM_GO_TO_THE_PROJECT',
       "AddNewCannedResponse",
-      "LABEL_LOADING"
+      "LABEL_LOADING",
+      "DIRECT_CHAT",
+      "GROUP_CHAT",
     ]
 
-    this.translationMap = this.customTranslateService.translateLanguage(keys)
-    this.logger.log('[CONVS-DETAIL] x this.translationMap ',this.translationMap)
+    const keysHeader = [
+      'DIRECT_CHAT',
+      'GROUP_CHAT',
+      'LABEL_IS_WRITING',
+      'LABEL_AVAILABLE',
+      'LABEL_NOT_AVAILABLE',
+      'LABEL_INACTIVE',
+      'LABEL_TODAY',
+      'LABEL_TOMORROW',
+      'LABEL_TO',
+      'LABEL_LAST_ACCESS',
+      'ARRAY_DAYS',
+    ]
+
+    const keysContentDetail = [
+      'LABEL_OPEN_INFO_CONVERSATION',
+      'LABEL_CLOSE_GROUP'
+    ]
+
+    this.translationsMap = this.customTranslateService.translateLanguage(keys)
+    this.translationsHeaderMap = this.customTranslateService.translateLanguage(keysHeader)
+    this.translationsContentMap = this.customTranslateService.translateLanguage(keysContentDetail)
+    this.logger.log('[CONVS-DETAIL] x this.translationMap ',this.translationsMap)
   }
 
   // --------------------------------------------------------
@@ -749,6 +764,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
             conv.conversation_with,
             conv.conversation_with_fullname,
             conv.channel_type,
+            conv.attributes['projectId'],
+            conv.attributes['project_name']
           )
         }
         if(!conv){
@@ -761,6 +778,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
                 conv.conversation_with,
                 conv.conversation_with_fullname,
                 conv.channel_type,
+                conv.attributes['projectId'],
+                conv.attributes['project_name']
               )
               let duration = getDateDifference(conv.timestamp, Date.now())
               duration.days > 10? this.disableTextarea = true: this.disableTextarea = false
@@ -779,6 +798,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
             conv.conversation_with,
             conv.conversation_with_fullname,
             conv.channel_type,
+            conv.attributes['projectId'],
+            conv.attributes['project_name']
           )
           let duration = getDateDifference(conv.timestamp, Date.now())
           duration.days > 10? this.disableTextarea = true: this.disableTextarea = false
@@ -790,6 +811,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
                 conv.conversation_with,
                 conv.conversation_with_fullname,
                 conv.channel_type,
+                conv.attributes['projectId'],
+                conv.attributes['project_name']
               )
             }
             this.logger.log('[CONVS-DETAIL] - setHeaderContent > conversationAvatar: ', this.conversationAvatar)
@@ -1024,7 +1047,9 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       this.conversationAvatar = setConversationAvatar(
         this.conversationWith,
         this.conversationWithFullname,
-        this.channelType
+        this.channelType,
+        this.conversation.attributes['projectId'],
+        this.conversation.attributes['project_name']
       )
       
     }
@@ -1147,7 +1172,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         setTimeout(() => {
           if (this.conversationWith.startsWith('support-group')) {
             const pos = message.lastIndexOf('/')
-            this.logger.log('[CONVS-DETAIL] - returnChangeTextArea - canned responses pos of / (using lastIndexOf) ', pos)
+            this.logger.log('[CONVS-DETAIL] - returnChangeTextArea - canned responses pos of / (using lastIndexOf) ', message, pos)
 
             if (pos === -1) {
               // this.tagsCannedFilter = []
@@ -1172,7 +1197,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
               // --------------------------------------------
               // Load canned responses
               // --------------------------------------------
-              this.HIDE_CANNED_RESPONSES = false
+              // this.HIDE_CANNED_RESPONSES = false
               this.messageStr = strSearch
               // ------------------------------------------------------------------------------------------------------------------------------------------
               // Hide / display Canned when the SLASH has POSITION POS 0 and checking if there is a space after the SLASH (in this case it will be hidden)
@@ -1201,13 +1226,17 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
                   this.logger.log('[CONVS-DETAIL] - returnChangeTextArea  --> beforeSlash', beforeSlash)
                   this.logger.log('[CONVS-DETAIL] - returnChangeTextArea  --> afterSlash', afterSlash)
 
+                  console.log('bbbbbbb', beforeSlash[beforeSlash.length-1].indexOf(' '), afterSlash === '', this.HIDE_CANNED_RESPONSES)
 
-                  if(beforeSlash[beforeSlash.length-1].indexOf(' ') >= 0 && afterSlash[0] === ''){
+                  if(beforeSlash[beforeSlash.length-1].indexOf(' ') >= 0 && afterSlash === ''){
                     this.HIDE_CANNED_RESPONSES = false
-                  } else if(beforeSlash[beforeSlash.length-1].indexOf(' ') < 0 && afterSlash[0] === '' ){
+                    console.log('bbbbbbb 1111', beforeSlash[beforeSlash.length-1])
+                  } else if(beforeSlash[beforeSlash.length-1].indexOf(' ') < 0 && afterSlash === '' ){
                     this.HIDE_CANNED_RESPONSES = true
-                  } else if(beforeSlash[beforeSlash.length-1].indexOf(' ') >= 0 && afterSlash[0] === ' '){
+                    console.log('bbbbbbb 22222', beforeSlash[beforeSlash.length-1])
+                  } else if(beforeSlash[beforeSlash.length-1].indexOf(' ') >= 0 && afterSlash === ' '){
                     this.HIDE_CANNED_RESPONSES = true
+                    console.log('bbbbbbb 33333', beforeSlash[beforeSlash.length-1])
                     // this.tagsCannedFilter = []
                   }
                 }
@@ -1497,6 +1526,13 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     }
   }
 
+  onOpenCloseInfoConversation(event){
+    this.logger.log('[CONVS-DETAIL] onOpenCloseInfoConversation - openInfoConversation ', event)
+    this.resizeTextArea()
+    this.openInfoConversation = event
+    this.USER_HAS_OPENED_CLOSE_INFO_CONV = true
+  }
+
   // -------------- START SCROLL/RESIZE  -------------- //
   /** */
   resizeTextArea() {
@@ -1598,6 +1634,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       this.heightMessageTextArea = '57' // NK edited
     }
   }
+
   checkAcceptedFile(draggedFileMimeType) {
     let isAcceptFile = false
     this.logger.log('[CONVS-DETAIL] > checkAcceptedFile - fileUploadAccept: ',this.appConfigProvider.getConfig().fileUploadAccept)
@@ -1706,7 +1743,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
 
   async presentToastOnlyImageFilesAreAllowedToDrag() {
     const toast = await this.toastController.create({
-      message: this.translationMap.get('FAILED_TO_UPLOAD_THE_FORMAT_IS_NOT_SUPPORTED'),
+      message: this.translationsMap.get('FAILED_TO_UPLOAD_THE_FORMAT_IS_NOT_SUPPORTED'),
       duration: 5000,
       color: 'danger',
       cssClass: 'toast-custom-class',

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

@@ -22,14 +22,14 @@
     <ion-list>
 
         <!-- supportMode && -->
-        <ion-item  *ngIf="displayNewConvsItem && conversationType !=='archived' && supportMode" class="ion-no-padding open-iframe-item">
+        <ion-item  *ngIf="displayNewConvsItem && conversationType !=='archived' && supportMode" class="ion-no-padding open-iframe-item" lines="none">
           <div tabindex="0"></div>
           <!-- <ion-note class="pinned-project">
             {{ 'PINNED_PROJECT' | translate }}
           </ion-note> -->
      
           <app-project-item
-            style="width: 100%;" 
+            style="width: 100%; margin: 0px 8px; border-bottom: 1px dashed #d3dbe5;" 
             (openUnsevedConvsEvent)="openUnsevedConversationIframe($event)"
             (projectIdEvent)="getLastProjectId($event)">
           </app-project-item>

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

@@ -43,7 +43,7 @@ ion-list {
 
   ion-item {
     cursor: pointer;
-    height: 64px;
+    // height: 64px;
     position: relative;
     display: flex;
     text-decoration: none;
@@ -324,7 +324,7 @@ ion-list {
   padding-left: 0px !important ;
   padding-right: 0px !important;
   // height: 55px !important;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+  // border-bottom: 1px solid rgba(0, 0, 0, 0.05);
   --background-hover: #ffffff;
   cursor:default !important;
 }

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

@@ -753,6 +753,13 @@ export class ConversationListPage implements OnInit {
       }
     }
 
+    if(conversation.attributes && conversation.attributes['projectId']){
+      let project = localStorage.getItem(conversation.attributes['projectId'])
+      if(project){
+        project = JSON.parse(project)
+        conversation.attributes.project_name = project['name']
+      }
+    }
     // if(conversation.conversation_with_fullname === 'Guest '){
     //   conversation.conversation_with_fullname = 'guest' + '#' + this.getUUidConversation(conversation.uid)
     // }