Skip to content

Commit c02ea94

Browse files
dariodepa75dariodepa75
committed
Merge branch 'master-pre' into features/to-master-pre/ds-widget-logs-4
# Conflicts: # CHANGELOG.md
2 parents beae221 + 0ea017d commit c02ea94

File tree

9 files changed

+33
-11
lines changed

9 files changed

+33
-11
lines changed

‎CHANGELOG.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77
### **Copyrigth**:
88
*Tiledesk SRL*
99

10+
# 1.31.2-rc4
11+
- **bug-fixed**: changed labels for add_kb_content action
12+
1013
# 1.31.2-rc3
11-
- **added**: added webhook in header
14+
- **added**: new action add_kb_content
1215

1316
# 1.31.2-rc2
1417
- **bug-fixed**: changed freePlanLimitDate

‎package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@tiledesk/cds",
33
"author": "Tiledesk SRL",
4-
"version": "1.31.2-rc2",
4+
"version": "1.31.2-rc4",
55
"license": "MIT",
66
"homepage": "https://www.tiledesk.com",
77
"repository": {

‎src/app/chatbot-design-studio/cds-dashboard/cds-canvas/actions/list/cds-action-add-kb-content/cds-action-add-kb-content.component.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<cds-textarea
2424
[textLimitBtn]="false"
2525
[emojiPikerBtn]="false"
26-
[setAttributeBtn]="false"
26+
[setAttributeBtn]="true"
2727
[minRow]="1"[maxRow]="1"
2828
[text]="action?.name"
2929
[placeholder]="'CDSCanvas.EnterTheKbName' | translate"
@@ -74,7 +74,7 @@
7474
{{ 'CDSCanvas.UseKnwoledgeBaseName' | translate }}
7575
</mat-checkbox>
7676
<label class="field-description">{{ "CDSCanvas.UseKBNameDescription" | translate }}
77-
<!-- <a *ngIf="BRAND_BASE_INFO['DOCS']" [href]="DOCS_LINK.namespace_as_name.link" [target]="DOCS_LINK.namespace_as_name.target">{{ 'LearnMore' | translate }}</a> -->
77+
<a *ngIf="BRAND_BASE_INFO['DOCS']" [href]="DOCS_LINK.namespace_as_name.link" [target]="DOCS_LINK.namespace_as_name.target">{{ 'LearnMore' | translate }}</a>
7878
</label>
7979
</section>
8080
</div>

‎src/app/chatbot-design-studio/cds-dashboard/cds-canvas/actions/list/cds-action-add-kb-content/cds-action-add-kb-content.component.scss

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
11
.field-description {
22
display: block;
3+
}
4+
.link-container {
5+
margin-bottom: 20px;
6+
a.link {
7+
font-size: 14px;
8+
font-weight: 400;
9+
}
10+
a.link:hover {
11+
cursor: pointer;
12+
text-decoration: underline;
13+
}
314
}

‎src/app/chatbot-design-studio/cds-dashboard/cds-canvas/actions/list/cds-action-add-kb-content/cds-action-add-kb-content.component.ts

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { DashboardService } from 'src/app/services/dashboard.service';
77
import { OpenaiService } from 'src/app/services/openai.service';
88
import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
99
import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
10+
import { BRAND_BASE_INFO } from 'src/app/chatbot-design-studio/utils-resources';
1011

1112
@Component({
1213
selector: 'cds-action-add-kb-content',
@@ -24,6 +25,10 @@ export class CdsActionAddKbContentComponent implements OnInit {
2425
listOfNamespaces: Array<{name: string, value: string, icon?:string}>;
2526
autocompleteOptions: Array<{label: string, value: string}> = [];
2627

28+
29+
BRAND_BASE_INFO = BRAND_BASE_INFO;
30+
DOCS_LINK = DOCS_LINK.ADD_TO_KB;
31+
2732
private logger: LoggerService = LoggerInstance.getInstance();
2833

2934
constructor(

‎src/app/chatbot-design-studio/utils-actions.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ export const ACTIONS_LIST: {
153153
WHATSAPP_ATTRIBUTE: { name: 'CDSActionList.NAME.WhatsAppByAttribute', chatbot_types: [TYPE_CHATBOT.CHATBOT, TYPE_CHATBOT.WEBHOOK, TYPE_CHATBOT.COPILOT], category: TYPE_ACTION_CATEGORY.INTEGRATIONS, type: TYPE_ACTION.WHATSAPP_ATTRIBUTE, src: "assets/images/actions/whatsapp.svg", status: "active", doc: "CDSActionList.DOC.WhatsAppByAttribute" },
154154
SEND_WHATSAPP: { name: 'CDSActionList.NAME.SendWhatsapp', chatbot_types: [TYPE_CHATBOT.CHATBOT, TYPE_CHATBOT.WEBHOOK, TYPE_CHATBOT.COPILOT], category: TYPE_ACTION_CATEGORY.INTEGRATIONS, type: TYPE_ACTION.SEND_WHATSAPP, src: "assets/images/actions/whatsapp.svg", status: "active", doc: "CDSActionList.DOC.SendWhatsapp" },
155155
// WHATSAPP_SEGMENT: { name: 'CDSActionList.NAME.WhatsAppBySegment', category: TYPE_ACTION_CATEGORY.INTEGRATIONS, type: TYPE_ACTION.WHATSAPP_SEGMENT, src: "assets/images/actions/whatsapp.svg", status: "active", description: "CDSActionList.DESCRIPTION.WhatsAppBySegment" },
156-
ADD_KB_CONTENT: { name: 'CDSActionList.NAME.AddKBContent', chatbot_types: [TYPE_CHATBOT.CHATBOT, TYPE_CHATBOT.WEBHOOK, TYPE_CHATBOT.COPILOT], category: TYPE_ACTION_CATEGORY.AI, type: TYPE_ACTION.KB_CONTENT, src: "assets/images/actions/add_kb_content.svg", status: "active", doc: "", },
157156
ASKGPT: { name: 'CDSActionList.NAME.AskTheKnowledgeBase', chatbot_types: [TYPE_CHATBOT.CHATBOT, TYPE_CHATBOT.WEBHOOK, TYPE_CHATBOT.COPILOT], category: TYPE_ACTION_CATEGORY.AI, type: TYPE_ACTION.ASKGPT, src: "assets/images/actions/ask_to_kb.svg", status: "inactive", doc: "CDSActionList.DOC.AskTheKnowledgeBase", },
158157
ASKGPTV2: { name: 'CDSActionList.NAME.AskTheKnowledgeBase', chatbot_types: [TYPE_CHATBOT.CHATBOT, TYPE_CHATBOT.WEBHOOK, TYPE_CHATBOT.COPILOT], category: TYPE_ACTION_CATEGORY.AI, type: TYPE_ACTION.ASKGPTV2, src: "assets/images/actions/ask_to_kb.svg", status: "active", doc: "CDSActionList.DOC.AskTheKnowledgeBase", },
158+
ADD_KB_CONTENT: { name: 'CDSActionList.NAME.AddKBContent', chatbot_types: [TYPE_CHATBOT.CHATBOT, TYPE_CHATBOT.WEBHOOK, TYPE_CHATBOT.COPILOT], category: TYPE_ACTION_CATEGORY.AI, type: TYPE_ACTION.KB_CONTENT, src: "assets/images/actions/add_kb_content.svg", status: "active", badge: 'NEW', doc: "", },
159159
GPT_TASK: { name: 'CDSActionList.NAME.GPTTask', chatbot_types: [TYPE_CHATBOT.CHATBOT, TYPE_CHATBOT.WEBHOOK, TYPE_CHATBOT.COPILOT], category: TYPE_ACTION_CATEGORY.AI, type: TYPE_ACTION.GPT_TASK, src: "assets/images/actions/openai_icon.svg", status: "active", doc: "CDSActionList.DOC.GPTTask", },
160160
GPT_ASSISTANT: { name: 'CDSActionList.NAME.GPTAssistant', chatbot_types: [TYPE_CHATBOT.CHATBOT, TYPE_CHATBOT.WEBHOOK, TYPE_CHATBOT.COPILOT], category: TYPE_ACTION_CATEGORY.AI, type: TYPE_ACTION.GPT_ASSISTANT, src: "assets/images/actions/openai_assistent.svg", status: "active", plan: PLAN_NAME.F, doc: "CDSActionList.DOC.GPTAssistant", },
161161
AI_PROMPT: { name: 'CDSActionList.NAME.AiPrompt', chatbot_types: [TYPE_CHATBOT.CHATBOT, TYPE_CHATBOT.WEBHOOK, TYPE_CHATBOT.COPILOT], category: TYPE_ACTION_CATEGORY.AI, type: TYPE_ACTION.AI_PROMPT, src: "assets/images/actions/ai-prompt.svg", status: "active", plan: PLAN_NAME.E, badge: 'NEW', doc: "CDSActionList.DOC.AiPrompt", },

‎src/app/chatbot-design-studio/utils.ts

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ export const DOCS_LINK = {
1010
advanced_prompt: { link: 'https://gethelp.tiledesk.com/articles/ask-knowledge-base-and-its-role-in-building-custom-ai-agents/#advanced-context', target: '_blank' },
1111
citations: { link: 'https://gethelp.tiledesk.com/articles/ask-knowledge-base-and-its-role-in-building-custom-ai-agents/#get-contents-sources', target: '_blank' }
1212
},
13+
ADD_TO_KB: {
14+
namespace_as_name: { link: 'https://gethelp.tiledesk.com/articles/add-to-knowledge-base-action/', target: '_blank'},
15+
},
1316
GPT_TASK : {
1417
json_mode: { link: 'https://platform.openai.com/docs/guides/structured-outputs/json-mode', target: '_blank' }
1518
},

‎src/assets/i18n/en.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -526,9 +526,9 @@
526526
"VisibilityConnectors":"Visibility of connectors",
527527
"ChangeAlphaConnectors":"Change alpha of the connectors color",
528528
"nameKB": "Name",
529-
"ContentKB": "Content",
530-
"EnterTheKbName": "Enter Knowledge Base Name",
531-
"PlaceholderKBContent": "Enter Knowledge Base Content"
529+
"ContentKB": "Text",
530+
"EnterTheKbName": "Content Name",
531+
"PlaceholderKBContent": "Content text"
532532
},
533533
"Alert": {
534534
"ErrorMaxOptions":"Cannot add another option. Max available options achived ( 0..9, *, # )",
@@ -663,7 +663,7 @@
663663
"WhatsAppStatic":"WhatsApp static",
664664
"WhatsAppByAttribute":"WhatsApp by attribute",
665665
"WhatsAppBySegment":"WhatsApp by segment",
666-
"AddKBContent":"Add knowledge base",
666+
"AddKBContent":"Add to knowledge base",
667667
"AskTheKnowledgeBase":"Ask knowledge base",
668668
"AskTheKnowledgeBaseV2":"Ask knowledge base V2",
669669
"GPTTask":"ChatGPT task",

0 commit comments

Comments
 (0)