Skip to content

Commit

Permalink
fix: use empty string when no input provided in action (#10229)
Browse files Browse the repository at this point in the history
  • Loading branch information
yukun-dong authored Oct 27, 2023
1 parent c9c564e commit 6c0b527
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class ActionApp : TeamsActivityHandler
var actionData = ((JObject)action.Data).ToObject<CardResponse>();
var templateJson = await System.IO.File.ReadAllTextAsync(_adaptiveCardFilePath, cancellationToken);
var template = new AdaptiveCards.Templating.AdaptiveCardTemplate(templateJson);
var adaptiveCardJson = template.Expand(new {title=actionData.Title, subTitle=actionData.SubTitle, text=actionData.Text});
var adaptiveCardJson = template.Expand(new {title=actionData.Title ?? "", subTitle=actionData.SubTitle ?? "", text=actionData.Text ?? ""});
var adaptiveCard = AdaptiveCard.FromJson(adaptiveCardJson).Card;
var attachments = new MessagingExtensionAttachment()
{
Expand Down
6 changes: 3 additions & 3 deletions templates/js/message-extension-action/src/actionApp.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ class ActionApp extends TeamsActivityHandler {
const template = new ACData.Template(helloWorldCard);
const card = template.expand({
$root: {
title: action.data.title,
subTitle: action.data.subTitle,
text: action.data.text,
title: action.data.title ?? "",
subTitle: action.data.subTitle ?? "",
text: action.data.text ?? "",
},
});
const attachment = CardFactory.adaptiveCard(card);
Expand Down
6 changes: 3 additions & 3 deletions templates/ts/message-extension-action/src/actionApp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ export class ActionApp extends TeamsActivityHandler {
const template = new ACData.Template(helloWorldCard);
const card = template.expand({
$root: {
title: action.data.title,
subTitle: action.data.subTitle,
text: action.data.text,
title: action.data.title ?? "",
subTitle: action.data.subTitle ?? "",
text: action.data.text ?? "",
},
});
const attachment = CardFactory.adaptiveCard(card);
Expand Down

0 comments on commit 6c0b527

Please sign in to comment.