@chat21/chat21-ionic 3.4.27-rc10 → 3.4.27-rc13

package/CHANGELOG.md

@@ -8,6 +8,15 @@
 ### **Copyrigth**: 
 *Tiledesk SRL*
 
+# 3.4.27-rc13
+- **added**: ability to mantain logout parameter when redirect to dashboard urls from sidebar component
+
+# 3.4.27-rc12
+- **added**: ability to manage logOut option in sidebar-user-detail with tiledesk_logOut url query params
+
+# 3.4.27-rc11
+- **bug-fixed**: fixed infinite loading in contact list
+
 # 3.4.27-rc10
 - **added**: ability to manage header-conversation-list with roles
 - **bug-fixed**: members in group list not loaded

package/package.json

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

package/src/app/app.component.html

@@ -21,7 +21,9 @@
     </div> -->
     
     <div class="user-details-sidebar" [ngClass]="{'hide-sidebar': IS_ONLINE === false || IS_ON_MOBILE_DEVICE || SUPPORT_MODE === false}">
-      <app-sidebar-user-details> </app-sidebar-user-details>
+      <app-sidebar-user-details
+        [logOut]="g?.logOut">
+      </app-sidebar-user-details>
     </div>
  
     <ion-split-pane when="md" contentId="main" [ngClass]="{'mobile': IS_ON_MOBILE_DEVICE, 'sidebar-hidden': IS_ON_MOBILE_DEVICE || SUPPORT_MODE === false}">

package/src/app/app.component.ts

@@ -45,6 +45,7 @@ import { ProjectService } from './services/projects/project.service';
 import { ContactsService } from './services/contacts/contacts.service';
 import { TiledeskService } from './services/tiledesk/tiledesk.service';
 import { Project } from 'src/chat21-core/models/projects';
+import { BRAND_BASE_INFO } from './utils/utils-resources';
 import { ProjectUsersService } from './services/project_users/project-users.service';
 
 @Component({
@@ -301,6 +302,9 @@ export class AppComponent implements OnInit {
 
         this.SUPPORT_MODE = this.g.supportMode
         this.logger.info('[APP-COMP] this.SUPPORT_MODE', this.SUPPORT_MODE)
+
+        BRAND_BASE_INFO['LOGOUT_ENABLED'] = this.g.logOut
+        this.logger.info('[APP-COMP] this.logOut', BRAND_BASE_INFO['LOGOUT_ENABLED'])
       }
 
     });

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

@@ -123,8 +123,26 @@ export class SidebarComponent implements OnInit {
       TILEDESK: 'https://www.tiledesk.com'
     };
 
+    this.setQueryParamsForAll({ tiledesk_logOut: BRAND_BASE_INFO['LOGOUT_ENABLED'] });
+
   }
 
+  // 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)

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

@@ -25,6 +25,7 @@ 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()

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

@@ -916,12 +916,17 @@ export class ConversationListPage implements OnInit {
 
     this.logger.log('[CONVS-LIST-PAGE] navigateByUrl this.uidConvSelected ', this.uidConvSelected)
 
+    const queryParams = this.route.snapshot.queryParams;
+    const queryString = new URLSearchParams(queryParams).toString();
+    
+
     this.setUidConvSelected(uidConvSelected, converationType)
     if (checkPlatformIsMobile()) {
       this.logger.log('[CONVS-LIST-PAGE] checkPlatformIsMobile(): ', checkPlatformIsMobile())
       this.logger.log('[CONVS-LIST-PAGE] DESKTOP (window < 768)', this.navService)
       this.logger.log('[CONVS-LIST-PAGE] navigateByUrl this.conversationSelected conversation_with_fullname ', this.conversationSelected)
       let pageUrl = 'conversation-detail/' + this.uidConvSelected + '/' + this.conversationSelected.conversation_with_fullname + '/' + converationType
+      pageUrl += queryString ? `?${queryString}` : '';
       this.logger.log('[CONVS-LIST-PAGE] pageURL', pageUrl)
         // replace(/\(/g, '%28').replace(/\)/g, '%29') -> used for the encoder of any round brackets
       this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29').replace( /#/g, "%23" ), {replaceUrl: true})
@@ -933,8 +938,10 @@ export class ConversationListPage implements OnInit {
       if (this.conversationSelected && this.conversationSelected.conversation_with_fullname) {
         pageUrl = 'conversation-detail/' + this.uidConvSelected + '/' + this.conversationSelected.conversation_with_fullname + '/' + converationType
       }
+      pageUrl += queryString ? `?${queryString}` : '';
       this.logger.log('[CONVS-LIST-PAGE] setUidConvSelected navigateByUrl--->: ', pageUrl)
       // replace(/\(/g, '%28').replace(/\)/g, '%29') -> used for the encoder of any round brackets
+      
       this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29').replace( /#/g, "%23" ), {replaceUrl: true})
     }
   }

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

@@ -95,7 +95,7 @@ export class GlobalSettingsService {
             globals[key] = stringToBoolean(val);
         }
         // this.logger.debug('[GLOBAL-SET] setVariableFromStorage SET globals == ---------->', globals);
-    } 
+    }
   }
 
   /**
@@ -143,5 +143,11 @@ export class GlobalSettingsService {
         this.appStorageService.setItem('projectID', TEMP)
     }
 
+    TEMP = getParameterByName(windowContext, 'tiledesk_logOut');
+    if (TEMP) {
+        globals.logOut = stringToBoolean(TEMP);
+        this.appStorageService.setItem('logOut', TEMP)
+    }
+
 }
 }

package/src/app/utils/globals.ts

@@ -15,6 +15,7 @@ export class Globals {
   jwt: string;
   fileUploadAccept: string;
   projectID: string;
+  logOut: boolean
 
   constructor(
   ) { }
@@ -36,6 +37,7 @@ export class Globals {
     this.lang = 'en'
     this.fileUploadAccept = 'image/*,.pdf,.txt'
     this.projectID = null;
+    this.logOut = true;
 
   }
 

package/src/chat21-core/utils/utils.ts

@@ -765,6 +765,12 @@ export function isOnMobileDevice() {
   return IS_ON_MOBILE_DEVICE;
 }
 
+
+export function checkIfIsInIframe(){
+  const isInIframe = window.self !== window.top;
+  return isInIframe;
+}
+
 export function checkWindowWidthIsLessThan991px() {
   // console.log('UTILS - checkWindowWidthIsLessThan991px:: ', window.innerWidth);
   if (window.innerWidth < 991) {