cherry-pick into save-input PR (mostly stashing so I make sure I don't lose this)

Author: zadjii-msft

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -1288,22 +1288,22 @@ namespace winrt::TerminalApp::implementation
 
                     try
                     {
-                        KeyChord keyChord = nullptr;
-                        hstring keyChordText = L"";
+                        winrt::Microsoft::Terminal::Control::KeyChord keyChord = nullptr;
                         if (!realArgs.KeyChord().empty())
                         {
                             keyChord = KeyChordSerialization::FromString(winrt::to_hstring(realArgs.KeyChord()));
-                            keyChordText = KeyChordSerialization::ToString(keyChord);
                         }
-
                         _settings.GlobalSettings().ActionMap().AddSendInputAction(realArgs.Name(), realArgs.Commandline(), keyChord);
-                        ActionSaved(realArgs.Commandline(), realArgs.Name(), keyChordText);
                         _settings.WriteSettingsToDisk();
+                        ActionSaved(realArgs.Commandline(), realArgs.Name(), realArgs.KeyChord());
                     }
                     catch (const winrt::hresult_error& ex)
                     {
-                        const auto message = ex.message();
+                        auto code = ex.code();
+                        auto message = ex.message();
                         ActionSaveFailed(message);
+                        args.Handled(true);
+                        return;
                     }
 
                     args.Handled(true);

src/cascadia/TerminalApp/Resources/en-US/Resources.resw

@@ -907,4 +907,10 @@
   <data name="RestartConnectionToolTip" xml:space="preserve">
     <value>Restart the active pane connection</value>
   </data>
+  <data name="ActionSavedToast.Title" xml:space="preserve">
+    <value>Action saved</value>
+  </data>
+  <data name="ActionSaveFailedToast.Title" xml:space="preserve">
+    <value>Action save failed</value>
+  </data>
 </root>

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -4133,14 +4133,9 @@ namespace winrt::TerminalApp::implementation
             }
             _UpdateTeachingTipTheme(ActionSavedToast().try_as<winrt::Windows::UI::Xaml::FrameworkElement>());
 
-            auto setText = [](const TextBlock& textBlock, const winrt::hstring& prefix, const winrt::hstring& text) {
-                textBlock.Text(text.empty() ? L"" : prefix + text);
-                textBlock.Visibility(text.empty() ? Windows::UI::Xaml::Visibility::Collapsed : Windows::UI::Xaml::Visibility::Visible);
-            };
-
-            setText(ActionSavedNameText(), L"Name: ", name);
-            setText(ActionSavedKeyChordText(), L"Key Chord: " ,keyChord );
-            setText(ActionSavedCommandLineText(), L"Input: " , input);
+            SavedActionName(L"Name: " + name);
+            SavedActionKeyChord(L"Key Chord: " + keyChord);
+            SavedActionCommandLine(L"Input: " + input);
 
             if (page->_actionSavedToast != nullptr)
             {

src/cascadia/TerminalApp/TerminalPage.h

@@ -201,6 +201,10 @@ namespace winrt::TerminalApp::implementation
         WINRT_OBSERVABLE_PROPERTY(winrt::Windows::UI::Xaml::Media::Brush, TitlebarBrush, PropertyChanged.raise, nullptr);
         WINRT_OBSERVABLE_PROPERTY(winrt::Windows::UI::Xaml::Media::Brush, FrameBrush, PropertyChanged.raise, nullptr);
 
+        WINRT_OBSERVABLE_PROPERTY(winrt::hstring, SavedActionName, PropertyChanged.raise, L"");
+        WINRT_OBSERVABLE_PROPERTY(winrt::hstring, SavedActionKeyChord, PropertyChanged.raise, L"");
+        WINRT_OBSERVABLE_PROPERTY(winrt::hstring, SavedActionCommandLine, PropertyChanged.raise, L"");
+
     private:
         friend struct TerminalPageT<TerminalPage>; // for Xaml to bind events
         std::optional<HWND> _hostingHwnd;

src/cascadia/TerminalApp/TerminalPage.idl

@@ -72,6 +72,10 @@ namespace TerminalApp
         void IdentifyWindow();
         void RenameFailed();
 
+        String SavedActionName { get; };
+        String SavedActionKeyChord { get; };
+        String SavedActionCommandLine { get; };
+
         // We cannot use the default XAML APIs because we want to make sure
         // that there's only one application-global dialog visible at a time,
         // and because of GH#5224.

src/cascadia/TerminalApp/TerminalPage.xaml

@@ -8,6 +8,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:local="using:TerminalApp"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:mtu="using:Microsoft.Terminal.UI"
       xmlns:mux="using:Microsoft.UI.Xaml.Controls"
       Background="Transparent"
       mc:Ignorable="d">
@@ -215,11 +216,14 @@
                 <StackPanel HorizontalAlignment="Stretch"
                             Orientation="Vertical">
                     <TextBlock x:Name="ActionSavedNameText"
-                               Text="" />
+                               Text="{x:Bind SavedActionName, Mode=OneWay}"
+                               Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(SavedActionName), Mode=OneWay}" />
                     <TextBlock x:Name="ActionSavedKeyChordText"
-                               Text="" />
+                               Text="{x:Bind SavedActionKeyChord, Mode=OneWay}"
+                               Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(SavedActionKeyChord), Mode=OneWay}" />
                     <TextBlock x:Name="ActionSavedCommandLineText"
-                               Text="" />
+                               Text="{x:Bind SavedActionCommandLine, Mode=OneWay}"
+                               Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(SavedActionCommandLine), Mode=OneWay}" />
                 </StackPanel>
             </mux:TeachingTip.Content>
         </mux:TeachingTip>