change delete profile architecture to be event based

src/cascadia/TerminalSettingsEditor/MainPage.cpp

@@ -235,19 +235,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void MainPage::_Navigate(const Editor::ProfileViewModel& profile)
     {
-        auto state{ winrt::make_self<ProfilePageNavigationState>(profile, _settingsClone.GlobalSettings().ColorSchemes(), *this) };
+        auto state{ winrt::make<ProfilePageNavigationState>(profile, _settingsClone.GlobalSettings().ColorSchemes(), *this) };
 
-        // You cannot delete the Windows Powershell and CMD profiles
-        const auto myGuid{ profile.Guid() };
-        const winrt::guid pwshGuid{ ::Microsoft::Console::Utils::GuidFromString(L"{61c54bbd-c2c6-5271-96e7-009a87ff44bf}") };
-        const winrt::guid cmdGuid{ ::Microsoft::Console::Utils::GuidFromString(L"{0caa0dad-35be-5f56-a8ff-afceeeaa6101}") };
-        if (myGuid != pwshGuid && myGuid != cmdGuid)
-        {
-            auto pfnDeleteProfile{ std::bind(&MainPage::_DeleteProfile, this, profile) };
-            state->SetDeleteProfileCallback(pfnDeleteProfile);
-        }
+        // Add an event handler for when the user wants to delete a profile.
+        state.DeleteProfile({ this, &MainPage::_DeleteProfile });
 
-        contentFrame().Navigate(xaml_typename<Editor::Profiles>(), *state);
+        contentFrame().Navigate(xaml_typename<Editor::Profiles>(), state);
     }
 
     void MainPage::OpenJsonTapped(IInspectable const& /*sender*/, Windows::UI::Xaml::Input::TappedRoutedEventArgs const& /*args*/)
@@ -334,10 +327,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return profileNavItem;
     }
 
