From cb150a312d535d4e5a3b40852fd03f5c0a5b3c37 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Fri, 20 Nov 2020 15:24:35 -0800
Subject: [PATCH 1/5] Hook up the Save button

---
 src/cascadia/TerminalSettingsEditor/MainPage.cpp     | 12 +++++++++++-
 src/cascadia/TerminalSettingsEditor/MainPage.h       |  4 ++--
 src/cascadia/TerminalSettingsEditor/MainPage.xaml    |  6 ++++--
 .../TerminalSettingsModel/GlobalAppSettings.cpp      |  1 +
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index b0283df76a4..88a422d0c22 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -39,7 +39,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
     MainPage::MainPage(const CascadiaSettings& settings) :
         _settingsSource{ settings },
-        _settingsClone{ settings },
+        _settingsClone{ settings.Copy() },
         _profileToNavItemMap{ winrt::single_threaded_map<Model::Profile, MUX::Controls::NavigationViewItem>() }
     {
         InitializeComponent();
@@ -150,6 +150,16 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
     }
 
+    void MainPage::SaveButton_Click(IInspectable const& /*sender*/, RoutedEventArgs const& /*args*/)
+    {
+        _settingsClone.WriteSettingsToDisk();
+    }
+
+    void MainPage::ResetButton_Click(IInspectable const& /*sender*/, RoutedEventArgs const& /*args*/)
+    {
+        _settingsClone = _settingsSource.Copy();
+    }
+
     void MainPage::_InitializeProfilesList()
     {
         // Manually create a NavigationViewItem for each profile
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.h b/src/cascadia/TerminalSettingsEditor/MainPage.h
index a40ee15e583..ff61a233b54 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.h
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.h
@@ -17,12 +17,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void OpenJsonTapped(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::TappedRoutedEventArgs const& args);
         void SettingsNav_Loaded(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
         void SettingsNav_ItemInvoked(Microsoft::UI::Xaml::Controls::NavigationView const& sender, Microsoft::UI::Xaml::Controls::NavigationViewItemInvokedEventArgs const& args);
+        void SaveButton_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
+        void ResetButton_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
 
         TYPED_EVENT(OpenJson, winrt::Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Settings::Model::SettingsTarget);
 
     private:
-        // XAML should data-bind to the _settingsClone
-        // When "save" is pressed, _settingsSource = _settingsClone
         winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings _settingsSource;
         winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings _settingsClone;
         winrt::Windows::Foundation::Collections::IMap<winrt::Microsoft::Terminal::Settings::Model::Profile, winrt::Microsoft::UI::Xaml::Controls::NavigationViewItem> _profileToNavItemMap;
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.xaml b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
index 32be814c9e0..5cf5864a944 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.xaml
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
@@ -120,11 +120,13 @@ the MIT License. See LICENSE in the project root for license information. -->
                     <StackPanel VerticalAlignment="Center" HorizontalAlignment="Right" Orientation="Horizontal" Margin="0,0,30,0">
                         <Button x:Uid="Settings_ResetSettingsButton"
                                 FontSize="15"
-                                ToolTipService.Placement="Mouse"/>
+                                ToolTipService.Placement="Mouse"
+                                Click="ResetButton_Click"/>
                         <Button x:Uid="Settings_SaveSettingsButton"
                                 FontSize="15"
                                 Style="{StaticResource AccentButtonStyle}"
-                                Margin="10,0,0,0"/>
+                                Margin="10,0,0,0"
+                                Click="SaveButton_Click"/>
                     </StackPanel>
                 </Grid>
             </Grid>
diff --git a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp
index 28a1f1aa529..71c8336f6ed 100644
--- a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp
+++ b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp
@@ -161,6 +161,7 @@ void GlobalAppSettings::DefaultProfile(const winrt::guid& defaultProfile) noexce
 {
     _validDefaultProfile = true;
     _defaultProfile = defaultProfile;
+    _UnparsedDefaultProfile = Utils::GuidToString(defaultProfile);
 }
 
 winrt::guid GlobalAppSettings::DefaultProfile() const

From 1442661cc86eb02c3ec4662de7313079f4a5ffb5 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Fri, 20 Nov 2020 16:19:11 -0800
Subject: [PATCH 2/5] bugfix: updating json should propagate to SUI

---
 src/cascadia/TerminalApp/SettingsTab.cpp         |  9 ++++++++-
 src/cascadia/TerminalApp/SettingsTab.h           |  1 +
 src/cascadia/TerminalApp/SettingsTab.idl         |  1 +
 src/cascadia/TerminalApp/TerminalPage.cpp        |  5 +++++
 src/cascadia/TerminalSettingsEditor/MainPage.cpp |  6 ++++++
 src/cascadia/TerminalSettingsEditor/MainPage.h   | 12 +++++++-----
 src/cascadia/TerminalSettingsEditor/MainPage.idl |  1 +
 7 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/cascadia/TerminalApp/SettingsTab.cpp b/src/cascadia/TerminalApp/SettingsTab.cpp
index dd78edabf98..46a74ac703b 100644
--- a/src/cascadia/TerminalApp/SettingsTab.cpp
+++ b/src/cascadia/TerminalApp/SettingsTab.cpp
@@ -12,6 +12,7 @@ using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Core;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
+using namespace winrt::Microsoft::Terminal::Settings::Editor;
 using namespace winrt::Windows::System;
 
 namespace winrt
@@ -22,7 +23,7 @@ namespace winrt
 
 namespace winrt::TerminalApp::implementation
 {
-    SettingsTab::SettingsTab(winrt::Microsoft::Terminal::Settings::Editor::MainPage settingsUI)
+    SettingsTab::SettingsTab(MainPage settingsUI)
     {
         Content(settingsUI);
 
@@ -31,6 +32,12 @@ namespace winrt::TerminalApp::implementation
         _CreateIcon();
     }
 
+    void SettingsTab::UpdateSettings(CascadiaSettings settings)
+    {
+        auto settingsUI{ Content().as<MainPage>() };
+        settingsUI.UpdateSettings(settings);
+    }
+
     // Method Description:
     // - Focus the settings UI
     // Arguments:
diff --git a/src/cascadia/TerminalApp/SettingsTab.h b/src/cascadia/TerminalApp/SettingsTab.h
index 28399b426a8..1c83fc243ba 100644
--- a/src/cascadia/TerminalApp/SettingsTab.h
+++ b/src/cascadia/TerminalApp/SettingsTab.h
@@ -29,6 +29,7 @@ namespace winrt::TerminalApp::implementation
     public:
         SettingsTab(winrt::Microsoft::Terminal::Settings::Editor::MainPage settingsUI);
 
+        void UpdateSettings(Microsoft::Terminal::Settings::Model::CascadiaSettings settings);
         void Focus(winrt::Windows::UI::Xaml::FocusState focusState) override;
 
     private:
diff --git a/src/cascadia/TerminalApp/SettingsTab.idl b/src/cascadia/TerminalApp/SettingsTab.idl
index 38d53e7b64e..deb45d4f155 100644
--- a/src/cascadia/TerminalApp/SettingsTab.idl
+++ b/src/cascadia/TerminalApp/SettingsTab.idl
@@ -7,5 +7,6 @@ namespace TerminalApp
 {
     [default_interface] runtimeclass SettingsTab : TabBase
     {
+        void UpdateSettings(Microsoft.Terminal.Settings.Model.CascadiaSettings settings);
     }
 }
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
index 176b55f9c80..0de3bc496a7 100644
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -2250,6 +2250,11 @@ namespace winrt::TerminalApp::implementation
                 // Force the TerminalTab to re-grab its currently active control's title.
                 terminalTab->UpdateTitle();
             }
+
+            if (auto settingsTab = tab.try_as<TerminalApp::SettingsTab>())
+            {
+                settingsTab.UpdateSettings(_settings);
+            }
         }
 
         auto weakThis{ get_weak() };
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index 88a422d0c22..1c69caf90dd 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -47,6 +47,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _InitializeProfilesList();
     }
 
