Merge branch 'master-PRE' into features/KB-URLS-PRE

# Conflicts:
#	CHANGELOG.md
#	package-lock.json
#	package.json
#	src/app/knowledge-bases/modals/modal-preview-settings/modal-preview-settings.component.html

CHANGELOG.md

@@ -1,9 +1,9 @@
 # tiledesk-dashboard
 
-### 2.7.33
-- Adds, on the History page, the ability to filter by conversation duration
+### 2.7.33-rc1
+- Adds, on the History page, the ability to filter by conversation duration 
 
-### 2.7.32
+### 2.7.32-rc1
 - Moves the menu item "Apps" from the sidebar to the setting sidebar
 
 ### 2.7.31
@@ -48,9 +48,15 @@
 - Adds the ability to select the launch block when a conversation is manually assigned to a chatbot
 - Improves the method to get the number of conversations in the monitor page
 
+### 2.7.19-rc1
+- Adds the ability to select the launch block when a conversation is manually assigned to a chatbot
+
 ### 2.7.18
 - Minor improvements and bug fixing
 
+### 2.7.18-rc1
+- Improves the method to get the number of conversations in the monitor page
+
 ### 2.7.17
 - Removes the ability to customize the quotas email template
 - Implements the icons for the SMS channel
@@ -99,6 +105,9 @@
 - Deploys in production
 - Adds the knowledge base walkthrough on the knowledge base page
 
+### 2.7.7-rc1
+- Adds the knowledge base walkthrough on the knowledge base page
+
 ### 2.7.6
 - Deploys in production
 - Adds a warning banner to the home page that displays when the user has used up one or more of his monthly resources
@@ -110,10 +119,21 @@
 ### 2.7.4
 - Added Time Slots in Operating Hours page
 
+### 2.7.4-rc1
+- Fix saving operation hours bug
+
 ### 2.7.3
 - Adds the ability, during onboarding, to create a chatbot that automatically answers questions based on the contents of the Knowledge Base
 - Improves the knowledge base page
 
+### 2.7.3-rc2
+- Adds the ability, during onboarding, to create a chatbot that automatically answers questions based on the contents of the Knowledge Base
+- Improves the knowledge base page 
+- Improves time slots UI
+
+### 2.7.3-rc1
+- Kb onboarding
+
 ### 2.7.2
 - Deploys in production
 - Adds GPT-4o mini language model
@@ -127,24 +147,61 @@
 - Adds the ability to edit the "Quota checkpoint notification" email template
 - Adds Twilio SMS channel integration  
 
+### 2.6.45-rc2
+- Improves time slots UI
+- Added translations for time slots
+
+### 2.6.45-rc1
+- Added time slots in Operating Hours
+
 ### 2.6.44
 - Deploys in production
 - Adds the option "Teammates can only see their own conversations" in the Project Settings > Advanced tab
 - Improvements and bug fixing
 
+### 2.6.44-rc4
+- Improvements and bug fixing
+
+### 2.6.44-rc3
+- Adds the option "Teammates can only see their own conversations" in the Project Settings > Advanced tab
+
+### 2.6.44-rc2
+- Fix vxml voice integration visibility
+
+### 2.6.44-rc1
+- Added vxml voice integration
+- Added twilio sms integration
+
 ### 2.6.43
 - Deploys in production
 - Improves the quota usage widget
 - Minor improvements
 
+### 2.6.43-rc2
+- Improves Knowledge Bases page
+
+### 2.6.43-rc1
+- Improves quotes widget
+- Added voice-vxml and sms-twilio channel in analytics
+
 ### 2.6.42
 - Deploys in production
 - Displays all the indexed chunks of a content on the "Manage your Knowledge Bases" page
 
+### 2.6.42-rc1
+- Displays all the indexed chunks of a content on the "Manage your Knowledge Bases" page
+
 ### 2.6.41
 - Deploys in production
 - Displays information about the Voice channel
 
