Skip to content
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

Jump to bottom

fix: Cast Text and Speak to string format #3844

Merged
merged 4 commits into from
Jul 2, 2021
Merged

fix: Cast Text and Speak to string format #3844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1b1f28
align with C#
Danieladu Jul 2, 2021
1783e47
add test
Danieladu Jul 2, 2021
6bff1ec
Merge branch 'main' into hond/cast
Danieladu Jul 2, 2021
c316700
Merge branch 'main' into hond/cast
Jul 2, 2021
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
6 changes: 6 additions & 0 deletions libraries/botbuilder-core/src/activityFactory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,12 @@ export class ActivityFactory {
const value: any = messageValue[key];

switch (property.toLowerCase()) {
case 'text':
activity.text = typeof value === 'string' ? value : JSON.stringify(value);
break;
case 'speak':
activity.speak = typeof value === 'string' ? value : JSON.stringify(value);
break;
case 'attachments':
activity.attachments = this.getAttachments(value);
break;
Expand Down
2 changes: 2 additions & 0 deletions libraries/botbuilder-dialogs-adaptive/tests/activityFactory.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,8 @@ function assertActivityWithHeroCardAttachment(activity) {
function assertCustomizedActivityType(activity) {
assert.strictEqual(activity.type, 'xxx');
assert.strictEqual(activity.name, 'hi');
assert.strictEqual(activity.text, '{"a":"b"}');
assert.strictEqual(activity.speak, '{"c":"d"}');
}

function assertHandoffActivity(activity) {
Expand Down
12 changes: 7 additions & 5 deletions libraries/botbuilder-dialogs-adaptive/tests/lg/NormalStructuredLG.lg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
]

# HeroCardTemplate(type)
[HeroCard
[HeroCard
title=Cheese gromit!
subtitle=${type}
text=This is some text describing the card, it's cool because it's cool
Expand All @@ -32,7 +32,7 @@
]

# ThumbnailCardTemplate(type)
[ThumbnailCard
[ThumbnailCard
title=Cheese gromit!
subtitle=${type}
text=This is some text describing the card, it's cool because it's cool
Expand Down Expand Up @@ -95,7 +95,7 @@
# AnimationCardTemplate
[AnimationCard
Title=Animation Card
Subtitle=look at it animate
Subtitle=look at it animate
autostart=true
autoloop=${true}
Image= ${{url:'https://docs.microsoft.com/en-us/bot-framework/media/how-it-works/architecture-resize.png'}}
Expand All @@ -117,6 +117,8 @@

# customizedActivityType
[Activity
text = ${{a:'b'}}
speak= ${{c:'d'}}
type = xxx
Name = hi
]
Expand Down Expand Up @@ -224,7 +226,7 @@
]

# SuggestedActionsReference(text)
[ Activity
[ Activity
Text = ${text}
${WelcomeActions()}
]
Expand Down Expand Up @@ -412,4 +414,4 @@
}
]
}
```
```