-
Notifications
You must be signed in to change notification settings - Fork 481
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.
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
[#6430] Adaptive ForEachElement does not exit when child action CancelAllDialogs is called #6452
Merged
tracyboehrer
merged 2 commits into
main
from
southworks/fix/foreachelement-cancel-dialog
Aug 29, 2022
Merged
[#6430] Adaptive ForEachElement does not exit when child action CancelAllDialogs is called #6452
tracyboehrer
merged 2 commits into
main
from
southworks/fix/foreachelement-cancel-dialog
Aug 29, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ceciliaavila
added
the
Automation: No parity
PR does not need to be applied to other languages.
label
Aug 25, 2022
Pull Request Test Coverage Report for Build 318702
💛 - Coveralls |
tracyboehrer
approved these changes
Aug 29, 2022
tracyboehrer
added a commit
that referenced
this pull request
Sep 1, 2022
* README version to 4.18 (#6425) Co-authored-by: Tracy Boehrer <trboehre@microsoft.com> * [#6434] Priority broken for RegexRecognizer (#6435) * Consider priority in OnRecognizeAsync method * Add unit test * Update Bool function to use Convert.ToBoolean (#6431) * Update IsMatch empty string values (#6426) * [#6428] Adaptive ForEachElement loop's incorrectly when changes cause ContinueDialogAsync to be recalled (#6448) * Reacquire childDialogState after ContinueDialogAsync * Add unit test * Support passing sas token url's for token service (#6449) Co-authored-by: Swagat Mishra <swagatm@microsoft.com> * Bump @actions/core from 1.6.0 to 1.9.1 in /actions/verify-pr-labels (#6445) Bumps [@actions/core](https://github.com/actions/toolkit/tree/HEAD/packages/core) from 1.6.0 to 1.9.1. - [Release notes](https://github.com/actions/toolkit/releases) - [Changelog](https://github.com/actions/toolkit/blob/main/packages/core/RELEASES.md) - [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/core) --- updated-dependencies: - dependency-name: "@actions/core" dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Support passing sas token url's for token service (#6449) Co-authored-by: Swagat Mishra <swagatm@microsoft.com> * [#6428] Adaptive ForEachElement loop's incorrectly when changes cause ContinueDialogAsync to be recalled (#6448) * Reacquire childDialogState after ContinueDialogAsync * Add unit test * Delete vnext code which is dead (#6440) * Fix PublishToCoveralls.ps1 (#6439) * Remove failing Powershell patch download * Upgrade coveralls.net to 4.0.1 * [#6430] Adaptive ForEachElement does not exit when child action CancelAllDialogs is called (#6452) * Consider canceled status to end the dialog * Add unit test * [#6432] TeamsInfo.GetMemberAsync(...) doesn't work properly in Skill Bot scenario, it returns http 405 error (#6443) * Implement GetMemberAsync for skills * Add unit test * [#6433] Error in AdaptiveDialog.ContinueActionAsync with native dialog SDK (#6444) * Add condition before loading the resource * Add unit tests * Load AdaptiveDialogs dynamically on DialogContext Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Tracy Boehrer <trboehre@microsoft.com> Co-authored-by: Cecilia Avila <44245136+ceciliaavila@users.noreply.github.com> Co-authored-by: Joel Mut <62260472+sw-joelmut@users.noreply.github.com> Co-authored-by: swagat mishra <swagatmishra2007@gmail.com> Co-authored-by: Swagat Mishra <swagatm@microsoft.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: BruceHaley <v-brucehaley@microsoft.com>
tracyboehrer
pushed a commit
that referenced
this pull request
Sep 7, 2022
tracyboehrer
pushed a commit
that referenced
this pull request
Sep 7, 2022
tracyboehrer
added a commit
that referenced
this pull request
Sep 7, 2022
tracyboehrer
added a commit
that referenced
this pull request
Sep 7, 2022
tracyboehrer
added a commit
that referenced
this pull request
Sep 7, 2022
* Revert "[#6430] Adaptive ForEachElement does not exit when child action CancelAllDialogs is called (#6452)" (#6466) This reverts commit c572be3. Co-authored-by: Tracy Boehrer <trboehre@microsoft.com> * Add cancellation token to TeamsOperation class (#6458) * Fix typing indicator shown after bot has replied (#6460) Co-authored-by: Tracy Boehrer <trboehre@microsoft.com> Co-authored-by: Joel Mut <62260472+sw-joelmut@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #6430
Description
This PR fixes the issue in the
ForEachElement
action that wasn't exiting the loop after a call to the CancelAllDialogs action.The fix also considers the nested ForEachElement loops scenario.
Specific Changes
ShouldEndDialog
method of the ForEachElement class to consider also Cancelled status as well as Complete to end the dialogs.ActionTests
class to cover the nested ForEachElement's loops with a CancelAllDialogs call scenario.Action_Foreach_Nested_WithCancel.test.dialog
test script.Testing
These images show the issue fixed after the changes.