Show selected date after Create button

Author: pmosk

src/endpoint/Timesheet.Create/Flow/Flow.Run.cs

@@ -27,43 +27,40 @@ internal static async ValueTask<Unit> RunAsync(
             return await context.BotFlow.NextAsync(cancellationToken).ConfigureAwait(false);
         }
 
-        var chatFlow = await context.GetChatFlowAsync(commandName, cancellationToken).ConfigureAwait(false);
+        var chatFlow = await InnerGetChatFlowAsync().ConfigureAwait(false);
         if (chatFlow is null)
         {
             return await context.BotFlow.NextAsync(cancellationToken).ConfigureAwait(false);
         }
 
-        var data = GetWebAppUpdateResponseJson(context);
-
-        await chatFlow.RunFlow(context, crmProjectApi, crmTimesheetApi, option, data).GetFlowStateAsync(cancellationToken).ConfigureAwait(false);
+        _ = await chatFlow.GetFlowStateAsync(cancellationToken).ConfigureAwait(false);
         return await context.BotFlow.EndAsync(cancellationToken).ConfigureAwait(false);
-    }
 
-    private static async Task<ChatFlowStarter<TimesheetCreateFlowState>?> GetChatFlowAsync(
-        this IBotContext context, string commandName, CancellationToken cancellationToken)
-    {
-        var starter = context.GetChatFlowStarter<TimesheetCreateFlowState>("TimesheetCreate");
-        if (await starter.IsStartedAsync(cancellationToken).ConfigureAwait(false))
+        async Task<ChatFlow<TimesheetCreateFlowState>?> InnerGetChatFlowAsync()
         {
-            return starter;
-        }
+            var starter = context.GetChatFlowStarter<TimesheetCreateFlowState>("TimesheetCreate");
+            if (await starter.IsStartedAsync(cancellationToken).ConfigureAwait(false))
+            {
+                return starter.RunFlow(context, crmProjectApi, crmTimesheetApi, option, default);
+            }
 
-        if (context.TurnContext.RecognizeCommandOrAbsent(commandName).IsPresent)
-        {
-            return starter;
-        }
+            if (context.TurnContext.RecognizeCommandOrAbsent(commandName).IsPresent)
+            {
+                return starter.RunFlow(context, crmProjectApi, crmTimesheetApi, option, default);
+            }
 
-        var timesheet = GetWebAppUpdateResponseJson(context);
-        if (string.Equals(timesheet?.Command, "updatetimesheet", StringComparison.InvariantCultureIgnoreCase))
-        {
-            await context.TurnContext.DeleteActivityAsync(context.TurnContext.Activity.Id, cancellationToken).ConfigureAwait(false);
-            return starter;
-        }
+            var timesheet = context.GetWebAppUpdateResponseJson();
+            if (string.Equals(timesheet?.Command, "updatetimesheet", StringComparison.InvariantCultureIgnoreCase))
+            {
+                await context.TurnContext.DeleteActivityAsync(context.TurnContext.Activity.Id, cancellationToken).ConfigureAwait(false);
+                return starter.RunFlow(context, crmProjectApi, crmTimesheetApi, option, timesheet);
+            }
 
-        return null;
+            return null;
+        }
     }
 
-    private static WebAppDataTimesheetUpdateJson? GetWebAppUpdateResponseJson(IBotContext context)
+    private static WebAppDataTimesheetUpdateJson? GetWebAppUpdateResponseJson(this IBotContext context)
     {
         var dataWebApp = TelegramWebAppResponse.FromChannelData(context.TurnContext.Activity.ChannelData);
         return JsonConvert.DeserializeObject<WebAppDataTimesheetUpdateJson>((dataWebApp.Message?.WebAppData?.Data).OrEmpty());

src/endpoint/Timesheet.Create/Flow/TimesheetCreateChatFlow.cs

@@ -20,6 +20,7 @@ internal static ChatFlow<TimesheetCreateFlowState> RunFlow(
                 ValueHours = data?.Duration,
                 Project = data?.Project,
                 Date = data?.Date,
+                ShowSelectedDate = data?.Date is not null && data?.Id is null,
                 LimitationDay = option.LimitationDay,
                 UrlWebApp = option.UrlWebApp,
                 WithoutConfirmation = data?.Project is not null

src/endpoint/Timesheet.Create/FlowState/TimesheetCreateFlowState.cs

@@ -25,6 +25,9 @@ public string? DateText
         init => Date = value is null ? null : DateOnly.Parse(value, CultureInfo.InvariantCulture);
     }
 
+    [JsonProperty("showSelectedDate")]
+    public bool ShowSelectedDate { get; init; }
+
     [JsonProperty("valueHours")]
     public decimal? ValueHours { get; init; }
 

src/endpoint/Timesheet.Create/FlowStep/Step.AwaitDate.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using GarageGroup.Infra.Bot.Builder;
 using Microsoft.Bot.Builder;
+using Microsoft.Bot.Schema;
 
 namespace GarageGroup.Internal.Timesheet;
 
@@ -11,7 +12,14 @@ partial class TimesheetCreateFlowStep
     internal static ChatFlow<TimesheetCreateFlowState> AwaitDate(
         this ChatFlow<TimesheetCreateFlowState> chatFlow)
         =>
-        chatFlow.AwaitDate(
+        chatFlow.SendActivityOrSkip(
+            BuildSelectedDateActivity)
+        .MapFlowState(
+            static state => state with
+            {
+                ShowSelectedDate = false
+            })
+        .AwaitDate(
             static context => new(
                 text: context.GetDateText(),
                 confirmButtonText: "Choose",
@@ -29,6 +37,22 @@ internal static ChatFlow<TimesheetCreateFlowState> AwaitDate(
                 Date = date
             });
 
+    private static Activity? BuildSelectedDateActivity(IChatFlowContext<TimesheetCreateFlowState> context)
+    {
+        if (context.FlowState.Date is null || context.FlowState.ShowSelectedDate is false || context.IsNotTelegramChannel())
+        {
+            return null;
+        }
+
+        var parameters = new TelegramParameters($"Date: <b>{context.FlowState.Date.Value.ToDisplayText()}</b>")
+        {
+            ParseMode = TelegramParseMode.Html,
+            ReplyMarkup = new TelegramReplyKeyboardRemove()
+        };
+
+        return parameters.BuildActivity();
+    }
+
     private static string GetDateText(this ITurnContext context)
     {
         if (context.IsMsteamsChannel())