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

Update GetValue to throw on error - HOLD #6604

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update GetValue to throw on error - HOLD #6604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f88a115
Update GetValue to throw on error
ceciliaavila Mar 17, 2023
c92b1a7
Fix OnRecognizeInputAsync get Choice Options
ceciliaavila Mar 17, 2023
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
10 changes: 9 additions & 1 deletion libraries/AdaptiveExpressions/ExpressionProperties/ExpressionProperty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,17 @@ public virtual Expression ToExpression()
/// </summary>
/// <param name="data">data to use for expression binding.</param>
/// <returns>Value or default(T) if not found.</returns>
/// <remarks>An error will be thrown if data is an invalid expression.</remarks>
public virtual T GetValue(object data)
{
return this.TryGetValue(data).Value;
var (value, error) = TryGetValue(data);

if (error != null)
{
throw new ArgumentException(error);
}

return value;
}

/// <summary>
Expand Down
3 changes: 2 additions & 1 deletion libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Input/ConfirmInput.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ protected async override Task<InputState> OnRecognizeInputAsync(DialogContext dc
{
// First check whether the prompt was sent to the user with numbers - if it was we should recognize numbers
var defaults = DefaultChoiceOptions[culture];
var choiceOptions = ChoiceOptions?.GetValue(dc.State) ?? defaults.Item3;
var opts = await GetChoiceOptionsAsync(dc, defaults).ConfigureAwait(false);
var choiceOptions = opts ?? defaults.Item3;

// This logic reflects the fact that IncludeNumbers is nullable and True is the default set in Inline style
if (!choiceOptions.IncludeNumbers.HasValue || choiceOptions.IncludeNumbers.Value)
Expand Down
Loading