@chat21/chat21-ionic 3.4.27-rc8 → 3.4.28

package/src/app/modals/create-ticket/create-ticket.page.html

@@ -36,7 +36,7 @@
             <img *ngIf="item.requestertype === 'agent' && UPLOAD_ENGINE_IS_FIREBASE" height="24" width="24"
               style="border-radius:50%; object-fit: cover; vertical-align: middle;"
               src="https://firebasestorage.googleapis.com/v0/b/{{storageBucket}}/o/profiles%2F{{item.id}}%2Fphoto.jpg?alt=media"
-              alt="" onerror="this.src='assets/images/default-avatar-x-select.png'">
+              alt="" onerror="this.src='assets/img/default-avatar-x-select.png'">
 
             <!-- ---------------------------------------- -->
             <!-- Usecase Native -->
@@ -44,11 +44,11 @@
             <img *ngIf="item.requestertype === 'agent' && !UPLOAD_ENGINE_IS_FIREBASE" height="24" width="24"
               style="border-radius:50%;object-fit: cover;vertical-align: middle;"
               src="{{baseUrl}}images?path=uploads%2Fusers%2F{{item.id}}%2Fimages%2Fthumbnails_200_200-photo.jpg" alt=""
-              onerror="this.src='assets/images/default-avatar-x-select.png'">
+              onerror="this.src='assets/img/default-avatar-x-select.png'">
 
             <img *ngIf="item.requestertype === 'lead'" height="24" width="24"
               style="border-radius:50%;object-fit: cover;vertical-align: middle;"
-              src="assets/images/default-avatar-x-select.png" alt="">
+              src="assets/img/default-avatar-x-select.png" alt="">
             <span style="font-weight: 400;">
               {{ item.name }}
             </span>
@@ -64,7 +64,7 @@
             <img *ngIf="item.requestertype === 'agent' && UPLOAD_ENGINE_IS_FIREBASE" height="24" width="24"
               style="border-radius:50%;object-fit: cover;vertical-align: middle;"
               src="https://firebasestorage.googleapis.com/v0/b/{{storageBucket}}/o/profiles%2F{{item.id}}%2Fphoto.jpg?alt=media"
-              alt="" onerror="this.src='assets/images/default-avatar-x-select.png'">
+              alt="" onerror="this.src='assets/img/default-avatar-x-select.png'">
 
             <!-- ---------------------------------------- -->
             <!-- Usecase Native -->
@@ -72,11 +72,11 @@
             <img *ngIf="item.requestertype === 'agent' && !UPLOAD_ENGINE_IS_FIREBASE" height="24" width="24"
               style="border-radius:50%;object-fit: cover;vertical-align: middle;"
               src="{{baseUrl}}images?path=uploads%2Fusers%2F{{item.id}}%2Fimages%2Fthumbnails_200_200-photo.jpg" alt=""
-              onerror="this.src='assets/images/default-avatar-x-select.png'">
+              onerror="this.src='assets/img/default-avatar-x-select.png'">
 
             <img *ngIf="item.requestertype === 'lead'" height="24" width="24"
               style="border-radius:50%; object-fit: cover;vertical-align: middle;"
-              src="assets/images/default-avatar-x-select.png" alt="">
+              src="assets/img/default-avatar-x-select.png" alt="">
             <span style="font-weight: 400;">
               {{ item.name }}
             </span>

package/src/app/modals/create-ticket/create-ticket.page.ts

