Merge branch 'master-pre-prod' into features/kb_01-prod1

CHANGELOG.md

@@ -1,11 +1,60 @@
 # tiledesk-dashboard
 
+
+### 2.6.0
+- Deploys in production
+- Improves Knowledge Bases 
+- Adds the ability to create Knowledge Bases by adding a sitemap
+- Adds the customer.io integration
+- Fixes the bug: app cards are not all the same height
+
+### 2.5.21
+- Deploys in production
+- Adds the ability to sort chatbot by name
+
+### 2.5.20
+- Deploys in production
+- Refactors the teammates table
+
+### 2.5.19
+- Deploys in production
+- Fixes the bug: not all chatbot images are displayed
+- Fixes the bug: published chatbots is not appearing as a draft
+
+### 2.5.18
+- Deploys in production
+- Fixes the bug: in the settings sidebar 'setAttribute' on 'Element' is not a valid attribute name
+- User profile image is called in loop
+
+### 2.5.17
+- Deploys in production
+- Fixes the bug: multiple status call in kb page
+
+### 2.5.16
+- Deploys in production
+- Improves the chatbots sidebar
+- Improves the settings sidebar
+- Externalizes style variables
+
+### 2.5.15
+- Deploys in production
+- Improvements and bug fixing
+
+### 2.5.14
+- Deploys in production
+- Fixing translations
+
+### 2.5.13
+- Deploys in production
+- Refactors the bot list page
+- Improvements and bug fixing
+
 ### 2.5.13-rc2
-- Fixes bug: check status didn't start after adding a new source
+- Fixes the bug: check status didn't start after adding a new source
 
 ### 2.5.13-rc1
-- Improves Knowledge Base page
-- Adds customer.io integration 
+- Improves Knowledge Base 
+- Adds the customer.io integration
 
 ### 2.5.12
 - Deploys in production

angular.json

@@ -53,6 +53,7 @@
               "node_modules/bootstrap/dist/css/bootstrap.css",
               "node_modules/perfect-scrollbar/css/perfect-scrollbar.css",
               "src/assets/sass/material-dashboard.scss",
+              "src/assets/css/cards-table.scss",
               "src/assets/css/demo.scss",
               "src/assets/sass/cds/styles.scss",
               "src/variables.scss",
@@ -167,6 +168,7 @@
               "node_modules/bootstrap/dist/css/bootstrap.css",
               "node_modules/perfect-scrollbar/css/perfect-scrollbar.css",
               "src/assets/sass/material-dashboard.scss",
+              "src/assets/css/cards-table.scss",
               "src/assets/css/demo.scss",
               "src/assets/sass/cds/styles.scss",
               "node_modules/@ng-select/ng-select/themes/default.theme.css",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-dashboard",
-  "version": "2.5.13-rc2",
+  "version": "2.6.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --aot",

src/app/analytics/metrics/messages/messages.component.ts

@@ -157,7 +157,7 @@ export class MessagesComponent implements OnInit {
   }
 
   agentSelected(selectedAgentId) {
-    this.logger.log("[ANALYTICS - MSGS] Selected agent: ", selectedAgentId);
+    console.log("[ANALYTICS - MSGS] Selected agent: ", selectedAgentId);
     this.lineChart.destroy();
     this.subscription.unsubscribe();
     this.getMessagesByLastNDays(this.selectedDaysId, selectedAgentId)

src/app/app-store/app-store.component.html

@@ -274,8 +274,9 @@ <h4 class="card-create-app-text">
       <!-- -------------------------------------------------------------------- -->
       <!-- @ App cards -->
       <!-- -------------------------------------------------------------------- -->
+
       <div *ngFor="let app of apps" class="col-lg-4 col-md-4 col-sm-6" style="cursor:pointer"
-        [ngClass]="{'hide-paid-app': !this.isVisiblePAY && (app.title === 'WhatsApp Business' || app.title === 'Facebook Messenger' || app.title === 'Help Center') }">
+        [ngClass]="{'hide-paid-app': areVisiblePaidApps === false  && (app.title === 'WhatsApp Business' || app.title === 'Facebook Messenger' || app.title === 'Help Center') }">
         <div class="card card-app-store" >
 
           <div class="card-content">
@@ -519,7 +520,7 @@ <h4 class="card-create-app-text">
                 </div>
               </div>
             </div>
-            <h5 class="card-title" style="min-height: 52px;margin-bottom: 5px;">
+            <h5 class="card-title" style="min-height: 48px;margin-bottom: 5px;">
               External
             </h5>
 

src/app/app-store/app-store.component.ts

@@ -49,6 +49,7 @@ export class AppStoreComponent extends PricingBaseComponent implements OnInit, O
   USER_ROLE: string;
   public_Key: string;
   isVisiblePAY: boolean;
+  areVisiblePaidApps: boolean;
   agentCannotManageAdvancedOptions: string;
   learnMoreAboutDefaultRoles: string;
   tPlanParams: any;
@@ -59,6 +60,7 @@ export class AppStoreComponent extends PricingBaseComponent implements OnInit, O
   project: any;
   callingPage: string;
   onlyOwnerCanManageTheAccountPlanMsg: string;
+
   constructor(
     public appStoreService: AppStoreService,
     private router: Router,
@@ -194,12 +196,30 @@ export class AppStoreComponent extends PricingBaseComponent implements OnInit, O
           this.isVisiblePAY = true;
         }
       }
