Skip to content

Commit 34bb459

Browse files
yuqingyangdanielluo-msft
authored andcommitted
Add parameter into adaptive card
1 parent 4e2fa52 commit 34bb459

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

Service/GroupMembershipManagement/Models/AdaptiveCards/DefaultCardTemplate.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ public class DefaultCardTemplate
1313
public string MessageContent { get; set; }
1414
public DateTime CardCreatedTime { get; set; }
1515
public string DestinationGroupName { get; set; }
16+
public string UIUrl { get; set; }
17+
public string DashboardUrl { get; set; }
1618
}
1719
}
1820

Service/GroupMembershipManagement/Repositories.Localization/Resources/LocalizationRepository.en-US.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@
971971
{
972972
"type": "Action.OpenUrl",
973973
"title": "Learn more about GMM",
974-
"url": "$root.DashboardUrl"
974+
"url": "${$root.DashboardUrl}"
975975
}
976976
],
977977
"$when": "${$root.DashboardUrl != \"\"}"
@@ -992,7 +992,7 @@
992992
{
993993
"type": "Action.OpenUrl",
994994
"title": "View in GMM UI",
995-
"url": "$root.UIUrl"
995+
"url": "${$root.UIUrl}"
996996
}
997997
],
998998
"$when": "${$root.UIUrl != \"\"}"

Service/GroupMembershipManagement/Repositories.Mail/MailRepository.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public async Task SendMailAsync(EmailMessage emailMessage, Guid? runId)
5656
}
5757
else if (_mailConfig.IsAdaptiveCardEnabled)
5858
{
59-
message = GetAdaptiveCardMessage(emailMessage);
59+
message = await GetAdaptiveCardMessage(emailMessage);
6060
}
6161
else
6262
{
@@ -130,7 +130,7 @@ private Message GetHTMLMessage(EmailMessage emailMessage)
130130
return message;
131131
}
132132

133-
public Message GetAdaptiveCardMessage(EmailMessage emailMessage)
133+
public async Task<Message> GetAdaptiveCardMessage(EmailMessage emailMessage)
134134
{
135135
var subjectContent = _localizationRepository.TranslateSetting(emailMessage?.Subject, emailMessage?.AdditionalSubjectParams);
136136
var messageContent = _localizationRepository.TranslateSetting(emailMessage?.Content, emailMessage?.AdditionalContentParams);
@@ -139,8 +139,8 @@ public Message GetAdaptiveCardMessage(EmailMessage emailMessage)
139139

140140
string groupId = emailMessage?.AdditionalContentParams[0];
141141
string destinationGroupName = string.IsNullOrEmpty(emailMessage?.DestinationGroupName) ? "" : emailMessage.DestinationGroupName;
142-
var urlSetting = await _settingsRepository.GetSettingByKeyAsync(SettingKey.UIUrl);
143-
var dashboardUrlSetting = await _settingsRepository.GetSettingByKeyAsync(SettingKey.DashboardUrl);
142+
var urlSetting = await _settingsRepository.GetSettingByKeyAsync(SettingKey.UIUrl);
143+
var dashboardUrlSetting = await _settingsRepository.GetSettingByKeyAsync(SettingKey.DashboardUrl);
144144

145145
string UIUrl = urlSetting?.SettingValue ?? "";
146146
string dashboardUrl = dashboardUrlSetting?.SettingValue ?? "";

0 commit comments

Comments
 (0)