Make ExcludeIndexes work with VS extension

fixes #2640
ErikEJ · Nov 24, 2024 · cb4ea2e · cb4ea2e
1 parent 1dbbde8
commit cb4ea2e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/src/GUI/Shared/Contracts/ViewModels/ITableInformationViewModel.cs b/src/GUI/Shared/Contracts/ViewModels/ITableInformationViewModel.cs
@@ -1,4 +1,5 @@
-using System.Collections.ObjectModel;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using RevEng.Common;
 
 namespace EFCorePowerTools.Contracts.ViewModels
@@ -9,6 +10,8 @@ public interface ITableInformationViewModel : IObjectTreeEditableViewModel, IObj
 
         bool HasPrimaryKey { get; }
 
+        IEnumerable<string> ExcludedIndexes { get; set; }
+
         ObjectType ObjectType { get; set; }
 
         ObjectTypeIcon ObjectTypeIcon { get; }
@@ -19,4 +22,4 @@ public interface ITableInformationViewModel : IObjectTreeEditableViewModel, IObj
 
         string ModelDisplayName { get; set; }
     }
-}
+}
diff --git a/src/GUI/Shared/ViewModels/ObjectTreeViewModel.cs b/src/GUI/Shared/ViewModels/ObjectTreeViewModel.cs
@@ -81,7 +81,7 @@ public IEnumerable<SerializationTableModel> GetSelectedObjects()
         {
             return Objects
                 .Where(c => c.IsSelected.Value)
-                .Select(m => new SerializationTableModel(m.ModelDisplayName, m.ObjectType, m.Columns.Where(c => !c.IsSelected.Value).Select(c => c.Name).ToList(), null));
+                .Select(m => new SerializationTableModel(m.ModelDisplayName, m.ObjectType, m.Columns.Where(c => !c.IsSelected.Value).Select(c => c.Name).ToList(), m.ExcludedIndexes?.ToList() ?? null));
         }
 
         public IEnumerable<Schema> GetRenamedObjects()
@@ -254,6 +254,7 @@ public void SelectObjects(IEnumerable<SerializationTableModel> objects)
             foreach (var obj in Objects)
             {
                 var t = objects.FirstOrDefault(m => m.Name == obj.ModelDisplayName);
+                obj.ExcludedIndexes = t?.ExcludedIndexes ?? null;
                 obj.SetSelectedCommand.Execute(t != null);
                 if (obj.ObjectType.HasColumns() && obj.IsSelected.Value)
                 {

diff --git a/src/GUI/Shared/ViewModels/PickTablesViewModel.cs b/src/GUI/Shared/ViewModels/PickTablesViewModel.cs
@@ -126,9 +126,12 @@ private void Ok_Executed()
         /// At least a single table, function or stored procedure must be selected.
         /// </summary>
         private bool Ok_CanExecute()
-            => ObjectTree.GetSelectedObjects().Any(c => c.ObjectType.HasColumns())
-              || ObjectTree.GetSelectedObjects().Any(c => c.ObjectType == ObjectType.Procedure)
-              || ObjectTree.GetSelectedObjects().Any(c => c.ObjectType == ObjectType.ScalarFunction);
+        {
+            var selectedObjects = ObjectTree.GetSelectedObjects().ToList();
+            return selectedObjects.Exists(c => c.ObjectType.HasColumns())
+                   || selectedObjects.Exists(c => c.ObjectType == ObjectType.Procedure)
+                   || selectedObjects.Exists(c => c.ObjectType == ObjectType.ScalarFunction);
+        }
 
         private void Cancel_Executed()
         {

diff --git a/src/GUI/Shared/ViewModels/TableInformationViewModel.cs b/src/GUI/Shared/ViewModels/TableInformationViewModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
@@ -37,6 +38,8 @@ public TableInformationViewModel(IMessenger messenger)
             Columns.CollectionChanged += Columns_CollectionChanged;
         }
 
+        public IEnumerable<string> ExcludedIndexes { get; set; }
+
         public string Schema
         {
             get => schema;

diff --git a/test/ScaffoldingTester/ScaffoldingTester/efpt.config.json b/test/ScaffoldingTester/ScaffoldingTester/efpt.config.json
@@ -15,6 +15,9 @@
    "T4TemplatePath": null,
    "Tables": [
       {
+         "ExcludedIndexes": [
+            "PK_Categories"
+         ],
          "Name": "[dbo].[Categories]",
          "ObjectType": 0
       },
@@ -164,6 +167,7 @@
    "UseAsyncStoredProcedureCalls": true,
    "UseBoolPropertiesWithoutDefaultSql": true,
    "UseDatabaseNames": false,
+   "UseDatabaseNamesForRoutines": false,
    "UseDateOnlyTimeOnly": false,
    "UseDbContextSplitting": false,
    "UseDecimalDataAnnotationForSprocResult": true,
@@ -178,7 +182,6 @@
    "UseNoObjectFilter": false,
    "UseNodaTime": false,
    "UseNullableReferences": false,
-   "UsePascalNamesForStoredProceduresAndFunctions": false,
    "UsePrefixNavigationNaming": false,
    "UseSchemaFolders": false,
    "UseSchemaNamespaces": false,