Update source output

Author: dkbennett

src/AppInstallerCLICore/Resources.h

@@ -690,8 +690,10 @@ namespace AppInstaller::CLI::Resource
         WINGET_DEFINE_RESOURCE_STRINGID(SourceEditCommandLongDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(SourceEditCommandShortDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(SourceEditExplicitArgumentDescription);
-        WINGET_DEFINE_RESOURCE_STRINGID(SourceEditOne);
+        WINGET_DEFINE_RESOURCE_STRINGID(SourceEditNewValue);
         WINGET_DEFINE_RESOURCE_STRINGID(SourceEditNoChanges);
+        WINGET_DEFINE_RESOURCE_STRINGID(SourceEditOldValue);
+        WINGET_DEFINE_RESOURCE_STRINGID(SourceEditOne);
         WINGET_DEFINE_RESOURCE_STRINGID(SourceExplicitArgumentDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(SourceExportCommandLongDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(SourceExportCommandShortDescription);

src/AppInstallerCLICore/Workflows/SourceFlow.cpp

@@ -281,13 +281,13 @@ namespace AppInstaller::CLI::Workflow
         {
             // Get the current source with this name.
             Repository::Source targetSource{ sd.Name };
+            auto oldExplicitValue = sd.Explicit;
 
             // Default to the current explicit value unless we are overriding it.
-            auto isExplicit = sd.Explicit;
+            auto isExplicit = oldExplicitValue;
             if (context.Args.Contains(Execution::Args::Type::SourceEditExplicit))
             {
-                auto explicitArg = context.Args.GetArg(Execution::Args::Type::SourceEditExplicit);
-                isExplicit = Utility::ConvertStringToBool(explicitArg);
+                isExplicit = Utility::ConvertStringToBool(context.Args.GetArg(Execution::Args::Type::SourceEditExplicit));
             }
 
             Repository::SourceEdit edits{ std::optional<bool>{ isExplicit } };
@@ -297,9 +297,13 @@ namespace AppInstaller::CLI::Workflow
                 continue;
             }
 
-            context.Reporter.Info() << Resource::String::SourceEditOne(Utility::LocIndView{ sd.Name }, Utility::LocIndView{ Utility::ConvertBoolToString(isExplicit) }) << std::endl;
+            context.Reporter.Info() << Resource::String::SourceEditOne(Utility::LocIndView{ sd.Name }) << std::endl;
             targetSource.Edit(edits);
-            context.Reporter.Info() << Resource::String::Done << std::endl;
+
+            // Output updated source information. Since only Explicit is editable, we will only list that field. The name of the source being edited is listed prior to the edits.
+            Execution::TableOutput<3> table(context.Reporter, { Resource::String::SourceListField, Resource::String::SourceEditOldValue, Resource::String::SourceEditNewValue });
+            table.OutputLine({ Resource::LocString(Resource::String::SourceListExplicit), std::string{ Utility::ConvertBoolToString(oldExplicitValue) }, std::string{ Utility::ConvertBoolToString(isExplicit) } });
+            table.Complete();
         }
     }
 

src/AppInstallerCLIE2ETests/SourceCommand.cs

@@ -289,7 +289,7 @@ public void SourceEdit()
             // Run the edit, this should be S_OK with "Done" as it changed the state to not-explicit.
             var editResult = TestCommon.RunAICLICommand("source edit", $"SourceTest --explicit false");
             Assert.AreEqual(Constants.ErrorCode.S_OK, editResult.ExitCode);
-            Assert.True(editResult.StdOut.Contains("Done"));
+            Assert.True(editResult.StdOut.Contains("Explicit"));
 
             // Run it again, this should result in S_OK with no changes and a message that the source is already in that state.
             var editResult2 = TestCommon.RunAICLICommand("source edit", $"SourceTest --explicit false");
@@ -321,7 +321,7 @@ public void SourceEditOverrideDefault()
 
             var editResult = TestCommon.RunAICLICommand("source edit", "winget-font -e false");
             Assert.AreEqual(Constants.ErrorCode.S_OK, editResult.ExitCode);
-            Assert.True(editResult.StdOut.Contains("Done"));
+            Assert.True(editResult.StdOut.Contains("Explicit"));
 
             // Verify that after edit it is now explicit false.
             var listResult2 = TestCommon.RunAICLICommand("source list", "winget-font");

src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw

@@ -552,10 +552,10 @@ They can be configured through the settings file 'winget settings'.</value>
     <value>Edit properties of a source</value>
   </data>
   <data name="SourceEditOne" xml:space="preserve">
-    <value>Changing source: {0} to Explicit={1}...</value>
-    <comment>{Locked="{0}","{1}"} Message displayed to inform the user about a registered repository source that is currently being edited. {0} is a placeholder replaced by the repository source name. {1} is a placeholder replaced by the changed value.</comment>
+    <value>Editing source: {0}</value>
+    <comment>{Locked="{0}"} Message displayed to inform the user about a registered repository source that is currently being edited. {0} is a placeholder replaced by the repository source name.</comment>
   </data>
-    <data name="SourceEditNoChanges" xml:space="preserve">
+  <data name="SourceEditNoChanges" xml:space="preserve">
     <value>The source named '{0}' is already in the desired state.</value>
     <comment>{Locked="{0}"} Message displayed to inform the user about a registered repository source that is currently being edited. {0} is a placeholder replaced by the repository source name.</comment>
   </data>
@@ -3475,4 +3475,12 @@ An unlocalized JSON fragment will follow on another line.</comment>
   <data name="APPINSTALLER_CLI_ERROR_FONT_ALREADY_INSTALLED" xml:space="preserve">
     <value>Font package is already installed.</value>
   </data>
-</root>
+  <data name="SourceEditOldValue" xml:space="preserve">
+    <value>Old value</value>
+    <comment>Column title for listing edit changes.</comment>
+  </data>
+  <data name="SourceEditNewValue" xml:space="preserve">
+    <value>New value</value>
+    <comment>Column title for listing the new value.</comment>
+  </data>
+</root>