Merge branch 'master-pre-prod'

# Conflicts: # CHANGELOG.md # package-lock.json # package.json
Tiledesk · Apr 4, 2024 · 02b6342 · 02b6342
2 parents 3aaf9f0 + 1f8b8f0
commit 02b6342
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 63 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,11 @@
 # tiledesk-dashboard
 
-### 2.6.6
+### 2.6.7
 - Deploys in production
+- Improves bot list page
+
+### 2.6.6
+- Deploys in production 
 - Fixes the bug: WordPress section does not open on installations page
 
 ### 2.6.5

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-dashboard",
-  "version": "2.6.6",
+  "version": "2.6.7",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --aot",

diff --git a/src/app/bots/bots-list/bots-list.component.html b/src/app/bots/bots-list/bots-list.component.html
@@ -65,9 +65,9 @@
               <!-- New chatbot list -->
               <div *ngIf="!showSpinner" class="main--wrapper">
                 <div class="page-title--wrapper">
-                  <div class="title--header">
-                    {{ pageName }}
-                  </div>
+                   <div class="title--header">
+                    <!-- {{ pageName }} -->
+                  </div> 
 
                   <div class="page--actions" *ngIf="faqkbList && faqkbList?.length > 0">
                     <span class="order-by-label">Order by </span>

diff --git a/src/app/bots/bots-list/bots-sidebar/bots-sidebar.component.html b/src/app/bots/bots-list/bots-sidebar/bots-sidebar.component.html
@@ -15,61 +15,31 @@
     <!--  @ My Chatbots  -->
     <!-- -------------------------------------------------------- -->
     <ng-container *ngIf="USER_ROLE !== 'agent'">
-      <li class="sidebar-item-wpr-no-link">
+      <!-- <li class="sidebar-item-wpr-no-link">
         <a class="sidebar-item-no-link">
           MY CHATBOTS
-
         </a>
-      </li>
+      </li> -->
 
       <li class="sidebar-item-wpr" [ngClass]="{'active-item': BOTS_MYCHATBOT_ALL_ROUTE_IS_ACTIVE}"
         (click)="goToOtherMyChatbotOther()">
         <a class="sidebar-item">
-          <!-- <svg class="chatbot-svg-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 104 104"
-            style="height: 21px; margin-left: -2px;margin-right: 5px;">
-            <defs>
-              <style>
-                .cls-1 {
-                  fill: #647491;
-                }
-
-                .cls-2 {
-                  fill: none;
-                }
-              </style>
-            </defs>
-            <title>ic_widget_bot_gray_03</title>
-            <g id="Livello_1" data-name="Livello 1">
-              <circle class="cls-1" cx="41.6" cy="41.9" r="3" />
-              <circle class="cls-1" cx="61.9" cy="41.9" r="3" />
-              <path class="cls-1" d="M61.5,87.5H42.4a9.8,9.8,0,0,0,9,7.2h1.1A9.8,9.8,0,0,0,61.5,87.5Z" />
-              <path class="cls-1"
-                d="M55.9,13.2a4,4,0,0,0-4-3.9A3.9,3.9,0,0,0,48,13.2a4.2,4.2,0,0,0,1.9,3.5v4.4h4V16.7A4,4,0,0,0,55.9,13.2Z" />
-              <path class="cls-1"
-                d="M81.8,77.9V59.2a6,6,0,0,0-6-5.9h-.1V45.9h0a23.8,23.8,0,0,0-47.5,0h0v7.4a6,6,0,0,0-6,5.9V77.9A4,4,0,0,0,20.3,82a4,4,0,0,0,3.4,3.3,4.1,4.1,0,0,0,4.5-4,4,4,0,0,0-2-3.4V66H27a1.2,1.2,0,0,1,1.2,1.1v5.3A13.4,13.4,0,0,0,41.5,85.8H62.3A13.4,13.4,0,0,0,75.7,72.4V67.1A1.1,1.1,0,0,1,76.8,66h1V77.9A4,4,0,0,0,75.9,82a4,4,0,0,0,3.4,3.3,4.1,4.1,0,0,0,4.5-4A4,4,0,0,0,81.8,77.9ZM56.6,62a2,2,0,1,1,2-2A2,2,0,0,1,56.6,62Zm4.9,0a2,2,0,1,1,2-2A2,2,0,0,1,61.5,62ZM39.9,49a4.1,4.1,0,0,1-4.1-4.1V43.8A13.9,13.9,0,0,1,49.6,29.9h4.6A14,14,0,0,1,68.1,43.8v1.1A4.2,4.2,0,0,1,64,49ZM66.3,62a2,2,0,1,1,2-2A2,2,0,0,1,66.3,62Z" />
-              <rect class="cls-2" width="104" height="104" />
-            </g>
-          </svg> -->
           <i class="material-icons settings-sidebar-icons" style="margin-left: 0px !important;">
             smart_toy
           </i>
           <p class="custom_paragraph" style="position: relative; top: 1px;">
