@chat21/chat21-web-widget 5.1.0-rc14 → 5.1.0-rc16

package/CHANGELOG.md

@@ -6,6 +6,10 @@
 ### **Copyrigth**: 
 *Tiledesk SRL*
 
+# 5.1.0-rc16
+- **added**: hideOnSpecificUrlList replaced in favour of hideOnSpecificDomainList
+
+# 5.1.0-rc15
 # 5.1.0-rc14
 - **added**: ability to hide widget on selected domains based on hideOnSpecificDomainList variable
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chat21/chat21-web-widget",
   "author": "Tiledesk SRL",
-  "version": "5.1.0-rc14",
+  "version": "5.1.0-rc16",
   "license": "MIT",
   "homepage": "https://www.tiledesk.com",
   "repository": {

package/src/app/app.component.ts

@@ -265,7 +265,7 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
                 //check if allowed to load
                 let canLoad = this.globalSettingsService.manageLoadingDomains();
                 if(!canLoad){
-                    this.logger.error('[Check canLoad] Widget is not able to load on this domain!!!')
+                    console.error('[Check canLoad] Widget is not able to load on this domain!!!')
                     this.hideWidget()
                     this.disposeWidget();
                 }

package/src/app/component/conversation-detail/conversation-footer/conversation-footer.component.ts

@@ -539,7 +539,7 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
   }
 
   checkForUrlDomain(text){
-    if(this.project && this.project.settings?.allowed_urls === true){
+    if(this.project && this.project.settings?.allowed_urls === true && this.project.settings?.allowed_urls_list){
       this.showAlertUrl = !isAllowedUrlInText(text, this.project.settings?.allowed_urls_list);
       if(this.showAlertUrl){
         return false

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

@@ -516,8 +516,11 @@ export class GlobalSettingsService {
                     if (variables.hasOwnProperty('showAudioRecorderFooterButton')) {
                         globals['showAudioRecorderFooterButton'] = variables['showAudioRecorderFooterButton'];
                     }
-                    if (variables.hasOwnProperty('hideOnSpecificDomainList')) {
-                        globals['hideOnSpecificDomainList'] = variables['hideOnSpecificDomainList'];
+                    if (variables.hasOwnProperty('hideOnSpecificUrl')) {
+                        globals['hideOnSpecificUrl'] = variables['hideOnSpecificUrl'];
+                    }
+                    if (variables.hasOwnProperty('hideOnSpecificUrlList')) {
+                        globals['hideOnSpecificUrlList'] = variables['hideOnSpecificUrlList'];
                     }
                     
                 }
@@ -1974,11 +1977,28 @@ export class GlobalSettingsService {
     }
 
     manageLoadingDomains(): boolean {
-        if(!this.globals.hideOnSpecificDomainList){
+
+        if(!this.globals.hideOnSpecificUrlList || !this.globals.hideOnSpecificUrl){
+            console.log('No hideOnSpecificUrlList or hideOnSpecificUrl');
             return true
         }
-        let isAllowedToLoad = !isAllowedUrlInText(this.globals.windowContext.location.origin, [])
-        return isAllowedToLoad
+
+        function wildcardToRegex(pattern: string): RegExp {
+            // Escape caratteri speciali della regex, tranne * che poi sostituiremo
+            const escaped = pattern.replace(/[-/\\^+?.()|[\]{}]/g, '\\$&');
+            // Sostituisci * con .*
+            const regexPattern = '^' + escaped.replace(/\*/g, '.*') + '$';
+            return new RegExp(regexPattern);
+        }
+        
+        const currentUrl = this.globals.windowContext.location.href;
+        const shouldHide = this.globals.hideOnSpecificUrlList.some(pattern => {
+            const regex = wildcardToRegex(pattern);
+            return regex.test(currentUrl);
+        });
+        
+        // let isAllowedToLoad = !isAllowedUrlInText(this.globals.windowContext.location.origin, this.globals.hideOnSpecificDomainList)
+        return !shouldHide
     }
 
 }

package/src/app/utils/globals.ts

@@ -219,7 +219,8 @@ export class Globals {
   showAttachmentFooterButton: boolean // *******  new ********
   showAudioRecorderFooterButton: boolean // *******  new ********
 
-  hideOnSpecificDomainList: Array<string> // *******  new ********
+  hideOnSpecificUrl: boolean // *******  new ********
+  hideOnSpecificUrlList: Array<string> // *******  new ********
   constructor(
   ) { }
 
@@ -419,8 +420,10 @@ export class Globals {
     this.showAttachmentFooterButton = true;
     /** show/hide rec audio option in footer chat-detail page */
     this.showAudioRecorderFooterButton = true;
+    /** enabled to set a list of domain not able to load the widget **/
+    this.hideOnSpecificUrl = false
     /** set a list of domain not able to load the widget */
-    this.hideOnSpecificDomainList = [];
+    this.hideOnSpecificUrlList = [];
 
     // ============ END: SET EXTERNAL PARAMETERS ==============//