@chat21/chat21-ionic 3.4.13-rc3 → 3.4.13-rc4

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # chat21-ionic ver 3.0
 
+### 3.4.13-rc.4
+- added: management for copilot option in project.profile obj
+- removed: token in each tiledesk Service method calls and added initialize method for each services
+ 
 ### 3.4.13-rc.3
 - added: copilot-popover on each received message
 - changed: canned-responsed no data ui

package/package.json

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

package/src/app/app.component.ts

@@ -40,7 +40,8 @@ import { Deeplinks } from '@ionic-native/deeplinks/ngx';
 import { TriggerEvents } from './services/triggerEvents/triggerEvents';
 import { Globals } from './utils/globals';
 import { GlobalSettingsService } from './services/global-settings/global-settings.service';
-import { commandToMessage, conversationToMessage, isSender } from 'src/chat21-core/utils/utils-message';
+import { conversationToMessage } from 'src/chat21-core/utils/utils-message';
+import { ProjectService } from './services/projects/project.service';
 
 @Component({
   selector: 'app-root',
@@ -103,13 +104,10 @@ export class AppComponent implements OnInit {
     private appConfigProvider: AppConfigProvider,
     public events: EventsService,
     public triggerEvents: TriggerEvents,
-    public config: Config,
     public chatManager: ChatManager,
     public translate: TranslateService,
     public alertController: AlertController,
     public navCtrl: NavController,
-    // public userService: UserService,
-    // public currentUserService: CurrentUserService,
     public modalController: ModalController,
     public messagingAuthService: MessagingAuthService,
     public tiledeskAuthService: TiledeskAuthService,
@@ -137,7 +135,8 @@ export class AppComponent implements OnInit {
     public fcm: FCM,
     public el: ElementRef,
     public g: Globals,
-    public globalSettingsService: GlobalSettingsService
+    public globalSettingsService: GlobalSettingsService,
+    public projectService: ProjectService
   ) {
 
     this.saveInStorageNumberOfOpenedChatTab();
@@ -1153,7 +1152,7 @@ export class AppComponent implements OnInit {
     // this.logger.info('initialize FROM [APP-COMP] - [APP-COMP] - GO-ONLINE isOnline ', this.isOnline);
     // clearTimeout(this.timeModalLogin);
     const tiledeskToken = this.tiledeskAuthService.getTiledeskToken();
-
+    const serverBaseURL = this.appConfigProvider.getConfig().apiUrl 
     // const supportmode = this.appConfigProvider.getConfig().supportMode;
     // this.logger.log('[APP-COMP] - GO-ONLINE - supportmode ', supportmode);
     // if (supportmode === true) {
@@ -1166,6 +1165,8 @@ export class AppComponent implements OnInit {
     this.logger.log('[APP-COMP] - GO-ONLINE - currentUser ', currentUser);
     this.chatManager.setTiledeskToken(tiledeskToken);
     this.chatManager.setCurrentUser(currentUser);
+
+    this.projectService.initialize(serverBaseURL)
     // this.chatManager.startApp();
 
     // ----------------------------------------------

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

@@ -97,16 +97,6 @@
     <div role="messaggio" *ngIf="messageType(MESSAGE_TYPE_MINE, message)" class="msg_container base_sent">
 
       <div class="message-date-hover"> {{message.timestamp | date:'HH:mm' }} </div>
-
-      <!-- <ng-container *ngIf="areVisibleCAR && supportMode">
-        <ion-button shape="round" size="small" class="btn-add-msg canned" ion-button fill="clear"
-          (click)="presentCreateCannedResponseModal(message)" [tooltip]="addAsCannedResponseTooltipText"
-          [options]="tooltipOptions" placement="bottom">
-          <ion-icon slot="icon-only" name="flash-outline" style="font-size: 1em;"> </ion-icon>
-          <span class="add-canned-response-add-icon">+</span>
-        </ion-button>
-      </ng-container> -->
-
       
       <div class="bubble-container">
 
@@ -174,6 +164,7 @@
           [fontSize]="stylesMap?.get('fontSize')"
           [fontFamily]="stylesMap?.get('fontFamily')"
           [stylesMap]="stylesMap"
+          [isCopilotEnabled]="isCopilotEnabled"
           (onBeforeMessageRender)="onBeforeMessageRenderFN($event)"
           (onAfterMessageRender)="onAfterMessageRenderFN($event)" 
           (onElementRendered)="onElementRenderedFN($event)"
@@ -189,22 +180,6 @@
         </ion-button>
       </ng-container>
 
-      <!-- <ng-container *ngIf="areVisibleCAR && supportMode">
-        <ion-button shape="round" size="small" class="btn-add-msg canned" ion-button fill="clear"
-          (click)="presentCreateCannedResponseModal(message)" [tooltip]="addAsCannedResponseTooltipText"
-          [options]="tooltipOptions" placement="bottom">
-          <ion-icon slot="icon-only" name="flash-outline" style="font-size: 1em;"> </ion-icon>
-          <span class="add-canned-response-add-icon">+</span>
-        </ion-button>
-      </ng-container> -->
-      <!-- <ng-container *ngIf="supportMode">
-        <ion-button shape="round" size="small" class="btn-add-msg emoji" ion-button fill="clear"
-          (click)="presentEmojiiModal()" tooltip="{{addAsCannedResponseTooltipText}}"
-          [options]="tooltipOptions" placement="bottom">
-          <ion-icon slot="icon-only" name="happy-outline" style="font-size: 1em;"> </ion-icon>
-        </ion-button>
-      </ng-container> -->
-
       <div class="message-date-hover" *ngIf="isChannelTypeGroup(channelType)"> {{message.timestamp | date:'HH:mm' }} </div>
     </div>
     

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

@@ -29,6 +29,7 @@ export class IonConversationDetailComponent extends ConversationContentComponent
   @Input() senderId: string;
   @Input() channelType: string;
   @Input() areVisibleCAR: boolean;
+  @Input() isCopilotEnabled: boolean = false
   @Input() supportMode: boolean;
   @Input() isMobile: boolean;
   @Input() openInfoConversation: boolean;
@@ -166,7 +167,6 @@ export class IonConversationDetailComponent extends ConversationContentComponent
     }else if(event.option === 'jsonInfo'){
       this.presentJsonMessageModal(event.data.message)
     } else if(event.option === 'copilot_question'){
-      console.log('hereeeeeee', event)
       this.eventService.publish('copilot:new_question', {text: event.data.text})
 
     }

package/src/app/chatlib/conversation-detail/message/bubble-message/bubble-message.component.html

@@ -11,6 +11,7 @@
   </div> -->
   <chat-options
     [message]="message"
+    [isCopilotEnabled]="isCopilotEnabled"
     [logLevel]="logger.getLoggerConfig().logLevel"
     (onOptionsDataReturned)="onOptionsDataReturnedFN($event)">
   </chat-options>

package/src/app/chatlib/conversation-detail/message/bubble-message/bubble-message.component.ts

@@ -26,6 +26,7 @@ export class BubbleMessageComponent implements OnInit, OnChanges {
   @Input() fontFamily: string;
   @Input() stylesMap: Map<string, string>;
   @Input() supportMode: boolean;
+  @Input() isCopilotEnabled: boolean = false;
   @Output() onBeforeMessageRender = new EventEmitter();
   @Output() onAfterMessageRender = new EventEmitter();
   @Output() onElementRendered = new EventEmitter<{element: string, status: boolean}>();

package/src/app/chatlib/conversation-detail/message/options/options.component.html

@@ -2,7 +2,7 @@
   <div class="options-logo" (click)="onClickOptionsMessage($event)" >
     <ion-icon name="chevron-down"></ion-icon>
   </div>
-  <div class="options-logo" (click)="onClickOptionsCopilot($event)">
+  <div *ngIf="isCopilotEnabled" class="options-logo" (click)="onClickOptionsCopilot($event)">
     <ion-icon id="copilot" src="assets/images/icons/copilot.svg"></ion-icon>
   </div>
 </div>

package/src/app/chatlib/conversation-detail/message/options/options.component.ts

@@ -14,6 +14,7 @@ import { CopilotPopoverComponent } from 'src/app/components/copilot-popover/copi
 export class OptionsComponent implements OnInit {
 
   @Input() message: MessageModel;
+  @Input() isCopilotEnabled: boolean = false;
   @Input() logLevel: number;
   @Output() onOptionsDataReturned = new EventEmitter<{option: string, data: any}>();
 

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

@@ -120,12 +120,11 @@ export class CannedResponseComponent implements OnInit {
   }
 
   getAndShowCannedResponses(strSearch, projectId) {
-    const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
     this.logger.log('[CANNED] - loadTagsCanned tagsCanned.length', this.tagsCanned.length)
     //if(this.tagsCanned.length <= 0 ){
     this.tagsCanned = []
     this.showLoading = true;
-    this.cannedResponsesService.getAll(tiledeskToken, projectId).subscribe((res) => {
+    this.cannedResponsesService.getAll(projectId).subscribe((res) => {
       this.logger.log('[CANNED] - loadTagsCanned  getCannedResponses RES', res)
 
       this.tagsCanned = res

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

@@ -28,7 +28,7 @@
       </div>
     </div>
 
-    <div>
+    <div *ngIf="isCopilotEnabled">
       <!-- COPILOT-OPTION -->
       <div class="section-option" id="copilot" tooltip="{{translationMap?.get('COPILOT.ASK_AI')}}" placement="top">
         <ion-button id="copilot" fill="clear" [class.active]="section ==='copilot'" (click)="onOpenSection('copilot')">

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

@@ -52,6 +52,7 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
   @Input() channel: string;
   @Input() tagsCannedFilter: any;
   @Input() areVisibleCAR: boolean;
+  @Input() isCopilotEnabled: boolean = false;
   @Input() supportMode: boolean;
   @Input() leadInfo: {lead_id: string, hasEmail: boolean, email: string, projectId: string, presence: {}};
   @Input() fileUploadAccept: string;

package/src/app/components/conversation-info/info-content/info-content.component.ts

@@ -225,17 +225,15 @@ export class InfoContentComponent implements OnInit {
 
     this.member = null;
 
-    const tiledeskToken = this.tiledeskAuthService.getTiledeskToken();
-    this.contactsService.loadContactDetail(tiledeskToken, this.conversationWith)
-      .subscribe(res => {
-        this.logger.log('[INFO-CONTENT-COMP] - setInfoDirect loadContactDetail RES', res);
-        this.member = res
-        this.logger.log('[INFO-CONTENT-COMP] - setInfoDirect member', this.member);
-      }, (error) => {
-        this.logger.error('[INFO-CONTENT-COMP] - setInfoDirect loadContactDetail - ERROR  ', error);
-      }, () => {
-        this.logger.log('I[INFO-CONTENT-COMP] - setInfoDirect loadContactDetail * COMPLETE *');
-      });
+    this.contactsService.loadContactDetail(this.conversationWith).subscribe(res => {
+      this.logger.log('[INFO-CONTENT-COMP] - setInfoDirect loadContactDetail RES', res);
+      this.member = res
+      this.logger.log('[INFO-CONTENT-COMP] - setInfoDirect member', this.member);
+    }, (error) => {
+      this.logger.error('[INFO-CONTENT-COMP] - setInfoDirect loadContactDetail - ERROR  ', error);
+    }, () => {
+      this.logger.log('I[INFO-CONTENT-COMP] - setInfoDirect loadContactDetail * COMPLETE *');
+    });
   }
 
   // ---------------------------------------------------

package/src/app/components/conversation-info/info-group/info-group.component.ts

@@ -38,7 +38,6 @@ export class InfoGroupComponent implements OnInit, AfterViewInit, OnChanges {
   constructor(
     public imageRepoService: ImageRepoService,
     public presenceService: PresenceService,
-    public tiledeskAuthService: TiledeskAuthService,
     public contactsService: ContactsService,
     public renderer: Renderer2,
     private router: Router,
@@ -56,10 +55,7 @@ export class InfoGroupComponent implements OnInit, AfterViewInit, OnChanges {
     // const currentUrl = this.router.url;
     // this.logger.log('InfoGroupComponent current_url ', currentUrl);
     // .pipe(takeUntil(this.unsubscribe$))
-    router.events
-      .pipe(filter(event => event instanceof NavigationEnd))
-
-      .subscribe((event: NavigationEnd) => {
+    router.events.pipe(filter(event => event instanceof NavigationEnd)).subscribe((event: NavigationEnd) => {
         // console.log('InfoGroupComponent -  router.events prev url :', event.url);
         this.previousUrl = event.url;
 
@@ -122,8 +118,6 @@ export class InfoGroupComponent implements OnInit, AfterViewInit, OnChanges {
 
     if (this.groupDetail) {
       if (this.groupDetail.uid.startsWith('group-')) {
-        const tiledeskToken = this.tiledeskAuthService.getTiledeskToken();
-
         this.member_array = []
         const members_isonline_array = []
 
@@ -156,9 +150,7 @@ export class InfoGroupComponent implements OnInit, AfterViewInit, OnChanges {
 
             });
 
-          this.contactsService.loadContactDetail(tiledeskToken, key)
-            .pipe(takeUntil(this.unsubscribe$))
-            .subscribe(user => {
+          this.contactsService.loadContactDetail(key).pipe(takeUntil(this.unsubscribe$)).subscribe(user => {
               this.logger.log('InfoGroupComponent group detail loadContactDetail RES', user);
               // this.logger.log('InfoGroupComponent group detail this.presenceService.BSIsOnline.value()', this.presenceService.BSIsOnline.getValue);
 

package/src/app/components/copilot-suggestions/copilot-suggestions.component.ts

@@ -1,3 +1,4 @@
+import { AppConfigProvider } from 'src/app/services/app-config';
 import { filter } from 'rxjs/operators';
 import { Component, ElementRef, EventEmitter, HostListener, Input, OnInit, Output, SimpleChange } from '@angular/core';
 import { CopilotService } from 'src/app/services/copilot/copilot.service';
@@ -39,19 +40,23 @@ export class CopilotSuggestionsComponent implements OnInit {
     public tiledeskAuthService: TiledeskAuthService,
     public tiledeskService: TiledeskService,
     public copilotService: CopilotService,
+    public appConfigProvider: AppConfigProvider,
     public el: ElementRef
-  ) { }
+  ) { 
+    const serverBaseUrl = this.appConfigProvider.getConfig().apiUrl
+    this.copilotService.initialize(serverBaseUrl)
+  }
 
   ngOnInit() {
     this.loggedUser = this.tiledeskAuthService.getCurrentUser()
   }
 
   ngOnChanges(changes: SimpleChange){
-      this.logger.debug('[COPILOT] - loadTagsCanned strSearch ', this.currentString)
-      if(changes && changes['conversationWith'] && (changes['conversationWith'].previousValue !== changes['conversationWith'].currentValue)){
-        this.projectID = getProjectIdSelectedConversation(this.conversationWith)
-      }
-      this.loadSuggestions(this.conversationWith)
+    this.logger.debug('[COPILOT] - loadTagsCanned strSearch ', this.currentString)
+    if(changes && changes['conversationWith'] && (changes['conversationWith'].previousValue !== changes['conversationWith'].currentValue)){
+      this.projectID = getProjectIdSelectedConversation(this.conversationWith)
+    }
+    this.loadSuggestions(this.conversationWith)
   }
 
 
@@ -90,13 +95,12 @@ export class CopilotSuggestionsComponent implements OnInit {
 
 
   getAndShowSuggestions(projectId) {
-    const tiledeskToken = this.tiledeskAuthService.getTiledeskToken()
     this.logger.log('[COPILOT] - loadTagsCanned tagsCanned.length', this.suggestions.length)
     //if(this.tagsCanned.length <= 0 ){
     this.suggestions = []
     this.showLoading = true;
     if(this.question && this.question !== ''){
-      this.copilotService.getAllFromQuestion(this.question, tiledeskToken, projectId, this.conversationWith).subscribe((res) => {
+      this.copilotService.getAllFromQuestion(this.question, projectId, this.conversationWith).subscribe((res) => {
         this.logger.log('[COPILOT] - loadTagsCanned  getCannedResponses RES', res)
         this.suggestions = res.map(el => ({ ...el, disabled : true }))
         this.logger.log('[COPILOT] - loadTagsCanned  getCannedResponses tagsCannedCount', this.suggestions)
@@ -108,7 +112,7 @@ export class CopilotSuggestionsComponent implements OnInit {
         this.onLoadedSuggestions.emit(this.suggestions)
       })
     } else {
-      this.copilotService.getAll(tiledeskToken, projectId, this.conversationWith).subscribe((res) => {
+      this.copilotService.getAll(projectId, this.conversationWith).subscribe((res) => {
         this.logger.log('[COPILOT] - loadTagsCanned  getCannedResponses RES', res)
         this.suggestions = res.map(el => ({ ...el, disabled : true }))
         this.logger.log('[COPILOT] - loadTagsCanned  getCannedResponses tagsCannedCount', this.suggestions)

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

@@ -1,7 +1,7 @@
 import { AppConfigProvider } from 'src/app/services/app-config';
 import { TiledeskAuthService } from 'src/chat21-core/providers/tiledesk/tiledesk-auth.service';
 import { EventsService } from 'src/app/services/events-service';
-import { ProjectsService } from './../../services/projects/projects.service';
+import { ProjectService } from '../../services/projects/project.service';
 import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
@@ -33,7 +33,7 @@ export class NavbarComponent implements OnInit {
   public MT: boolean;
 
   constructor(
-    private projectsService: ProjectsService,
+    private projectService: ProjectService,
     private tiledeskAuthService: TiledeskAuthService,
     private appConfigProvider: AppConfigProvider,
     private translateService: CustomTranslateService, 
@@ -78,7 +78,7 @@ export class NavbarComponent implements OnInit {
 
   getProjects() {
     this.logger.log('[NAVBAR] calling getProjects ... ');
-    this.projectsService.getProjects(this.tiledeskToken).subscribe((projects: any) => {
+    this.projectService.getProjects().subscribe((projects: any) => {
       this.logger.log('[NAVBAR] getProjects PROJECTS ', projects);
       if (projects) {
           // this.projects = projects;
@@ -170,7 +170,7 @@ export class NavbarComponent implements OnInit {
       url = baseUrl + '#/project/' + this.project.id_project.id + '/project-settings/general' + '?token=' + this.tiledeskToken
     }else if(event ==='allProjects'){
       url = baseUrl + '#/projects/' + '?token=' + this.tiledeskToken
-    }else if('addProject'){
+    }else if(event === 'addProject'){
       url = baseUrl + '#/create-new-project/' + '?token=' + this.tiledeskToken
     }
     console.log('onClickDropdownOption-->', url)

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

@@ -14,6 +14,7 @@ import { WebSocketJs } from 'src/app/services/websocket/websocket-js';
 import { AppConfigProvider } from 'src/app/services/app-config';
 import { ConvertRequestToConversation } from 'src/chat21-core/utils/convertRequestToConversation';
 import { compareValues } from 'src/chat21-core/utils/utils';
+import { ProjectService } from 'src/app/services/projects/project.service';
 
 @Component({
   selector: 'app-project-item',
@@ -46,7 +47,7 @@ export class ProjectItemComponent implements OnInit {
     public appStorageService: AppStorageService,
     private translateService: CustomTranslateService,
     public tiledeskAuthService: TiledeskAuthService,
-    public tiledeskService: TiledeskService,
+    public projectService: ProjectService,
     public webSocketJs: WebSocketJs,
     private appConfigProvider: AppConfigProvider,
     public events: EventsService,
@@ -174,9 +175,7 @@ export class ProjectItemComponent implements OnInit {
 
     if (!stored_project || stored_project === 'undefined') {
       this.logger.log('PROJECT-ITEM - THERE IS NOT STORED LAST PROJECT OR IS UNDEFINED ', stored_project)
-      const tiledeskToken = this.appStorageService.getItem('tiledeskToken');
-      this.logger.log('[PROJECT-ITEM] - GET PROJECTS - tiledeskToken', tiledeskToken);
-      this.tiledeskService.getProjects(tiledeskToken).subscribe(projects => {
+      this.projectService.getProjects().subscribe(projects => {
         this.logger.log('[PROJECT-ITEM - GET PROJECTS - RES', projects);
 
         this.logger.log('[INFO-CONTENT-COMP] - GET PROJECTS - RES this.project', this.project);

package/src/app/modals/create-canned-response/create-canned-response.page.ts

@@ -177,7 +177,7 @@ export class CreateCannedResponsePage implements OnInit {
     this.logger.log('[CREATE-CANNED-RES] - CREATE CANNED RESP - MSG ', message);
     this.logger.log('[CREATE-CANNED-RES] - CREATE CANNED RESP - TITLE ', title);
 
-    this.cannedResponsesService.add(this.tiledeskToken, this.prjctID, title.trim(), message.trim()).subscribe((responses: any) => {
+    this.cannedResponsesService.add(this.prjctID, title.trim(), message.trim()).subscribe((responses: any) => {
       this.logger.log('[CREATE-CANNED-RES] - CREATE CANNED RESP - RES ', responses);
     }, (error) => {
       this.logger.error('[CREATE-CANNED-RES]- CREATE CANNED RESP - ERROR  ', error);

package/src/app/pages/contacts-directory/contacts-directory.page.ts

@@ -10,6 +10,7 @@ import { EventsService } from '../../services/events-service';
 // Logger
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
+import { AppConfigProvider } from 'src/app/services/app-config';
 
 @Component({
   selector: 'app-contacts-directory',
@@ -18,7 +19,6 @@ import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance'
 })
 export class ContactsDirectoryPage implements OnInit {
   
-  @Input() token: string;
   @Input() isMobile: boolean;
   @Input() stylesMap: Map<string, string>;
   // @Input() user: string;
@@ -31,22 +31,23 @@ export class ContactsDirectoryPage implements OnInit {
     private navService: NavProxyService,
     // private contactsDirectoryService: ContactsDirectoryService,
     private contactsService: ContactsService,
+    private appConfigProvider: AppConfigProvider,
     public events: EventsService
   ) {
+    const serverBaseUrl = this.appConfigProvider.getConfig().apiUrl
+    this.contactsService.initialize(serverBaseUrl)
   }
 
   ngOnInit() {
-    this.logger.log('[CONTACT-DIRECTORY-PAGE] - TOKEN (ngOnInit)', this.token);
     this.initialize();
   }
 
   /** */
   initialize() {
     this.logger.log('[CONTACT-DIRECTORY-PAGE] - initialize');
-    this.logger.log('[CONTACT-DIRECTORY-PAGE] - token: ', this.token);
     this.contacts = [];
     this.initSubscriptions();
-    this.contactsService.loadContactsFromUrl(this.token);
+    this.contactsService.loadContactsFromUrl();
   }
 
   /**

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

@@ -135,7 +135,8 @@
                   [messages]="messages" 
                   [senderId]="loggedUser.uid"
                   [baseLocation]="window?.location?.origin"
-                  [areVisibleCAR]="areVisibleCAR" 
+                  [areVisibleCAR]="areVisibleCAR"
+                  [isCopilotEnabled]="isCopilotEnabled"
                   [supportMode]= "supportMode"
                   [isMobile]="isMobile"
                   [isTypings]="isTypings"
@@ -203,7 +204,8 @@
               [channelType]="channelType"
               [channel]="conversation?.attributes?.request_channel"
               [tagsCannedFilter]="tagsCannedFilter"
-              [areVisibleCAR]="areVisibleCAR" 
+              [areVisibleCAR]="areVisibleCAR"
+              [isCopilotEnabled]="isCopilotEnabled"
               [supportMode]="supportMode"
               [leadInfo]="leadInfo"
               [fileUploadAccept]="appConfigProvider.getConfig().fileUploadAccept"

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

@@ -1,3 +1,4 @@
+import { ProjectPlanUtils } from './../../utils/project-utils';
 import { DomSanitizer } from '@angular/platform-browser';
 import {
   Component,
@@ -81,6 +82,7 @@ import { EventsService } from '../../services/events-service'
 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';
 
 @Component({
   selector: 'app-conversation-detail',
@@ -147,6 +149,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
 
   public_Key: any;
   areVisibleCAR: boolean;
+  isCopilotEnabled: boolean;
   supportMode: boolean;
   isEmailEnabled: boolean;
   offlineMsgEmail: boolean;
@@ -234,10 +237,11 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     public presenceService: PresenceService,
     public toastController: ToastController,
     public tiledeskService: TiledeskService,
+    public projectService: ProjectService,
     private networkService: NetworkService,
     private events: EventsService,
     private webSocketService: WebsocketService,
-    private sanitizer: DomSanitizer,
+    public projectPlanUtils: ProjectPlanUtils,
     private g: Globals,
   ) {
     // Change list on date change
@@ -498,6 +502,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     this.isEmailEnabled = (this.appConfigProvider.getConfig().emailSection === 'true' || this.appConfigProvider.getConfig().emailSection === true) ? true : false;
     this.isWhatsappTemplatesEnabled = (this.appConfigProvider.getConfig().whatsappTemplatesSection === 'true' || this.appConfigProvider.getConfig().whatsappTemplatesSection === true) ? true : false;
 
+    this.cannedResponsesService.initialize(appconfig.apiUrl)
+
     if (checkPlatformIsMobile()) {
       this.isMobile = true
       // this.openInfoConversation = false; // indica se è aperto il box info conversazione
@@ -544,7 +550,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         this.logger.log('[CONVS-DETAIL] - GET PROJECTID BY CONV RECIPIENT RES + projectId', res, res.id_project)
         if (res) {
           const projectId = res.id_project
-          this.getProjectById(tiledeskToken, projectId)
+          this.getProjectById(projectId)
         }
       }, (error) => {
         this.logger.error('[CONVS-DETAIL] - GET PROJECTID BY CONV RECIPIENT - ERROR  ',conversationWith,  error)
@@ -558,13 +564,14 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     
   }
 
-  getProjectById(tiledeskToken, projectId) {
-    this.tiledeskService.getProjectById(tiledeskToken, projectId).subscribe((project) => {
+  getProjectById(projectId) {
+    this.projectService.getProjectById(projectId).subscribe(async (project) => {
       this.logger.log('[CONVS-DETAIL] - GET PROJECTID BY CONV RECIPIENT RES', project)
       if (project) {
         const projectId = project.id_project
-        this.canShowCanned = this.checkPlanIsExpired(project)
+        this.canShowCanned = this.projectPlanUtils.checkPlanIsExpired(project)
         this.offlineMsgEmail = this.checkOfflineMsgEmailIsEnabled(project)
+        this.isCopilotEnabled = this.projectPlanUtils.checkProjectProfileFeature(project, 'copilot')
       }
     }, (error) => {
       this.logger.error('[CONVS-DETAIL] - GET PROJECTID BY CONV RECIPIENT - ERROR  ', error)
@@ -577,27 +584,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   }
 
 
-  checkPlanIsExpired(project: Project): boolean {
-    let check: boolean = false
-
-    //case FREE plan
-    if(project && project.trialExpired && project.profile.type=== 'trial'){
-      check = true
-    }else if(project && !project.trialExpired && project.profile.type=== 'trial'){
-      check = false
-    }
-
-    //case PAYMENT plan
-    if(project && project.isActiveSubscription && project.profile.type=== 'payment'){
-      check = true
-    }else if(project && !project.isActiveSubscription && project.profile.type=== 'payment'){
-      check = false
-    }
-
-    return check
-  }
-
-
   checkOfflineMsgEmailIsEnabled(project: Project): boolean {
     let check: boolean = true
 

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

@@ -911,7 +911,7 @@ export class ConversationListPage implements OnInit {
         isMobile: this.isMobile
       })
     } else {
-      this.navService.push(ContactsDirectoryPage, { token: TOKEN })
+      this.navService.push(ContactsDirectoryPage, {})
     }
   }
 

package/src/app/services/canned-responses/canned-responses.service.ts

@@ -6,38 +6,44 @@ import { map } from 'rxjs/operators';
 // Logger
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
+import { AppStorageService } from 'src/chat21-core/providers/abstract/app-storage.service';
 
 @Injectable({
   providedIn: 'root'
 })
 export class CannedResponsesService {
 
-  private apiUrl: string;
+  private SERVER_BASE_URL: string;
+  private tiledeskToken: string;
+
   private logger: LoggerService = LoggerInstance.getInstance();
 
   constructor(
     public http: HttpClient,
-    public appConfigProvider: AppConfigProvider
+    public appStorageService: AppStorageService
   ) {
-   
     this.logger.log('[CANNED-RESPONSES-SERVICE] HELLO !');
-    this.apiUrl = appConfigProvider.getConfig().apiUrl;
-    this.logger.log('[CANNED-RESPONSES-SERVICE] apiUrl ', this.apiUrl);
+  }
+
+  initialize(serverBaseUrl: string) {
+    this.logger.log('[CANNED-RESPONSES-SERVICE] - initialize serverBaseUrl', serverBaseUrl);
+    this.SERVER_BASE_URL = serverBaseUrl;
+    this.tiledeskToken = this.appStorageService.getItem('tiledeskToken')
   }
 
 
-  public getAll(token: string, projectid: string) {
-    const cannedResponsesURL = this.apiUrl + projectid + "/canned/";
-    this.logger.log('[CANNED-RESPONSES-SERVICE] getCannedResponses - URL ', cannedResponsesURL);
+  public getAll(projectid: string) {
+    const url = this.SERVER_BASE_URL + projectid + "/canned/";
+    this.logger.log('[CANNED-RESPONSES-SERVICE] getCannedResponses - URL ', url);
 
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
     
-    return this.http.get(cannedResponsesURL, httpOptions).pipe(map((res: any) => {
+    return this.http.get(url, httpOptions).pipe(map((res: any) => {
         this.logger.log('[CANNED-RESPONSES-SERVICE] getCannedResponses - RES ', res);
         return res
     }))
@@ -46,14 +52,14 @@ export class CannedResponsesService {
   // -------------------------------------------------------------------------------------
   // @ Create - Save (POST) new canned response
   // -------------------------------------------------------------------------------------
-  public add(token: string, projectid: string, title: string, message: string) {
-    const url =  this.apiUrl  + projectid + '/canned/'
+  public add(projectid: string, title: string, message: string) {
+    const url =  this.SERVER_BASE_URL  + projectid + '/canned/'
     this.logger.log('[TILEDESK-SERVICE] - CREATE CANNED-RES - URL', url); 
     
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 
@@ -70,13 +76,13 @@ export class CannedResponsesService {
   }
 
   public edit(token: string, projectid: string, canned: any){
-    const cannedResponsesURL = this.apiUrl + projectid + "/canned/"+ canned._id;
+    const cannedResponsesURL = this.SERVER_BASE_URL + projectid + "/canned/"+ canned._id;
     this.logger.log('[CANNED-RESPONSES-SERVICE] editCannedResponses - URL ', cannedResponsesURL);
     
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 
@@ -92,7 +98,7 @@ export class CannedResponsesService {
   }
 
   public delete(token: string, projectid: string, cannedID: string){
-    const cannedResponsesURL = this.apiUrl + projectid + "/canned/"+cannedID;
+    const cannedResponsesURL = this.SERVER_BASE_URL + projectid + "/canned/"+cannedID;
     this.logger.log('[CANNED-RESPONSES-SERVICE] deleteCannedResponses - URL ', cannedResponsesURL);
 
     const httpOptions = {

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

@@ -14,6 +14,7 @@ import { map } from 'rxjs/operators';
 // Logger
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
+import { AppStorageService } from 'src/chat21-core/providers/abstract/app-storage.service';
 
 @Injectable({
   providedIn: 'root'
@@ -26,36 +27,41 @@ export class ContactsService {
   BScontactDetail: BehaviorSubject<UserModel> = new BehaviorSubject<UserModel>(null);
 
   // private
-  private urlRemoteContacts: string;
+  private SERVER_BASE_URL: string;
+  private tiledeskToken: string;
+
   private contacts: UserModel[];
   private logger: LoggerService = LoggerInstance.getInstance();
 
   constructor(
     public http: HttpClient,
-    public appConfigProvider: AppConfigProvider
+    public appStorageService: AppStorageService
   ) {
-    this.urlRemoteContacts = appConfigProvider.getConfig().apiUrl + 'chat21/contacts';
+    this.logger.log('[COPILOT-SERVICE] HELLO !');
   }
 
+  initialize(serverBaseUrl: string) {
+    this.logger.log('[COPILOT-SERVICE] - initialize serverBaseUrl', serverBaseUrl);
+    this.SERVER_BASE_URL = serverBaseUrl;
+    this.tiledeskToken = this.appStorageService.getItem('tiledeskToken')
+  }
 
-  // initialize() {}
 
   /** */
-  public loadContactsFromUrl(token: string) {
-    this.contacts = [];
-    this.logger.log('[CONTACT-SERVICE] loadContactsFromUrl token', token);
-    this.logger.log('[CONTACT-SERVICE] loadContactsFromUrl urlRemoteContacts', this.urlRemoteContacts)
+  public loadContactsFromUrl() {
+    const url = this.SERVER_BASE_URL + 'chat21/contacts';
+    this.logger.log('[CONTACT-SERVICE] loadContactsFromUrl urlRemoteContacts', url)
     // if (this.urlRemoteContacts.startsWith('http') && token) {
     const that = this;
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
-   
- 
-    this.http.get<any[]>(this.urlRemoteContacts, httpOptions).subscribe(users => {
+      
+    this.contacts = [];
+    this.http.get<any[]>(url, httpOptions).subscribe(users => {
       this.logger.log('[CONTACT-SERVICE] loadContactsFromUrl users ', users);
       users.forEach(user => {
         const member = that.createCompleteUser(user);
@@ -103,24 +109,21 @@ export class ContactsService {
   * @param token
   * @param uid
   */
-  public loadContactDetail(token: string, uid: string) {
+  public loadContactDetail(uid: string) {
     this.contacts = [];
+    const url = this.SERVER_BASE_URL + 'chat21/contacts/' + uid;
     this.logger.log('[CONTACT-SERVICE] - loadContactDetail - uid ', uid);
-    this.logger.log('[CONTACT-SERVICE] - loadContactDetail - token ', token);
-    const urlRemoteContactDetail = this.urlRemoteContacts + '/' + uid;
     // if (urlRemoteContactDetail.startsWith('http') && token) {
 
       const httpOptions = {
         headers: new HttpHeaders({
           'Content-Type': 'application/json',
-          Authorization: token
+          Authorization: this.tiledeskToken
         })
       };
       // const postData = {};
-      this.logger.log('[CONTACT-SERVICE] - loadContactDetail  url ', urlRemoteContactDetail);
-      return this.http
-        .get(urlRemoteContactDetail, httpOptions)
-        .pipe(map((res: any) => {
+      this.logger.log('[CONTACT-SERVICE] - loadContactDetail  url ', url);
+      return this.http.get(url, httpOptions).pipe(map((res: any) => {
           this.logger.log('[CONTACT-SERVICE] - loadContactDetail - loadContactDetail RES ', res);
           if (res.uid) {
             let user = this.createCompleteUser(res)

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

@@ -5,61 +5,65 @@ import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 import { map, filter } from 'rxjs/operators';
 import * as uuid from 'uuid';
+import { AppStorageService } from 'src/chat21-core/providers/abstract/app-storage.service';
 
 @Injectable({
   providedIn: 'root'
 })
 export class CopilotService {
 
-  private apiUrl: string;
+  private SERVER_BASE_URL: string;
+  private tiledeskToken: string;
+
   private logger: LoggerService = LoggerInstance.getInstance();
   
   constructor(
     public http: HttpClient,
-    public appConfigProvider: AppConfigProvider
+    public appStorageService: AppStorageService
   ) {
     this.logger.log('[COPILOT-SERVICE] HELLO !');
-    this.apiUrl = appConfigProvider.getConfig().apiUrl;
-    this.logger.log('[COPILOT-SERVICE] apiUrl ', this.apiUrl);
   }
 
-  public getAll(token: string, projectid: string, conversWith: string) {
-      const url = this.apiUrl + projectid + "/copilot?request_id=" + conversWith;
-      this.logger.log('[COPILOT-SERVICE] getAllSuggestions - URL ', url);
+  initialize(serverBaseUrl: string) {
+    this.logger.log('[COPILOT-SERVICE] - initialize serverBaseUrl', serverBaseUrl);
+    this.SERVER_BASE_URL = serverBaseUrl;
+    this.tiledeskToken = this.appStorageService.getItem('tiledeskToken')
+  }
+
+  public getAll(projectid: string, conversWith: string) {
+    const url = this.SERVER_BASE_URL + projectid + "/copilot?request_id=" + conversWith;
+    this.logger.log('[COPILOT-SERVICE] getAllSuggestions - URL ', url);
   
-      const httpOptions = {
-        headers: new HttpHeaders({
-          'Content-Type': 'application/json',
-          Authorization: token
-        })
-      };
+    const httpOptions = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+        Authorization: this.tiledeskToken
+      })
+    };
       
-      return this.http.get(url, httpOptions).pipe(map((res: [any]) => {
-          let suggestions = res.filter(el => el !== null).map(el => ({ ...el, _id:  uuid.v4()} ));
-          this.logger.log('[COPILOT-SERVICE] getCannedResponses - RES ', suggestions);
-          return suggestions
-      }))
+    return this.http.get(url, httpOptions).pipe(map((res: [any]) => {
+        let suggestions = res.filter(el => el !== null).map(el => ({ ...el, _id:  uuid.v4()} ));
+        return suggestions
+    }))
   }
 
-  public getAllFromQuestion(question: string, token: string, projectid: string, conversWith: string) {
-    const url = this.apiUrl + projectid + "/copilot?request_id=" + conversWith;
+  public getAllFromQuestion(question: string, projectid: string, conversWith: string) {
+    const url = this.SERVER_BASE_URL + projectid + "/copilot?request_id=" + conversWith;
     this.logger.log('[COPILOT-SERVICE] getAllSuggestions - URL ', url);
 
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 
-    console.log('questionnnn', question)
     const body = {
       text: question
     };
     
     return this.http.post(url, body, httpOptions).pipe(map((res: [any]) => {
         let suggestions = res.filter(el => el !== null).map(el => ({ ...el, _id:  uuid.v4()} ));
-        this.logger.log('[COPILOT-SERVICE] getCannedResponses - RES ', suggestions);
         return suggestions
     }))
 }

package/src/app/services/projects/{projects.service.spec.ts → project.service.spec.ts}

@@ -1,12 +1,12 @@
 import { TestBed } from '@angular/core/testing';
 
-import { ProjectsService } from './projects.service';
+import { ProjectService } from './project.service';
 
 describe('ProjectsService', () => {
   beforeEach(() => TestBed.configureTestingModule({}));
 
   it('should be created', () => {
-    const service: ProjectsService = TestBed.get(ProjectsService);
+    const service: ProjectService = TestBed.get(ProjectService);
     expect(service).toBeTruthy();
   });
 });

package/src/app/services/projects/project.service.ts

@@ -0,0 +1,68 @@
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { map } from 'rxjs/operators';
+import { Project } from 'src/chat21-core/models/projects';
+import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
+import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
+import { AppConfigProvider } from '../app-config';
+import { Observable } from 'rxjs';
+import { AppStorageService } from 'src/chat21-core/providers/abstract/app-storage.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ProjectService {
+
+  private SERVER_BASE_URL: string;
+  private tiledeskToken: string;
+
+  private logger: LoggerService = LoggerInstance.getInstance();
+
+  constructor(
+    public http: HttpClient,
+    public appStorageService: AppStorageService
+  ) {
+   
+    this.logger.log('[PROJECTS-SERVICE] HELLO !');
+  }
+
+  initialize(serverBaseUrl: string) {
+    this.logger.log('[TILEDESK-PROJECTS-SERV] - initialize serverBaseUrl', serverBaseUrl);
+    this.SERVER_BASE_URL = serverBaseUrl;
+    this.tiledeskToken = this.appStorageService.getItem('tiledeskToken')
+  }
+
+  public getProjects(): Observable<Project[]> {
+    const url = this.SERVER_BASE_URL  + "projects/";
+    this.logger.log('[PROJECTS-SERVICE] getProjects - URL ', url);
+
+    const httpOptions = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+        Authorization: this.tiledeskToken
+      })
+    };
+    
+    return this.http.get(url, httpOptions).pipe(map((res: Project[]) => {
+        this.logger.log('[PROJECTS-SERVICE] getProjects - RES ', res);
+        return res
+    }))
+  }
+
+  public getProjectById(id: string): Observable<Project> {
+    const url = this.SERVER_BASE_URL + 'projects/' + id;
+    this.logger.log('[TILEDESK-SERVICE] - GET PROJECT BY ID URL', url);
+
+    const httpOptions = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+        Authorization: this.tiledeskToken
+      })
+    };
+    return this.http.get(url, httpOptions).pipe(map((project: Project) => {
+      this.logger.log('[TILEDESK-SERVICE] GET PROJECT BY ID URL - RES ', project);
+      return project
+    }))
+  }
+
+}

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

@@ -89,41 +89,6 @@ export class TiledeskService {
     }))
   }
 
-  public getProjects(token: string) {
-    const url = this.apiUrl + 'projects/';
-    this.logger.log('[TILEDESK-SERVICE] - GET PROJECTS URL', url);
-
-    const httpOptions = {
-      headers: new HttpHeaders({
-        'Content-Type': 'application/json',
-        Authorization: token
-      })
-    };
-
-    return this.http.get(url, httpOptions).pipe(map((res: any) => {
-      this.logger.log('[TILEDESK-SERVICE] GET PROJECTS - RES ', res);
-      return res
-    }))
-  }
-
-
-  public getProjectById( token: string , id: string) {
-    const url = this.apiUrl + 'projects/' + id;
-    this.logger.log('[TILEDESK-SERVICE] - GET PROJECT BY ID URL', url);
-
-    const httpOptions = {
-      headers: new HttpHeaders({
-        'Content-Type': 'application/json',
-        Authorization: token
-      })
-    };
-    return this.http.get(url, httpOptions).pipe(map((res: any) => {
-      this.logger.log('[TILEDESK-SERVICE] GET PROJECT BY ID URL - RES ', res);
-      return res
-    }))
-  }
-
-
   public getProjectUsersByProjectId(project_id: string, token: string) {
     const url = this.apiUrl + project_id + '/project_users/';
     this.logger.log('[TILEDESK-SERVICE] - GET PROJECT-USER URL', url);

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

@@ -0,0 +1,140 @@
+import { Injectable, OnInit } from "@angular/core";
+import { PLAN_NAME } from "src/chat21-core/utils/constants";
+import { LoggerService } from "src/chat21-core/providers/abstract/logger.service";
+import { LoggerInstance } from "src/chat21-core/providers/logger/loggerInstance";
+import { Project } from 'src/chat21-core/models/projects';
+import { ProjectService } from "../services/projects/project.service";
+import { AppConfigProvider } from "../services/app-config";
+
+@Injectable({
+    providedIn: 'root'
+})
+export class ProjectPlanUtils {
+    
+    project: Project
+
+    private logger: LoggerService = LoggerInstance.getInstance()
+    constructor(
+        private projectService: ProjectService
+    ){ 
+    }
+
+    checkProjectProfileFeature(project: Project, feature: string): boolean{
+        
+        this.logger.log('[PROJECT_PROFILE] checkProjectProfileFeature -->', feature, project)
+
+        // this.project = await this.projectService.getProjectById(projectId).toPromise()
+        this.project = project;
+
+        if(this.project.profile.type === 'free'){
+            this.logger.log('[PROJECT_PROFILE] USECASE: Free Plan')
+            if(this.project.trialExpired === false){
+                // ------------------------------------------------------------------------ 
+                // USECASE: Free Plan (TRIAL ACTIVE i.e. Scale trial)
+                // ------------------------------------------------------------------------
+                return true
+            }else {
+                // ------------------------------------------------------------------------
+                // USECASE: Free Plan (TRIAL EXPIRED)
+                // ------------------------------------------------------------------------
+                return false
+            }
+        }else if(this.project.profile.type === 'payment'){
+            // ------------------------------------------------------------------------ 
+            // USECASE: PAYMENT Plan (TRIAL ACTIVE i.e. Scale trial)
+            // ------------------------------------------------------------------------
+            this.logger.log('[PROJECT_PROFILE] USECASE: payment')
+            
+            /** check if the subscription is Active or NOT */
+            if(this.project.isActiveSubscription === false){
+                return false
+            }
+
+            /** get che current keyName for the current project (usefull to compare later)*/
+            /** before: MAKE A COMPARE BETWEEN OLD AND NEW PROJECT TYPE
+             * LEGEND: 
+             * - A --> D
+             * - B --> E
+             * - C --> F
+             */
+            let currentPlanNameKey: string[] = ['A']
+            switch(this.project.profile.name.toUpperCase()){
+                case PLAN_NAME.A.toUpperCase(): {
+                    this.logger.log('case A')
+                    currentPlanNameKey = Object.keys(PLAN_NAME).filter(x => PLAN_NAME[x].toUpperCase() == PLAN_NAME.D.toUpperCase());
+                    break;
+                }
+                case PLAN_NAME.B.toUpperCase(): {
+                    this.logger.log('case B')
+                    currentPlanNameKey = Object.keys(PLAN_NAME).filter(x => PLAN_NAME[x].toUpperCase() == PLAN_NAME.E.toUpperCase());
+                    break;
+                }
+                case PLAN_NAME.C.toUpperCase(): {
+                    this.logger.log('case C')
+                    currentPlanNameKey = Object.keys(PLAN_NAME).filter(x => PLAN_NAME[x].toUpperCase() == PLAN_NAME.F.toUpperCase());
+                    break;
+                }
+                default: {
+                    currentPlanNameKey = Object.keys(PLAN_NAME).filter(x => PLAN_NAME[x].toUpperCase() == this.project.profile.name.toUpperCase());
+                    break;
+                }
+                    
+            }
+            
+            /** compare enums: current action enum plan >= current prject profile enum name (UPPERCASE)  */
+            // if(currentPlanNameKey.length>0){
+            //     let actionPlanNameKey: string[] = Object.keys(PLAN_NAME).filter(x => PLAN_NAME[x].toUpperCase() == actionPlanAvailability.toUpperCase());
+            //     this.logger.log('check plan availability: currentPlanNameKey VS actionPlanNameKey -->', currentPlanNameKey[0], actionPlanNameKey[0])
+            //     // this.logger.log('check plan availability: PLAN currentPlanNameKey VS PLAN actionPlanNameKey -->', PLAN_NAME[currentPlanNameKey[0]]> PLAN_NAME[actionPlanNameKey[0]])
+            //     return currentPlanNameKey[0] >= actionPlanNameKey[0] ? true: false; 
+            // }
+            
+            /**check only CUSTOM PLAN */
+            this.logger.log('[PROJECT_PROFILE] USECASE: currentPlanNameKey', currentPlanNameKey[0], PLAN_NAME.F)
+            if(PLAN_NAME[currentPlanNameKey[0]] === PLAN_NAME.F){
+                return this.checkIfIsEnabledInProject(feature)
+            }
+            
+            return false
+        }        
+        
+    }
+
+    public checkIfIsEnabledInProject(featureKey: string): boolean{
+        
+        this.logger.log('[PROJECT_PROFILE] checkIfIsEnabledInProject -->', featureKey, this.project)
+        if (this.project.profile['customization'] === undefined){
+            // ------------------------------------------------------------------------ 
+            // USECASE: customization obj not exist
+            // ------------------------------------------------------------------------
+            return false
+        } else if(this.project.profile['customization'] && this.project.profile['customization'][featureKey]){
+            // ------------------------------------------------------------------------ 
+            // USECASE: customization obj exist AND customization.actions obj not exist
+            // ------------------------------------------------------------------------
+            return true
+        } 
+        return false
+    }
+
+    checkPlanIsExpired(project: Project): boolean {
+        let check: boolean = false
+    
+        //case FREE plan
+        if(project && project.trialExpired && project.profile.type=== 'trial'){
+          check = true
+        }else if(project && !project.trialExpired && project.profile.type=== 'trial'){
+          check = false
+        }
+    
+        //case PAYMENT plan
+        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/chat21-core/utils/constants.ts

@@ -141,6 +141,9 @@ export enum PLAN_NAME {
     A = 'Growth',
     B = 'Scale',
     C = 'Plus',
+    D = 'Basic',
+    E = 'Premium',
+    F = 'Custom'
 }
 
 export const tranlatedLanguage = ['it', 'en', 'de', 'es', 'pt', 'fr', 'ru', 'tr', 'sr', 'ar', 'uk', 'sv', 'az', 'kk', 'uz']

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

@@ -1,43 +0,0 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { map } from 'rxjs/operators';
-import { Project } from 'src/chat21-core/models/projects';
-import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
-import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
-import { AppConfigProvider } from '../app-config';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class ProjectsService {
-
-  private apiUrl: string;
-  private logger: LoggerService = LoggerInstance.getInstance();
-
-  constructor(
-    public http: HttpClient,
-    public appConfigProvider: AppConfigProvider
-  ) {
-   
-    this.logger.log('[PROJECTS-SERVICE] HELLO !');
-    this.apiUrl = appConfigProvider.getConfig().apiUrl;
-    this.logger.log('[PROJECTS-SERVICE] apiUrl ', this.apiUrl);
-  }
-
-  public getProjects(token: string) {
-    const url = this.apiUrl  + "projects/";
-    this.logger.log('[PROJECTS-SERVICE] getProjects - URL ', url);
-
-    const httpOptions = {
-      headers: new HttpHeaders({
-        'Content-Type': 'application/json',
-        Authorization: token
-      })
-    };
-    
-    return this.http.get(url, httpOptions).pipe(map((res: Project[]) => {
-        this.logger.log('[PROJECTS-SERVICE] getProjects - RES ', res);
-        return res
-    }))
-  }
-}