-            All
+            <!-- All -->
+            My Chatbots
           </p>
 
           <span class="sidebar-item-s">{{ myChatbotOtherCount }}</span>
         </a>
       </li>
 
 
-      <li class="sidebar-item-wpr" [ngClass]="{'active-item': BOTS_MYCHATBOT_INCREASE_SALES_ROUTE_IS_ACTIVE}"
+      <!-- <li class="sidebar-item-wpr" [ngClass]="{'active-item': BOTS_MYCHATBOT_INCREASE_SALES_ROUTE_IS_ACTIVE}"
         (click)="goToBotIncreaseSalesBots()">
         <a class="sidebar-item">
-          <!-- <svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 24 24" width="16px" fill="#647491"
-            style="margin-right: 8px;">
-            <path d="M0 0h24v24H0z" fill="none" />
-            <path d="M16 6l2.29 2.29-4.88 4.88-4-4L2 16.59 3.41 18l6-6 4 4 6.3-6.29L22 12V6z" />
-          </svg> -->
           <i class="material-icons settings-sidebar-icons" style="margin-left: 0px !important;">
             trending_up
           </i>
@@ -78,33 +48,22 @@
           </p>
           <span class="sidebar-item-s">{{ increaseSalesBotsCount }}</span>
         </a>
-      </li>
+      </li> -->
 
-      <!-- [ngClass]="{'active-item': BOTS_CUSTOMER_SATISFACTION_TEMPALTES_ROUTE_IS_ACTIVE}" -->
-      <li class="sidebar-item-wpr" [ngClass]="{'active-item': BOTS_MYCHATBOT_CUSTOMER_SATISFACTION_ROUTE_IS_ACTIVE}"
+
+      <!-- <li class="sidebar-item-wpr" [ngClass]="{'active-item': BOTS_MYCHATBOT_CUSTOMER_SATISFACTION_ROUTE_IS_ACTIVE}"
         (click)="goToBotCustomerSatisfactionBots()">
         <a class="sidebar-item">
-          <!-- <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="16px" viewBox="0 0 24 24"
-            width="16px" fill="#647491" style="margin-right: 8px;">
-            <g>
-              <rect fill="none" height="24" width="24" />
-            </g>
-            <g>
-              <g />
-              <path
-                d="M11.99,2C6.47,2,2,6.48,2,12c0,5.52,4.47,10,9.99,10C17.52,22,22,17.52,22,12C22,6.48,17.52,2,11.99,2z M8.5,8 C9.33,8,10,8.67,10,9.5S9.33,11,8.5,11S7,10.33,7,9.5S7.67,8,8.5,8z M12,18c-2.28,0-4.22-1.66-5-4h10C16.22,16.34,14.28,18,12,18z M15.5,11c-0.83,0-1.5-0.67-1.5-1.5S14.67,8,15.5,8S17,8.67,17,9.5S16.33,11,15.5,11z" />
-            </g>
-          </svg> -->
-
-          <i class="material-icons settings-sidebar-icons" style="margin-left: 0px !important;">
+         
+         <i class="material-icons settings-sidebar-icons" style="margin-left: 0px !important;">
             emoji_emotions
           </i>
           <p class="custom_paragraph" style="position: relative; top: 1px;">
             Customer Satisfaction
           </p>
           <span class="sidebar-item-s">{{ customerSatisfactionBotsCount }}</span>
         </a>
-      </li>
+      </li> -->
     </ng-container>
 
     <!-- ------------------------------------------------------- -->

