Merge branch 'master-2' into features/to-master/ds-generic-bug-fix-5

# Conflicts:
#	src/app/chatbot-design-studio/cds-dashboard/cds-canvas/actions/list/cds-action-reply/elements/cds-action-reply-image/cds-action-reply-image.component.ts
#	src/app/chatbot-design-studio/cds-dashboard/cds-canvas/actions/list/cds-action-reply/elements/cds-action-reply-text/cds-action-reply-text.component.ts
#	src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-canvas.component.ts
#	src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-intent/cds-intent.component.ts
#	src/app/chatbot-design-studio/services/connector.service.ts
#	src/app/chatbot-design-studio/services/intent.service.ts
#	src/app/chatbot-design-studio/utils.ts

Author: dariodepa75

.gitignore

@@ -55,4 +55,5 @@ Thumbs.db
 *.sublime-workspace
 
 /src/environments/env-locali
-/src/environments/real_data
+/src/environments/real_data
+settings.json

CHANGELOG.md

@@ -7,15 +7,154 @@
 ### **Copyrigth**: 
 *Tiledesk SRL*
 
+
+# 1.30.4
+- **changed**: added LLM Ollama and changed template selection from select to input with autocomplete
+
+# 1.30.3
+- **bug-fixed**: css text-align and font-size in ng-select
+- **bug-fixed**: added cds-select onReset in operand cds-action-assign-variable-v2
+
+# 1.30.2
+- **bug-fixed**: deleted log widget
+
+# 1.30.1
+- **bug-fixed**: fixed ExpressionChangedAfterItHasBeenCheckedError
+
+# 1.30.0
+- **changed**: Hide examples button if text exists in JSON buttons
+- **bug-fixed**: Fixed graphic errors examples button in JSON buttons
+- **bug-fixed**: Fixed logic example in JSON buttons
+- **bug-fixed**: Fixed graphic errors in JSON buttons
+- **added**: JSON buttons models
+- **added**: more info JSON buttons
+- **bug-fixed**: disabled JSON.parse in action jsonbuttons
+- **added**: added json buttons
+- **canged**: Hide examples button if text exists in JSON buttons
+- **bug-fixed**: Fixed graphic errors examples button in JSON buttons 
+
+
+# 1.29.2
+
+# 1.29.1
+- **added**: deepseek-chat llm model and claude 3.7
+- **removed**: mixtral-8x7b-32768 model
+
+# 1.29.2
+
+# 1.29.1
+- **added**: deepseek-chat llm model and claude 3.7
+- **removed**: mixtral-8x7b-32768 model
+
+
+# 1.30.0-rc.9
+- **canged**: Hide examples button if text exists in JSON buttons
+
+# 1.30.0-rc.8
+- **bug-fixed**: Fixed graphic errors examples button in JSON buttons 
+- **bug-fixed**: Fixed logic example in JSON buttons 
+- **bug-fixed**: Fixed errors explode row in widget log
+- **bug-fixed**: scroll to bottom in widget log
+
+# 1.30.0-rc.7
+- **bug-fixed**: Fixed graphic errors in JSON buttons 
+
+# 1.30.0-rc.6
+- **canged**: changed graphics of the log widget
+
+# 1.30.0-rc.5
+- **added**: JSON buttons models
+- **added**: more info JSON buttons
+
+
+# 1.30.0-rc.4
+- **bug-fixed**: opacity label connector
+- **bug-fixed**: show hide label connector
+- **bug-fixed**: hide the label when the connector is not visible
+- **bug-fixed**: remove the label when I remove a connector
+- **bug-fixed**: hide contracted connector when delete or change connector from panel action
+- **bug-fixed**: chack show-hide connectors on all actions
+- **bug-fixed**: change z-index at connector menu
+- **canged**: save the state of the contracted connector in the intent json
+
+
+# 1.30.0-rc.3
+- **bug-fixed**: disabled JSON.parse in action jsonbuttons
+
+
+# 1.30.0-rc.2
+- **changed**: Webhook remove chat actions (tagAction)
+- **changed**: Webhook remove training and form sentences from blocks
+- **bug-fixed**: when I create a copilot webhook passing in the body copilot:true
+- **bug-fixed**: in the chatbot copilot webhook check the async loop
+
+# 1.30.0-rc.1
+- **added**: added json buttons
+- **changed**: hide Button typing alias in action reply
+
+# 1.30.0-rc.0
+- **added**: hide/show single connector
+- **bug-fixed**: web request 
+- **changed**: change default intent color 
+
+# 1.29.0-rc.15
+- **bug-fixed**: new set thereIsWebResponse on createWebhook
+
+# 1.29.0-rc.14
+- **bug-fixed**: set thereIsWebResponse on createWebhook
+
+# 1.29.0-rc.13
+- **bug-fixed**: select default intent by subtype
+
+# 1.29.0-rc.12
+- **bug-fixed**: webhook css + services
+
+# 1.29.0-rc.11
+- **added**: new webhook
+
+# 1.29.0-rc.3
+- **changed**: web-response action UI improvements
+
+# 1.29.0-rc.2
+- **added**: web-response action
+
+# 1.29.0-rc.1
+- **added**: close intent as default internal intent for voice chatbot
+
+# 1.28.3
+- **bug-fixed**: widget into iframe not allows to use microphone
+
+# 1.28.3-rc.1
+- **bug-fixed**: widget into iframe not allows to use microphone
+
 # 1.28.1
 - **bug-fixed**: error in loadTokenMultiplier undefined value, called in CdsActionGPTTaskComponent
 - **bug-fixed**: defaultfallback and start intents error to display in cds-panel-intent-list
 
