Smorin4/edit multiple

code/SharedFunctionality.Core/Gen/GenComposer.cs

@@ -22,7 +22,6 @@ public static IEnumerable<GenInfo> Compose(UserSelection userSelection, bool add
             {
                 return genQueue;
             }
-
             AddProject(userSelection, genQueue);
             AddTemplates(userSelection.Pages, genQueue, userSelection, newItemGeneration: false);
             AddTemplates(userSelection.Features, genQueue, userSelection, newItemGeneration: false);
@@ -53,7 +52,6 @@ public static IEnumerable<GenInfo> Compose(UserSelection userSelection, bool add
             }
 
             genQueue = AddInCompositionTemplates(genQueue, userSelection, false);
-
             return genQueue;
         }
 

code/SharedFunctionality.UI/Launcher/WizardLauncher.cs

@@ -17,6 +17,7 @@
 using Microsoft.Templates.UI.ViewModels.NewItem;
 using Microsoft.Templates.UI.Views;
 using Microsoft.Templates.UI.Views.Common;
+using Microsoft.Templates.UI.Views.NewItem;
 using Microsoft.Templates.UI.VisualStudio.GenShell;
 using Microsoft.VisualStudio.TemplateWizard;
 
@@ -83,6 +84,8 @@ private UserSelection StartWizard(IWizardShell wizardShell, WizardTypeEnum wizar
         private static UserSelection LaunchWizardShell(IWizardShell wizardShell)
         {
             GenContext.ToolBox.Shell.UI.ShowModal(wizardShell as IWindow);
+            //UserSelectionItem newBlank = new UserSelectionItem() { Name = "NewMain", TemplateId = "ts.WinUI.Page.Blank" };
+            //wizardShell.Result.Pages.Add(newBlank);
             return wizardShell.Result;
         }
 

code/SharedFunctionality.UI/Services/ValidationService.cs

@@ -35,6 +35,8 @@ public static string InferTemplateName(string templateName)
 
         public static bool HasAllPagesViewSuffix(bool fromNewTemplate, string newName)
         {
+
+            // in new item instance, throws because names = null after this line (cannot be null)
             var names = _getPageNames?.Invoke();
             if (!names.Any())
             {

code/SharedFunctionality.UI/SharedFunctionality.UI.projitems

@@ -88,6 +88,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Validators\HasPivotValidator.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Validators\IBreakingChangeValidator.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\Common\BaseDialogViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModels\Common\BaseSelectionViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\Common\BaseMainViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\Common\CompositionTool\CompositionFile.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\Common\CompositionTool\CompositionToolViewModel.cs" />
@@ -147,7 +148,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\CodeViewer.xaml.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\CodeViewer.xaml.cs" />
     <Page Include="$(MSBuildThisFileDirectory)Controls\MarkdownBlock.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

code/SharedFunctionality.UI/ViewModels/Common/BaseSelectionViewModel.cs

@@ -0,0 +1,76 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Microsoft.Templates.Core;
+using Microsoft.Templates.Core.Gen;
+using Microsoft.Templates.UI.Mvvm;
+using Microsoft.Templates.UI.ViewModels.NewProject;
+
+namespace Microsoft.Templates.UI.ViewModels.Common
+{
+    public class BaseSelectionViewModel
+    {
+        /*
+        Initialize
+        UpdateHasItemsAddedByUser
+        AllTemplates
+        GetUserSelection
+         */
+
+        public static IEnumerable<string> GetNames(ObservableCollection<UserSelectionGroup> groups)
+        {
+            var names = new List<string>();
+            groups.ToList().ForEach(g => names.AddRange(g.GetNames()));
+            return names;
+        }
+
+        public static IEnumerable<string> GetPageNames(ObservableCollection<UserSelectionGroup> groups) => groups.First(g => g.TemplateType == TemplateType.Page).GetNames(p => p.ItemNameEditable);
+        public static ObservableCollection<SavedTemplateViewModel> GetCollection(TemplateType templateType, ObservableCollection<UserSelectionGroup> groups)
+        {
+            return groups.First(g => g.TemplateType == templateType).Items;
+        }
+        public static bool IsTemplateAdded(TemplateInfoViewModel template, ObservableCollection<UserSelectionGroup> groups) => GetCollection(template.TemplateType, groups).Any(t => t.Equals(template));
+
+        public static UserSelectionGroup GetGroup(TemplateType templateType, ObservableCollection<UserSelectionGroup> groups) => groups.First(t => t.TemplateType == templateType);
+
+        public static void AddToGroup(TemplateType templateType, SavedTemplateViewModel savedTemplate, ObservableCollection<UserSelectionGroup> groups)
+        {
+            bool GenGroupEqual(SavedTemplateViewModel st) => st.GenGroup == savedTemplate.GenGroup;
+            bool GenGroupPrevious(SavedTemplateViewModel st) => st.GenGroup < savedTemplate.GenGroup;
+
+            int index = 0;
+            var group = GetGroup(templateType, groups);
+            if (group.Items.Any(GenGroupEqual))
+            {
+                index = group.Items.IndexOf(group.Items.Last(GenGroupEqual)) + 1;
+            }
+            else if (group.Items.Any())
+            {
+                index = group.Items.IndexOf(group.Items.Last(GenGroupPrevious)) + 1;
+            }
+
+            group.Insert(index, savedTemplate);
+        }
+        public static UserSelection GetUserSelection(ObservableCollection<UserSelectionGroup> groups, UserSelectionContext _context) // creates user selection list
+        {
+            var selection = new UserSelection(_context);
+            var pages = groups.First(g => g.TemplateType == TemplateType.Page).Items;
+            selection.HomeName = pages.FirstOrDefault()?.Name ?? string.Empty;
+            selection.Pages.AddRange(pages.Select(i => i.ToUserSelectionItem()));
+
+            var features = groups.First(g => g.TemplateType == TemplateType.Feature).Items;
+            selection.Features.AddRange(features.Select(i => i.ToUserSelectionItem()));
+
+            var services = groups.First(g => g.TemplateType == TemplateType.Service).Items;
+            selection.Services.AddRange(services.Select(i => i.ToUserSelectionItem()));
+
+            var tests = groups.First(g => g.TemplateType == TemplateType.Testing).Items;
+            selection.Testing.AddRange(tests.Select(i => i.ToUserSelectionItem()));
+            return selection;
+        }
+    }
+}

code/SharedFunctionality.UI/ViewModels/NewItem/MainViewModel.cs

@@ -14,11 +14,14 @@
 using Microsoft.Templates.Core.Gen;
 using Microsoft.Templates.SharedResources;
 using Microsoft.Templates.UI.Controls;
+using Microsoft.Templates.UI.Extensions;
 using Microsoft.Templates.UI.Mvvm;
 using Microsoft.Templates.UI.Services;
 using Microsoft.Templates.UI.Threading;
 using Microsoft.Templates.UI.ViewModels.Common;
+using Microsoft.Templates.UI.ViewModels.NewProject;
 using Microsoft.Templates.UI.Views.NewItem;
+using Microsoft.Templates.UI.Views.NewProject;
 
 namespace Microsoft.Templates.UI.ViewModels.NewItem
 {
@@ -36,6 +39,7 @@ public class MainViewModel : BaseMainViewModel
         public TemplateType TemplateType { get; set; }
 
         public static MainViewModel Instance { get; private set; }
+        public Dictionary<TemplateType, TemplatesStepViewModel> StepsViewModels { get; } = new Dictionary<TemplateType, TemplatesStepViewModel>();
 
         public TemplateSelectionViewModel TemplateSelection { get; } = new TemplateSelectionViewModel();
 
@@ -75,10 +79,10 @@ public override void UnsubscribeEventHandlers()
         }
 
         private static IEnumerable<StepData> NewItemSteps
-        {
+        { 
             get
             {
-                yield return StepData.MainStep(NewItemStepTemplateSelection, "1", Resources.NewItemStepOne, () => new TemplateSelectionPage(), true, true);
+                //yield return StepData.MainStep(NewItemStepTemplateSelection, "1", Resources.NewItemStepOne, () => new TemplateSelectionPage(), true, true);
                 yield return StepData.MainStep(NewItemStepChangesSummary, "2", Resources.NewItemStepTwo, () => new ChangesSummaryPage(_output));
             }
         }
@@ -87,8 +91,40 @@ public void Initialize(TemplateType templateType, UserSelectionContext context)
         {
             TemplateType = templateType;
             WizardStatus.Title = GetNewItemTitle(templateType);
-
+            TemplateSelection.Initialize(context);
             Initialize(context);
+            BuildStepViewModelAsync(templateType);
+        }
+
+        private async Task BuildStepViewModelAsync(TemplateType templateType)
+        {
+            var hasTemplates = DataService.HasTemplatesFromType(templateType, Context);
+            var stepId = templateType.GetNewProjectStepId();
+            var isStepAdded = StepsViewModels.ContainsKey(templateType);
+            if (hasTemplates)
+            {
+                if (!isStepAdded)
+                {
+                    var stepTitle = templateType.GetNewProjectStepTitle();
+                    var pageTitle = templateType.GetStepPageTitle();
+                    var step = new TemplatesStepViewModel(templateType, Context, pageTitle);
+                    step.LoadData();
+                    StepsViewModels.Add(templateType, step);
+                    WizardNavigation.Current.AddNewStep(stepId, stepTitle, () => new TemplatesStepPage(templateType));
+                }
+                else
+                {
+                    var step = StepsViewModels[templateType];
+                    step.ResetData();
+                }
+            }
+
+            // if we want multiple selection pages in the edit menu
+            /*else if (!hasTemplates && isStepAdded)
+            {
+                StepsViewModels.Remove(templateType);
+                await WizardNavigation.Current.RemoveStepAsync(stepId);
+            }*/
         }
 
         private string GetNewItemTitle(TemplateType templateType)
@@ -160,36 +196,13 @@ private string GetNewItemHasNoChangesMessage(TemplateType templateType)
         private async Task<NewItemGenerationResult> CleanupAndGenerateNewItemAsync()
         {
             NewItemGenController.Instance.CleanupTempGeneration();
-            var userSelection = CreateUserSelection();
+            var userSelection = TemplateSelection.GetUserSelection();
             await _generationService.GenerateNewItemAsync(TemplateSelection.Template.TemplateType, userSelection);
             return NewItemGenController.Instance.CompareOutputAndProject();
         }
-
-        private UserSelection CreateUserSelection()
-        {
-            var userSelection = new UserSelection(Context) { HomeName = string.Empty };
-            var selectedTemplate = new UserSelectionItem { Name = TemplateSelection.Name, TemplateId = TemplateSelection.Template.TemplateId };
-            userSelection.Add(selectedTemplate, TemplateSelection.Template.TemplateType);
-
-            foreach (var dependencyTemplate in TemplateSelection.Template.Dependencies)
-            {
-                var selectedTemplateDependency = new UserSelectionItem { Name = dependencyTemplate.DefaultName, TemplateId = dependencyTemplate.TemplateId };
-                userSelection.Add(selectedTemplateDependency, dependencyTemplate.TemplateType);
-            }
-
-            return userSelection;
-        }
-
         private void OnFinish(object sender, EventArgs e)
         {
-            var userSelection = new UserSelection(Context);
-            userSelection.Add(
-                new UserSelectionItem()
-                {
-                    Name = TemplateSelection.Name,
-                    TemplateId = TemplateSelection.Template.TemplateId,
-                }, TemplateType);
-            NewItemWizardShell.Current.Result = userSelection;
+            NewItemWizardShell.Current.Result = TemplateSelection.GetUserSelection();
             NewItemWizardShell.Current.Result.ItemGenerationType = ChangesSummary.DoNotMerge ? ItemGenerationType.Generate : ItemGenerationType.GenerateAndMerge;
         }
 
@@ -198,9 +211,26 @@ public IEnumerable<string> GetNames()
             return TemplateSelection.Dependencies.Select(i => i.DefaultName);
         }
 
+        public TemplateInfoViewModel GetTemplate(TemplateInfo templateInfo)
+        {
+            StepsViewModels[templateInfo.TemplateType].LoadData();
+            var groups = StepsViewModels[templateInfo.TemplateType].Groups;
+            foreach (var group in groups)
+            {
+                var template = group.GetTemplate(templateInfo);
+                if (template != null)
+                {
+                    return template;
+                }
+            }
+
+            return null;
+        }
+
         public override async Task OnTemplatesAvailableAsync()
         {
-            ValidationService.Initialize(GetNames, null);
+            //ValidationService.Initialize(GetNames, null);
+            ValidationService.Initialize(TemplateSelection.GetNames, TemplateSelection.GetPageNames);
             TemplateSelection.LoadData(TemplateType, Context);
             WizardStatus.IsLoading = false;
 
@@ -257,12 +287,20 @@ public override async Task ProcessItemAsync(object item)
         {
             if (item is TemplateInfoViewModel template)
             {
-                TemplateSelection.SelectTemplate(template);
+                await AddTemplateAsync(template);
             }
 
             await Task.CompletedTask;
         }
 
+        private async Task AddTemplateAsync(TemplateInfoViewModel selectedTemplate)
+        {
+            if (!selectedTemplate.Disabled && selectedTemplate.CanBeAdded)
+            {
+                await TemplateSelection.AddAsync(TemplateOrigin.UserSelection, selectedTemplate);
+            }
+        }
+
         public override bool IsSelectionEnabled(MetadataType metadataType) => true;
     }
 }