Resolved #58 and added support for #65

Author: Danish-Mentorange

Maverick.PCF.Builder.Common/ControlManifestHelper.cs

@@ -62,6 +62,11 @@ public ControlManifestDetails GetControlManifestDetails(string controlFolder)
                                                     ControlDetails.PreviewImagePath = $"{currentDir}\\{sanitizedPreviewImageRelativePath}";
                                                 }
 
+                                                if (xmlReader.GetAttribute("control-type") != null && xmlReader.GetAttribute("control-type") == "virtual")
+                                                {
+                                                    ControlDetails.IsVirtual = true;
+                                                }
+
                                                 break;
                                             case "data-set":
                                                 ControlDetails.IsDatasetTemplate = true;

Maverick.PCF.Builder.DataObjects/ControlManifestDetails.cs

@@ -18,6 +18,7 @@ public ControlManifestDetails()
             PreviewImagePath = null;
             Properties = new List<ControlProperty>();
             Features = new List<Feature>();
+            IsVirtual = false;
         }
 
         public string WorkingFolderPath { get; set; }
@@ -27,6 +28,7 @@ public ControlManifestDetails()
         public string ControlName { get; set; }
         public string ControlDisplayName { get; set; }
         public string ControlDescription { get; set; }
+        public bool IsVirtual { get; set; }
         public List<TypeGroup> TypeGroups { get; set; }
         public string PreviewImagePath { get; set; }
         public string Version { get; set; }

Maverick.PCF.Builder.Helper/Commands.cs

@@ -75,6 +75,18 @@ public static string PcfInit(string controlNamespace, string controlName, string
                 return $"pac pcf init --namespace {controlNamespace} --name {controlName} --template {controlTemplate.ToLower()}";
             }
 
+            /// <summary>
+            /// pac pcf init --namespace controlNamespace --name controlName --template controlTemplate.ToLower() --framework react
+            /// </summary>
+            /// <param name="controlNamespace"></param>
+            /// <param name="controlName"></param>
+            /// <param name="controlTemplate"></param>
+            /// <returns></returns>
+            public static string PcfInitVirtual(string controlNamespace, string controlName, string controlTemplate)
+            {
+                return $"pac pcf init --namespace {controlNamespace} --name {controlName} --template {controlTemplate.ToLower()} --framework react";
+            }
+
             /// <summary>
             /// pac solution init --publisher-name publisherName --publisher-prefix customizationPrefix
             /// </summary>

Maverick.PCF.Builder/PCFBuilder.cs

@@ -320,6 +320,7 @@ private void Routine_NewComponent()
             txtControlName.Clear();
             txtControlDisplayName.Clear();
             txtControlDescription.Clear();
+            cboxControlType.SelectedIndex = -1;
             cboxTemplate.SelectedIndex = -1;
             cboxAdditionalPackages.SelectedIndex = -1;
             txtComponentVersion.Clear();
@@ -335,6 +336,7 @@ private void Routine_NewComponent()
             txtNamespace.Enabled = true;
             txtControlDisplayName.Enabled = true;
             txtControlDescription.Enabled = true;
+            cboxControlType.Enabled = true;
             cboxTemplate.Enabled = true;
             cboxAdditionalPackages.Enabled = true;
             txtSolutionName.Enabled = true;
@@ -368,6 +370,7 @@ private void Routine_EditComponent()
             {
                 txtControlName.Enabled = false;
                 txtNamespace.Enabled = false;
+                cboxControlType.Enabled = false;
                 cboxTemplate.Enabled = false;
                 cboxAdditionalPackages.Enabled = false;
                 btnCreateComponent.Enabled = false;
@@ -522,9 +525,11 @@ private void IdentifyControlDetails()
 
                 ControlDetails = ControlManifest.GetControlManifestDetails(txtWorkingFolder.Text);
 
-                _mainPluginLocalWorker = new BackgroundWorker();
-                _mainPluginLocalWorker.DoWork += IdentifyAdditionalPackage;
-                _mainPluginLocalWorker.RunWorkerAsync();
+                //_mainPluginLocalWorker = new BackgroundWorker();
+                //_mainPluginLocalWorker.DoWork += IdentifyAdditionalPackage;
+                //_mainPluginLocalWorker.RunWorkerAsync();
+
+                IdentifyAdditionalPackage_New();
 
                 if (!string.IsNullOrEmpty(ControlDetails.ControlName))
                 {
@@ -575,6 +580,23 @@ private void IdentifyAdditionalPackage(object worker, DoWorkEventArgs args)
             }
         }
 
+        private void IdentifyAdditionalPackage_New()
+        {
+            // Identify additional package installs - for now only check for Fluent UI
+            var packageName = Enum.AdditionalPackages().FirstOrDefault(p => p.Value == "Fluent UI").Key;
+            string[] addPkgCommands = new string[] { Commands.Npm.CheckAdditionalPackage(packageName) };
+            var addPkgOutput = CommandLineHelper.RunCommand(addPkgCommands);
+
+            // scrub data
+            addPkgOutput = addPkgOutput.Substring(addPkgOutput.IndexOf(addPkgCommands[0]) + addPkgCommands[0].Length);
+
+            if (addPkgOutput.ToLower().Contains(packageName.ToLower()))
+            {
+                cboxAdditionalPackages.SelectedIndex = 1;
+                ControlDetails.AdditionalPackageIndex = 1;
+            }
+        }
+
         private void IdentifySolutionDetails(bool suppressErrors = false)
         {
             DataverseSolutionDetails = new SolutionDetails();
@@ -714,6 +736,7 @@ private void PopulateControlDetails()
             txtControlDescription.Text = ControlDetails.ControlDescription;
             txtComponentVersion.Text = ControlDetails.Version;
 
+            cboxControlType.SelectedIndex = ControlDetails.IsVirtual ? 1 : 0;
             cboxTemplate.SelectedIndex = ControlDetails.IsDatasetTemplate ? 1 : 0;
 
             if (!string.IsNullOrEmpty(ControlDetails.PreviewImagePath))
@@ -1983,14 +2006,24 @@ private void BtnCreateComponent_Click(object sender, EventArgs e)
                 }
 
                 ReloadDetails = true;
-                if (string.IsNullOrEmpty(additionalPackage))
+                if ((string)cboxControlType.SelectedItem == "Virtual")
                 {
-                    RunCommandLine(cdWorkingDir, pacCommand, npmCommand);
+                    string pacCommandVirtual = Commands.Pac.PcfInitVirtual(txtNamespace.Text, txtControlName.Text, cboxTemplate.SelectedItem.ToString());
+                    RunCommandLine(cdWorkingDir, pacCommandVirtual, npmCommand);
+                    
                 }
                 else
                 {
-                    RunCommandLine(cdWorkingDir, pacCommand, npmCommand, additionalPackage);
+                    if (string.IsNullOrEmpty(additionalPackage))
+                    {
+                        RunCommandLine(cdWorkingDir, pacCommand, npmCommand);
+                    }
+                    else
+                    {
+                        RunCommandLine(cdWorkingDir, pacCommand, npmCommand, additionalPackage);
+                    }
                 }
+                
 
                 // Create VS Code Workspace file
 
@@ -2631,6 +2664,15 @@ private void btnManageFeatures_Click(object sender, EventArgs e)
             }
         }
 
+        private void cboxControlType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if ((string)cboxControlType.SelectedItem == "Virtual")
+            {
+                cboxAdditionalPackages.SelectedIndex = 1;
+                cboxAdditionalPackages.Enabled = false;
+            }
+        }
+
         #endregion