diff --git a/src/app/project-edit-add/project-edit-add.component.html b/src/app/project-edit-add/project-edit-add.component.html
@@ -827,7 +827,7 @@ <h2 weight="500" class="plan-card-title">
                 <!-- -------------------------------------------------------- -->
                 <span *ngIf="PROJECT_SETTINGS_AUTH_ROUTE">
                   <!-- SECTION SHARED SECRET - TITLE AND SUBTITLE -->
-                  <div class="row">
+                  <div class="row" *ngIf="isVisibleVisitorAuthentication">
                     <div class="col-md-12">
                       <h3 class="card_title__underlined">
                         <span class="card_title__underline">
@@ -842,7 +842,7 @@ <h3 class="card_title__underlined">
                   </div>
 
                   <!-- SHARED SECRET GENERATE -->
-                  <div class="input-wrapper" style="max-width: 992px;">
+                  <div class="input-wrapper" style="max-width: 992px;" *ngIf="isVisibleVisitorAuthentication">
 
                     <div class="row">
                       <div class="col-sm-8">
@@ -876,7 +876,7 @@ <h3 class="card_title__underlined">
                   <div class="input-wrapper" style="max-width: 992px;">
                     <div class="row">
                       <div class="col-md-12">
-                        <h3 class="card_title__underlined" style="margin-top:30px">
+                        <h3 class="card_title__underlined"  [ngStyle]="{'margin-top':isVisibleVisitorAuthentication === true ? '30px' : '0px' }">
                           <span class="card_title__underline">
                             {{ "ProjectEditPage.Webhook" | translate }}
                           </span>

diff --git a/src/app/project-edit-add/project-edit-add.component.ts b/src/app/project-edit-add/project-edit-add.component.ts
@@ -132,7 +132,8 @@ export class ProjectEditAddComponent implements OnInit, OnDestroy {
   isVisibleCustomizeEmailTemplate: boolean
   isVisibleSMTPsettings: boolean;
   isVisibleBannedVisitor: boolean
-  isVisibleAutoSendTranscript: boolean
+  isVisibleAutoSendTranscript: boolean;
+  isVisibleVisitorAuthentication: boolean;
   max_agent_assigned_chat: number
   reassignment_delay: number
   automatic_idle_chats: number
@@ -426,14 +427,31 @@ export class ProjectEditAddComponent implements OnInit, OnDestroy {
           // console.log('PUBLIC-KEY (PROJECT-EDIT-ADD) - isVisibleAutoSendTranscript', this.isVisibleAutoSendTranscript);
         }
       }
-
+
+      if (key.includes("VAU")) {
+        // console.log('PUBLIC-KEY (PROJECT-EDIT-ADD) - key', key);
+        let vau = key.split(":");
+        //  console.log('PUBLIC-KEY (PROJECT-EDIT-ADD) - ips key&value', ips);
+        if (vau[1] === "F") {
+          this.isVisibleVisitorAuthentication = false;
+          // console.log('PUBLIC-KEY (PROJECT-EDIT-ADD) - isVisibleVisitorAuthentication', this.isVisibleVisitorAuthentication);
+        } else {
+          this.isVisibleVisitorAuthentication = true;
+          // console.log('PUBLIC-KEY (PROJECT-EDIT-ADD) - isVisibleVisitorAuthentication', this.isVisibleVisitorAuthentication);
+        }
+      }    
     });
 
     if (!this.public_Key.includes("PAY")) {
       // this.logger.log('PUBLIC-KEY (PROJECT-EDIT-ADD) - key.includes("PAY")', this.public_Key.includes("PAY"));
       this.isVisiblePaymentTab = false;
     }
 
+    if (!this.public_Key.includes("VAU")) {
+      // this.logger.log('PUBLIC-KEY (PROJECT-EDIT-ADD) - key.includes("VAU")', this.public_Key.includes("VAU"));
+      this.isVisibleVisitorAuthentication = false;
+    }
+
     if (!this.public_Key.includes("PSA")) {
       // this.logger.log('PUBLIC-KEY (PROJECT-EDIT-ADD) - key.includes("PSA")', this.public_Key.includes("PSA"));
       this.isVisibleAdvancedTab = false;