@chat21/chat21-ionic 3.0.61-rc11 → 3.0.61-rc15

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

@@ -13,7 +13,7 @@ import { EventsService } from 'src/app/services/events-service';
 import { tranlatedLanguage } from '../../../chat21-core/utils/constants';
 
 // utils
-import { avatarPlaceholder,  getColorBck} from 'src/chat21-core/utils/utils-user';
+import { avatarPlaceholder, getColorBck } from 'src/chat21-core/utils/utils-user';
 
 @Component({
   selector: 'app-sidebar',
@@ -49,6 +49,15 @@ export class SidebarComponent implements OnInit {
   countClickOnOpenUserDetailSidebar: number = 0
   USER_PHOTO_PROFILE_EXIST: boolean;
   currentUser: any;
+  dashboard_home_url: string;
+  dashboard_bots_url: string;
+  dashboard_convs_url: string;
+  dashboard_contacts_url: string;
+  dashboard_app_url: string;
+  dashboard_analytics_url: string;
+  dashboard_activities_url: string;
+  dashboard_history_url: string;
+  dashboard_settings_url: string;
   constructor(
     public imageRepoService: ImageRepoService,
     public appStorageService: AppStorageService,
@@ -59,13 +68,13 @@ export class SidebarComponent implements OnInit {
     public appConfigProvider: AppConfigProvider,
     private translate: TranslateService,
     public events: EventsService,
-   
+
   ) { }
 
   ngOnInit() {
     this.DASHBOARD_URL = this.appConfig.getConfig().dashboardUrl + '#/project/';
     // console.log('[SIDEBAR] DASHBOARD_URL ', this.DASHBOARD_URL)
-    this.getStoredProjectAndDashboardBaseUrl()
+    this.getStoredProjectAndUserRole()
     this.subcribeToAuthStateChanged()
     this.listenTocurrentProjectUserUserAvailability$()
     this.getOSCODE();
@@ -84,8 +93,44 @@ export class SidebarComponent implements OnInit {
     //     height: '35px'
     //   };
     // }
+
+
+  }
+
+
+  getStoredProjectAndUserRole() {
+    const stored_project = localStorage.getItem('last_project')
+    // console.log('[SIDEBAR] stored_project ', stored_project)
+    if (stored_project) {
+      const project = JSON.parse(stored_project)
+      this.logger.log('[SIDEBAR] project ', project)
+
+      this.project_id = project.id_project.id
+      this.logger.log('[SIDEBAR] project_id ', this.project_id)
+
+      this.USER_ROLE = project.role;
+      this.logger.log('[SIDEBAR] USER_ROLE ', this.USER_ROLE)
+      this.buildURLs(this.USER_ROLE)
+    }
   }
 
+  buildURLs(USER_ROLE) {
+    this.dashboard_home_url = this.DASHBOARD_URL + this.project_id + '/home'
+    this.dashboard_bots_url = this.DASHBOARD_URL + this.project_id + '/bots'
+    this.dashboard_convs_url = this.DASHBOARD_URL + this.project_id + '/wsrequests'
+    this.dashboard_contacts_url = this.DASHBOARD_URL + this.project_id + '/contacts'
+    this.dashboard_app_url = this.DASHBOARD_URL + this.project_id + '/app-store'
+    this.dashboard_analytics_url = this.DASHBOARD_URL + this.project_id + '/analytics'
+    this.dashboard_activities_url = this.DASHBOARD_URL + this.project_id + '/activities'
+    this.dashboard_history_url = this.DASHBOARD_URL + this.project_id + '/history'
+    this.dashboard_settings_url = ''
+    if (USER_ROLE !== 'agent') {
+      this.dashboard_settings_url = this.DASHBOARD_URL + this.project_id + '/widget-set-up'
+    } else if (USER_ROLE === 'agent') {
+      this.dashboard_settings_url = this.DASHBOARD_URL + this.project_id + '/cannedresponses'
+    }
+
+  }
 
   subcribeToAuthStateChanged() {
     this.messagingAuthService.BSAuthStateChanged.subscribe((state) => {
@@ -106,12 +151,12 @@ export class SidebarComponent implements OnInit {
   }
 
   checkIfExistPhotoProfile(imageUrl) {
-    this.verifyImageURL(imageUrl,  (imageExists) => {
+    this.verifyImageURL(imageUrl, (imageExists) => {
 
       if (imageExists === true) {
         this.USER_PHOTO_PROFILE_EXIST = true;
         this.logger.log('[SIDEBAR] photo_profile_URL IMAGE EXIST ', imageExists)
-      
+
       } else {
         this.USER_PHOTO_PROFILE_EXIST = false;
         this.logger.log('[SIDEBAR] photo_profile_URL IMAGE EXIST ', imageExists)
@@ -134,7 +179,7 @@ export class SidebarComponent implements OnInit {
       currentUser['fullname_initial'] = 'N/A'
       currentUser['fillColour'] = 'rgb(98, 100, 167)'
     }
-}
+  }
 
   verifyImageURL(image_url, callBack) {
     const img = new Image();
@@ -380,36 +425,21 @@ export class SidebarComponent implements OnInit {
 
 
 
-
-  getStoredProjectAndDashboardBaseUrl() {
-    const stored_project = localStorage.getItem('last_project')
-    // console.log('[SIDEBAR] stored_project ', stored_project)
-    if (stored_project) {
-      const project = JSON.parse(stored_project)
-      this.logger.log('[SIDEBAR] project ', project)
-
-      this.project_id = project.id_project.id
-      this.logger.log('[SIDEBAR] project_id ', this.project_id)
-
-      this.USER_ROLE = project.role;
-      this.logger.log('[SIDEBAR] USER_ROLE ', this.USER_ROLE)
-    }
-  }
-
   goToHome() {
     let url = this.DASHBOARD_URL + this.project_id + '/home'
+    this.dashboard_home_url = url;
     const myWindow = window.open(url, '_self');
     myWindow.focus();
   }
 
-  goToConversations() {
-    let url = this.DASHBOARD_URL + this.project_id + '/wsrequests'
+  goToBots() {
+    let url = this.DASHBOARD_URL + this.project_id + '/bots'
     const myWindow = window.open(url, '_self');
     myWindow.focus();
   }
 
-  goToBots() {
-    let url = this.DASHBOARD_URL + this.project_id + '/bots'
+  goToConversations() {
+    let url = this.DASHBOARD_URL + this.project_id + '/wsrequests'
     const myWindow = window.open(url, '_self');
     myWindow.focus();
   }
@@ -446,12 +476,28 @@ export class SidebarComponent implements OnInit {
     myWindow.focus();
   }
 
+  goToWidgetSetUpOrToCannedResponses() {
+    if (this.USER_ROLE !== 'agent') {
+      this.goToWidgetSetUp()
+    } else if (this.USER_ROLE === 'agent') {
+      this.goToSettings_CannedResponses()
+    }
+  }
+
+  goToWidgetSetUp() {
+    let url = this.DASHBOARD_URL + this.project_id + '/widget-set-up'
+    const myWindow = window.open(url, '_self');
+    myWindow.focus();
+  }
+
   goToSettings_CannedResponses() {
     let url = this.DASHBOARD_URL + this.project_id + '/cannedresponses'
     const myWindow = window.open(url, '_self');
     myWindow.focus();
   }
 
+
+
   public translations() {
     const keys = [
       'Available',

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

@@ -107,4 +107,11 @@
         <div> Logout</div>
     </section>
 
+    <section class="user-details-footer-chat-version">
+        <div class="chat-version"> 
+        <!-- &copy; {{test | date: 'yyyy'}} {{company_name}} ver {{version}} -->
+        ver {{version}}
+        </div>
+    </section>
+
 </div>

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

@@ -275,6 +275,18 @@ button.user-details-btn-close {
     color: #fff;
 }
 
+.user-details-footer-chat-version {
+    position: absolute;
+    bottom: 11px;
+    text-align: center;
+    margin: auto;
+    transform: translateX(-50%);
+    left: 50%;
+    margin: auto;
+    font-size: 12px;
+    font-weight: 400;
+}
+
 :host ::ng-deep .mat-slide-toggle.mat-checked:not(.mat-disabled) .mat-slide-toggle-bar {
     background-color: #a9afbb;
     margin-left: 30px;
@@ -315,4 +327,4 @@ button.user-details-btn-close {
     font-weight: 400;
     font-family: "Poppins";
     font-size: 32px;
-}
+}

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

@@ -11,7 +11,8 @@ import { skip } from 'rxjs/operators';
 import { AppConfigProvider } from 'src/app/services/app-config';
 import { EventsService } from 'src/app/services/events-service';
 import { tranlatedLanguage } from '../../../chat21-core/utils/constants';
-import { avatarPlaceholder,  getColorBck} from 'src/chat21-core/utils/utils-user';
+import { avatarPlaceholder, getColorBck } from 'src/chat21-core/utils/utils-user';
+import * as PACKAGE from 'package.json';
 @Component({
   selector: 'app-sidebar-user-details',
   templateUrl: './sidebar-user-details.component.html',
@@ -53,8 +54,10 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
   public_Key: any
   plan_name: string;
   plan_subscription_is_active: boolean;
-   USER_PHOTO_PROFILE_EXIST: boolean;
- 
+  USER_PHOTO_PROFILE_EXIST: boolean;
+  version: string
+  test: Date = new Date();
+  company_name: string = 'Tiledesk'
   constructor(
     private translate: TranslateService,
     public tiledeskAuthService: TiledeskAuthService,
@@ -68,6 +71,7 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
   ) { }
 
   ngOnInit() {
+    this.version = PACKAGE.version;
     this.getCurrentChatLangAndTranslateLabels();
     this.subcribeToAuthStateChanged();
     this.listenTocurrentProjectUserUserAvailability$();
@@ -95,12 +99,12 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
   }
 
   checkIfExistPhotoProfile(imageUrl) {
-    this.verifyImageURL(imageUrl,  (imageExists) => {
+    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)
-      
+
       } else {
         this.USER_PHOTO_PROFILE_EXIST = false;
         this.logger.log('[SIDEBAR-USER-DETAILS] photo_profile_URL IMAGE EXIST ', imageExists)
@@ -124,7 +128,7 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
       currentUser['fullname_initial'] = 'N/A'
       currentUser['fillColour'] = 'rgb(98, 100, 167)'
     }
-}
+  }
 
   verifyImageURL(image_url, callBack) {
     const img = new Image();
@@ -198,7 +202,7 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
       this.logger.log('[SIDEBAR-USER-DETAILS] chat_lang: ', this.chat_lang);
     }
 
-   
+
     if (tranlatedLanguage.includes(this.chat_lang)) {
       this.logger.log('[SIDEBAR-USER-DETAILS] tranlatedLanguage includes', this.chat_lang, ': ', tranlatedLanguage.includes(this.chat_lang))
       this.translate.use(this.chat_lang);

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

@@ -35,6 +35,9 @@ import { SharedModule } from 'src/app/shared/shared.module';
 // import { SharedConversationInfoModule } from 'src/app/shared/shared-conversation-info.module';
 import { NgxLinkifyjsModule } from 'ngx-linkifyjs';
 import { ScrollbarThemeModule } from '../../utils/scrollbar-theme.directive';
+import { PickerModule } from '@ctrl/ngx-emoji-mart';
+
+
 @NgModule({
   imports: [
     CommonModule,
@@ -43,6 +46,7 @@ import { ScrollbarThemeModule } from '../../utils/scrollbar-theme.directive';
     TooltipModule,
     ConversationDetailPageRoutingModule,
     ScrollbarThemeModule,
+    PickerModule,
     TranslateModule.forChild({
       loader: {
         provide: TranslateLoader,
@@ -58,7 +62,7 @@ import { ScrollbarThemeModule } from '../../utils/scrollbar-theme.directive';
   declarations: [
     ConversationDetailPage,
     HeaderConversationDetailComponent,
-    MessageTextAreaComponent,
+    MessageTextAreaComponent
     // BubbleDayMessageComponent,
     // BubbleSystemMessageComponent,
     // BubbleMyMessageComponent,

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

@@ -1,7 +1,7 @@
 <span *ngIf="conversationWith && loggedUser; then showConversation else showPlaceholder"></span>
 <ng-template #showPlaceholder>
   <!-- class="splash-page" -->
-  <ion-content  padding >
+  <ion-content padding>
     <!-- <div padding class="image-splash-page"></div>
     <div padding class="title-splash-page">
       text new conversation + button
@@ -9,7 +9,8 @@
 
     <ion-grid style="height: 100%;">
       <ion-row class="ion-justify-content-center ion-align-items-center" style="height: 100%; flex-direction: column">
-        <span *ngIf="isOnline === true  && !showSpinner" style="color: #92949c; font-size: 16px;line-height: 18px;margin-top: -160px;">
+        <span *ngIf="isOnline === true  && !showSpinner"
+          style="color: #92949c; font-size: 16px;line-height: 18px;margin-top: -160px;">
           <span *ngIf="conversation_count > 0 ">
             {{'PleaseSelectChatToStartMessaging' | translate }}
           </span>
@@ -34,8 +35,7 @@
   <app-header-conversation-detail [isMobile]="isMobile" [idLoggedUser]="loggedUser.uid"
     [conversationAvatar]="conversationAvatar" [translationMap]="translationMap"
     (eventOpenCloseInfoConversation)="returnOpenCloseInfoConversation($event)"
-    [isOpenInfoConversation]="isOpenInfoConversation"
-    [conv_type]="conv_type">
+    [isOpenInfoConversation]="isOpenInfoConversation" [conv_type]="conv_type">
   </app-header-conversation-detail>
 
   <ion-content id="conv-details">
@@ -137,15 +137,24 @@
             <!-- ----------------------------------------------------------- -->
             <!-- Canned responses -->
             <!-- ----------------------------------------------------------- -->
-
-            <div id="canned" *ngIf="tagsCannedFilter.length > 0 && HIDE_CANNED_RESPONSES === false">
-              <ion-list class="canned-list">
+            <div id="canned">
+              <ion-list class="canned-list" *ngIf="tagsCannedFilter.length > 0 && HIDE_CANNED_RESPONSES === false">
                 <ion-item button="true" [ngClass]="{'is_active_item': i == arrowkeyLocation}" lines="none"
                   class="canned-item" id="{{'canned-item_'+ i }}"
                   *ngFor="let canned of tagsCannedFilter; let i = index;" [innerHtml]="canned.title"
                   (click)="replaceTagInMessage(canned, $event)">
                 </ion-item>
+                <ion-item  class="canned-item add-canned-response-wpr" button="true" lines="none" (click)="presentCreateCannedResponseModal()">
+                  <ion-icon class="add-canned-response-icon"  name="flash-outline"></ion-icon>
+                  <span class="add-canned-response-add-icon">+</span>
+                 <label class="add-canned-response-label" >{{translationMap?.get('AddNewCannedResponse')}}</label> 
+                </ion-item>
               </ion-list>
+              <!-- <ion-list class="canned-list" *ngIf="tagsCannedFilter.length === 0 && HIDE_CANNED_RESPONSES === false">
+                <ion-item button="true" >
+                  There are no canned responses available
+                </ion-item>
+              </ion-list> -->
             </div>
 
 
@@ -156,15 +165,14 @@
             <!-- openInfoConversation   {{openInfoConversation}} - isMobile {{isMobile}} -->
             <app-message-text-area
               *ngIf="(openInfoConversation === false && isMobile === true) || (openInfoConversation === true && isMobile === false) || (openInfoConversation === false && isMobile === false)"
-              [tagsCannedCount]="tagsCannedCount" [areVisibleCAR]="areVisibleCAR" [loggedUser]="loggedUser"
-              [conversationWith]="conversationWith" [tagsCannedFilter]="tagsCannedFilter"
+              [tagsCannedCount]="tagsCannedCount" [areVisibleCAR]="areVisibleCAR" [support_mode]="support_mode"
+              [loggedUser]="loggedUser" [conversationWith]="conversationWith" [tagsCannedFilter]="tagsCannedFilter"
               (eventChangeTextArea)="returnChangeTextArea($event)"
               (hasClickedOpenCannedResponses)="hasClickedOpenCannedResponses($event)"
               (eventSendMessage)="returnSendMessage($event)" [translationMap]="translationMap"
               [fileUploadAccept]="appConfigProvider.getConfig().fileUploadAccept"
               [isOpenInfoConversation]="isOpenInfoConversation" [dropEvent]="dropEvent"
-              (onPresentModalScrollToBottom)="onPresentModalScrollToBottom($event)"
-              [disableTextarea]="disableTextarea">
+              (onPresentModalScrollToBottom)="onPresentModalScrollToBottom($event)" [disableTextarea]="disableTextarea">
             </app-message-text-area>
             <!-- [events]="eventsReplaceTexareaText.asObservable()" -->
           </ion-row>

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

@@ -25,6 +25,34 @@
     font-size: 24px;
 }
 
+.add-canned-response-icon {
+    color: #b3bfd0;
+    cursor: pointer;
+    font-size: 18px;
+}
+.add-canned-response-label {
+    color: #b3bfd0;
+    cursor: pointer;
+}
+.add-canned-response-add-icon {
+    color: #b3bfd0;
+    cursor: pointer;
+    position: relative;
+    top: 4px;
+    left: -6px;
+}
+
+#canned > ion-list > ion-item.canned-item.add-canned-response-wpr:hover > span {
+    color: #1877f2;
+}
+
+#canned > ion-list > ion-item.canned-item.add-canned-response-wpr:hover > ion-icon {
+    color: #1877f2;
+}
+#canned > ion-list > ion-item.canned-item.add-canned-response-wpr:hover > label {
+    color: #1877f2;
+}
+
 // ion-back-button{
 //     display: none!important;
 // }