@chat21/chat21-ionic 3.0.86-rc.4 → 3.0.86-rc.6

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ### 3.0.86 in PROD
 
+### 3.0.86-rc.6
+- bug-fixed: do not change showSourceInfo status if sourcePage info not exist
+- bug-fixed: last_project is undefined
+
+### 3.0.86-rc.5
+- added: header-conversations-list-unassigned component
+- added: toast after text is copied
+- added: unassigned header to conversations-list page and joinConversation options icon
+- removed: "Open" - "Close info detail" string from close/open info conversation detail
+
 ### 3.0.86-rc.4
 - bug-fixed: close emoji-picker if focus is on message-text-area
 - bug-fixed: removed hover background bell icon

package/package.json

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

package/src/app/app.component.scss

@@ -46,3 +46,5 @@
 //         display: block; // Safari bug fix
 //     }
 // }
+
+

package/src/app/chatlib/conversation-detail/ion-conversation-detail/ion-conversation-detail.component.html

@@ -53,13 +53,21 @@
 <!--  nk - no tag ionic -->
 <!-- ----------------------------------------------------------- -->
 <div class="manage_conversation_info_container" [ngClass]="{'close': !openInfoConversation, 'mobile': isMobile}">
-  <ion-button fill="clear" *ngIf="openInfoConversation" (click)="onOpenCloseInfoConversationFN()">
+  <ion-button fill="clear" *ngIf="openInfoConversation" (click)="onOpenCloseInfoConversationFN()"
+    [tooltip]="closeGroupTooltip"  [options]="tooltipOptions" placement="bottom"  content-type="template">
     <ion-icon name="arrow-forward-outline"></ion-icon>
-    {{translationMap.get('LABEL_CLOSE_GROUP')}}
+    <!-- {{translationMap.get('LABEL_CLOSE_GROUP')}} -->
+    <ng-template #closeGroupTooltip>
+      <span> {{ translationMap?.get('LABEL_CLOSE_GROUP')}} </span>
+    </ng-template>
   </ion-button>
-  <ion-button fill="clear" *ngIf="!openInfoConversation" (click)="onOpenCloseInfoConversationFN()">
+  <ion-button fill="clear" *ngIf="!openInfoConversation" (click)="onOpenCloseInfoConversationFN()"
+    [tooltip]="openGroupTooltip"  [options]="tooltipOptions" placement="bottom"  content-type="template">
     <ion-icon name="arrow-back-outline"></ion-icon>
-    {{translationMap.get('LABEL_OPEN_INFO_CONVERSATION')}}
+    <ng-template #openGroupTooltip>
+      <span> {{ translationMap?.get('LABEL_OPEN_INFO_CONVERSATION')}} </span>
+    </ng-template>
+    <!-- {{translationMap.get('LABEL_OPEN_INFO_CONVERSATION')}} -->
   </ion-button>
 </div>
 
@@ -166,7 +174,7 @@
           (onBeforeMessageRender)="onBeforeMessageRenderFN($event)"
           (onAfterMessageRender)="onAfterMessageRenderFN($event)" 
           (onElementRendered)="onElementRenderedFN($event)"
-          (click)="onBubbleMessageClick($event, i)">
+          (click)="onBubbleMessageClick($event, message, i)">
         </chat-bubble-message>
 
         <div class="options-container">
@@ -201,7 +209,7 @@
     
     <div class="base_receive sourcePage-container" *ngIf="messageType(MESSAGE_TYPE_OTHERS, message) && message?.attributes?.sourcePage" [class.show]="showSourceInfo && showSourceInfoIndex===i">
       <svg xmlns="http://www.w3.org/2000/svg" height="15px" width="15px" viewBox="0 0 24 24"  fill="none"><path _ngcontent-wrg-c96="" d="M0 0h24v24H0V0z" fill="none"></path><path _ngcontent-wrg-c96="" d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zM4 12c0-.61.08-1.21.21-1.78L8.99 15v1c0 1.1.9 2 2 2v1.93C7.06 19.43 4 16.07 4 12zm13.89 5.4c-.26-.81-1-1.4-1.9-1.4h-1v-3c0-.55-.45-1-1-1h-6v-2h2c.55 0 1-.45 1-1V7h2c1.1 0 2-.9 2-2v-.41C17.92 5.77 20 8.65 20 12c0 2.08-.81 3.98-2.11 5.4z"></path></svg>