-    void MainPage::_DeleteProfile(Editor::ProfileViewModel& profile)
+    void MainPage::_DeleteProfile(const IInspectable /*sender*/, const Editor::DeleteProfileEventArgs& args)
     {
         // Delete profile from settings model
-        const auto guid{ profile.Guid() };
+        const auto guid{ args.ProfileGuid() };
         auto profileList{ _settingsClone.AllProfiles() };
         for (uint32_t i = 0; i < profileList.Size(); ++i)
         {

src/cascadia/TerminalSettingsEditor/MainPage.h

@@ -36,7 +36,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void _InitializeProfilesList();
         void _CreateAndNavigateToNewProfile(const uint32_t index);
         winrt::Microsoft::UI::Xaml::Controls::NavigationViewItem _CreateProfileNavViewItem(const Editor::ProfileViewModel& profile);
-        void _DeleteProfile(Editor::ProfileViewModel& profile);
+        void _DeleteProfile(const Windows::Foundation::IInspectable sender, const Editor::DeleteProfileEventArgs& args);
 
         void _Navigate(hstring clickedItemTag);
         void _Navigate(const Editor::ProfileViewModel& profile);

src/cascadia/TerminalSettingsEditor/Profiles.cpp

@@ -39,6 +39,37 @@ static const std::set<std::wstring_view> ProfileGeneratorNamespaces{
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
+    bool ProfilePageNavigationState::CanDeleteProfile() const
+    {
+        const auto guid{ Profile().Guid() };
+        const std::wstring_view source{ Profile().Source() };
+        if (IsBaseLayer())
+        {
+            return false;
+        }
+        else if (InBoxProfileGuids.find(guid) != InBoxProfileGuids.end())
+        {
+            // in-box profile
+            return false;
+        }
+        else if (LegacyDynamicProfileGuids.find(guid) != LegacyDynamicProfileGuids.end() ||
+                 ProfileGeneratorNamespaces.find(source) != ProfileGeneratorNamespaces.end())
+        {
+            // dynamic profile
+            return false;
+        }
+        else
+        {
+            return true;
+        }
+    }
+
+    void ProfilePageNavigationState::DeleteProfile()
+    {
+        auto deleteProfileArgs{ winrt::make_self<DeleteProfileEventArgs>(_Profile.Guid()) };
+        _DeleteProfileHandlers(*this, *deleteProfileArgs);
+    }
+
     Profiles::Profiles() :
         _ColorSchemeList{ single_threaded_observable_vector<ColorScheme>() }
     {
@@ -265,4 +296,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     {
         return _State.Profile().CursorShape() == TerminalControl::CursorStyle::Vintage;
     }
+
+    // -------------------------------- WinRT Events ---------------------------------
+    // Winrt events need a method for adding a callback to the event and removing the callback.
+    // These macros will define them both for you.
+    DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(ProfilePageNavigationState, DeleteProfile, _DeleteProfileHandlers, Editor::ProfilePageNavigationState, Editor::DeleteProfileEventArgs);
 }

src/cascadia/TerminalSettingsEditor/Profiles.h

@@ -5,6 +5,7 @@
 
 #include "Profiles.g.h"
 #include "ProfilePageNavigationState.g.h"
+#include "DeleteProfileEventArgs.g.h"
 #include "ProfileViewModel.g.h"
 #include "Utils.h"
 #include "ViewModelHelpers.h"
@@ -60,6 +61,16 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         Model::Profile _profile;
     };
 
+    struct DeleteProfileEventArgs :
+        public DeleteProfileEventArgsT<DeleteProfileEventArgs>
+    {
+    public:
+        DeleteProfileEventArgs(guid profileGuid) :
+            _ProfileGuid(profileGuid) {}
+
+        GETSET_PROPERTY(guid, ProfileGuid);
+    };
+
     struct ProfilePageNavigationState : ProfilePageNavigationStateT<ProfilePageNavigationState>
     {
     public:
@@ -70,23 +81,16 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         {
         }
 
-        bool CanDeleteProfile() { return _pfnDeleteProfile != nullptr; };
-        void SetDeleteProfileCallback(std::function<void(Editor::ProfileViewModel&)> pfn) { _pfnDeleteProfile.swap(pfn); }
-        void DeleteProfile()
-        {
-            if (!_pfnDeleteProfile)
-            {
-                return;
-            }
-            _pfnDeleteProfile(_Profile);
-        }
+        bool CanDeleteProfile() const;
+        void DeleteProfile();
 
         Windows::Foundation::Collections::IMapView<hstring, Model::ColorScheme> Schemes() { return _Schemes; }
         void Schemes(const Windows::Foundation::Collections::IMapView<hstring, Model::ColorScheme>& val) { _Schemes = val; }
 
         GETSET_PROPERTY(IHostedInWindow, WindowRoot, nullptr);
         GETSET_PROPERTY(Editor::ProfileViewModel, Profile, nullptr);
         GETSET_PROPERTY(bool, IsBaseLayer, false);
+        DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(DeleteProfile, _DeleteProfileHandlers, Editor::ProfilePageNavigationState, Editor::DeleteProfileEventArgs);
 
     private:
         Windows::Foundation::Collections::IMapView<hstring, Model::ColorScheme> _Schemes;

src/cascadia/TerminalSettingsEditor/Profiles.idl

@@ -50,6 +50,11 @@ namespace Microsoft.Terminal.Settings.Editor
         OBSERVABLE_PROJECTED_SETTING(Microsoft.Terminal.Settings.Model.BellStyle, BellStyle);
     }
 
+    runtimeclass DeleteProfileEventArgs
+    {
+        Guid ProfileGuid { get; };
+    }
+
     runtimeclass ProfilePageNavigationState
     {
         Windows.Foundation.Collections.IMapView<String, Microsoft.Terminal.Settings.Model.ColorScheme> Schemes;
@@ -59,6 +64,8 @@ namespace Microsoft.Terminal.Settings.Editor
 
         Boolean CanDeleteProfile { get; };
         Boolean IsBaseLayer;
+
+        event Windows.Foundation.TypedEventHandler<ProfilePageNavigationState, DeleteProfileEventArgs> DeleteProfile;
     };
 
     [default_interface] runtimeclass Profiles : Windows.UI.Xaml.Controls.Page, Windows.UI.Xaml.Data.INotifyPropertyChanged