+# 1.28.1-rc.1
+- **added**: create a new intent (float action menu) of the same color as the parent intent
+- **bug-fixed**: fixed error in loadTokenMultiplier undefined value, called in CdsActionGPTTaskComponent
+- **bug-fixed**: fix default fallback and start blocks error to display in cds-panel-intent-list
+
 # 1.28.1
 - **added**: doc for AI_PROMPT and WHATSAPP actions
 
+# 1.28.0-rc.1
+- **added**: added OpenIntentListState in local storage
+
 # 1.28.0
 
+# 1.28.0-rc.2
+- **added**: added OpenIntentListState in local storage
+- **added**: added widget log panel
+- **changed**: new panel to change alpha color
+
+# 1.28.0-rc.1
+- **changed**: added sat-popover on change alpha color
+- **bug-fixed**: element position start only the first time
+- **bug-fixed**: cleanup of "stageService" file
+- **bug-fixed**: on live test of chatbot or intent, save scale and position
+
 # 1.27.0-rc.20
 - **bug-fixed**: initStageSettings
 - **bug-fixed**: set default alpha_connectors

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/cds",
   "author": "Tiledesk SRL",
-  "version": "1.28.2",
+  "version": "1.30.4",
   "license": "MIT",
   "homepage": "https://www.tiledesk.com",
   "repository": {

package.json

@@ -18,6 +18,7 @@ import { NetworkService } from './services/network.service';
 import { MatDialog } from '@angular/material/dialog';
 import { NetworkOfflineComponent } from './modals/network-offline/network-offline.component';
 import { ImageRepoService } from 'src/chat21-core/providers/abstract/image-repo.service';
+import { IconService } from './chatbot-design-studio/services/icon.service';
 
 @Component({
   selector: 'app-root',
@@ -49,13 +50,17 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
     private imageRepoService: ImageRepoService,
     private scriptService: ScriptService,
     private networkService: NetworkService,
+    private iconService: IconService
   ){
 
   }
 
+
+  
+
   ngOnInit(): void {
     const appconfig = this.appConfigService.getConfig();
-    this.logger.log('[APP-COMP] ngOnInit  appconfig', appconfig)
+    // this.logger.log('[APP-COMP] ngOnInit  appconfig', appconfig)
     this.persistence = appconfig.authPersistence;
     this.appStorageService.initialize(environment.storage_prefix, this.persistence, '')
 
@@ -79,7 +84,6 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
 
       const storedToken = localStorage.getItem('tiledesk_token');
       this.logger.log('[APP-COMP] ngOnInit AUTOLOGIN storedToken ', storedToken)
-      this.logger.log('[APP-COMP] ngOnInit AUTOLOGIN SAVE THE PARAMS TOKEN ', token)
       if (storedToken !== token) {
         localStorage.setItem('tiledesk_token', token);
       } else {
@@ -95,6 +99,10 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
 
 
   private async initialize(){
+
+    // Lazy loading icons in App
+    this.iconService.registerIcons();
+
     let serverBaseURL = this.appConfigService.getConfig().apiUrl
     this.tiledeskAuthService.initialize(serverBaseURL);
 
@@ -105,7 +113,6 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
 
     await this.initAuthentication();
     this.setLanguage(null);
-
   }
 
 

src/app/app.component.ts

@@ -67,6 +67,7 @@ import { NetworkOfflineComponent } from './modals/network-offline/network-offlin
 import { BrandResources } from './chatbot-design-studio/BrandResources';
 import { FilterPipe } from './pipe/filter.pipe';
 
+
 // FACTORIES
 export function createTranslateLoader(http: HttpClient) {
   return new TranslateHttpLoader(http, './assets/i18n/', '.json');

src/app/app.module.ts

@@ -1,4 +1,3 @@
-import { HEADER_TYPE } from './../../utils';
 import { Component, OnInit, Output, Input, EventEmitter } from '@angular/core';
 import { TYPE_METHOD_ATTRIBUTE } from '../../utils';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';

src/app/chatbot-design-studio/cds-base-element/attributes/attributes.component.ts

@@ -21,7 +21,8 @@
             <div class="select-item-wrp">
                 <span class="material-icons" *ngIf="item['icon']"
                     [class.intent-start]="item[bindLabelSelect] === RESERVED_INTENT_NAMES.START"
-                    [class.intent-defaultFallback]="item[bindLabelSelect] === RESERVED_INTENT_NAMES.DEFAULT_FALLBACK">{{item['icon']}}</span>
+                    [class.intent-defaultFallback]="item[bindLabelSelect] === RESERVED_INTENT_NAMES.DEFAULT_FALLBACK"
+                    [class.intent-close]="item[bindLabelSelect] === RESERVED_INTENT_NAMES.CLOSE">{{item['icon']}}</span>
                 <span class="label-select">{{ item[bindLabelSelect] | translate }}</span>
                 <span *ngIf="optionalBindAdditionalText" class="label-select-option">{{item[optionalBindAdditionalText] | translate }}</span>
             </div>
@@ -33,7 +34,8 @@
                     <div class="select-item-wrp">
                         <span class="material-icons" *ngIf="item['icon']"
                             [class.intent-start]="item[bindLabelSelect] === RESERVED_INTENT_NAMES.START"
-                            [class.intent-defaultFallback]="item[bindLabelSelect] === RESERVED_INTENT_NAMES.DEFAULT_FALLBACK">{{item['icon']}}</span>
+                            [class.intent-defaultFallback]="item[bindLabelSelect] === RESERVED_INTENT_NAMES.DEFAULT_FALLBACK"
+                            [class.intent-close]="item[bindLabelSelect] === RESERVED_INTENT_NAMES.CLOSE">{{item['icon']}}</span>
                         <span class="label-select">{{ item[bindLabelSelect] | translate }}</span>
                         <span *ngIf="optionalBindAdditionalText" class="label-select-option">{{item[optionalBindAdditionalText] | translate }}</span>
                     </div>

src/app/chatbot-design-studio/cds-base-element/select/select.component.html

@@ -32,7 +32,8 @@
                 &.intent-start{
                     color: var(--color-green-hex);
                 }
-                &.intent-defaultFallback{
+                &.intent-defaultFallback,
+                &.intent-close{
                     color: var(--color-red-hex)
                 }
             }
@@ -113,7 +114,8 @@
                 &.intent-start{
                     color: var(--color-green-hex);
                 }
-                &.intent-defaultFallback{
+                &.intent-defaultFallback,
+                &.intent-close{
                     color: var(--color-red-hex)
                 }
             }
@@ -133,21 +135,20 @@
             height: 14px;
             width: 14px;
             display: flex;
+            align-items: center;
         }
 
     } 
 
     .ng-value-container .ng-input{
         display: flex;
-        // top: 0px !important;
-        // height: 43px;
     }
 
     .ng-clear-wrapper{
         height: 14px;
         width: 14px;
         display: flex;
-
+        align-items: center;
     }
 
     .ng-dropdown-panel,

src/app/chatbot-design-studio/cds-base-element/select/select.component.scss

@@ -12,7 +12,7 @@ export class SelectComponent implements OnInit {
   @ViewChild('ngSelect', { static: true }) ngSelect: NgSelectComponent;
 
   @Input() items: []
-  @Input() itemSelected: any
+  @Input() itemSelected: any;
   @Input() bindLabelSelect: string;
   @Input() bindValueSelect: string;
   @Input() optionalBindAdditionalText: string;