+
+      if (key.includes("DPA")) {
+
+        let paidApps = key.split(":");
+
+        if (paidApps[1] === "F") {
+          this.areVisiblePaidApps = false;
+          this.logger.log('APP-STORE areVisiblePaidApps ',this.areVisiblePaidApps) 
+        } else {
+          this.areVisiblePaidApps = true;
+          this.logger.log('APP-STORE areVisiblePaidApps ',this.areVisiblePaidApps) 
+        }
+      }
+
+
     });
 
 
     if (!this.public_Key.includes("PAY")) {
       this.isVisiblePAY = false;
     }
+    if (!this.public_Key.includes("DPA")) {
+      this.areVisiblePaidApps = false;
+    }
   }
 
   getCurrentProject() {
@@ -690,12 +710,12 @@ export class AppStoreComponent extends PricingBaseComponent implements OnInit, O
       dangerMode: false,
     }).then((value) => {
       if (value === 'catch') {
-        // this.logger.log('featureAvailableFromPlanC value', value)
+        this.logger.log('presentModalFeautureAvailableFromTier2Plan value', value)
         // this.logger.log('[APP-STORE] prjct_profile_type', this.prjct_profile_type)
         // this.logger.log('[APP-STORE] subscription_is_active', this.subscription_is_active)
         // this.logger.log('[APP-STORE] prjct_profile_type', this.prjct_profile_type)
         // this.logger.log('[APP-STORE] trial_expired', this.trial_expired)
-        // this.logger.log('[APP-STORE] isVisiblePAY', this.isVisiblePAY)
+        this.logger.log('[APP-STORE] isVisiblePAY', this.isVisiblePAY)
         if (this.isVisiblePAY) {
           // this.logger.log('[APP-STORE] HERE 1')
           if (this.USER_ROLE === 'owner') {
@@ -794,6 +814,12 @@ export class AppStoreComponent extends PricingBaseComponent implements OnInit, O
         this.learnMoreAboutDefaultRoles = translation;
       });
 
+      this.translate
+      .get('OnlyUsersWithTheOwnerRoleCanManageTheAccountPlan')
+      .subscribe((translation: any) => {
+        this.onlyOwnerCanManageTheAccountPlanMsg = translation
+      })
+
   }
 
   translateCancel() {

src/app/app.component.ts

@@ -35,7 +35,7 @@ import { NotifyService } from './core/notify.service';
 import { avatarPlaceholder, getColorBck } from './utils/util';
 import { LocalDbService } from './services/users-local-db.service';
 import { ProjectService } from './services/project.service';
-import { style } from '@angular/animations';
+
 
 
 declare const gtag: Function;

src/app/app.module.ts

@@ -396,6 +396,8 @@ import { KnowledgeBasesPreviousComponent } from './knowledge-bases-previous/know
 import { ModalUrlsKnowledgeBaseComponent } from './knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component';
 import { AddContentMenuComponent } from './knowledge-bases/menu/add-content-menu/add-content-menu.component';
 import { UserModalComponent } from './users/user-modal/user-modal.component';
+import { MessagesStatsModalComponent } from './components/modals/messages-stats-modal/messages-stats-modal.component';
+
 
 
 
@@ -702,7 +704,8 @@ const appInitializerFn = (appConfig: AppConfigService, brandService: BrandServic
     KnowledgeBasesPreviousComponent,
     ModalUrlsKnowledgeBaseComponent,
     AddContentMenuComponent,
-    UserModalComponent
+    UserModalComponent,
+    MessagesStatsModalComponent
   ],
   imports: [
     TooltipModule.forRoot(CutomTooltipOptions as TooltipOptions),

src/app/auth/unauthorized-for-pricing/unauthorized-for-pricing.component.html

@@ -25,7 +25,7 @@ <h4 style="text-align: center;">
               {{ "OnlyUsersWithTheOwnerRoleCanManageTheAccountPlan" | translate }}
             </h4>
 
-            <a style="font-size:18px" href='{{URL_UNDERSTANDING_DEFAULT_ROLES}}' target='_blank'>
+            <a *ngIf="hideHelpLink" style="font-size:18px" href='{{URL_UNDERSTANDING_DEFAULT_ROLES}}' target='_blank'>
                {{'LearnMoreAboutDefaultRoles' | translate}}
             </a>
 

src/app/auth/unauthorized-for-pricing/unauthorized-for-pricing.component.ts

@@ -1,14 +1,22 @@
 import { Component, OnInit } from '@angular/core';
 import { URL_understanding_default_roles } from '../../utils/util';
+import { BrandService } from 'app/services/brand.service';
 @Component({
   selector: 'appdashboard-unauthorized-for-pricing',
   templateUrl: './unauthorized-for-pricing.component.html',
   styleUrls: ['./unauthorized-for-pricing.component.scss']
 })
 export class UnauthorizedForPricingComponent implements OnInit {
 
-  URL_UNDERSTANDING_DEFAULT_ROLES = URL_understanding_default_roles
-  constructor() { }
+  URL_UNDERSTANDING_DEFAULT_ROLES = URL_understanding_default_roles;
+  public hideHelpLink: boolean;
+
+  constructor(
+    public brandService: BrandService
+  ) {
+    const brand = brandService.getBrand(); 
+    this.hideHelpLink= brand['DOCS'];
+   }
 
   ngOnInit() {
   }

src/app/automations/automations.component.html

@@ -12,8 +12,9 @@
   <div class="container-fluid" style="padding-left: 5px;padding-right: 5px;">
 
     <div class="content-wpr" style="display: flex;">
-      <appdashboard-settings-sidebar style="border-right:1px solid #e5effe !important">
-      </appdashboard-settings-sidebar>
+
+      <appdashboard-settings-sidebar></appdashboard-settings-sidebar>
+
       <div class="teplate-content" style="flex: 1 1 auto; margin: 0 20px;">
 
         <loading-spinner *ngIf="showSpinner"></loading-spinner>