@chat21/chat21-ionic 3.4.30-rc2 → 3.4.30

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

@@ -15,10 +15,7 @@ import { tranlatedLanguage } from '../../../chat21-core/utils/constants';
 // utils
 import { avatarPlaceholder, getColorBck } from 'src/chat21-core/utils/utils-user';
 import { BRAND_BASE_INFO, LOGOS_ITEMS } from 'src/app/utils/utils-resources';
-import { getOSCode, hasRole } from 'src/app/utils/utils';
-import { PERMISSIONS } from 'src/app/utils/permissions.constants';
-import { ProjectUser } from 'src/chat21-core/models/projectUsers';
-import { ProjectUsersService } from 'src/app/services/project_users/project-users.service';
+import { getOSCode } from 'src/app/utils/utils';
 
 @Component({
   selector: 'app-sidebar',
@@ -34,7 +31,7 @@ export class SidebarComponent implements OnInit {
   IS_AVAILABLE: boolean = false;
   IS_INACTIVE: boolean = true;
   IS_BUSY: boolean; 
-  // isVisibleAPP: boolean;
+  isVisibleAPP: boolean;
   isVisibleANA: boolean;
   isVisibleACT: boolean;
   isVisibleMON: boolean;
@@ -44,10 +41,9 @@ export class SidebarComponent implements OnInit {
   project_id: string;
   DASHBOARD_URL: string;
   // HAS_CLICKED_OPEN_USER_DETAIL: boolean = false
-  public translationsMap: Map<string, string>;
+  public translationMap: Map<string, string>;
   public_Key: any;
   conversations_lbl: string;
-  whatsappbroadcast_lbl: string;
   contacts_lbl: string;
   apps_lbl: string;
   analytics_lbl: string;
@@ -57,14 +53,19 @@ export class SidebarComponent implements OnInit {
   countClickOnOpenUserDetailSidebar: number = 0
   USER_PHOTO_PROFILE_EXIST: boolean;
   currentUser: any;
-  URLS: { [key: string]: string} = {};
-
-  public projectUser: ProjectUser;
-  public roles: { [key: string]: boolean }
-
+  dashboard_home_url: string;
+  dashboard_knb_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;
+  tiledesk_url: string;
   LOGOS_ITEMS = LOGOS_ITEMS;
   BRAND_BASE_INFO = BRAND_BASE_INFO;
-  PERMISSIONS = PERMISSIONS;
   constructor(
     public imageRepoService: ImageRepoService,
     public appStorageService: AppStorageService,
@@ -74,13 +75,12 @@ export class SidebarComponent implements OnInit {
     public wsService: WebsocketService,
     public appConfigProvider: AppConfigProvider,
     private translate: TranslateService,
-    public projectUsersService: ProjectUsersService,
     public events: EventsService,
 
   ) { }
 
   ngOnInit() {
-    this.URLS.TILEDESK = BRAND_BASE_INFO['COMPANY_SITE_URL'] as string
+    this.tiledesk_url = BRAND_BASE_INFO['COMPANY_SITE_URL'] as string
     
     this.DASHBOARD_URL = this.appConfig.getConfig().dashboardUrl + '#/project/';
     this.getStoredProjectAndUserRole()
@@ -92,57 +92,36 @@ export class SidebarComponent implements OnInit {
 
 
   getStoredProjectAndUserRole() {
-    this.events.subscribe('storage:last_project',async (project) =>{
+    this.events.subscribe('storage:last_project',project =>{
       this.logger.log('[SIDEBAR] stored_project ', project)
       if (project && project !== 'undefined') {
         this.project_id = project.id_project.id
         this.USER_ROLE = project.role;
         this.buildURLs(this.USER_ROLE)
-        this.projectUser = await this.projectUsersService.getProjectUserByProjectId(project.id_project.id)
-        this.roles = this.checkRoles()
-        this.logger.log('[SIDEBAR] roles ', this.roles)
       }
     })
   }
 
   buildURLs(USER_ROLE) {
-    const base = this.DASHBOARD_URL + this.project_id;
-
-    this.URLS = {
-      HOME: `${base}/home`,
-      KNOWLEDGEBASE: `${base}/knowledge-bases`,
-      BOTS: `${base}/bots`,
-      MONITOR: `${base}/wsrequests`,
-      WHATSAPP: `${base}/automations`,
-      CONTACTS: `${base}/contacts`,
-      APPSTORE: `${base}/app-store`,
-      ANALYTICS: `${base}/analytics`,
-      ACTIVITIES: `${base}/activities`,
-      HISTORY: `${base}/history`,
-      SETTINGS: USER_ROLE !== 'agent' ? `${base}/widget-set-up` : `${base}/cannedresponses`,
-      TILEDESK: 'https://www.tiledesk.com'
-    };
-
-    this.setQueryParamsForAll({ tiledesk_logOut: BRAND_BASE_INFO['LOGOUT_ENABLED'] });
+    this.dashboard_home_url = this.DASHBOARD_URL + this.project_id + '/home'
+    this.dashboard_knb_url = this.DASHBOARD_URL + this.project_id + '/knowledge-bases'
+    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'
+    }
+    this.tiledesk_url = 'https://www.tiledesk.com'
 
   }
 
-  // Funzione helper per aggiungere query params a tutte le URL
-setQueryParamsForAll(queryParams: any) {
-  if (!queryParams) return;
-
-  const queryString = new URLSearchParams(queryParams).toString();
-
-  // Cicla tutte le chiavi di URLS
-  Object.keys(this.URLS).forEach(key => {
-    if (this.URLS[key]) {
-      // Controlla se già ci sono query params
-      const separator = this.URLS[key].includes('?') ? '&' : '?';
-      this.URLS[key] = `${this.URLS[key]}${queryString ? separator + queryString : ''}`;
-    }
-  });
-}
-
   subcribeToAuthStateChanged() {
     this.messagingAuthService.BSAuthStateChanged.subscribe((state) => {
       this.logger.log('[SIDEBAR] BSAuthStateChanged ', state)
@@ -261,7 +240,6 @@ setQueryParamsForAll(queryParams: any) {
       this.logger.error('[SIDEBAR] - ngOnInit - currentUser not found in storage ')
     }
     this.translateLabels()
-    this.translations()
   }
 
 
@@ -278,7 +256,6 @@ setQueryParamsForAll(queryParams: any) {
 
     this.translate.get(keys).subscribe((text: string) => {
       this.conversations_lbl = text['Conversations'];
-      this.whatsappbroadcast_lbl = text['WhatsAppBroadcasts']
       this.contacts_lbl = text['LABEL_CONTACTS']
       this.apps_lbl = text['Apps']
       this.analytics_lbl = text['Analytics']
@@ -294,55 +271,13 @@ setQueryParamsForAll(queryParams: any) {
     
     this.isVisibleANA = getOSCode("ANA", this.public_Key);
     this.isVisibleACT = getOSCode("ACT", this.public_Key);
+    this.isVisibleAPP = getOSCode("APP", this.public_Key);
     this.isVisibleMON = getOSCode("MON", this.public_Key);
     this.isVisibleCNT = getOSCode("CNT", this.public_Key);
     this.isVisibleKNB = getOSCode("KNB", this.public_Key);
-
+    
   }
 
-
-  checkRoles(): { [key: string]: boolean } {
-      const permissionKeys = [
-        'HOME_READ',
-        'KB_READ',
-        'FLOWS_READ',
-        'INBOX_READ',
-        'AUTOMATIONSLOG_READ',
-        'LEADS_READ',
-        'ANALYTICS_READ',
-        'ACTIVITIES_READ',
-        'HISTORY_READ',
-        'PROJECTSETTINGS_GENERAL_READ',
-        'PROJECTSETTINGS_DEVELOPER_READ',
-        'PROJECTSETTINGS_SMARTASSIGNMENT_READ',
-        'PROJECTSETTINGS_NOTIFICATION_READ',
-        'PROJECTSETTINGS_SECURITY_READ',
-        'PROJECTSETTINGS_BANNED_READ',
-        'PROJECTSETTINGS_ADVANCED_READ'
-      ] as const;
-  
-      const roles: { [key: string]: boolean } = {};
-      for (const key of permissionKeys) {
-        const permission = PERMISSIONS[key];
-        roles[permission] = hasRole(this.projectUser, permission);
-      }
-
-
-      let settingRoleKEys = [
-        'PROJECTSETTINGS_GENERAL_READ',
-        'PROJECTSETTINGS_DEVELOPER_READ',
-        'PROJECTSETTINGS_SMARTASSIGNMENT_READ',
-        'PROJECTSETTINGS_NOTIFICATION_READ',
-        'PROJECTSETTINGS_SECURITY_READ',
-        'PROJECTSETTINGS_BANNED_READ',
-        'PROJECTSETTINGS_ADVANCED_READ'
-      ] as const;
-      roles[PERMISSIONS.SETTINGS_READ] = settingRoleKEys.some(settingKey => roles[PERMISSIONS[settingKey]]);
-  
-      return roles;
-  
-    }
-
   listenTocurrentProjectUserUserAvailability$() {
     this.wsService.currentProjectUserAvailability$.subscribe((data) => {
       this.logger.log('[SIDEBAR] - $UBSC TO WS USER AVAILABILITY & BUSY STATUS RES ', data);
@@ -392,20 +327,92 @@ setQueryParamsForAll(queryParams: any) {
     }
   }
 
+  goToHome() {
+    let url = this.DASHBOARD_URL + this.project_id + '/home'
+    this.dashboard_home_url = url;
+    const myWindow = window.open(url, '_self');
+    myWindow.focus();
+  }
+
+  goToBots() {
+    let url = this.DASHBOARD_URL + this.project_id + '/bots/my-chatbots/all'
+    const myWindow = window.open(url, '_self');
+    myWindow.focus();
+  }
+
+  goToConversations() {
+    let url = this.DASHBOARD_URL + this.project_id + '/wsrequests'
+    const myWindow = window.open(url, '_self');
+    myWindow.focus();
+  }
+
+  goToContacts() {
+    let url = this.DASHBOARD_URL + this.project_id + '/contacts'
+    const myWindow = window.open(url, '_self');
+    myWindow.focus();
+  }
+
+  goToAppStore() {
+    let url = this.DASHBOARD_URL + this.project_id + '/app-store'
+    const myWindow = window.open(url, '_self');
+    myWindow.focus();
+  }
+
+  goToAnalytics() {
+    let url = this.DASHBOARD_URL + this.project_id + '/analytics'
+    const myWindow = window.open(url, '_self');
+    myWindow.focus();
+  }
+
+  goToActivities() {
+    let url = this.DASHBOARD_URL + this.project_id + '/activities'
+    const myWindow = window.open(url, '_self');
+    myWindow.focus();
+  }
+
+  goToHistory() {
+    let url = this.DASHBOARD_URL + this.project_id + '/history'
+    const myWindow = window.open(url, '_self');
+    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 = [
-      'Monitor',
-      'Flows',
-      'Knowledgebases',
-      'WhatsAppBroadcasts',
-      'LABEL_CONTACTS',
-      'Apps',
-      'Analytics',
-      'Activities',
-      'History',
-      'Settings'
+      'LABEL_AVAILABLE',
+      'LABEL_NOT_AVAILABLE',
+      'LABEL_BUSY',
+      'VIEW_ALL_CONVERSATIONS',
+      'CONVERSATIONS_IN_QUEUE',
+      'CONVERSATION_IN_QUEUE',
+      'NO_CONVERSATION_IN_QUEUE',
+      'PINNED_PROJECT',
+      'CHANGE_PINNED_PROJECT',
+      "CHANGE_TO_YOUR_STATUS_TO_AVAILABLE",
+      "CHANGE_TO_YOUR_STATUS_TO_UNAVAILABLE"
     ];
-    this.translationsMap = this.translateService.translateLanguage(keys);
+    this.translationMap = this.translateService.translateLanguage(keys);
   }
 
 

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

@@ -81,11 +81,11 @@
             [searchable]="false">
             <ng-template ng-label-tmp let-item="item">
                 <img style="width: 15px;height: 15px;position: relative; top: 1px;" height="15" width="15" [src]="item?.avatar" />
-                <span id="sidebaravatar_{{item.name}}" style="text-transform: capitalize; margin-left:8px">  {{item.label | translate}} </span>
+                <span id="sidebaravatar_{{item.name}}" style="text-transform: capitalize; margin-left:8px">  {{item.label}} </span>
             </ng-template>
             <ng-template ng-option-tmp let-item="item" let-index="index">
                 <img style="width: 15px;height: 15px;position: relative; top: 1px;" height="15" width="15" [src]="item?.avatar" />
-                <span id="sidebaravatar_{{item.name}}" style="text-transform: capitalize; margin-left:8px">  {{item.label | translate}} </span>
+                <span id="sidebaravatar_{{item.name}}" style="text-transform: capitalize; margin-left:8px">  {{item.label}} </span>
             </ng-template>
         </ng-select>
     </section>

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

@@ -25,7 +25,6 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
   // HAS_CLICKED_OPEN_USER_DETAIL: boolean = false;
   // @Output() onCloseUserDetailsSidebar = new EventEmitter();
 
-  @Input() logOut: boolean;
 
   public browserLang: string;
   private logger: LoggerService = LoggerInstance.getInstance()
@@ -243,9 +242,9 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
                           .set('SubscriptionPaymentProblem', text['SubscriptionPaymentProblem'])
                           .set('ThePlanHasExpired', text['ThePlanHasExpired'])
 
-      // this.teammateStatus.forEach(element => {
-      //   element.label = this.translationsMap.get(element.label)
-      // });
+      this.teammateStatus.forEach(element => {
+        element.label = this.translationsMap.get(element.label)
+      });
       
     });
   }
@@ -262,7 +261,7 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
   listenToCurrentStoredProject() {
     this.events.subscribe('storage:last_project', projectObjct => {
       if (projectObjct && projectObjct !== 'undefined') {
-        this.logger.log('[SIDEBAR-USER-DETAILS] - GET STORED PROJECT ', projectObjct)
+        // this.logger.log('[SIDEBAR-USER-DETAILS] - GET STORED PROJECT ', projectObjct)
 
         //TODO: recuperare info da root e non da id_project
         this.project = {
@@ -285,8 +284,6 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
         } else if (this.project.profile.type === 'payment' && this.project.profile.name === 'enterprise') {
           this.getEnterprisePlanTranslation();
         }
-
-        this.wsService.subscriptionToWsCurrentProjectUserAvailability(this.project._id, projectObjct._id);
       }
     })
 
@@ -332,14 +329,14 @@ export class SidebarUserDetailsComponent implements OnInit, OnChanges {
             // this.logger.log('teammateStatus ', this.teammateStatus) 
             this.selectedStatus = this.teammateStatus[2].id;
             this.logger.debug('[SIDEBAR-USER-DETAILS] - PROFILE_STATUS selected option', this.teammateStatus[2].name);
-            // this.teammateStatus = this.teammateStatus.slice(0)
+            this.teammateStatus = this.teammateStatus.slice(0)
           } else if (projectUser['user_available'] === false && (projectUser['profileStatus'] === '' || !projectUser['profileStatus'])) {
             this.selectedStatus = this.teammateStatus[1].id;
             this.logger.debug('[SIDEBAR-USER-DETAILS] - PROFILE_STATUS selected option', this.teammateStatus[1].name);
-            // this.teammateStatus = this.teammateStatus.slice(0)
+            this.teammateStatus = this.teammateStatus.slice(0)
           } else if (projectUser['user_available'] === true && (projectUser['profileStatus'] === '' || !projectUser['profileStatus'])) {
             this.selectedStatus = this.teammateStatus[0].id
-            // this.teammateStatus = this.teammateStatus.slice(0)
+            this.teammateStatus = this.teammateStatus.slice(0)
             this.logger.debug('[SIDEBAR-USER-DETAILS] - PROFILE_STATUS selected option', this.teammateStatus[0].name);
           }
           this.IS_BUSY = projectUser['isBusy']

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',
@@ -65,7 +64,6 @@ 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
@@ -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/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>