Fix icon issues

Author: Yu Leng (from Dev Box)

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Command/ShellCommand.cs

@@ -36,6 +36,9 @@ public ShellCommand(string name, string value, BookmarkType type)
         BookmarkName = name;
         BookmarkType = type;
         BookmarkValue = value;
+        Icon = IconHelper.GetIconByType(type);
+
+        Name = name;
 
         // Icon = new IconInfo(IconFromUrl(Value, type));
     }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/BookmarkTypeHelper.cs

@@ -8,6 +8,7 @@
 using System.Text;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
+using Microsoft.CmdPal.Ext.Bookmarks.Models;
 
 namespace Microsoft.CmdPal.Ext.Bookmarks.Helpers;
 
@@ -20,17 +21,17 @@ public static string GetBookmarkChoices()
             new JsonObject
             {
                 ["title"] = "Web",
-                ["value"] = "Web",
+                ["value"] = BookmarkType.Web.ToString(),
             },
             new JsonObject
             {
                 ["title"] = "File",
-                ["value"] = "File",
+                ["value"] = BookmarkType.File.ToString(),
             },
             new JsonObject
             {
                 ["title"] = "Folder",
-                ["value"] = "Folder",
+                ["value"] = BookmarkType.Folder.ToString(),
             },
         };
 
@@ -39,7 +40,7 @@ public static string GetBookmarkChoices()
             bookmarkChoices.Add(new JsonObject
             {
                 ["title"] = "pwsh",
-                ["value"] = "PWSH",
+                ["value"] = BookmarkType.PWSH.ToString(),
             });
         }
 
@@ -48,7 +49,7 @@ public static string GetBookmarkChoices()
             bookmarkChoices.Add(new JsonObject
             {
                 ["title"] = "Windows PowerShell",
-                ["value"] = "PowerShell",
+                ["value"] = BookmarkType.PowerShell.ToString(),
             });
         }
 
@@ -57,7 +58,7 @@ public static string GetBookmarkChoices()
             bookmarkChoices.Add(new JsonObject
             {
                 ["title"] = "Command Prompt",
-                ["value"] = "Cmd",
+                ["value"] = BookmarkType.Cmd.ToString(),
             });
         }
 
@@ -66,7 +67,7 @@ public static string GetBookmarkChoices()
             bookmarkChoices.Add(new JsonObject
             {
                 ["title"] = "Python",
-                ["value"] = "python",
+                ["value"] = BookmarkType.Python.ToString(),
             });
         }
 
@@ -75,7 +76,7 @@ public static string GetBookmarkChoices()
             bookmarkChoices.Add(new JsonObject
             {
                 ["title"] = "Python3",
-                ["value"] = "python3",
+                ["value"] = BookmarkType.Ptyhon3.ToString(),
             });
         }
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Models/BookmarkType.cs

@@ -6,7 +6,7 @@ namespace Microsoft.CmdPal.Ext.Bookmarks.Models;
 
 public enum BookmarkType
 {
-    Web = 0,
+    Web,
     File,
     Folder,
     PWSH,

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/AddBookmarkForm.cs

@@ -86,7 +86,6 @@ public override CommandResult SubmitForm(string payload)
         // get the name and url out of the values
         var formName = formInput["name"] ?? string.Empty;
         var formBookmark = formInput["bookmark"] ?? string.Empty;
-        var hasPlaceholder = formBookmark.ToString().Contains('{') && formBookmark.ToString().Contains('}');
         var bookmarkTypeString = formInput["bookmarkType"]?.ToString() ?? string.Empty;
 
         // Determine the type of the bookmark