+### 2.6.41-rc2
+- Adds the Voice Channel integration 
+
+### 2.6.41-rc1
+- Deploys in production
+- Displays information about the Voice channel
+
 ### 2.6.40
 - Deploys in production
 - Displays a dialog box that allows to update the plan when the knowledge bases limit is reached

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-dashboard",
-  "version": "2.7.33",
+  "version": "2.7.33-rc1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --aot",

src/app/app.module.ts

@@ -397,6 +397,9 @@ import { UserModalComponent } from './users/user-modal/user-modal.component';
 import { MessagesStatsModalComponent } from './components/modals/messages-stats-modal/messages-stats-modal.component';
 import { WsChatbotService } from './services/websocket/ws-chatbot.service';
 import { AnalyticsService } from './services/analytics.service';
+import { N8nIntegrationComponent } from './integrations/list/n8n-integration/n8n-integration.component';
+
+
 import { KnowledgeBasesAlertComponent } from './knowledge-bases/knowledge-bases-alert/knowledge-bases-alert.component';
 import { LogRequestsInterceptor } from './services/interceptor/log-requests.interceptor';
 import { CnpSelectTemplatesOrKbComponent } from './create-new-project/cnp-select-templates-or-kb/cnp-select-templates-or-kb.component';

src/app/auth/autologin/autologin.component.ts

@@ -168,11 +168,11 @@ export class AutologinComponent implements OnInit {
       this.logger.log('[AUTOLOGIN] SSO - ssoLogin routeSegments ', routeSegments);
 
       const projectIDGetFromRoute = routeSegments[2]
-      
+
       this.logger.log('[AUTOLOGIN] SSO - ssoLogin projectIDGetFromRoute ', projectIDGetFromRoute);
-    
+
       this.getProject(projectIDGetFromRoute)
-    
+
 
       this.router.navigate([route]);
 
@@ -205,6 +205,7 @@ export class AutologinComponent implements OnInit {
       }
 
 
+
     }, () => {
       this.logger.log('[AUTOLOGIN] SSO - ssoLogin getCurrentAuthenticatedUser * COMPLETE *');
 
@@ -222,7 +223,7 @@ export class AutologinComponent implements OnInit {
     });
   }
 
- 
+
 
 
   getProject(projectIDGetFromRouteIsNumber) {
@@ -240,7 +241,7 @@ export class AutologinComponent implements OnInit {
     })
   }
 
- 
+
 
 
 

src/app/components/navbar/navbar.component.html

@@ -80,26 +80,11 @@
 
                   <div class="quote-container">
 
-                    <div class="quota-wpr">
-
-                      <div class="quota-header-section">
-                        <p class="quote-title">Conversations</p>
-                        <div class="quote-count">{{requests_count | number:'1.0-0'}} / {{requests_limit |
-                          number:'1.0-0'}}</div>
-                      </div>
-
-                      <div class="convs-count-container">
-                        <div class="convs-count-wpr">
-                          <div class="convs-count-label">Opened </div>
-                          <div class="convs-count-value" (click)="goToHistoryOpenedConvs()"> {{openedConversations}}
-                          </div>
-                        </div>
-                        <div class="convs-count-wpr">
-                          <div class="convs-count-label">Closed </div>
-                          <div class="convs-count-value" (click)="goToHistoryClosedConvs()"> {{closedConversations}}
-                          </div>
-                        </div>
-                      </div>
+                    <div>
+                      <p class="quote-title">{{'Requests' | translate}}</p>
+                      <div class="quote-count">{{requests_count}} / {{requests_limit}}</div> 
+                      <p class="quote-title">Conversations</p>
+                      <div class="quote-count">{{requests_count | number:'1.0-0'}} / {{requests_limit | number:'1.0-0'}}</div>
                     </div>
 
 

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

@@ -355,7 +355,6 @@ export class NavbarComponent extends PricingBaseComponent implements OnInit, Aft
   getProjectQuotes() {
     this.quotesService.getProjectQuotes(this.projectId).then((response) => {
       this.logger.log("[NAVBAR] getProjectQuotes response: ", response);
-      this.logger.log("getProjectQuotes: ", response);
       this.project_limits = response;
     }).catch((err) => {
       this.logger.error("[NAVBAR] getProjectQuotes error: ", err);