+    void MainPage::UpdateSettings(Model::CascadiaSettings settings)
+    {
+        _settingsSource = settings;
+        _settingsClone = settings.Copy();
+    }
+
     // Function Description:
     // - Called when the NavigationView is loaded. Navigates to the first item in the NavigationView, if no item is selected
     // Arguments:
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.h b/src/cascadia/TerminalSettingsEditor/MainPage.h
index ff61a233b54..e3bdc1d93d1 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.h
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.h
@@ -13,6 +13,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         MainPage() = delete;
         MainPage(const Model::CascadiaSettings& settings);
 
+        void UpdateSettings(Model::CascadiaSettings settings);
+
         void OpenJsonKeyDown(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs const& args);
         void OpenJsonTapped(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::TappedRoutedEventArgs const& args);
         void SettingsNav_Loaded(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
@@ -20,16 +22,16 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void SaveButton_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
         void ResetButton_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
 
-        TYPED_EVENT(OpenJson, winrt::Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Settings::Model::SettingsTarget);
+        TYPED_EVENT(OpenJson, winrt::Windows::Foundation::IInspectable, Model::SettingsTarget);
 
     private:
-        winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings _settingsSource;
-        winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings _settingsClone;
-        winrt::Windows::Foundation::Collections::IMap<winrt::Microsoft::Terminal::Settings::Model::Profile, winrt::Microsoft::UI::Xaml::Controls::NavigationViewItem> _profileToNavItemMap;
+        Model::CascadiaSettings _settingsSource;
+        Model::CascadiaSettings _settingsClone;
+        winrt::Windows::Foundation::Collections::IMap<Model::Profile, winrt::Microsoft::UI::Xaml::Controls::NavigationViewItem> _profileToNavItemMap;
 
         void _InitializeProfilesList();
         void _CreateAndNavigateToNewProfile(const uint32_t index);
-        winrt::Microsoft::UI::Xaml::Controls::NavigationViewItem _CreateProfileNavViewItem(const winrt::Microsoft::Terminal::Settings::Model::Profile& profile);
+        winrt::Microsoft::UI::Xaml::Controls::NavigationViewItem _CreateProfileNavViewItem(const Model::Profile& profile);
 
         void _Navigate(hstring clickedItemTag);
     };
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.idl b/src/cascadia/TerminalSettingsEditor/MainPage.idl
index 28ac5f565bb..d3d74def259 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.idl
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.idl
@@ -7,6 +7,7 @@ namespace Microsoft.Terminal.Settings.Editor
     {
         MainPage(Microsoft.Terminal.Settings.Model.CascadiaSettings settings);
 
+        void UpdateSettings(Microsoft.Terminal.Settings.Model.CascadiaSettings settings);
         event Windows.Foundation.TypedEventHandler<Object, Microsoft.Terminal.Settings.Model.SettingsTarget> OpenJson;
     }
 }