@@ -9,7 +9,6 @@ import * as uuid from 'uuid';
 import { EventsService } from 'src/app/services/events-service'
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
-import { ProjectUsersService } from 'src/app/services/project_users/project-users.service'
 
 @Component({
   selector: 'app-create-ticket',
@@ -43,29 +42,28 @@ export class CreateTicketPage implements OnInit {
       {
         id: 1,
         name: 'urgent',
-        avatar: 'assets/images/priority_icons/urgent_v2.svg'
+        avatar: 'assets/img/priority_icons/urgent_v2.svg'
       },
       {
         id: 2,
         name: 'high',
-        avatar: 'assets/images/priority_icons/high_v2.svg '
+        avatar: 'assets/img/priority_icons/high_v2.svg '
       },
       {
         id: 3,
         name: 'medium',
-        avatar: 'assets/images/priority_icons/medium_v2.svg'
+        avatar: 'assets/img/priority_icons/medium_v2.svg'
       },
       {
         id: 4,
         name: 'low',
-        avatar: 'assets/images/priority_icons/low_v2.svg'
+        avatar: 'assets/img/priority_icons/low_v2.svg'
       },
     ];
 
   logger: LoggerService = LoggerInstance.getInstance();
   constructor(
     public modalController: ModalController,
-    public projectUsersService: ProjectUsersService,
     public tiledeskService: TiledeskService,
     public appConfigProvider: AppConfigProvider,
     public events: EventsService
@@ -106,7 +104,7 @@ export class CreateTicketPage implements OnInit {
   // Create the array of the project-users and contacts displayed in the combo box  "Requester"
   // -------------------------------------------------------------------------------------------
   getProjectUsersAndContacts(projctid: string) {
-    const projectUsers = this.projectUsersService.getProjectUsersByProjectId(projctid)
+    const projectUsers = this.tiledeskService.getProjectUsersByProjectId(projctid)
     const leads = this.tiledeskService.getAllLeadsActiveWithLimit(projctid,10000)
 
     zip(projectUsers, leads).subscribe(
@@ -245,7 +243,7 @@ export class CreateTicketPage implements OnInit {
   // -------------------------------------------------------------------------------------------------------------------
   getProjectUserBotsAndDepts(projctid: string) {
     // this.loadingAssignee = true;
-    const projectUsers = this.projectUsersService.getProjectUsersByProjectId( projctid)
+    const projectUsers = this.tiledeskService.getProjectUsersByProjectId( projctid)
     const bots = this.tiledeskService.getAllBotByProjectId(projctid)
     const depts = this.tiledeskService.getDeptsByProjectId(projctid)
 

package/src/app/modals/loader-preview/loader-preview.page.ts

@@ -156,7 +156,7 @@ export class LoaderPreviewPage implements OnInit, AfterViewInit {
   }
   // file-alt-solid.png
   async createFile() {
-    let response = await fetch('./assets/images/file-alt-solid.png')
+    let response = await fetch('./assets/img/file-alt-solid.png')
     let data = await response.blob()
     let metadata = {
       type: 'image/png',

package/src/app/modals/send-whatsapp-template/send-whatsapp-template.page.scss

@@ -106,7 +106,7 @@ ion-footer {
     width: 100%;
     min-height: 200px;
     //background-image: url(https://user-images.githubusercontent.com/15075759/28719144-86dc0f70-73b1-11e7-911d-60d70fcded21.png);
-    background-image: url(../../../assets/images/whatsapp_background.png);
+    background-image: url(../../../assets/img/whatsapp_background.png);
     border-radius: 8px;
     background-size: cover;
     display: flex;

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

@@ -173,7 +173,7 @@
             <!-- ----------------------------------------------------------- -->
             <app-canned-response *ngIf="SHOW_CANNED_RESPONSES"
               id="canned"
-              [roles]="rolesCanned"
+              [canShowCanned]="canShowCanned"
               [conversationWith]="conversationWith"
               [conversationWithFullname]="conversationWithFullname"
               [currentString]="messageStr"
@@ -201,8 +201,7 @@
             <!-- [tagsCannedFilter]="tagsCannedFilter" -->
             <!-- openInfoConversation   {{openInfoConversation}} - isMobile {{isMobile}} -->
             <app-message-text-area *ngIf="(openInfoConversation === false && isMobile === true) || (openInfoConversation === true && isMobile === false) || (openInfoConversation === false && isMobile === false)"
-              [loggedUser]="loggedUser"
-              [projectUser]="projectUser"
+              [loggedUser]="loggedUser" 
               [conversationWith]="conversationWith" 
               [channelType]="channelType"
               [channel]="conversation?.attributes?.request_channel"
@@ -214,10 +213,8 @@
               [fileUploadAccept]="fileUploadAccept"
               [emailSection]="isEmailEnabled"
               [offlineMsgEmail]="offlineMsgEmail"
-              [cannedSection]="canShowCanned"
               [whatsappTemplatesSection]="isWhatsappTemplatesEnabled"
               [isOpenInfoConversation]="openInfoConversation" 
-              [ticketSection]="isTicketEnabled"
               [stylesMap]="styleMap"
               [translationMap]="translationsMap"
               [dropEvent]="dropEvent"
@@ -226,8 +223,7 @@
               (onClickOpenCannedResponses)="onClickOpenCannedResponses($event)"
               (eventSendMessage)="returnSendMessage($event)" 
               (onPresentModalScrollToBottom)="onPresentModalScrollToBottom($event)"
-              (onOpenFooterSection)="onOpenFooterSection($event)"
-              (onOpenTicket)="onOpenTicket($event)">
+              (onOpenFooterSection)="onOpenFooterSection($event)">
             </app-message-text-area>
             <!-- [events]="eventsReplaceTexareaText.asObservable()" -->
           </ion-row>

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

@@ -5,7 +5,7 @@
 }
 
 .image-splash-page {
-    background: url("../../../assets/images/no_conversation.jpg");
+    background: url("../../../assets/img/no_conversation.jpg");
     width: 50%;
     height: 50%;
     position: relative;

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

@@ -83,10 +83,7 @@ import { WebsocketService } from 'src/app/services/websocket/websocket.service';
 import { Project } from 'src/chat21-core/models/projects';
 import { Globals } from 'src/app/utils/globals';
 import { ProjectService } from 'src/app/services/projects/project.service';
-import { ProjectUsersService } from 'src/app/services/project_users/project-users.service';
-import { ProjectUser } from 'src/chat21-core/models/projectUsers';
-import { getOSCode, hasRole } from 'src/app/utils/utils';
-import { PERMISSIONS } from 'src/app/utils/permissions.constants';
+import { getOSCode } from 'src/app/utils/utils';
 
 @Component({
   selector: 'app-conversation-detail',
@@ -111,7 +108,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   private subscriptions: Array<any>
   public tenant: string;
   public loggedUser: UserModel
-  public projectUser: ProjectUser;
   public conversationWith: string
   public conversationWithFullname: string
   public messages: Array<MessageModel> = []
@@ -141,7 +137,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   public tagsCannedFilter: Array<any> = [];
   public SHOW_CANNED_RESPONSES: boolean = false
   public canShowCanned: boolean = true
-  public rolesCanned: { [key: string]: boolean }
 
   public SHOW_COPILOT_SUGGESTIONS: boolean = false;
 
@@ -176,10 +171,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   copilotQuestion: string = '';
   /**COPILOT : end */
 
-  /** TICKET: start */
-  isTicketEnabled: boolean = false;
-  /** TICKET: end */
-
   isMine = isMine
   isInfo = isInfo
   isFirstMessage = isFirstMessage
@@ -249,7 +240,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     public toastController: ToastController,
     public tiledeskService: TiledeskService,
     public projectService: ProjectService,
-    public projectUsersService: ProjectUsersService,
     private networkService: NetworkService,
     private events: EventsService,
     private webSocketService: WebsocketService,
@@ -487,7 +477,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.isEmailEnabled = (this.appConfigProvider.getConfig().emailSection === 'true' || this.appConfigProvider.getConfig().emailSection === true) ? true : false;
-    this.isTicketEnabled = (this.appConfigProvider.getConfig().ticketSection === 'true' || this.appConfigProvider.getConfig().ticketSection === true) ? true : false;
     this.isWhatsappTemplatesEnabled = (this.appConfigProvider.getConfig().whatsappTemplatesSection === 'true' || this.appConfigProvider.getConfig().whatsappTemplatesSection === true) ? true : false;
 
     this.cannedResponsesService.initialize(appconfig.apiUrl)
@@ -545,6 +534,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         this.logger.log('[CONVS-DETAIL] - GET PROJECTID BY CONV RECIPIENT * COMPLETE *',)
       })
     }else {
+      this.canShowCanned = false;
       this.offlineMsgEmail = false;
     }
     
@@ -555,13 +545,10 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       this.logger.log('[CONVS-DETAIL] - GET PROJECTID BY CONV RECIPIENT RES', project)
       if (project) {
         const projectId = project.id_project
-        this.projectUser = await this.projectUsersService.getProjectUserByProjectId(project._id)
+        this.canShowCanned = this.projectPlanUtils.checkPlanIsExpired(project)
         this.offlineMsgEmail = this.checkOfflineMsgEmailIsEnabled(project)
         this.isCopilotEnabled = this.projectPlanUtils.checkProjectProfileFeature(project, 'copilot');
         this.fileUploadAccept = this.checkAcceptedUploadFile(project)
-        this.rolesCanned = this.checkCannedResponsesRoles(project)
-        this.canShowCanned = this.checkCannedResponses(project)
-        this.logger.log('[CONVS-DETAIL] this.rolesCanned ', this.canShowCanned)
       }
     }, (error) => {
       this.logger.error('[CONVS-DETAIL] - GET PROJECTID BY CONV RECIPIENT - ERROR  ', error)
@@ -599,40 +586,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     return this.appConfigProvider.getConfig().fileUploadAccept
   }
 
-  checkCannedResponses(project: Project): boolean {
-    let expires = this.projectPlanUtils.checkPlanIsExpired(project)
-    this.logger.log('[CONVS-DETAIL] checkCannedResponses expires ', expires)
-    if(expires){
-      return false
-    }
-
-    let hasRoleToShowCanned = this.rolesCanned[PERMISSIONS.CANNED_RESPONSES_READ]
-    this.logger.log('[CONVS-DETAIL] checkCannedResponses hasRoleToShowCanned ', hasRoleToShowCanned)
-    if(!hasRoleToShowCanned){
-      return false
-    }
-
-    return true
-  }
-
-  checkCannedResponsesRoles(project: Project): { [key: string]: boolean } {
-    const permissionKeys = [
-      'CANNED_RESPONSES_CREATE',
-      'CANNED_RESPONSES_READ',
-      'CANNED_RESPONSES_UPDATE',
-      'CANNED_RESPONSES_DELETE',
-    ] as const;
-
-    const roles: { [key: string]: boolean } = {};
-    for (const key of permissionKeys) {
-      const permission = PERMISSIONS[key];
-      roles[permission] = hasRole(this.projectUser, permission);
-    }
-
-    return roles;
-
-  }
-
   // getProjectIdSelectedConversation(conversationWith: string): string{
   //   const conversationWith_segments = conversationWith.split('-')
   //   // Removes the last element of the array if is = to the separator
@@ -716,11 +669,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       "WHATSAPP.ERROR_WHATSAPP_NOT_INSTALLED",
       "WHATSAPP.ERROR_WHATSAPP_GENERIC_ERROR",
 
-      "TICKET.OPEN_TICKET",
-      "TICKET.DESCRIPTION",
-      "TICKET.CONFIRM",
-      "TICKET.CLOSE",
-
       "COPILOT.ASK_AI",
       "COPILOT.NO_SUGGESTIONS_PRESENT",
 
@@ -1156,7 +1104,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         //   ${metadata.name}
         // </a>`
 
-        // msg = ![file-image-placehoder](./assets/images/file-alt-solid.png) + [${metadata.name}](${metadata.src})
+        // msg = ![file-image-placehoder](./assets/img/file-alt-solid.png) + [${metadata.name}](${metadata.src})
         msg = `[${metadata.name}](${metadata.src})`
       }
     }
@@ -1936,13 +1884,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   }
 
 
-  onOpenTicket() {
-    this.logger.debug('[CONVS-DETAIL] openTicketOnExternalService - conversationWith ', this.conversationWith)
-    if(window['openTicketOnHDA']){
-      window['openTicketOnHDA'](this.conversationWith)
-    }
-
-  }
   // -------------- START SCROLL/RESIZE  -------------- //
   /** */
   resizeTextArea() {

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

@@ -109,9 +109,9 @@ export class ConversationListPage implements OnInit {
   profile_name_translated: string;
   selectedStatus: any;
   teammateStatus = [
-    { id: 1, name: 'Available', avatar: 'assets/images/teammate-status/avaible.svg', label: "LABEL_AVAILABLE" },
-    { id: 2, name: 'Unavailable', avatar: 'assets/images/teammate-status/unavaible.svg', label: "LABEL_NOT_AVAILABLE" },
-    { id: 3, name: 'Inactive', avatar: 'assets/images/teammate-status/inactive.svg', label: "LABEL_INACTIVE" },
+    { id: 1, name: 'Available', avatar: 'assets/img/teammate-status/avaible.svg', label: "LABEL_AVAILABLE" },
+    { id: 2, name: 'Unavailable', avatar: 'assets/img/teammate-status/unavaible.svg', label: "LABEL_NOT_AVAILABLE" },
+    { id: 3, name: 'Inactive', avatar: 'assets/img/teammate-status/inactive.svg', label: "LABEL_INACTIVE" },
   ];
   // PROJECT AVAILABILITY INFO: end
 
@@ -473,7 +473,7 @@ export class ConversationListPage implements OnInit {
   listenToCurrentStoredProject() {
     this.events.subscribe('storage:last_project', projectObjct => {
       if (projectObjct && projectObjct !== 'undefined') {
-        // console.log('[CONVS-LIST-PAGE] - GET STORED PROJECT ', projectObjct)
+        this.logger.log('[CONVS-LIST-PAGE] - GET STORED PROJECT ', projectObjct)
 
         //TODO: recuperare info da root e non da id_project
         this.project = {
@@ -888,21 +888,21 @@ export class ConversationListPage implements OnInit {
       this.logger.log('[CONVS-LIST-PAGE] checkPlatformIsMobile(): ', checkPlatformIsMobile())
       this.logger.log('[CONVS-LIST-PAGE] DESKTOP (window < 768)', this.navService)
       this.logger.log('[CONVS-LIST-PAGE] navigateByUrl this.conversationSelected conversation_with_fullname ', this.conversationSelected)
-      let pageUrl = 'conversation-detail/' + this.uidConvSelected + '/' + this.conversationSelected.conversation_with_fullname + '/' + converationType
+      let pageUrl = 'conversation-detail/' + this.uidConvSelected + '/' + encodeURIComponent(this.conversationSelected.conversation_with_fullname) + '/' + converationType
       this.logger.log('[CONVS-LIST-PAGE] pageURL', pageUrl)
         // replace(/\(/g, '%28').replace(/\)/g, '%29') -> used for the encoder of any round brackets
-      this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29').replace( /#/g, "%23" ), {replaceUrl: true})
+      this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29'), {replaceUrl: true})
     } else {
       this.logger.log('[CONVS-LIST-PAGE] navigateByUrl this.conversationSelected conversation_with_fullname ', this.conversationSelected)
       this.logger.log('[CONVS-LIST-PAGE] checkPlatformIsMobile(): ', checkPlatformIsMobile())
       this.logger.log('[CONVS-LIST-PAGE] MOBILE (window >= 768) ', this.navService)
       let pageUrl = 'conversation-detail/' + this.uidConvSelected
       if (this.conversationSelected && this.conversationSelected.conversation_with_fullname) {
-        pageUrl = 'conversation-detail/' + this.uidConvSelected + '/' + this.conversationSelected.conversation_with_fullname + '/' + converationType
+        pageUrl = 'conversation-detail/' + this.uidConvSelected + '/' + encodeURIComponent(this.conversationSelected.conversation_with_fullname) + '/' + converationType
       }
       this.logger.log('[CONVS-LIST-PAGE] setUidConvSelected navigateByUrl--->: ', pageUrl)
       // replace(/\(/g, '%28').replace(/\)/g, '%29') -> used for the encoder of any round brackets
-      this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29').replace( /#/g, "%23" ), {replaceUrl: true})
+      this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29'), {replaceUrl: true})
     }
   }
 

package/src/app/pages/profile-info/profile-info.page.ts

@@ -51,9 +51,9 @@ export class ProfileInfoPage implements OnInit {
 
   isVisiblePAY: boolean;
   teammateStatus = [
-    { id: 1, name: 'Available', avatar: 'assets/images/teammate-status/avaible.svg', label: "LABEL_AVAILABLE" },
-    { id: 2, name: 'Unavailable', avatar: 'assets/images/teammate-status/unavaible.svg', label: "LABEL_NOT_AVAILABLE" },
-    { id: 3, name: 'Inactive', avatar: 'assets/images/teammate-status/inactive.svg', label: "LABEL_INACTIVE" },
+    { id: 1, name: 'Available', avatar: 'assets/img/teammate-status/avaible.svg', label: "LABEL_AVAILABLE" },
+    { id: 2, name: 'Unavailable', avatar: 'assets/img/teammate-status/unavaible.svg', label: "LABEL_NOT_AVAILABLE" },
+    { id: 3, name: 'Inactive', avatar: 'assets/img/teammate-status/inactive.svg', label: "LABEL_INACTIVE" },
   ];
 
   constructor(

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

@@ -67,11 +67,11 @@ export class BrandService {
       ]
     },
     COMMON: {
-      COMPANY_LOGO:"assets/logos/tiledesk_logo.svg",
-      COMPANY_LOGO_NO_TEXT:"assets/logos/tiledesk_logo.svg",
-      BASE_LOGO: "assets/logos/tiledesk_logo.svg",
-      BASE_LOGO_NO_TEXT: "assets/logos/tiledesk_logo.svg",
-      BASE_LOGO_WHITE: "assets/logos/tiledesk-logo_new_white.svg",
+      COMPANY_LOGO:"assets/img/logos/tiledesk_logo.svg",
+      COMPANY_LOGO_NO_TEXT:"assets/img/logos/tiledesk_logo.svg",
+      BASE_LOGO: "assets/img/logos/tiledesk_logo.svg",
+      BASE_LOGO_NO_TEXT: "assets/img/logos/tiledesk_logo.svg",
+      BASE_LOGO_WHITE: "assets/img/logos/tiledesk-logo_new_white.svg",
       BASE_LOGO_WHITE_NO_TEXT:"",
       COMPANY_NAME: "Tiledesk",
       BRAND_NAME: "Tiledesk",

package/src/app/services/global-settings/global-settings.service.ts

@@ -88,8 +88,8 @@ export class GlobalSettingsService {
     this.logger.debug('[GLOBAL-SET] setVariableFromStorage :::::::: SET VARIABLE ---------->', Object.keys(globals));
     for (const key of Object.keys(globals)) {
         const val = this.appStorageService.getItem(key);
-        this.logger.debug('[GLOBAL-SET] setVariableFromStorage SET globals KEY ---------->', key);
-        this.logger.debug('[GLOBAL-SET] setVariableFromStorage SET globals VAL ---------->', val);
+        // this.logger.debug('[GLOBAL-SET] setVariableFromStorage SET globals KEY ---------->', key);
+        // this.logger.debug('[GLOBAL-SET] setVariableFromStorage SET globals VAL ---------->', val);
         if (val && val !== null) {
             // globals.setParameter(key, val);
             globals[key] = stringToBoolean(val);
@@ -111,10 +111,8 @@ export class GlobalSettingsService {
     }
 
     TEMP = getParameterByName(windowContext, 'tiledesk_supportMode');
-    console.log('TEMP supportMode', TEMP);
     if (TEMP) {
         globals.supportMode = stringToBoolean(TEMP);
-        this.appStorageService.setItem('supportMode', String(globals.supportMode))
     }
 
     TEMP = getParameterByName(windowContext, 'tiledesk_lang');
@@ -140,7 +138,6 @@ export class GlobalSettingsService {
     TEMP = getParameterByName(windowContext, 'tiledesk_projectID');
     if (TEMP) {
         globals.projectID = TEMP;
-        this.appStorageService.setItem('projectID', TEMP)
     }
 
 }

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

@@ -93,6 +93,22 @@ export class TiledeskService {
     }))
   }
 
+  public getProjectUsersByProjectId(project_id: string) {
+    const url = this.SERVER_BASE_URL + project_id + '/project_users/';
+    this.logger.log('[TILEDESK-SERVICE] - GET PROJECT-USER URL', url);
+    
+    const httpOptions = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+        Authorization: this.tiledeskToken
+      })
+    };
+    return this.http.get(url, httpOptions).pipe(map((res: any) => {
+      this.logger.log('[TILEDESK-SERVICE] - GET PROJECT-USER RES ', res);
+      return res
+    }))
+  }
+
   public getAllLeadsActiveWithLimit(project_id: string, limit: number) {
     const url = this.SERVER_BASE_URL + project_id + '/leads?limit=' + limit + '&with_fullname=true';
     this.logger.log('[TILEDESK-SERVICE] - GET ALL ACTIVE LEADS (LIMIT 10000) -  URL', url);

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

@@ -22,9 +22,6 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatSlideToggleModule } from '@angular/material/slide-toggle';
 import { SafeHtmlPipe } from '../directives/safe-html.pipe';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { createTranslateLoader } from 'src/chat21-core/utils/utils';
-import { HttpClient } from '@angular/common/http';
 
 // import { MessageTextAreaComponent } from '../components/conversation-detail/message-text-area/message-text-area.component'; // MessageTextAreaComponent is part of the declarations ConversationDetailPageModule
 
@@ -143,14 +140,6 @@ import { HttpClient } from '@angular/common/http';
     NgSelectModule,
     FormsModule,
 
-    TranslateModule.forChild({
-      loader: {
-        provide: TranslateLoader,
-        useFactory: (createTranslateLoader),
-        deps: [HttpClient]
-      }
-    })
-
   ],
   schemas: [
     CUSTOM_ELEMENTS_SCHEMA,

package/src/app/utils/project-utils.ts

@@ -129,9 +129,9 @@ export class ProjectPlanUtils {
     
         //case PAYMENT plan
         if(project && project.isActiveSubscription && project.profile.type=== 'payment'){
-          check = false
-        }else if(project && !project.isActiveSubscription && project.profile.type=== 'payment'){
           check = true
+        }else if(project && !project.isActiveSubscription && project.profile.type=== 'payment'){
+          check = false
         }
     
         return check

package/src/app/utils/utils-resources.ts

@@ -7,16 +7,17 @@ export const BRAND_BASE_INFO: { [key: string] : string | boolean} ={
     FAVICON: "https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v13-300x300.png",
     META_TITLE:"Tiledesk - Open Source Live Chat",
     DOCS: true,
-    LOGOUT_ENABLED: true
+    LOGOUT_ENABLED: true,
+    DISPLAY_EDIT_PROFILE: true
 }
 
 export var LOGOS_ITEMS: { [key: string] : { label: string | boolean, icon: string }} ={
-    COMPANY_LOGO: {label: BRAND_BASE_INFO.COMPANY_NAME,  icon: 'assets/logos/tiledesk_logo.svg'},
-    COMPANY_LOGO_NO_TEXT: {label: BRAND_BASE_INFO.COMPANY_NAME, icon: 'assets/logos/tiledesk_logo_no_text.svg'},
-    BASE_LOGO: {label: BRAND_BASE_INFO.BRAND_NAME,  icon: 'assets/logos/tiledesk_logo.svg'},
-    BASE_LOGO_NO_TEXT: {label: BRAND_BASE_INFO.BRAND_NAME, icon: 'assets/logos/tiledesk_logo_no_text.svg'},
-    BASE_LOGO_WHITE: { label: BRAND_BASE_INFO.BRAND_NAME, icon: '"assets/logos/tiledesk-logo_new_white.svg'},
-    BASE_LOGO_WHITE_NO_TEXT: { label: BRAND_BASE_INFO.BRAND_NAME, icon: '"assets/logos/tiledesk-logo_new_white.svg'},
+    COMPANY_LOGO: {label: BRAND_BASE_INFO.COMPANY_NAME,  icon: 'assets/img/logos/tiledesk_logo.svg'},
+    COMPANY_LOGO_NO_TEXT: {label: BRAND_BASE_INFO.COMPANY_NAME, icon: 'assets/img/logos/tiledesk_logo_no_text.svg'},
+    BASE_LOGO: {label: BRAND_BASE_INFO.BRAND_NAME,  icon: 'assets/img/logos/tiledesk_logo.svg'},
+    BASE_LOGO_NO_TEXT: {label: BRAND_BASE_INFO.BRAND_NAME, icon: 'assets/img/logos/tiledesk_logo_no_text.svg'},
+    BASE_LOGO_WHITE: { label: BRAND_BASE_INFO.BRAND_NAME, icon: '"assets/img/logos/tiledesk-logo_new_white.svg'},
+    BASE_LOGO_WHITE_NO_TEXT: { label: BRAND_BASE_INFO.BRAND_NAME, icon: '"assets/img/logos/tiledesk-logo_new_white.svg'},
     BASE_LOGO_GRAY: { label: BRAND_BASE_INFO.BRAND_NAME, icon: 'https://support-pre.tiledesk.com/dashboard/assets/img/logos/tiledesk-logo_new_gray.svg'}
 }
 

package/src/app/utils/utils.ts

@@ -1,12 +1,10 @@
-import { ProjectUser } from "src/chat21-core/models/projectUsers";
-
 export function getOSCode(key: string, token: string): boolean {
 
     if (token) {
       const keys: String[] = token.split("-");
 
       let element = keys.find(el => el.includes(key))
-      // console.log('keys', keys)
+      console.log('keys', keys)
       if(element){
         element = element.split(":")[1]
         if(element && element === "F"){
@@ -23,19 +21,4 @@ export function getOSCode(key: string, token: string): boolean {
     } 
 
     return false
-}
-
-
-export function hasRole(projectUser: ProjectUser, role: string ): boolean {
-  let roles = ['owner', 'admin', 'agent'];
-  if(roles.includes(projectUser.role)){
-    return true
-  }
-
-  if(Array.isArray(projectUser.rolePermissions) && projectUser.rolePermissions.includes(role)){
-    return true
-  }
-
-  return false
-
 }

package/src/assets/i18n/ar.json

@@ -225,10 +225,6 @@
   "admin": "مدير",
   "agent": "وكيل",
   "Conversations": "المحادثات",
-  "Monitor": "شاشة",
-  "Flows": "التدفّقات",
-  "Knowledgebases": "قواعد المعرفة",
-  "Whatsappbroadcasts": "نشرات WhatsApp",
   "Apps": "تطبيقات",
   "Analytics": "تحليلات",
   "Activities": "أنشطة",
@@ -310,11 +306,5 @@
     "SEND_EMAIL_SUCCESS_OFFLINE_MESSAGE":"تم إرسال الرسالة أيضًا عبر البريد الإلكتروني 📩"
   },
   "EMOJI_NOT_ELLOWED": "الرموز التعبيرية غير مسموح بها",
-  "DOMAIN_NOT_ALLOWED": "يحتوي الرابط على نطاق غير مسموح",
-  "TICKET": {
-    "OPEN_TICKET": "افتح تذكرة",
-    "DESCRIPTION": "هل تؤكد أنك تريد فتح تذكرة لهذه المحادثة؟",
-    "CONFIRM": "تأكيد",
-    "CLOSE": "إغلاق"
-  }
+  "DOMAIN_NOT_ALLOWED": "يحتوي الرابط على نطاق غير مسموح"
 }

package/src/assets/i18n/az.json

@@ -225,10 +225,6 @@
   "admin": "Administrator",
   "agent": "Agent",
   "Conversations": "Söhbətlər",
-  "Monitor": "Monitor",
-  "Flows": "Axınlar",
-  "Knowledgebases": "Bilik bazaları",
-  "Whatsappbroadcasts": "WhatsApp Yayınları",
   "Apps": "Proqramlar",
   "Analytics": "Analitika",
   "Activities": "Fəaliyyətlər",
@@ -310,11 +306,5 @@
     "SEND_EMAIL_SUCCESS_OFFLINE_MESSAGE":"Mesaj e-poçt vasitəsilə də göndərilib 📩"    
   },
   "EMOJI_NOT_ELLOWED": "Emoji icazə verilmir",
-  "DOMAIN_NOT_ALLOWED": "URL icazə verilməyən domeni ehtiva edir",
-  "TICKET": {
-    "OPEN_TICKET": "Bilet aç",
-    "DESCRIPTION": "Bu söhbət üçün bilet açmaq istədiyinizi təsdiqləyirsinizmi?",
-    "CONFIRM": "Təsdiqlə",
-    "CLOSE": "Bağla"
-  }
+  "DOMAIN_NOT_ALLOWED": "URL icazə verilməyən domeni ehtiva edir"
 }

package/src/assets/i18n/de.json

@@ -225,10 +225,6 @@
   "admin": "Administrator",
   "agent": "Agent",
   "Conversations": "Gespräche",
-  "Monitor": "Monitor",
-  "Flows": "Flows",
-  "Knowledgebases": "Wissensdatenbanken",
-  "Whatsappbroadcasts": "WhatsApp-Broadcasts",
   "Apps": "Anwendungen",
   "Analytics": "Analytik",
   "Activities": "Aktivitäten",
@@ -310,11 +306,5 @@
     "SEND_EMAIL_SUCCESS_OFFLINE_MESSAGE":"Nachricht auch per E-Mail gesendet 📩"
   },
   "EMOJI_NOT_ELLOWED": "Emoji nicht erlaubt",
-  "DOMAIN_NOT_ALLOWED": "Die URL enthält eine nicht erlaubte Domain",
-  "TICKET": {
-    "OPEN_TICKET": "Ticket öffnen",
-    "DESCRIPTION": "Bestätigen Sie, dass Sie ein Ticket für dieses Gespräch eröffnen möchten?",
-    "CONFIRM": "Bestätigen",
-    "CLOSE": "Schließen"
-  }
+  "DOMAIN_NOT_ALLOWED": "Die URL enthält eine nicht erlaubte Domain"
 }