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

# Conflicts:
#	src/app/chatbot-design-studio/cds-dashboard/cds-canvas/actions/list/cds-action-web-request-v2/cds-action-web-request-v2.component.scss
#	src/app/chatbot-design-studio/cds-dashboard/cds-canvas/actions/list/cds-action-web-request-v2/cds-action-web-request-v2.component.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

@@ -40,7 +40,62 @@
 - **added**: deepseek-chat llm model and claude 3.7
 - **removed**: mixtral-8x7b-32768 model
 
-# 1.29.0
+# 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
@@ -69,15 +124,37 @@
 # 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

src/app/app.component.ts

@@ -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,10 +50,14 @@ 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)
@@ -94,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);
 
@@ -104,7 +113,6 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
 
     await this.initAuthentication();
     this.setLanguage(null);
-
   }
 
 

src/app/app.module.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/chatbot-design-studio/cds-base-element/select/select.component.html

@@ -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.scss

@@ -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)
                 }
             }

src/app/chatbot-design-studio/cds-dashboard/cds-canvas/actions/list-voice/elements/cds-action-reply-audio/cds-action-reply-audio.component.html

@@ -44,7 +44,10 @@
 
     <div class="text-editor">
         <div *ngIf="!response.metadata.src" class="response-frame-panel no-image">
-            <div class="image"><img src="assets/images/icons/add_audio.svg"></div>
+            <div class="image">
+                <mat-icon svgIcon="add_audio" aria-hidden="true"></mat-icon>
+                <img src="assets/images/icons/add_audio.svg">
+            </div>
             <div class="text">{{'CDSCanvas.ClickToAddAudioURL' | translate}}</div>
         </div>
         <div *ngIf="response.metadata.src" class="response-frame-panel no-image">

src/app/chatbot-design-studio/cds-dashboard/cds-canvas/actions/list/cds-action-ai-prompt/cds-action-ai-prompt.component.html

@@ -20,9 +20,10 @@
     </div>
 
     <div class="action-row">
-
         <div id="gpt-icon" class="action-row-left icon-action">
-            <img *ngIf="!action?.llm" src="assets/images/icons/add_ai_model.svg" alt="ai model">
+            <mat-icon *ngIf="!action?.llm" svgIcon="add_ai_model" aria-hidden="true"></mat-icon>
+            <!-- <img *ngIf="!action?.llm" src="assets/images/icons/add_ai_model.svg" alt="ai model"> -->
+            <!-- <mat-icon *ngIf="action?.llm" [svgIcon]="getLlmIcon(action?.llm)" aria-hidden="true"></mat-icon> -->
             <img *ngIf="action?.llm" src="{{ (llm_models | filter:{key: 'value', value: action?.llm }).src }}" alt="">
         </div>
 
@@ -311,7 +312,7 @@
 
     <hr class="custom-divider" style="margin-top: 10px;">
 
-    <div class="link-container" *ngIf="projectPlan === PLAN_NAME.F">
+    <div class="link-container" *ngIf="projectPlan === PLAN_NAME.G">
         <a class="link" (click)="goToIntegrations()">{{'CDSCanvas.ManageIntegrationKey' | translate }}</a>
     </div>