From 23f08e8747a049276b6387cd07ad44e479b507b3 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Mon, 23 Nov 2020 11:03:12 -0800
Subject: [PATCH 3/5] update SUI after settings changes are made

---
 .../TerminalSettingsEditor/MainPage.cpp       | 72 ++++++++++++++++++-
 .../TerminalSettingsEditor/MainPage.h         |  3 +-
 2 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index 1c69caf90dd..c0c3d66d2d2 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -47,10 +47,77 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _InitializeProfilesList();
     }
 
-    void MainPage::UpdateSettings(Model::CascadiaSettings settings)
+    fire_and_forget MainPage::UpdateSettings(Model::CascadiaSettings settings)
     {
         _settingsSource = settings;
         _settingsClone = settings.Copy();
+
+        co_await winrt::resume_foreground(Dispatcher());
+
+        // reconstruct our list of profiles
+        auto menuItems{ SettingsNav().MenuItems() };
+        unsigned int i = 0;
+        while (i < menuItems.Size())
+        {
+            if (const auto navViewItem{ menuItems.GetAt(i).try_as<MUX::Controls::NavigationViewItem>() })
+            {
+                const auto tag{ navViewItem.Tag() };
+                if (tag.try_as<Model::Profile>())
+                {
+                    // remove NavViewItem pointing to a Profile
+                    menuItems.RemoveAt(i);
+                    continue;
+                }
+                else if (const auto stringTag{ tag.try_as<hstring>() })
+                {
+                    if (stringTag == addProfileTag)
+                    {
+                        // remove NavViewItem pointing to "Add Profile"
+                        menuItems.RemoveAt(i);
+                        continue;
+                    }
+                }
+            }
+            ++i;
+        }
+        _InitializeProfilesList();
+
+        _RefreshCurrentPage();
+    }
+
+    void MainPage::_RefreshCurrentPage()
+    {
+        auto navigationMenu{ SettingsNav() };
+        if (const auto selectedItem{ navigationMenu.SelectedItem() })
+        {
+            if (const auto tag{ selectedItem.as<MUX::Controls::NavigationViewItem>().Tag() })
+            {
+                if (const auto profile{ tag.try_as<Model::Profile>() })
+                {
+                    // check if the profile still exists
+                    if (_settingsClone.FindProfile(profile.Guid()))
+                    {
+                        // Navigate to the page with the given profile
+                        contentFrame().Navigate(xaml_typename<Editor::Profiles>(), winrt::make<ProfilePageNavigationState>(profile, _settingsClone.GlobalSettings().ColorSchemes()));
+                        return;
+                    }
+                }
+                else if (const auto stringTag{ tag.try_as<hstring>() })
+                {
+                    // navigate to the page with this tag
+                    _Navigate(*stringTag);
+                    return;
+                }
+            }
+        }
+
+        // could not find the page we were on, fallback to first menu item
+        const auto firstItem{ navigationMenu.MenuItems().GetAt(0) };
+        navigationMenu.SelectedItem(firstItem);
+        if (const auto tag{ navigationMenu.SelectedItem().as<NavigationViewItem>().Tag() })
+        {
+            _Navigate(unbox_value<hstring>(tag));
+        }
     }
 
     // Function Description:
@@ -164,6 +231,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     void MainPage::ResetButton_Click(IInspectable const& /*sender*/, RoutedEventArgs const& /*args*/)
     {
         _settingsClone = _settingsSource.Copy();
+        _RefreshCurrentPage();
     }
 
     void MainPage::_InitializeProfilesList()
@@ -181,7 +249,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         // Top off (the end of the nav view) with the Add Profile item
         MUX::Controls::NavigationViewItem addProfileItem;
         addProfileItem.Content(box_value(RS_(L"Nav_AddNewProfile/Content")));
-        addProfileItem.Tag(box_value(L"AddProfile"));
+        addProfileItem.Tag(box_value(addProfileTag));
         addProfileItem.SelectsOnInvoked(false);
 
         FontIcon icon;
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.h b/src/cascadia/TerminalSettingsEditor/MainPage.h
index e3bdc1d93d1..f3dbacbf3a1 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.h
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.h
@@ -13,7 +13,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         MainPage() = delete;
         MainPage(const Model::CascadiaSettings& settings);
 
-        void UpdateSettings(Model::CascadiaSettings settings);
+        fire_and_forget UpdateSettings(Model::CascadiaSettings settings);
 
         void OpenJsonKeyDown(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs const& args);
         void OpenJsonTapped(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::TappedRoutedEventArgs const& args);
@@ -34,6 +34,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         winrt::Microsoft::UI::Xaml::Controls::NavigationViewItem _CreateProfileNavViewItem(const Model::Profile& profile);
 
         void _Navigate(hstring clickedItemTag);
+        void _RefreshCurrentPage();
     };
 }
 

From 2577bc3577a095c85672390407906e43ded61052 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Tue, 1 Dec 2020 10:01:23 -0800
Subject: [PATCH 4/5] else if

---
 src/cascadia/TerminalApp/TerminalPage.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
index 2958f472af3..2b415c85981 100644
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -2263,8 +2263,7 @@ namespace winrt::TerminalApp::implementation
                 // Force the TerminalTab to re-grab its currently active control's title.
                 terminalTab->UpdateTitle();
             }
-
-            if (auto settingsTab = tab.try_as<TerminalApp::SettingsTab>())
+            else if (auto settingsTab = tab.try_as<TerminalApp::SettingsTab>())
             {
                 settingsTab.UpdateSettings(_settings);
             }

From 95f2b0f6d19785c0f98f2a5a65d2ba60a1d970c8 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Tue, 1 Dec 2020 11:16:25 -0800
Subject: [PATCH 5/5] fix navigation to ProfilePageNavigationState

---
 src/cascadia/TerminalSettingsEditor/MainPage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index a6f9a1b57a5..cab77cd894e 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -97,7 +97,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                     if (_settingsClone.FindProfile(profile.Guid()))
                     {
                         // Navigate to the page with the given profile
-                        contentFrame().Navigate(xaml_typename<Editor::Profiles>(), winrt::make<ProfilePageNavigationState>(profile, _settingsClone.GlobalSettings().ColorSchemes()));
+                        contentFrame().Navigate(xaml_typename<Editor::Profiles>(), winrt::make<ProfilePageNavigationState>(profile, _settingsClone.GlobalSettings().ColorSchemes(), *this));
                         return;
                     }
                 }