Merge branch 'master-pre'

Tiledesk · Jun 13, 2024 · 4dd04c8 · 4dd04c8
2 parents c5d84a1 + 85a7eed
commit 4dd04c8
Show file tree

Hide file tree

Showing 21 changed files with 523 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,14 @@
     *Giovanni Troisi*  
 ### **Copyrigth**: *Tiledesk SRL*
 
+
+### 1.13.0-rc.2
+👉 **added**: new delay-text component to increment input timeout over 120s 
+👉 **added**: ability to not activate NoInput and NoMatch connector if commands inside cds-action-replyv2 not contains buttons
+
+### 1.13.0-rc.1
+👉 **bug-fixed**: namespace select into cds-action-askgptv2 to not save data 
+
 ### 1.12.0 in PROD 
 
 ### 1.12.0-rc.5

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/cds",
   "author": "Tiledesk SRL",
-  "version": "1.12.0",
+  "version": "1.13.0-rc.2",
   "license": "MIT",
   "homepage": "https://www.tiledesk.com",
   "repository": {

diff --git a/...ashboard/cds-canvas/actions/list/cds-action-askgpt-v2/cds-action-askgpt-v2.component.html b/...ashboard/cds-canvas/actions/list/cds-action-askgpt-v2/cds-action-askgpt-v2.component.html
@@ -74,7 +74,7 @@
             [text]="action?.question" 
             [placeholder]="'CDSCanvas.QuestionToSubmit' | translate"
             (blur)="onBlur($event)"
-            (changeTextarea)="changeTextarea($event, 'question')">
+            (changeTextarea)="onChangeTextarea($event, 'question')">
         </cds-textarea>
     </div>
 
@@ -143,7 +143,7 @@
         <cds-select id="text-condition" 
             [items]="listOfNamespaces" 
             [bindLabelSelect]="'name'"
-            [bindValueSelect]="'id'" 
+            [bindValueSelect]="'value'" 
             [itemSelected]="action?.namespace" 
             [placeholder]="'CDSCanvas.SelectNamespace' | translate"
             [clearable]="true" 
@@ -228,11 +228,11 @@
                     </div>
                 </div>
 
-                <!-- // top_k slider -->
+                <!-- // chunk limit slider -->
                 <div class="text-editor-wrapper">
                     <div class="field-box">
                         <!-- <label class="title-label">{{'CDSCanvas.Temperature' | translate }}</label> -->
-                        <label class="title-label">Top K</label>
+                        <label class="title-label">{{'CDSCanvas.ChunkLimit' | translate }}</label>
                         <div class="action-wait-content">
 
                             <div class="action-wait-slider">
@@ -269,20 +269,6 @@
                     </cds-textarea>
                 </div> -->
 
-                <!-- <div class="field-box">
-                    <label class="title-label">{{'CDSCanvas.SystemContext' | translate }}</label>
-                    <cds-textarea id="context" 
-                        [textLimitBtn]="false" 
-                        [emojiPikerBtn]="false" 
-                        [setAttributeBtn]="false"
-                        [minRow]="1" [maxRow]="3" 
-                        [text]="action.context" 
-                        [placeholder]="'CDSCanvas.YouAreAwesomeAssistant' | translate"
-                        (blur)="onBlur($event)"
-                        (changeTextarea)="onChangeTextarea($event, 'context')">
-                    </cds-textarea>
-                </div> -->
-
             </div>
         </mat-expansion-panel>
     </mat-accordion>

diff --git a/...-dashboard/cds-canvas/actions/list/cds-action-askgpt-v2/cds-action-askgpt-v2.component.ts b/...-dashboard/cds-canvas/actions/list/cds-action-askgpt-v2/cds-action-askgpt-v2.component.ts
@@ -18,6 +18,7 @@ import { AttributesDialogComponent } from '../cds-action-gpt-task/attributes-dia
 import { TYPE_UPDATE_ACTION, TYPE_GPT_MODEL } from 'src/app/chatbot-design-studio/utils';
 import { variableList } from 'src/app/chatbot-design-studio/utils-variables';
 import { Namespace } from 'src/app/models/namespace-model';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'cds-action-askgpt-v2',
@@ -34,7 +35,7 @@ export class CdsActionAskgptV2Component implements OnInit {
   @Output() onConnectorChange = new EventEmitter<{type: 'create' | 'delete',  fromId: string, toId: string}>()
 
   listOfIntents: Array<{name: string, value: string, icon?:string}>;
-  listOfNamespaces: Array<Namespace>
+  listOfNamespaces: Array<{name: string, value: string, icon?:string}>;
 
   // Connectors
   idIntentSelected: string;
@@ -65,6 +66,7 @@ export class CdsActionAskgptV2Component implements OnInit {
     private intentService: IntentService,
     private appConfigService: AppConfigService,
     private openaiService: OpenaiService,
+    private translate: TranslateService,
     private dialog: MatDialog
   ) { }
 
@@ -192,12 +194,12 @@ export class CdsActionAskgptV2Component implements OnInit {
   private getListNamespaces(){
     this.openaiService.getAllNamespaces().subscribe((namaspaceList) => {
       this.logger.log("[ACTION-ASKGPT] getListNamespaces", namaspaceList)
-      this.listOfNamespaces = namaspaceList
+      this.listOfNamespaces = namaspaceList.map((el) => { return { name: el.name, value: el.id} })
 
     })
   }
 
-  changeTextarea($event: string, property: string) {
+  onChangeTextarea($event: string, property: string) {
     this.logger.log("[ACTION-ASKGPT] onEditableDivTextChange event", $event)
     this.logger.log("[ACTION-ASKGPT] onEditableDivTextChange property", property)
     this.action[property] = $event
@@ -361,6 +363,7 @@ export class CdsActionAskgptV2Component implements OnInit {
         element.classList.add('preview-container-extended')
       }, 200)
       this.showAiError = true;
+      this.ai_error = this.translate.instant('CDSCanvas.AiError')
     }, () => {
       this.logger.debug("[ACTION GPT-TASK] preview prompt *COMPLETE*: ");
       this.searching = false;

diff --git a/...ds-dashboard/cds-canvas/actions/list/cds-action-gpt-task/cds-action-gpt-task.component.ts b/...ds-dashboard/cds-canvas/actions/list/cds-action-gpt-task/cds-action-gpt-task.component.ts
@@ -19,6 +19,7 @@ import { TYPE_GPT_MODEL, TYPE_UPDATE_ACTION } from 'src/app/chatbot-design-studi
 import { variableList } from 'src/app/chatbot-design-studio/utils-variables';
 import { DashboardService } from 'src/app/services/dashboard.service';
 import { PLAN_NAME } from 'src/chat21-core/utils/constants';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'cds-action-gpt-task',
@@ -72,6 +73,7 @@ export class CdsActionGPTTaskComponent implements OnInit {
     private openaiService: OpenaiService,
     private intentService: IntentService,
     private appConfigService: AppConfigService,
+    private translate: TranslateService,
     private dashboardService: DashboardService
   ) { }
 
@@ -345,6 +347,7 @@ export class CdsActionGPTTaskComponent implements OnInit {
         element.classList.add('preview-container-extended')
       }, 200)
       this.showAiError = true;
+      this.ai_error = this.translate.instant('CDSCanvas.AiError')
     }, () => {
       this.logger.debug("[ACTION GPT-TASK] preview prompt *COMPLETE*: ");
       this.searching = false;

diff --git a/...-canvas/actions/list/cds-action-reply/cds-action-reply-v2/cds-action-reply.component.html b/...-canvas/actions/list/cds-action-reply/cds-action-reply-v2/cds-action-reply.component.html
@@ -217,6 +217,7 @@
                     [idAction] = "idAction"
                     [action] = "action"
                     [previewMode] = "previewMode"
+                    [handleActionChanges]="eventActionChanges.asObservable()"
                     (updateAndSaveAction) = onUpdateAndSaveAction($event)
                     (changeActionReply) = onChangeActionReply($event)
                     (onConnectorChange)= onConnectorChangeReply($event)>

diff --git a/...ds-canvas/actions/list/cds-action-reply/cds-action-reply-v2/cds-action-reply.component.ts b/...ds-canvas/actions/list/cds-action-reply/cds-action-reply-v2/cds-action-reply.component.ts
@@ -9,6 +9,7 @@ import { IntentService } from '../../../../../../services/intent.service';
 import { ConnectorService } from '../../../../../../services/connector.service';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
+import { Subject } from 'rxjs';
 
 
 @Component({
@@ -27,6 +28,8 @@ export class CdsActionReplyV2Component implements OnInit {
   @Output() updateAndSaveAction = new EventEmitter();
   @Output() onConnectorChange = new EventEmitter<{type: 'create' | 'delete',  fromId: string, toId: string}>()
 
+  eventActionChanges: Subject<ActionReplyV2> = new Subject<ActionReplyV2>();
+
   // idIntentSelected: string;
   idAction: string;
 
@@ -312,6 +315,7 @@ export class CdsActionReplyV2Component implements OnInit {
       this.logger.log('[cds-action-reply] onCreateNewButton: ', this.action, this.arrayResponses);
       // this.intentService.setIntentSelected(this.intentSelected.intent_id);
       this.intentService.selectAction(this.intentSelected.intent_id, this.action._tdActionId);
+      this.eventActionChanges.next(this.action)
       const element = {type: TYPE_UPDATE_ACTION.ACTION, element: this.action};
       this.onUpdateAndSaveAction(element);
     }
@@ -346,7 +350,9 @@ export class CdsActionReplyV2Component implements OnInit {
     event.buttons.splice(event.index, 1);
     var intentId = this.idAction.substring(0, this.idAction.indexOf('/'));
     this.connectorService.deleteConnectorFromAction(intentId, button.__idConnector);
-    this.updateAndSaveAction.emit({type: TYPE_UPDATE_ACTION.ACTION, element: this.action});
+    this.eventActionChanges.next(this.action)
+    const element = {type: TYPE_UPDATE_ACTION.ACTION, element: this.action};
+    this.onUpdateAndSaveAction(element);
   }
 
 

diff --git a/...-action-reply/elements/cds-action-reply-settings/cds-action-reply-settings.component.html b/...-action-reply/elements/cds-action-reply-settings/cds-action-reply-settings.component.html
@@ -8,14 +8,14 @@
     </div> -->
 
 
-    <div class="previewContent">
+    <div class="previewContent" [attr.disabled]="isConnectorInputDisabled">
 
         <div class="icon-action">
             <img class="active-icon" src="assets/images/icons/if_condition.svg">
         </div>
 
         <label class="title-preview-label">{{'CDSCanvas.NoInput' | translate}}
-            <span *ngIf="action.hasOwnProperty('noInputTimeout')">({{action.noInputTimeout/1000}} s)</span>
+            <span *ngIf="action.hasOwnProperty('noInputTimeout')">({{formatLabel(action?.noInputTimeout/1000)}})</span>
         </label>
 
         <cds-connector class="button-connector"
@@ -25,7 +25,7 @@
         </cds-connector>
     </div>
 
-    <div class="previewContent">
+    <div class="previewContent" [attr.disabled]="isConnectorMatchDisabled">
 
         <div class="icon-action">
             <img class="active-icon" src="assets/images/icons/if_condition.svg">
@@ -70,21 +70,28 @@
             </div>
             <label class="condition-text">{{'CDSCanvas.NoInput' | translate}}</label>
             <div class="delay-wrapper" [ngStyle]="{width: canShowFilter? 'auto': '70%'}">
-                <appdashboard-delay-slider
+                <appdashboard-delay-slider *ngIf="action.noInputTimeout < 120000"
                     [delayTime]="action.noInputTimeout/1000"
                     [max]="120" [step]="1"
                     (changeDelayTime)="onChangeDelayTime($event)"
                     (clickDelayTime)="onClickDelayTime($event)">
                 </appdashboard-delay-slider>
+                <appdashboard-delay-text *ngIf="action.noInputTimeout >= 120000"
+                    [delayTime]="action.noInputTimeout/1000"
+                    [max]="120"
+                    (changeDelayTime)="onChangeDelayTime($event)"
+                    (clickDelayTime)="onClickDelayTime($event)">
+                </appdashboard-delay-text>
             </div>
         </div>
-        <cds-select id="text-condition" 
+        <cds-select id="noinput-condition" 
             [items]="listOfIntents" 
             [bindLabelSelect]="'name'"
             [bindValueSelect]="'value'" 
             [itemSelected]="action?.noInputIntent" 
             [placeholder]="'CDSCanvas.SelectABlock' | translate"
             [clearable]="true" 
+            [attr.disabled]="isConnectorInputDisabled"
             (onSelected)="onChangeBlockSelect($event, 'noInputIntent')"
             (onReset)="onResetBlockSelect($event, 'noInputIntent')">
         </cds-select>
@@ -103,13 +110,14 @@
             </div>
             <label class="condition-text">{{'CDSCanvas.NoMatch' | translate}}</label>
         </div>
-        <cds-select id="text-condition" 
+        <cds-select id="nomatch-condition" 
             [items]="listOfIntents" 
             [bindLabelSelect]="'name'"
             [bindValueSelect]="'value'" 
             [itemSelected]="action?.noMatchIntent" 
             [placeholder]="'CDSCanvas.SelectABlock' | translate"
-            [clearable]="true" 
+            [clearable]="true"
+            [attr.disabled]="isConnectorMatchDisabled"
             (onSelected)="onChangeBlockSelect($event, 'noMatchIntent')"
             (onReset)="onResetBlockSelect($event, 'noMatchIntent')">
         </cds-select>

diff --git a/...-action-reply/elements/cds-action-reply-settings/cds-action-reply-settings.component.scss b/...-action-reply/elements/cds-action-reply-settings/cds-action-reply-settings.component.scss
@@ -32,6 +32,13 @@
         padding: 5px 10px;
         margin: 0px;
         position: relative;
+
+
+        &[disabled=true]{
+            cursor: not-allowed;
+            opacity: 0.6;
+            pointer-events: none;
+        }
     }
 }
 
@@ -100,4 +107,14 @@ cds-textarea.text-editable-div ::ng-deep{
         width: calc(100% - 20px) !important;
         font-size: 0.9em !important;
     }
+}
+
+
+cds-select#noinput-condition[disabled=true] ::ng-deep,
+cds-select#nomatch-condition[disabled=true] ::ng-deep{
+    cursor: not-allowed;
+    opacity: 0.6;
+    .ng-select{ 
+        pointer-events: none;
+    }
 }