@chat21/chat21-ionic 3.4.26 → 3.4.27-rc1

package/CHANGELOG.md

@@ -8,6 +8,10 @@
 ### **Copyrigth**: 
 *Tiledesk SRL*
 
+# 3.4.27-rc1
+- **added**: managed canned responses with roles
+- **changed**: name in info mesage 
+
 # 3.4.26 in PROD
 
 # 3.4.26-rc2
@@ -16,6 +20,7 @@
 # 3.4.26-rc1
 - **added**: tiledesk_projectID query param to manage user status
 - **added**: token to managane ticket feature
+- **added**: getOsCode login into utils.ts
 
 # 3.4.25 in PROD
 - **changed**: pipe marked to support malicious text input
@@ -38,6 +43,24 @@
 # 3.4.22 in PROD
 - **added**: managed allowed_upload_extentions from project settings
 
+# 3.4.21-rc6
+- **added**: managed allowed_upload_extentions from project settings
+
+# 3.4.21-rc5
+- **added**: setConversation as read when agent click on it
+
+# 3.4.21-rc4
+- **added**: ability to init and decrement new conversation count badge
+
+# 3.4.21-rc3
+- **changed**: badge notification for agentDesktop
+
+# 3.4.21-rc2
+- **added**: count in newConversation handler event
+
+# 3.4.21-rc1
+- **added**:  implement badge notification for agentDesktop sw when new conversation is assigned to logged agent
+
 # 3.4.21 in PROD
 
 # 3.4.20 in PROD
@@ -51,8 +74,8 @@
 - **bug-fixed**: minor fix on ion-texarea element with allowed url domain
 
 # 3.4.19-rc1
-- added: ability to check for if emoji is allowd to be sent in message textarea
-- added: ability to check for if url domain  is allowd to be sent in message textarea
+- **added**: ability to check for if emoji is allowd to be sent in message textarea
+- **added**: ability to check for if url domain  is allowd to be sent in message textarea
 
 # 3.4.18 in PROD
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@chat21/chat21-ionic",
     "author": "Tiledesk SRL",
