Skip to content

refine title and payload #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 25, 2024
Merged

refine title and payload #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/lib/helpers/types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ IRichContent.prototype.text;
* @property {string?} [truncateMsgId] - The message id to truncate.
* @property {string[]?} [states] - The states input by user.
* @property {Postback?} [postback] - The parent message id.
* @property {string?} [payload] - The payload message.
*/

/**
Expand Down
13 changes: 8 additions & 5 deletions src/routes/chat/[agentId]/[conversationId]/chat-box.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@
isSendingMsg = true;
renewUserSentMessages(msgText);

const postback = buildPostbackMessage(dialogs, msgText);
const postback = buildPostbackMessage(dialogs, data?.payload || null);
/** @type {import('$types').MessageData?} */
const messageData = {
...data,
Expand Down Expand Up @@ -362,11 +362,14 @@
await sentTextMessage();
}

/** @param {string} answer */
async function confirmSelectedOption(answer) {
/**
* @param {string} title
* @param {string} payload
*/
async function confirmSelectedOption(title, payload) {
if (isSendingMsg || isThinking) return;

await sendChatMessage(answer);
await sendChatMessage(title, { payload: payload });
}

async function sentTextMessage() {
Expand All @@ -377,7 +380,7 @@

/**
* @param {import('$types').ChatResponseModel[]} dialogs
* @param {string} content
* @param {string?} content
*/
function buildPostbackMessage(dialogs, content) {
/** @type {import('$types').Postback?} */
Expand Down
14 changes: 6 additions & 8 deletions src/routes/chat/[agentId]/[conversationId]/richContent/rc-generic-options.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@
/** @type {boolean} */
export let disableOption = false;

/** @type {boolean} */
export let fillPostback = false;

/** @type {any[]} */
export let options = [];

/** @type {(args0: string) => any} */
/** @type {(args0: string, args1: string) => any} */
export let onConfirm;

/** @type {any[]} */
Expand Down Expand Up @@ -49,14 +46,15 @@
*/
function handleClickOption(e, option) {
e.preventDefault();
innerConfirm(fillPostback ? option?.payload : option?.title);
innerConfirm(option?.title, option?.payload);
}

/**
* @param {string} answer
* @param {string} title
* @param {string} payload
*/
function innerConfirm(answer) {
onConfirm && onConfirm(answer);
function innerConfirm(title, payload) {
onConfirm && onConfirm(title, payload);
reset();
}

Expand Down
43 changes: 20 additions & 23 deletions src/routes/chat/[agentId]/[conversationId]/richContent/rc-options.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,10 @@
/** @type {boolean} */
export let disableOption = false;

/** @type {boolean} */
export let fillPostback = false;

/** @type {any[]} */
export let options = [];

/** @type {(args0: string) => any} */
/** @type {(args0: string, args1: string) => any} */
export let onConfirm;

/** @type {string} */
Expand All @@ -22,12 +19,14 @@
const separator = '|';

/** @type {string[]} */
let answers = [];
let titleAnswers = [];
/** @type {string[]} */
let payloadAnswers = [];
/** @type {any[]} */
let localOptions = [];

onMount(() => {
answers = [];
reset();
localOptions = collectOptions(options);
});

Expand All @@ -53,23 +52,18 @@
e.preventDefault();

if (!isMultiSelect) {
innerConfirm(fillPostback ? option?.payload : option?.title);
innerConfirm(option?.title, option?.payload);
} else {
localOptions = localOptions.map((op, idx) => {
if (idx === index) {
op.isClicked = !op.isClicked;
if (op.isClicked) {
if (fillPostback) {
answers = [...answers, op.payload];
} else {
answers = [...answers, op.title];
}
titleAnswers = [...titleAnswers, op.title];
payloadAnswers = [...payloadAnswers, op.payload];
} else {
if (fillPostback) {
answers = answers.filter(a => a != op.payload);
} else {
answers = answers.filter(a => a != op.title);
}
const targetIdx = titleAnswers.findIndex(a => a == op.title);
titleAnswers = titleAnswers.filter((x, index) => index != targetIdx);
payloadAnswers = payloadAnswers.filter((x, index) => index != targetIdx);
}
}
return op;
Expand All @@ -82,21 +76,24 @@
*/
function handleConfirm(e) {
e.preventDefault();
const answer = answers.join(separator);
innerConfirm(answer);
const titles = titleAnswers.join(separator);
const payloads = payloadAnswers.join(separator);
innerConfirm(titles, payloads);
}

/**
* @param {string} answer
* @param {string} title
* @param {string} payload
*/
function innerConfirm(answer) {
onConfirm && onConfirm(answer);
function innerConfirm(title, payload) {
onConfirm && onConfirm(title, payload);
reset();
}

function reset() {
localOptions = [];
answers = [];
titleAnswers = [];
payloadAnswers = [];
}

</script>
Expand Down
15 changes: 8 additions & 7 deletions src/routes/chat/[agentId]/[conversationId]/richContent/rich-content.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@
/** @type {boolean} */
export let disableOption = false;

/** @type {(args0: string) => any} */
/** @type {(args0: string, args1: string) => any} */
export let onConfirm = () => {};

/**
* @param {string} answer
* @param {string} title
* @param {string} payload
*/
function handleConfirm(answer) {
onConfirm && onConfirm(answer);
function handleConfirm(title, payload) {
onConfirm && onConfirm(title, payload);
}
</script>

Expand All @@ -32,11 +33,11 @@

{#if displayExtraElements}
{#if message?.rich_content?.message?.rich_type === RichType.QuickReply}
<RcOptions options={message?.rich_content?.message?.quick_replies} fillPostback={message?.rich_content?.fill_postback} disableOption={disableOption} onConfirm={handleConfirm} />
<RcOptions options={message?.rich_content?.message?.quick_replies} disableOption={disableOption} onConfirm={handleConfirm} />
{:else if message?.rich_content?.message?.rich_type === RichType.Button}
<RcOptions options={message?.rich_content?.message?.buttons} fillPostback={message?.rich_content?.fill_postback} disableOption={disableOption} onConfirm={handleConfirm} />
<RcOptions options={message?.rich_content?.message?.buttons} disableOption={disableOption} onConfirm={handleConfirm} />
{:else if message?.rich_content?.message?.rich_type === RichType.MultiSelect}
<RcOptions options={message?.rich_content?.message?.options} isMultiSelect fillPostback={message?.rich_content?.fill_postback} disableOption={disableOption} onConfirm={handleConfirm} />
<RcOptions options={message?.rich_content?.message?.options} isMultiSelect disableOption={disableOption} onConfirm={handleConfirm} />
{:else if message?.rich_content?.message?.rich_type === RichType.Generic}
<RcGenericOptions options={message?.rich_content?.message?.elements} disableOption={disableOption} onConfirm={handleConfirm} />
{/if}
Expand Down