-      <span title="{{message?.attributes?.sourcePage}}" class="truncate">{{message?.attributes?.sourcePage}}</span>
+      <span title="{{message?.attributes?.sourcePage}}" class="truncate"><a target="_blank" href="{{message?.attributes?.sourcePage}}">{{message?.attributes?.sourcePage}}</a></span>
     </div>
 
     <!-- message type:: button &&  -->

package/src/app/chatlib/conversation-detail/ion-conversation-detail/ion-conversation-detail.component.scss

@@ -347,6 +347,7 @@ ion-item {
 .sourcePage-container{
     margin: 0 0px 0px 10px;
     display: none;
+    width: 75%;
     align-items: center;
     color: rgb(135, 150, 175);
     font-size: 12px;

package/src/app/chatlib/conversation-detail/ion-conversation-detail/ion-conversation-detail.component.ts

@@ -15,7 +15,7 @@ import { TiledeskAuthService } from 'src/chat21-core/providers/tiledesk/tiledesk
 import { TranslateService } from '@ngx-translate/core';
 import * as moment from 'moment';
 import { AppConfigProvider } from 'src/app/services/app-config';
-import { ModalController, PopoverController } from '@ionic/angular';
+import { ModalController, PopoverController, ToastController } from '@ionic/angular';
 import { CreateCannedResponsePage } from 'src/app/modals/create-canned-response/create-canned-response.page';
 
 @Component({
@@ -71,7 +71,8 @@ export class IonConversationDetailComponent extends ConversationContentComponent
     private translate: TranslateService,
     public appConfigProvider: AppConfigProvider,
     public modalController: ModalController,
-    public popoverController: PopoverController
+    public popoverController: PopoverController,
+    public toastController: ToastController
   ) {
     super(cdref, uploadService)
 
@@ -158,11 +159,14 @@ export class IonConversationDetailComponent extends ConversationContentComponent
   onClickCopyMesage(event, message: MessageModel){
     this.logger.log('[CONVS-DETAIL][ION-CONVS-DETAIL] - onClickCopyMesage');
     navigator.clipboard.writeText(message.text)
+    this.presentToast()
   }
 
-  onBubbleMessageClick(event: any, index: number){
-    this.showSourceInfo = !this.showSourceInfo
-    this.showSourceInfoIndex = index
+  onBubbleMessageClick(event: any, message: MessageModel, index: number){
+    if(message && message.attributes && message.attributes.sourcePage){
+      this.showSourceInfo = !this.showSourceInfo
+      this.showSourceInfoIndex = index
+    }
   }
 
   onElementRenderedFN(event) {
@@ -229,4 +233,18 @@ export class IonConversationDetailComponent extends ConversationContentComponent
 
     return await popover.present();
   }
+
+  async presentToast(){
+    const toast = await this.toastController.create({
+      message: '<div style="display: flex">'+
+                '<ion-icon name="copy"></ion-icon> '+
+                `<span>${this.translationMap.get("COPY_MESSAGE_TOAST")}</span>`+
+              '</div>',
+      duration: 3000,
+      color: 'light',
+      position: 'bottom',
+      cssClass: 'toast-copy'
+    });
+    toast.present();
+  }
 }

package/src/app/chatlib/list-conversations-component/ion-list-conversations/ion-list-conversations.component.html

@@ -167,6 +167,19 @@
         <span *ngIf="!conversation?.recipient.startsWith('support-group')"> {{ translationsMap?.get('Archive') }} </span>
       </ng-template>
     </ion-button>
+
+    <!-- <ion-button *ngIf="conversation?.recipient.startsWith('support-group') && !conversation.archived" [tooltip]="joinTooltip"  [options]="tooltip_options" placement="bottom"  content-type="template"
+      [ngClass]="{'hide': !isApp, 'button-on-desktop': !isApp, 'button-on-mobile': isApp  }"
+      id="{{ 'join_conversation_button' + conversation.uid }}" class="close-conversation-button" ion-button clear
+      item-end (click)="joinConversation(conversation);$event.stopPropagation();" padding>
+      <ion-icon slot="icon-only" style="display:block;" id="{{ 'join_button_icon' + conversation.uid }}" name="link-outline" item-end></ion-icon>
+
+      <ng-template #joinTooltip>
+        <span>{{ translationsMap?.get('JOIN_CONVERSATION')}} </span>
+      </ng-template>
+    </ion-button> -->
+
+
     <!-- <ion-button *ngIf="conversation.archived" class="close-conversation-button" ion-button clear item-end disabled padding>
       <!- - <ion-icon  style="display:block;" id="{{ 'close_button_icon' + conversation.uid }}" color="close-conversation" name="archive-outline" item-end></ion-icon> - ->
       <i class="material-icons" id="{{ 'close_button_icon' + conversation.uid }}"  item-end> history </i>

package/src/app/chatlib/list-conversations-component/ion-list-conversations/ion-list-conversations.component.ts

@@ -30,6 +30,7 @@ export class IonListConversationsComponent extends ListConversationsComponent im
   @Input() archiveActionNotAllowed: boolean;
   @Input() uidConvSelected: string;
   @Output() onCloseConversation = new EventEmitter<ConversationModel>();
+  @Output() onJoinConversation = new EventEmitter<ConversationModel>();
   @Output() onCloseAlert = new EventEmitter();
 
   convertMessage = convertMessage;
@@ -129,6 +130,7 @@ export class IonListConversationsComponent extends ListConversationsComponent im
     const translationKeys = [
       'Resolve',
       'Archive',
+      'JOIN_CONVERSATION',
       'ALERT_TITLE',
       'ActionNotAllowed',
       'CLOSE_ALERT_CONFIRM_LABEL',
@@ -219,5 +221,12 @@ export class IonListConversationsComponent extends ListConversationsComponent im
     let currentIndex = this.listConversations.findIndex(conv => conv.uid === conversation.uid)
   }
 
+  joinConversation(conversation: ConversationModel) {
+    var conversationId = conversation.uid;
+    this.logger.log('[ION-LIST-CONVS-COMP] - joinConversation - conversationId ', conversationId)
+    this.onJoinConversation.emit(conversation)
+    let currentIndex = this.listConversations.findIndex(conv => conv.uid === conversation.uid)
+  }
+
 
 }

package/src/app/components/conversations-list/header-conversations-list-unassigned/header-conversations-list-unassigned.component.html

@@ -0,0 +1,11 @@
+<ion-toolbar [class.mobile]="isMobile">
+  
+  <ion-buttons slot="start">
+    <ion-button ion-button (click)="onBackButtonHandler()">
+      <ion-icon slot="icon-only" name="arrow-back-outline"></ion-icon>
+    </ion-button>
+  </ion-buttons>
+
+  <ion-title> {{headerTitle}}</ion-title>
+
+</ion-toolbar>

package/src/app/components/conversations-list/header-conversations-list-unassigned/header-conversations-list-unassigned.component.scss

@@ -0,0 +1,14 @@
+ion-toolbar {
+    height: var(--header-height);   
+    &:not(.mobile){
+        --background: var(--list-bkg-color);
+        border: none;
+    }
+    &.mobile{
+        border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+    }
+
+    ion-button{
+        --color: var(--basic-blue);
+    }
+}

package/src/app/components/conversations-list/header-conversations-list-unassigned/header-conversations-list-unassigned.component.spec.ts

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { HeaderConversationsListUnassigned } from './header-conversations-list-unassigned.component';
+
+describe('HeaderConversationsListUnassignedComponent', () => {
+  let component: HeaderConversationsListUnassigned;
+  let fixture: ComponentFixture<HeaderConversationsListUnassigned>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ HeaderConversationsListUnassigned ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(HeaderConversationsListUnassigned);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

package/src/app/components/conversations-list/header-conversations-list-unassigned/header-conversations-list-unassigned.component.ts

@@ -0,0 +1,25 @@
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+
+@Component({
+  selector: 'header-conversations-list-unassigned',
+  templateUrl: './header-conversations-list-unassigned.component.html',
+  styleUrls: ['./header-conversations-list-unassigned.component.scss'],
+})
+export class HeaderConversationsListUnassigned implements OnInit {
+
+  @Input() headerTitle: string
+  @Input() isMobile: boolean;
+  @Output() onBackButton = new EventEmitter<boolean>();
+  static UserPresenceComponent: any[] | any;
+
+  constructor() { }
+
+  ngOnInit() {
+    // console.log('headertitleeee', this.headerTitle)
+  }
+
+  onBackButtonHandler(){
+    this.onBackButton.emit(true)
+  }
+
+}

package/src/app/components/project-item/project-item.component.ts

@@ -87,10 +87,10 @@ export class ProjectItemComponent implements OnInit {
   }
 
   openUnservedConvs() {
-    this.openUnsevedConvsEvent.emit('notificationsorprjctbtn')
+    this.openUnsevedConvsEvent.emit({event: 'notificationsorprjctbtn', data: this.unservedConversations})
   }
   openUnservedConvsAndGoToProjectList() {
-    this.openUnsevedConvsEvent.emit('pinbtn')
+    this.openUnsevedConvsEvent.emit({event:'pinbtn', data: this.unservedConversations})
   }
 
   getStoredTokenAndConnectWS() {

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

@@ -291,19 +291,13 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
 
 
   getStoredProjectAndUserRole() {
-    const stored_project = localStorage.getItem('last_project')
-    // console.log('[SIDEBAR] stored_project ', stored_project)
-    if (stored_project && stored_project !== undefined) {
-      const project = JSON.parse(stored_project)
-      // this.logger.log('[CONVS-DETAIL]  project ', project)
-
-      // this.project_id = project.id_project.id
-      // this.logger.log('[CONVS-DETAIL] project_id ', this.project_id)
-
-      this.USER_ROLE = project.role;
-      // this.USER_ROLE = 'agent';
-      this.logger.log('[CONVS-DETAIL]  USER_ROLE ', this.USER_ROLE)
-    }
+    this.events.subscribe('storage:last_project',project =>{
+      this.logger.log('[CONVS-DETAIL] stored_project ', project)
+      if (project && project !== 'undefined') {
+        this.USER_ROLE = project.role;
+        this.logger.log('[CONVS-DETAIL]  USER_ROLE ', this.USER_ROLE)
+      }
+    });
   }
 
   getConversations() {
@@ -636,7 +630,9 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       "SEND_EMAIL_SUCCESS",
       "SEND_EMAIL_ERROR",
       "SUBJECT_OFFLINE_MESSAGE",
-      "SEND_EMAIL_SUCCESS_OFFLINE_MESSAGE"
+      "SEND_EMAIL_SUCCESS_OFFLINE_MESSAGE",
+
+      
     ]
 
     const keysHeader = [
@@ -657,6 +653,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       'LABEL_OPEN_INFO_CONVERSATION',
       'LABEL_CLOSE_GROUP',
       'LABEL_IS_WRITING',
+      'COPY',
+      'COPY_MESSAGE_TOAST'
     ]
 
     this.translationsMap = this.customTranslateService.translateLanguage(keys)

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

@@ -11,11 +11,18 @@
     (openProfileInfo)=openProfileInfo($event)>
   </header-conversations-list>
 
-  <header-conversations-list-archived *ngIf="conversationType !=='active'" 
+  <header-conversations-list-archived *ngIf="conversationType ==='archived'" 
     [headerTitle]=headerTitle
     [isMobile]="isMobile"
     (onBackButton)=onBackButtonFN($event)>
   </header-conversations-list-archived>
+
+  <header-conversations-list-unassigned *ngIf="conversationType ==='unassigned'"
+    [headerTitle]=headerTitle
+    [isMobile]="isMobile"
+    (onBackButton)=onBackButtonFN($event)>
+  </header-conversations-list-unassigned>
+
 </ion-header>
 
 <!-- appScrollbarTheme -->
@@ -39,7 +46,7 @@
         </ion-item>
 
       <span
-        *ngIf="(conversations.length > 0 && conversationType ==='active') || (archivedConversations.length > 0  && conversationType ==='archived');then contentConversations else contentMessageWelcome">
+        *ngIf="(conversations.length > 0 && conversationType ==='active') || (archivedConversations.length > 0  && conversationType ==='archived') || (unassignedConversations.length > 0  && conversationType ==='unassigned');then contentConversations else contentMessageWelcome">
         here is ignored
       </span>
 
@@ -73,6 +80,20 @@
           (onImageLoaded)="onImageLoaded($event)"
           (onConversationLoaded)="onConversationLoaded($event)">
         </ion-list-conversations>
+
+        <!-- ---------------------------------- -->
+        <!-- UNASSIGNED CONVERSATION LIST -->
+        <!-- ---------------------------------- -->
+        <ion-list-conversations *ngIf="conversationType ==='unassigned'" 
+          [listConversations]="unassignedConversations"
+          [stylesMap]="stylesMap" 
+          [translationMap]="translationMapConversation"
+          (onConversationSelected)=onConversationSelected($event)
+          (onCloseConversation)="onCloseConversation($event)" 
+          (onJoinConversation) ="onJoinConversation($event)"
+          (onImageLoaded)="onImageLoaded($event)"
+          (onConversationLoaded)="onConversationLoaded($event)">
+        </ion-list-conversations>
       </ng-template>
 
       <ng-template #contentMessageWelcome>
@@ -102,7 +123,7 @@
         </div>
 
         <div id="no-convs-wpr"
-          *ngIf="(!loadingIsActive && conversations.length === 0) || (!loadingIsActive && archivedConversations.length === 0) ">
+          *ngIf="(!loadingIsActive && conversations.length === 0) || (!loadingIsActive && archivedConversations.length === 0) || (!loadingIsActive && unassignedConversations.length === 0)">
           <ion-item id="no-convs" class="ion-text-center" lines="none">
             <ion-label class="ion-text-wrap" color="medium">
               {{ 'LABEL_MSG_PUSH_START_CHAT' | translate }}

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

@@ -64,6 +64,7 @@ export class ConversationListPage implements OnInit {
   public loggedUserUid: string
   public conversations: Array<ConversationModel> = []
   public archivedConversations: Array<ConversationModel> = []
+  public unassignedConversations: Array<ConversationModel> = []
   public uidConvSelected: string
   public conversationSelected: ConversationModel
   public uidReciverFromUrl: string
@@ -253,22 +254,33 @@ export class ConversationListPage implements OnInit {
     this.lastProjectId = projectid
   }
 
-  openUnsevedConversationIframe(event) {
+  openUnsevedConversationIframe(event:{event: string, data: ConversationModel[]}) {
     this.logger.log('[CONVS-LIST-PAGE] openUnsevedConversationIframe ', event)
     this.hasClickedOpenUnservedConvIframe = true
+    // if(event && event.data){
+    //   this.conversationType = 'unassigned'
+    //   this.unassignedConversations = event.data
+      
+    //   const keys = ['UnassignedConversations']
+    //   // const keys = ['History'];
+
+    //   this.headerTitle = this.translateService.translateLanguage(keys).get(keys[0])
+    // }
     this.logger.log('[CONVS-LIST-PAGE] - HAS CLIKED OPEN UNSERVED REQUEST IFRAME',this.hasClickedOpenUnservedConvIframe )
     const DASHBOARD_BASE_URL = this.appConfigProvider.getConfig().dashboardUrl
     // http://localhost:4204/#/projects-for-panel
     this.PROJECTS_FOR_PANEL_URL = DASHBOARD_BASE_URL + '#/projects-for-panel'
     this.UNASSIGNED_CONVS_URL = DASHBOARD_BASE_URL + '#/project/' + this.lastProjectId + '/unserved-request-for-panel'
 
-    if (event === 'pinbtn') {
+    if (event.event === 'pinbtn') {
       this.IFRAME_URL = this.PROJECTS_FOR_PANEL_URL
     } else {
       this.IFRAME_URL = this.UNASSIGNED_CONVS_URL
     }
     this.logger.log('[CONVS-LIST-PAGE] - HAS CLIKED OPEN UNSERVED REQUEST IFRAME > UNASSIGNED CONVS URL',this.UNASSIGNED_CONVS_URL )
     this.openUnassignedConversations(this.IFRAME_URL, event)
+
+
   }
 
   // ---------------------------------------------------------
@@ -649,6 +661,8 @@ export class ConversationListPage implements OnInit {
         conversationSelected = this.conversations.find((item) => item.uid === this.uidConvSelected)
       } else if (conversationType === 'archived') { 
         conversationSelected = this.archivedConversations.find((item) => item.uid === this.uidConvSelected)
+      } else if (conversationType === 'unassigned') { 
+        conversationSelected = this.unassignedConversations.find((item) => item.uid === this.uidConvSelected)
       }
       if (conversationSelected) {
         this.logger.log('[CONVS-LIST-PAGE] conversationSelected', conversationSelected)
@@ -873,6 +887,10 @@ export class ConversationListPage implements OnInit {
     })
   }
 
+  onJoinConversation(conversation: ConversationModel){
+    this.logger.log('[CONVS-LIST-PAGE] onJoinConversation  conversation', conversation)
+  }
+
   // ----------------------------------------------------------------------------------------------
   // onCloseConversation
   // https://github.com/chat21/chat21-cloud-functions/blob/master/docs/api.md#delete-a-conversation

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

@@ -48,6 +48,10 @@ export class UnassignedConversationsPage implements OnInit {
     this.hideHotjarFeedbackBtn();
   }
 
+  ngOnDestroy(){
+    this.logger.log('[UNASSIGNED-CONVS-PAGE] - onDestroy called', this.iframe_URL);
+  }
+
   hideHotjarFeedbackBtn() {
     const hotjarFeedbackBtn = <HTMLElement>document.querySelector("#_hj_feedback_container > div > button")
     if (hotjarFeedbackBtn) {

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

@@ -1,3 +1,4 @@
+import { HeaderConversationsListUnassigned } from './../components/conversations-list/header-conversations-list-unassigned/header-conversations-list-unassigned.component';
 import { NavbarComponent } from './../components/navbar/navbar.component';
 import { FormsModule } from '@angular/forms';
 import { NgSelectModule } from '@ng-select/ng-select';
@@ -90,6 +91,7 @@ import { SafeHtmlPipe } from '../directives/safe-html.pipe';
     HtmlEntitiesEncodePipe,
     SafeHtmlPipe,
     HeaderConversationsListArchived,
+    HeaderConversationsListUnassigned,
     NetworkOfflineComponent
   ],
   exports: [
@@ -123,6 +125,7 @@ import { SafeHtmlPipe } from '../directives/safe-html.pipe';
     InfoDirectComponent,
     InfoGroupComponent,
     HeaderConversationsListArchived,
+    HeaderConversationsListUnassigned,
     NetworkOfflineComponent
 
   ],

package/src/assets/i18n/ar.json

@@ -240,6 +240,9 @@
   "Settings": "إعدادات",
   "Resolve": "حل",
   "Archive": "أرشيف",
+  "JOIN_CONVERSATION":"انضم إلى المحادثة",
+  "COPY":"ينسخ",
+  "COPY_MESSAGE_TOAST":"<b> تم النسخ إلى الحافظة! </ b> الصقها أينما تريد.",
   "ActionNotAllowed": "الإجراء غير مسموح به",
   "YouAreNoLongerAmongTheTeammatesManagingThisConversation": "لم تعد من بين زملائك في الفريق الذين يديرون هذه المحادثة",
   "TicketSuccessfullyCreated":"تم إنشاء التذكرة بنجاح",

package/src/assets/i18n/az.json

@@ -240,6 +240,9 @@
     "Settings": "Parametrlər",
     "Resolve": "Həll et",
     "Archive": "Arxiv",
+    "JOIN_CONVERSATION":"Söhbətə qoşulun",
+    "COPY":"Kopyalayın",
+    "COPY_MESSAGE_TOAST":"<b> Buferə kopyalandı!</b> Onu istədiyiniz yerə yapışdırın.",
     "ActionNotAllowed": "Fəaliyyətə icazə verilmir",
     "YouAreNoLongerAmongTheTeammatesManagingThisConversation": "Siz artıq bu söhbəti idarə edən komanda yoldaşları arasında deyilsiniz",
     "TicketSuccessfullyCreated": "Bilet uğurla yaradıldı",

package/src/assets/i18n/de.json

@@ -240,6 +240,9 @@
   "Settings": "Einstellungen",
   "Resolve": "Lösen",
   "Archive": "Archivieren",
+  "JOIN_CONVERSATION":"Nehmen Sie am Gespräch teil",
+  "COPY":"Kopieren",
+  "COPY_MESSAGE_TOAST":"<b> In die Zwischenablage kopiert!</b> An beliebiger Stelle einfügen.",
   "ActionNotAllowed": "Aktion nicht erlaubt",
   "YouAreNoLongerAmongTheTeammatesManagingThisConversation":"Sie gehören nicht mehr zu den Teamkollegen, die diese Unterhaltung führen",
   "TicketSuccessfullyCreated": "Ticket erfolgreich erstellt",

package/src/assets/i18n/en.json

@@ -240,6 +240,9 @@
   "Settings": "Settings",
   "Resolve": "Resolve",
   "Archive": "Archive",
+  "JOIN_CONVERSATION":"Join conversation",
+  "COPY":"Copy",
+  "COPY_MESSAGE_TOAST":"<b> Copied to clipboard!</b> Paste it wherever you like.",
   "ActionNotAllowed":"Action not allowed",
   "YouAreNoLongerAmongTheTeammatesManagingThisConversation":"You are no longer among the teammates managing this conversation",
   "TicketSuccessfullyCreated":"Ticket successfully created",

package/src/assets/i18n/es.json

@@ -240,6 +240,9 @@
   "Settings": "Ajustes",
   "Resolve": "Resolver",
   "Archive": "Archivas",
+  "JOIN_CONVERSATION":"Unirse a la conversación",
+  "COPY":"Copiar",
+  "COPY_MESSAGE_TOAST":"<b> Copiado al portapapeles!</b> Pégalo donde quieras.",
   "ActionNotAllowed":"Acción no permitida",
   "YouAreNoLongerAmongTheTeammatesManagingThisConversation":"Ya no estás entre los compañeros de equipo que gestionan esta conversación",
   "TicketSuccessfullyCreated":"Ticket creado con éxito",

package/src/assets/i18n/fr.json

@@ -240,6 +240,9 @@
   "Settings": "Réglages",
   "Resolve": "Résoudre",
   "Archive": "Archiver",
+  "JOIN_CONVERSATION":"Rejoindre la conversation",
+  "COPY":"Copie",
+  "COPY_MESSAGE_TOAST":"<b> Copié dans le presse-papier !</b> Collez-le où vous le souhaitez.",
   "ActionNotAllowed":"Action non autorisée",
   "YouAreNoLongerAmongTheTeammatesManagingThisConversation":"Vous n'êtes plus parmi les coéquipiers qui gèrent cette conversation",
   "TicketSuccessfullyCreated":"Ticket créé avec succès",

package/src/assets/i18n/it.json

@@ -240,6 +240,9 @@
     "Settings": "Impostazioni",
     "Resolve": "Risolvi",
     "Archive": "Archivia",
+    "JOIN_CONVERSATION":"Partecipa alla chat",
+    "COPY":"Copia",
+    "COPY_MESSAGE_TOAST":"<b> Copiato negli appunti!</b> Incollalo dove preferisci.",
     "ActionNotAllowed":"Azione non permessa",
     "YouAreNoLongerAmongTheTeammatesManagingThisConversation":"Non sei più tra i compagni di squadra che gestiscono questa conversazione",
     "TicketSuccessfullyCreated":"Ticket creato con successo",

package/src/assets/i18n/kk.json

@@ -240,6 +240,9 @@
     "Settings": "Параметрлер",
     "Resolve": "Шешіңіз",
     "Archive": "Мұрағат",
+    "JOIN_CONVERSATION":"Әңгімеге қосылу",
+    "COPY":"Көшіру",
+    "COPY_MESSAGE_TOAST":"<b> Буферге көшірілді!</b> Оны қалаған жеріңізге қойыңыз.",
     "ActionNotAllowed": "Әрекетке рұқсат етілмейді",
     "YouAreNoLongerAmongTheTeammatesManagingThisConversation": "Сіз бұдан былай осы әңгімені басқаратын командаластардың арасында емессіз",
     "TicketSuccessfullyCreated": "Билет сәтті жасалды",

package/src/assets/i18n/pt.json

@@ -240,6 +240,9 @@
   "Settings": "Configurações",
   "Resolve": "Resolver",
   "Archive": "Arquivar",
+  "JOIN_CONVERSATION":"Entrar na conversa",
+  "COPY":"Cópia",
+  "COPY_MESSAGE_TOAST":"<b> Copiado para a área de transferência!</b> Cole onde quiser.",
   "ActionNotAllowed":"Ação não autorizada",
   "YouAreNoLongerAmongTheTeammatesManagingThisConversation":"Você não está mais entre os colegas de equipe que estão gerenciando esta conversa",
   "TicketSuccessfullyCreated":"Ticket criado com sucesso",

package/src/assets/i18n/ru.json

@@ -240,6 +240,9 @@
   "Settings": "Настройки",
   "Resolve": "Pазрешить",
   "Archive": "Архивировать",
+  "JOIN_CONVERSATION":"Присоединиться к беседе",
+  "COPY":"Копировать",
+  "COPY_MESSAGE_TOAST":"<b> Скопировано в буфер обмена!</b> Вставьте куда хотите.",
   "ActionNotAllowed":"Действие не разрешено",
   "YouAreNoLongerAmongTheTeammatesManagingThisConversation":"Вы больше не входите в число товарищей по команде, ведущих этот разговор",
   "TicketSuccessfullyCreated":"Тикет успешно создан",

package/src/assets/i18n/sr.json

@@ -240,6 +240,9 @@
   "Settings": "Подешавања",
   "Resolve": "Ресолве",
   "Archive": "Архива",
+  "JOIN_CONVERSATION":"Придружите се разговору",
+  "COPY":"Копирај",
+  "COPY_MESSAGE_TOAST":"<b> Копирано у међуспремник!</b> Налепите где год желите.",
   "ActionNotAllowed":"Радња није дозвољена",
   "YouAreNoLongerAmongTheTeammatesManagingThisConversation":"Више нисте међу саиграчима који управљају овим разговором",
   "TicketSuccessfullyCreated":"Улазница је успешно направљена",

package/src/assets/i18n/sv.json

@@ -240,6 +240,9 @@
     "Settings": "inställningar",
     "Resolve": "Lösa",
     "Archive": "Arkiv",
+    "JOIN_CONVERSATION":"Gå med i konversationen",
+    "COPY":"Kopiera",
+    "COPY_MESSAGE_TOAST":"<b> Kopierat till urklipp!</b> Klistra in det var du vill.",
     "ActionNotAllowed": "Åtgärd inte tillåten",
     "YouAreNoLongerAmongTheTeammatesManagingThisConversation": "Du är inte längre bland lagkamraterna som hanterar den här konversationen",
     "TicketSuccessfullyCreated": "Biljetten har skapats",

package/src/assets/i18n/tr.json

@@ -240,6 +240,9 @@
   "Settings": "Ayarlar",
   "Resolve": "Çözmek",
   "Archive": "Arşivle",
+  "JOIN_CONVERSATION":"Sohbete katıl",
+  "COPY":"Kopyala",
+  "COPY_MESSAGE_TOAST":"<b> Panoya kopyalandı!</b> İstediğiniz yere yapıştırın.",
   "ActionNotAllowed":"İşleme izin verilmiyor",
   "YouAreNoLongerAmongTheTeammatesManagingThisConversation":"Artık bu konuşmayı yöneten takım arkadaşları arasında değilsiniz",
   "TicketSuccessfullyCreated":"Bilet başarıyla oluşturuldu",

package/src/assets/i18n/uk.json

@@ -240,6 +240,9 @@
     "Settings": "Налаштування",
     "Resolve": "Вирішити",
     "Archive": "Архів",
+    "JOIN_CONVERSATION":"Приєднатися до розмови",
+    "COPY":"Копія",
+    "COPY_MESSAGE_TOAST":"<b> Скопійовано в буфер обміну!</b> Вставте куди завгодно.",
     "ActionNotAllowed": "Дія не дозволена",
     "YouAreNoLongerAmongTheTeammatesManagingThisConversation": "Ви більше не серед товаришів по команді, які керують цією розмовою",
     "TicketSuccessfullyCreated": "Квиток успішно створено",

package/src/assets/i18n/uz.json

@@ -241,6 +241,9 @@
     "Settings": "Sozlamalar",
     "Resolve": "Yechish",
     "Archive": "Arxiv",
+    "JOIN_CONVERSATION":"Suhbatga qo'shiling",
+    "COPY":"Nusxalash",
+    "COPY_MESSAGE_TOAST":"<b> Buferga nusxalandi!</b> Uni xohlagan joyga joylashtiring.",
     "ActionNotAllowed": "Harakatga ruxsat berilmagan",
     "YouAreNoLongerAmongTheTeammatesManagingThisConversation": "Siz endi bu suhbatni boshqarayotgan jamoadoshlar orasida emassiz",
     "TicketSuccessfullyCreated": "Chipta muvaffaqiyatli yaratildi",

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

@@ -19,9 +19,9 @@ export class ConvertRequestToConversation {
             request.attributes,
             request.request_id && (request.request_id.startsWith('group-') || request.request_id.startsWith('support-group'))? TYPE_SUPPORT_GROUP: TYPE_DIRECT,
             request.lead && request.lead.fullname ? request.lead.fullname: null,
-            request.requester_id,
+            request.request_id,
+            request.request_id,
             request.lead && request.lead.fullname ? request.lead.fullname: null,
-            request.requester_id,
             '',
             true,
             request.first_text,

package/src/global.scss

@@ -742,3 +742,13 @@ ul.dropdown-menu > li > a {
     border-radius: 16px !important;
 }
 
+
+//TOAST
+.toast-copy{
+    --end: 0px;
+    --width: auto;
+    .toast-message{
+        display: flex !important;
+    }
+}
+