-    "version": "3.4.26",
+    "version": "3.4.27-rc1",
     "license": "MIT License",
     "homepage": "https://tiledesk.com/",
     "repository": {

package/src/app/app.component.ts

@@ -44,6 +44,7 @@ import { conversationToMessage } from 'src/chat21-core/utils/utils-message';
 import { ProjectService } from './services/projects/project.service';
 import { ContactsService } from './services/contacts/contacts.service';
 import { TiledeskService } from './services/tiledesk/tiledesk.service';
+import { ProjectUsersService } from './services/project_users/project-users.service';
 
 @Component({
   selector: 'app-root',
@@ -142,6 +143,7 @@ export class AppComponent implements OnInit {
     /**TILEDESK SERVICES */
     private tiledeskService: TiledeskService,
     private projectService: ProjectService,
+    private projectUsersService: ProjectUsersService,
     private contactsService: ContactsService
   ) {
 
@@ -168,6 +170,7 @@ export class AppComponent implements OnInit {
     }, { capture: true });
   }
 
+
   listenChatAlreadyOpenWithoutParamsInMobileMode() {
     this.events.subscribe('noparams:mobile', (isAlreadyOpenInMobileMode) => {
       // console.log('[APP-COMP] Chat is Already Open In Mobile Mode ', isAlreadyOpenInMobileMode)
@@ -332,7 +335,7 @@ export class AppComponent implements OnInit {
 
   listenToPostMsgs() {
     window.addEventListener("message", (event) => {
-      this.logger.log("[APP-COMP] message event ", event);
+      // this.logger.log("[APP-COMP] message event ", event);
 
       if (event && event.data && event.data.action && event.data.parameter) {
         if (event.data.action === 'openJoinConversationModal') {
@@ -1110,6 +1113,7 @@ export class AppComponent implements OnInit {
       if (conversation && conversation.is_new === true && this.isInitialized) {
         this.manageTabNotification('conv_added', conversation.sound)
         this.manageEventNewConversation(conversation)
+        this.setNotification();
       }
       if(conversation) this.updateConversationsOnStorage()
     });
@@ -1174,6 +1178,7 @@ export class AppComponent implements OnInit {
 
     this.tiledeskService.initialize(serverBaseURL)
     this.projectService.initialize(serverBaseURL)
+    this.projectUsersService.initialize(serverBaseURL)
     this.contactsService.initialize(serverBaseURL)
     // this.chatManager.startApp();
 
@@ -1344,7 +1349,10 @@ export class AppComponent implements OnInit {
 
   subscribeConversationSelected= (conversation: ConversationModel) => {
     if(conversation && conversation.is_new){
-      this.audio_NewConv.pause()
+      this.audio_NewConv.pause();
+      this.conversationsHandlerService.setConversationRead(conversation.uid)
+      //UPDATE NOTIFICATION FOR NEW CONVERSATION COUNT 
+      this.setNotification();
     }
   }
 
@@ -1420,6 +1428,9 @@ export class AppComponent implements OnInit {
         this.logger.debug('[APP-COMP]-CONVS - INIT CONV CONVS 2', conversations)
         this.events.publish('appcompSubscribeToConvs:loadingIsActive', false);
       }
+
+      //INIT NOTIFICATION FOR NEW CONVERSATION COUNT 
+      this.setNotification();
     });
 
   }
@@ -1636,6 +1647,14 @@ export class AppComponent implements OnInit {
     this.triggerEvents.triggerOnNewConversationInit(conversation)
   }
 
+  private setNotification() {
+    this.logger.log('[APP-COMP] setNotification for NEW CONVERSATION');
+    if(window['AGENTDESKTOP']){
+      this.logger.log('[APP-COMP] manageNotification AGENTDESKTOP exist', window['AGENTDESKTOP']);
+      window['AGENTDESKTOP']['TAB'].Badge(this.conversationsHandlerService.countIsNew().toString())
+    }
+  }
+
 
   @HostListener('document:visibilitychange', [])
   visibilitychange() {

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

@@ -1,20 +1,30 @@
 <div>
-  <div class="canned-list" *ngIf="tagsCannedFilter.length > 0">
-    <ion-item button="true" [ngClass]="{'is_active_item': i == arrowkeyLocation}" lines="none"
-      class="canned-item no-ripple border" id="{{'canned-item_'+ i }}"
-      *ngFor="let canned of tagsCannedFilter; let i = index;"
-      (click)="onClickCannedFN(canned, $event)">
-      <div class="cannedContent">
-        <ion-input [class.readonly]="canned?.disabled" [readonly]="canned?.disabled" type="text" [(ngModel)]="canned.title" class="title" id="{{'titleCanned_'+canned._id}}" #title></ion-input>
-        <ion-input [class.readonly]="canned?.disabled" [readonly]="canned?.disabled" type="text" [(ngModel)]="canned.text"  class="text truncate"></ion-input>
+  <div class="canned-list" *ngIf="!showLoading">
+    <span *ngIf="tagsCannedFilter.length > 0">
+      <ion-item button="true" [ngClass]="{'is_active_item': i == arrowkeyLocation}" lines="none"
+        class="canned-item no-ripple border" id="{{'canned-item_'+ i }}"
+        *ngFor="let canned of tagsCannedFilter; let i = index;"
+        (click)="onClickCannedFN(canned, $event)">
+        <div class="cannedContent">
+          <ion-input [class.readonly]="canned?.disabled" [readonly]="canned?.disabled" type="text" [(ngModel)]="canned.title" class="title" id="{{'titleCanned_'+canned._id}}" #title></ion-input>
+          <ion-input [class.readonly]="canned?.disabled" [readonly]="canned?.disabled" type="text" [(ngModel)]="canned.text"  class="text truncate"></ion-input>
+        </div>
+        <!-- <ion-icon class="canned-item-icon" name="pin" src="assets/images/pin.svg" slot=end *ngIf="canned.pinned" (click)="onPinCanned(canned, $event)"></ion-icon>
+        <ion-icon class="canned-item-icon" name="pin" src="assets/images/pinned.svg" slot=end (click)="onUnPinCanned(canned, $event)"></ion-icon> -->
+        <ion-icon class="canned-item-icon"  name="checkmark-sharp" slot=end *ngIf="(canned.createdBy === loggedUser.uid && !canned.disabled) && roles[PERMISSIONS.CANNED_RESPONSES_UPDATE]" (click)="onConfirmEditCanned(canned, $event)"></ion-icon>
+        <ion-icon class="canned-item-icon"  name="pencil-sharp" slot=end *ngIf="(canned.createdBy === loggedUser.uid && canned.disabled) && roles[PERMISSIONS.CANNED_RESPONSES_UPDATE]" (click)="onEditCanned(canned, $event)"></ion-icon>
+        <ion-icon class="canned-item-icon"  name="trash-bin-outline" slot=end *ngIf="(canned.createdBy === loggedUser.uid) && roles[PERMISSIONS.CANNED_RESPONSES_DELETE]" (click)="onDeleteCanned(canned, $event)"></ion-icon>
+      </ion-item>
+    </span>
+    <div class="no-data" *ngIf="tagsCannedFilter.length === 0">
+      <div class="container">
+        <ion-item button="false" lines="none" class="canned-item no-ripple border">
+          <ion-icon name="cloud-offline" slot="start"></ion-icon>
+          <ion-label>{{translationMap.get('THERE_ARE_NO_CANNED_RESPONSES_AVAILABLE')}}</ion-label>
+        </ion-item>
       </div>
-      <!-- <ion-icon class="canned-item-icon" name="pin" src="assets/images/pin.svg" slot=end *ngIf="canned.pinned" (click)="onPinCanned(canned, $event)"></ion-icon>
-      <ion-icon class="canned-item-icon" name="pin" src="assets/images/pinned.svg" slot=end (click)="onUnPinCanned(canned, $event)"></ion-icon> -->
-      <ion-icon class="canned-item-icon"  name="checkmark-sharp" slot=end *ngIf="canned.createdBy === loggedUser.uid && !canned.disabled" (click)="onConfirmEditCanned(canned, $event)"></ion-icon>
-      <ion-icon class="canned-item-icon"  name="pencil-sharp" slot=end *ngIf="canned.createdBy === loggedUser.uid && canned.disabled" (click)="onEditCanned(canned, $event)"></ion-icon>
-      <ion-icon class="canned-item-icon"  name="trash-bin-outline" slot=end *ngIf="canned.createdBy === loggedUser.uid" (click)="onDeleteCanned(canned, $event)"></ion-icon>
-    </ion-item>
-    <ion-item  class="canned-item add-canned-response-wpr" button="true" lines="none" (click)="onClickAddCannedResponseFN()">
+    </div>
+    <ion-item *ngIf="roles[PERMISSIONS.CANNED_RESPONSES_CREATE]" class="canned-item add-canned-response-wpr" button="true" lines="none" (click)="onClickAddCannedResponseFN()">
       <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> 
@@ -33,12 +43,5 @@
       <div class="label">{{translationMap.get('LABEL_LOADING')}}</div>
     </div>
   </div>
-  <div class="no-data" *ngIf="tagsCannedFilter.length === 0 && !showLoading">
-    <div class="container">
-      <ion-item button="false" lines="none" class="canned-item no-ripple border">
-        <ion-icon name="cloud-offline" slot="start"></ion-icon>
-        <ion-label>{{translationMap.get('THERE_ARE_NO_CANNED_RESPONSES_AVAILABLE')}}</ion-label>
-      </ion-item>
-    </div>
-  </div>
+  
 </div>

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

@@ -9,6 +9,7 @@ import { TiledeskAuthService } from 'src/chat21-core/providers/tiledesk/tiledesk
 import { compareValues, htmlEntities } from 'src/chat21-core/utils/utils';
 import { getProjectIdSelectedConversation } from 'src/chat21-core/utils/utils-message';
 import { PLAN_NAME } from 'src/chat21-core/utils/constants';
+import { PERMISSIONS } from 'src/app/utils/permissions.constants';
 
 @Component({
   selector: 'app-canned-response',
@@ -21,7 +22,7 @@ export class CannedResponseComponent implements OnInit {
   @Input() conversationWith: string;
   @Input() conversationWithFullname: string;
   @Input() currentString: string;
-  @Input() canShowCanned: boolean = true;
+  @Input() roles: Array<string>;
   @Input() stylesMap: Map<string, string>;
   @Input() translationMap: Map<string, string>;
   @Output() onLoadedCannedResponses = new EventEmitter<[any]>();
@@ -36,6 +37,7 @@ export class CannedResponseComponent implements OnInit {
 
   public arrowkeyLocation = -1
 
+  PERMISSIONS = PERMISSIONS
   
   private logger: LoggerService = LoggerInstance.getInstance();
   constructor(

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

@@ -57,7 +57,7 @@
       <div class="buttons-left">
 
         <!-- CANNED RESPONSES -->
-        <ng-container *ngIf="areVisibleCAR && supportMode">
+        <ng-container *ngIf="areVisibleCAR && supportMode && cannedSection">
           <div class="canned-responses-btn-wpr" tooltip="{{translationMap?.get('CANNED_RESPONSES')}}" placement="top">
             <ion-button ion-button fill="clear" class="canned-responses-btn" (click)="openCannedResponses()"
               [disabled]="!conversationWith?.startsWith(CHANNEL_TYPE.SUPPORT_GROUP) || disableTextarea">

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

@@ -26,6 +26,7 @@ import { CopilotService } from 'src/app/services/copilot/copilot.service';
 import { BRAND_BASE_INFO } from 'src/app/utils/utils-resources';
 import { ProjectService } from 'src/app/services/projects/project.service';
 import { Project } from 'src/chat21-core/models/projects';
+import { ProjectUser } from 'src/chat21-core/models/projectUsers';
 
 
 @Component({
@@ -49,6 +50,7 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
   @ViewChild('fileInput', { static: false }) fileInput: any;
 
   @Input() loggedUser: UserModel;
+  @Input() projectUser: ProjectUser;
   @Input() conversationWith: string;
   @Input() channelType: string;
   @Input() channel: string;
@@ -62,6 +64,7 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
   @Input() offlineMsgEmail: boolean;
   @Input() whatsappTemplatesSection: boolean;
   @Input() isOpenInfoConversation: boolean;
+  @Input() cannedSection: boolean;
   @Input() stylesMap: Map<string, string>;
   @Input() translationMap: Map<string, string>;
   @Input() dropEvent: any;

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

@@ -9,6 +9,7 @@ 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',
@@ -64,6 +65,7 @@ export class CreateTicketPage implements OnInit {
   logger: LoggerService = LoggerInstance.getInstance();
   constructor(
     public modalController: ModalController,
+    public projectUsersService: ProjectUsersService,
     public tiledeskService: TiledeskService,
     public appConfigProvider: AppConfigProvider,
     public events: EventsService
@@ -104,7 +106,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.tiledeskService.getProjectUsersByProjectId(projctid)
+    const projectUsers = this.projectUsersService.getProjectUsersByProjectId(projctid)
     const leads = this.tiledeskService.getAllLeadsActiveWithLimit(projctid,10000)
 
     zip(projectUsers, leads).subscribe(
@@ -243,7 +245,7 @@ export class CreateTicketPage implements OnInit {
   // -------------------------------------------------------------------------------------------------------------------
   getProjectUserBotsAndDepts(projctid: string) {
     // this.loadingAssignee = true;
-    const projectUsers = this.tiledeskService.getProjectUsersByProjectId( projctid)
+    const projectUsers = this.projectUsersService.getProjectUsersByProjectId( projctid)
     const bots = this.tiledeskService.getAllBotByProjectId(projctid)
     const depts = this.tiledeskService.getDeptsByProjectId(projctid)
 

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

@@ -173,7 +173,7 @@
             <!-- ----------------------------------------------------------- -->
             <app-canned-response *ngIf="SHOW_CANNED_RESPONSES"
               id="canned"
-              [canShowCanned]="canShowCanned"
+              [roles]="rolesCanned"
               [conversationWith]="conversationWith"
               [conversationWithFullname]="conversationWithFullname"
               [currentString]="messageStr"
@@ -201,7 +201,8 @@
             <!-- [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" 
+              [loggedUser]="loggedUser"
+              [projectUser]="projectUser"
               [conversationWith]="conversationWith" 
               [channelType]="channelType"
               [channel]="conversation?.attributes?.request_channel"
@@ -213,6 +214,7 @@
               [fileUploadAccept]="fileUploadAccept"
               [emailSection]="isEmailEnabled"
               [offlineMsgEmail]="offlineMsgEmail"
+              [cannedSection]="canShowCanned"
               [whatsappTemplatesSection]="isWhatsappTemplatesEnabled"
               [isOpenInfoConversation]="openInfoConversation" 
               [stylesMap]="styleMap"

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

@@ -83,7 +83,10 @@ 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 { getOSCode } from 'src/app/utils/utils';
+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';
 
 @Component({
   selector: 'app-conversation-detail',
@@ -108,6 +111,7 @@ 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> = []
@@ -137,6 +141,7 @@ 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;
 
@@ -240,6 +245,7 @@ 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,
@@ -534,7 +540,6 @@ 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;
     }
     
@@ -545,10 +550,13 @@ 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.canShowCanned = this.projectPlanUtils.checkPlanIsExpired(project)
+        this.projectUser = await this.projectUsersService.getProjectUserByProjectId(project._id)
         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)
+        console.log('[CONVS-DETAIL] this.rolesCanned ', this.rolesCanned)
       }
     }, (error) => {
       this.logger.error('[CONVS-DETAIL] - GET PROJECTID BY CONV RECIPIENT - ERROR  ', error)
@@ -586,6 +594,40 @@ 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 true
+    }
+
+    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

package/src/app/services/project_users/project-users.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ProjectUsersService } from './project-users.service';
+
+describe('ProjectUsersService', () => {
+  let service: ProjectUsersService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ProjectUsersService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

package/src/app/services/project_users/project-users.service.ts

@@ -0,0 +1,63 @@
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { ProjectUser } from 'src/chat21-core/models/projectUsers';
+import { AppStorageService } from 'src/chat21-core/providers/abstract/app-storage.service';
+import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
+import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ProjectUsersService {
+
+  private SERVER_BASE_URL: string;
+  private tiledeskToken: string;
+
+  private logger: LoggerService = LoggerInstance.getInstance();
+  constructor(
+      public http: HttpClient,
+      public appStorageService: AppStorageService
+  ) {}
+  
+  initialize(serverBaseUrl: string) {
+    this.logger.log('[TILEDESK-PROJECT_USERS-SERV] - initialize serverBaseUrl', serverBaseUrl);
+    this.SERVER_BASE_URL = serverBaseUrl;
+    this.tiledeskToken = this.appStorageService.getItem('tiledeskToken')
+  }
+
+  public getProjectUsersByProjectId(project_id: string): Observable<ProjectUser[]> {
+    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 getProjectUserByProjectId(project_id:  string): Promise<ProjectUser> {
+    const url = this.SERVER_BASE_URL + project_id + '/project_users/me';
+    this.logger.log('[TILEDESK-SERVICE]- GET PROJECT-USER BY USER-ID - 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[0]
+    })).toPromise();
+  }
+
+}

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

@@ -93,22 +93,6 @@ 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/utils/permissions.constants.ts

@@ -0,0 +1,135 @@
+
+export const PERMISSIONS = {
+  REQUEST_READ_ALL: 'request_read_all',
+  REQUEST_READ_GROUP: 'request_read_group',
+  REQUEST_READ_MY: 'request_read_my',
+ 
+  INBOX_READ: 'inbox_read',
+  REQUEST_UPDATE: 'request_update',
+  REQUEST_SEND: 'request_send',
+  REQUEST_CREATE_TICKET: 'request_create_ticket',
+  REQUEST_CLOSE: 'request_close',
+  REQUEST_JOIN: 'request_join',
+  REQUEST_REOPEN: 'request_reopen',
+  REQUEST_DELETE: 'request_delete',
+  REQUEST_UPDATE_STATUS: 'request_update_status',
+  REQUEST_UPDATE_PRIORITY: 'request_update_priority',
+  REQUEST_UPDATE_FOLLOWERS: 'request_update_followers',
+  REQUEST_UPDATE_SMART_ASSIGNMENT: 'request_update_smart_assignment',
+  REQUEST_UPDATE_TAGS: 'request_update_tags',
+  REQUEST_UPDATE_NOTES: 'request_update_notes',
+  REQUEST_REASSIGN:'request_reassign',
+  REQUEST_ADD:'request_add',
+  REQUEST_LEFT: 'request_left',
+  REQUEST_TRANSCRIPT_SEND: 'request_transcript_send',
+
+  HISTORY_READ: 'history_read',
+
+  AUTOMATIONSLOG_READ: "automationslog_read",
+  AUTOMATIONSLOG_CREATE: "automationslog_create",
+
+  KB_READ: 'kb_read',
+  KB_CONTENTS_ADD:'kb_contents_add',
+  KB_CONTENT_UPDATE: 'kb_content_update',
+  KB_CONTENT_REINDEX: 'kb_content_reindex',
+  KB_CONTENT_CHECK_STATUS: 'kb_content_check_status',
+  KB_NAMESPACE_ADD:'kb_namespace_add',
+  KB_SETTINGS_EDIT:'kb_settings_edit',
+  KB_DELETE: 'kb_delete',
+  KB_CONTENTS_EXPORT: 'kb_contents_export',
+  // KB_NAMESPACE_DELETE:'kb_namespace_delete',
+  // KB_CONTENTS_DELETE:'kb_contents_delete',
+
+
+
+  FLOWS_READ: 'flows_read',
+  FLOW_ADD: 'flow_add',
+  FLOW_EDIT: 'flow_edit',
+  FLOW_TEST: 'flow_test',
+  FLOW_DUPLICATE: 'flow_duplicate',
+  FLOW_DELETE: 'flow_delete',
+  FLOW_SHARE: 'flow_share',
+  FLOW_EXPORT: 'flow_export',
+  FLOW_WEBHOOK_COPY:"flow_webhook_copy",
+  FLOW_WEBHOOK_EDIT:"flow_webhook_edit",
+  FLOW_WEBHOOK_DELETE:"flow_webhook_delete",
+  // FLOW_VIEW_MESSAGE_GRAPH: 'flow_view_message_graph',
+ 
+  LEADS_READ: 'leads_read',
+  LEAD_UPDATE: 'lead_update',
+  LEAD_RESTORE: 'lead_restore',
+  LEAD_TRASH: 'lead_trash',
+  LEAD_DELETE: 'lead_delete',
+  LEADS_EXPORT: 'leads_export',
+  LEAD_BAN: 'lead_ban',
+  LEAD_UNBAN: 'lead_unban',
+
+  ANALYTICS_READ: 'analytics_read',
+  ACTIVITIES_READ: 'activities_read',
+
+  WIDGETSETUP_READ: 'widgetsetup_read',
+  INSTALLATION_READ: 'installation_read',
+  TRANSLATIONS_READ: 'translations_read',
+
+  DEPARTMENTS_LIST_READ: 'department_list_read',
+  DEPARTMENT_DETAIL_READ: 'department_detail_read',
+  DEPARTMENT_CREATE_READ: 'department_create_read',
+
+  TEAMMATES_READ: 'teammates_read',
+  TEAMMATES_DETAILS_READ: 'teammates_detail_read',
+  TEAMMATES_CREATE: 'teammates_create',
+  ROLES_READ: 'roles_read',
+  GROUPS_READ: 'groups_read',
+
+  TEAMMATE_STATUS_UPDATE: 'teammate_status_update',
+
+  EMAIL_TICKETING_READ:'email_ticketing_read',
+  EMAIL_TICKETING_UPDATE:'email_ticketing_update',
+
+  CANNED_RESPONSES_READ:'canned_responses_read',
+  CANNED_RESPONSES_UPDATE:'canned_responses_update',
+  CANNED_RESPONSES_CREATE:'canned_responses_create',
+  CANNED_RESPONSES_DELETE:'canned_responses_delete',
+  
+  TAGS_READ:'tags_read',
+  TAG_CREATE:'tag_create',
+  TAG_DELETE:'tag_delete',
+  TAG_UPDATE:'tag_update',
+
+  HOURS_READ: 'hours_read',
+  HOURS_UPDATE: 'hours_update',
+  HOURS_DELETE: 'hours_delete',
+  HOURS_CREATE: 'hours_create',
+
+  INTEGRATIONS_READ: 'integrations_read',
+  INTEGRATIONS_UPDATE: 'integrations_update',
+
+  APPS_READ:'apps_read',
+  APPS_UPDATE:'apps_update',
+
+  PROJECTSETTINGS_GENERAL_READ: 'projectsettings_general_read',
+  PROJECTSETTINGS_GENERAL_UPDATE: 'projectsettings_general_update',
+
+  PROJECTSETTINGS_SUBSCRIPTION_READ: 'projectsettings_subscription_read',
+
+  PROJECTSETTINGS_DEVELOPER_READ: 'projectsettings_developer_read',
+  PROJECTSETTINGS_DEVELOPER_UPDATE: 'projectsettings_developer_update',
+
+  PROJECTSETTINGS_SMARTASSIGNMENT_READ: 'projectsettings_smartassignment_read',
+  PROJECTSETTINGS_SMARTASSIGNMENT_UPDATE: 'projectsettings_smartassignment_update',
+
+  PROJECTSETTINGS_NOTIFICATION_READ: 'projectsettings_notification_read',
+
+  PROJECTSETTINGS_SECURITY_READ: 'projectsettings_security_read',
+
+  PROJECTSETTINGS_BANNED_READ: 'projectsettings_banned_read',
+
+  PROJECTSETTINGS_ADVANCED_READ: 'projectsettings_advanced_read',
+  
+
+  ACCESS_LISTS: 'accessLists',
+  PROFILE_PAGES: 'profilePages',
+  LEAD_DATA: 'leadData',
+  IMPORT_DATA: 'importData',
+  MANAGE_TAGS: 'manageTags'
+};

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 = true
-        }else if(project && !project.isActiveSubscription && project.profile.type=== 'payment'){
           check = false
+        }else if(project && !project.isActiveSubscription && project.profile.type=== 'payment'){
+          check = true
         }
     
         return check

package/src/app/utils/utils.ts

@@ -1,10 +1,12 @@
+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"){
@@ -21,4 +23,19 @@ 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/chat21-core/models/projectUsers.ts

@@ -0,0 +1,19 @@
+export interface ProjectUser {
+    _id?: string;
+    updatedAt?: any;
+    createdAt?: any;
+    id_project?: string;
+    user_available?: boolean;
+    role?: string;
+    createdBy?: string;
+    is_group_member?: boolean;
+    // id_user?: string;
+    isAuthenticated?: boolean;
+    isBusy?: boolean;
+    status?: string;
+    id_user?: any;
+    rolePermissions?: string[];
+    profileStatus?: string;
+    presence?: { [key: string]: string}
+    __v?: any;
+}

package/src/chat21-core/providers/firebase/firebase-conversation-handler.ts

@@ -392,7 +392,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
                     verb = INFO_SUPPORT_USER_ADDED_VERB;
                     complement = INFO_SUPPORT_USER_ADDED_COMPLEMENT;
                 } else {
-                    // other user has been added to the group (and he has not a fullname, so use hes useruid)
+                    // other user has been added to the group (and he has not a firstname, so use hes useruid)
                     subject = message.attributes.messagelabel.parameters.member_id;
                     verb = INFO_SUPPORT_USER_ADDED_VERB;
                     complement = INFO_SUPPORT_USER_ADDED_COMPLEMENT;

package/src/chat21-core/providers/mqtt/mqtt-conversation-handler.ts

@@ -370,7 +370,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
                     verb = INFO_SUPPORT_USER_ADDED_VERB;
                     complement = INFO_SUPPORT_USER_ADDED_COMPLEMENT;
                 } else {
-                    // other user has been added to the group (and he has not a fullname, so use hes useruid)
+                    // other user has been added to the group (and he has not a firstname, so use hes useruid)
                     subject = message.attributes.messagelabel.parameters.member_id;
                     verb = INFO_SUPPORT_USER_ADDED_VERB;
                     complement = INFO_SUPPORT_USER_ADDED_COMPLEMENT;