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

Revert "[#6430] Adaptive ForEachElement does not exit when child acti… #6466

Merged
merged 1 commit into from
Sep 7, 2022
Merged

Revert "[#6430] Adaptive ForEachElement does not exit when child acti… #6466

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
5 changes: 2 additions & 3 deletions libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/ForEachElement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@ private DialogContext CreateChildContext(DialogContext dc, DialogState childDial

private bool ShouldEndDialog(DialogTurnResult turnResult, out DialogTurnResult finalTurnResult)
{
DialogTurnStatus[] endedDialog = { DialogTurnStatus.Complete, DialogTurnStatus.Cancelled };
finalTurnResult = null;

// Insure BreakLoop ends the dialog
Expand All @@ -280,12 +279,12 @@ private bool ShouldEndDialog(DialogTurnResult turnResult, out DialogTurnResult f
// the result will be nested.
while (finalTurnResult.Result != null
&& finalTurnResult.Result is DialogTurnResult dtr
&& dtr.ParentEnded && endedDialog.Contains(dtr.Status))
&& dtr.ParentEnded && dtr.Status == DialogTurnStatus.Complete)
{
finalTurnResult = dtr;
}

return finalTurnResult.ParentEnded && endedDialog.Contains(finalTurnResult.Status);
return finalTurnResult.ParentEnded && finalTurnResult.Status == DialogTurnStatus.Complete;
}

private void UpdateActionScopeState(DialogContext dc, DialogState state)
Expand Down
6 changes: 0 additions & 6 deletions tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/ActionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,12 +296,6 @@ public async Task Action_Foreach_Nested()
await TestUtils.RunTestScript(_resourceExplorerFixture.ResourceExplorer);
}

[Fact]
public async Task Action_Foreach_Nested_WithCancel()
{
await TestUtils.RunTestScript(_resourceExplorerFixture.ResourceExplorer);
}

[Fact]
public async Task Action_Foreach_Object()
{
Expand Down
67 changes: 0 additions & 67 deletions ...der.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Foreach_Nested_WithCancel.test.dialog
View file
Open in desktop

This file was deleted.