[POI] add ShouldInterrupt for SelectPointOfInterestPrompt, SelectActionPrompt (#2268)

* Based on how RouterDialog handles DialogTurnStatus.Empty
* Add test RouteToPointOfInterestAndInterruptTest
* fix selectAction (Teams supports 1.1?)

Author: xieofxie

skills/csharp/pointofinterestskill/Content/PointOfInterestOverview.1.0.json

@@ -61,7 +61,12 @@
       ],
       "selectAction": {
         "type": "Action.Submit",
-        "data": "{SubmitText}"
+        "data": {
+          "msteams": {
+            "type": "imBack",
+            "value": "{SubmitText}"
+          }
+        }
       }
     }
   ],

skills/csharp/pointofinterestskill/Dialogs/PointOfInterestDialogBase.cs

@@ -81,8 +81,8 @@ public PointOfInterestDialogBase(
 
             AddDialog(new TextPrompt(Actions.CurrentLocationPrompt));
             AddDialog(new ConfirmPrompt(Actions.ConfirmPrompt) { Style = ListStyle.Auto, });
-            AddDialog(new ChoicePrompt(Actions.SelectPointOfInterestPrompt) { Style = ListStyle.None });
-            AddDialog(new ChoicePrompt(Actions.SelectActionPrompt) { Style = ListStyle.None });
+            AddDialog(new ChoicePrompt(Actions.SelectPointOfInterestPrompt, InterruptablePromptValidator) { Style = ListStyle.None });
+            AddDialog(new ChoicePrompt(Actions.SelectActionPrompt, InterruptablePromptValidator) { Style = ListStyle.None });
             AddDialog(new ChoicePrompt(Actions.SelectRoutePrompt) { ChoiceOptions = new ChoiceFactoryOptions { InlineSeparator = string.Empty, InlineOr = string.Empty, InlineOrMore = string.Empty, IncludeNumbers = true } });
         }
 
@@ -113,8 +113,29 @@ public static Activity CreateOpenDefaultAppReply(Activity activity, PointOfInter
             return replyEvent;
         }
 
+        public override async Task<DialogTurnResult> ContinueDialogAsync(DialogContext outerDc, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            var result = await base.ContinueDialogAsync(outerDc, cancellationToken);
+            var state = await Accessor.GetAsync(outerDc.Context);
+            if (state.ShouldInterrupt)
+            {
+                // Assume already call CancelAllDialogsAsync
+                // TODO Empty indicates RouteAsync in RouterDialog
+                state.ShouldInterrupt = false;
+                return new DialogTurnResult(DialogTurnStatus.Empty);
+            }
+            else
+            {
+                return result;
+            }
+        }
+
         protected override async Task<DialogTurnResult> OnBeginDialogAsync(DialogContext dc, object options, CancellationToken cancellationToken = default(CancellationToken))
         {
+            // Clear interrupt state
+            var state = await Accessor.GetAsync(dc.Context);
+            state.ShouldInterrupt = false;
+
             return await base.OnBeginDialogAsync(dc, options, cancellationToken);
         }
 
@@ -183,6 +204,12 @@ protected async Task<DialogTurnResult> ProcessCurrentLocationSelection(Waterfall
             try
             {
                 var state = await Accessor.GetAsync(sc.Context);
+
+                if (state.ShouldInterrupt)
+                {
+                    return await sc.CancelAllDialogsAsync();
+                }
+
                 var cancelMessage = ResponseManager.GetResponse(POISharedResponses.CancellingMessage);
 
                 if (sc.Result != null)
@@ -323,6 +350,12 @@ protected async Task<DialogTurnResult> ProcessPointOfInterestSelection(Waterfall
             try
             {
                 var state = await Accessor.GetAsync(sc.Context);
+
+                if (state.ShouldInterrupt)
+                {
+                    return await sc.CancelAllDialogsAsync();
+                }
+
                 var defaultReplyMessage = ResponseManager.GetResponse(POISharedResponses.GetRouteToActiveLocationLater);
 
                 if (sc.Result != null)
@@ -404,6 +437,11 @@ protected async Task<DialogTurnResult> ProcessPointOfInterestAction(WaterfallSte
         {
             var state = await Accessor.GetAsync(sc.Context);
 
+            if (state.ShouldInterrupt)
+            {
+                return await sc.CancelAllDialogsAsync();
+            }
+
             var choice = sc.Result as FoundChoice;
             int choiceIndex = choice.Index;
 
@@ -827,6 +865,33 @@ private string GetCardImageUri(string imagePath)
             return $"{serverUrl}/images/{imagePath}";
         }
 
+        private async Task<bool> InterruptablePromptValidator<T>(PromptValidatorContext<T> promptContext, CancellationToken cancellationToken)
+        {
+            if (promptContext.Recognized.Succeeded)
+            {
+                return true;
+            }
+            else
+            {
+                var locale = CultureInfo.CurrentUICulture.TwoLetterISOLanguageName;
+                var localeConfig = Services.CognitiveModelSets[locale];
+                localeConfig.LuisServices.TryGetValue("PointOfInterest", out var poiService);
+                var poiResult = await poiService.RecognizeAsync<PointOfInterestLuis>(promptContext.Context, CancellationToken.None);
+                var topIntent = poiResult.TopIntent();
+
+                if (topIntent.score > 0.5 && topIntent.intent != PointOfInterestLuis.Intent.None)
+                {
+                    var state = await Accessor.GetAsync(promptContext.Context);
+                    state.ShouldInterrupt = true;
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+        }
+
         private class ImageSize
         {
             public const int RouteWidth = 440;

skills/csharp/pointofinterestskill/Models/PointOfInterestSkillState.cs

@@ -25,6 +25,8 @@ public PointOfInterestSkillState()
 
         public List<RouteDirections.Summary> FoundRoutes { get; set; }
 
+        public bool ShouldInterrupt { get; set; }
+
         public string Keyword { get; set; }
 
         public string Address { get; set; }

skills/csharp/tests/pointofinterestskill.tests/Flow/PointOfInterestDialogTests.cs

@@ -119,6 +119,31 @@ await GetTestFlow()
                 .StartTestAsync();
         }
 
+        /// <summary>
+        /// Find points of interest nearby with interruptions.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [TestMethod]
+        public async Task RouteToPointOfInterestAndInterruptTest()
+        {
+            await GetTestFlow()
+                .Send(BaseTestUtterances.LocationEvent)
+                .Send(FindPointOfInterestUtterances.WhatsNearby)
+                .AssertReply(AssertContains(POISharedResponses.MultipleLocationsFound, new string[] { CardStrings.Overview }))
+                .Send(FindPointOfInterestUtterances.WhatsNearby)
+                .AssertReply(AssertContains(POISharedResponses.MultipleLocationsFound, new string[] { CardStrings.Overview }))
+                .Send(BaseTestUtterances.OptionOne)
+                .AssertReply(AssertContains(null, new string[] { CardStrings.DetailsNoCall }))
+                .Send(FindPointOfInterestUtterances.WhatsNearby)
+                .AssertReply(AssertContains(POISharedResponses.MultipleLocationsFound, new string[] { CardStrings.Overview }))
+                .Send(BaseTestUtterances.OptionOne)
+                .AssertReply(AssertContains(null, new string[] { CardStrings.DetailsNoCall }))
+                .Send(BaseTestUtterances.StartNavigation)
+                .AssertReply(CheckForEvent())
+                .AssertReply(CompleteDialog())
+                .StartTestAsync();
+        }
+
         /// <summary>
         /// Find points of interest nearby with multiple routes.
         /// </summary>