Fixing filter ordering (#2403)

microsoft · Oct 10, 2024 · 74624aa · 74624aa
1 parent 02b08d3
commit 74624aa
Show file tree

Hide file tree

Showing 2 changed files with 108 additions and 108 deletions.
diff --git a/src/Microsoft.SqlTools.SqlCore/ObjectExplorer/SmoModel/SmoTreeNodes.cs b/src/Microsoft.SqlTools.SqlCore/ObjectExplorer/SmoModel/SmoTreeNodes.cs
@@ -807,6 +807,13 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Description = SR.FilterSchemaDescription,
  },
  new NodeFilterProperty
+ {
+ Name = "CreateDate",
+ DisplayName = SR.FilterCreateDate,
+ Type = NodeFilterPropertyDataType.Date,
+ Description = SR.FilterCreateDateDescription,
+ },
+ new NodeFilterProperty
  {
  Name = "Owner",
  DisplayName = SR.FilterOwner,
@@ -837,13 +844,6 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Type = NodeFilterPropertyDataType.Boolean,
  Description = SR.FilterIsMemoryOptimizedDescription,
  },
- new NodeFilterProperty
- {
- Name = "CreateDate",
- DisplayName = SR.FilterCreateDate,
- Type = NodeFilterPropertyDataType.Date,
- Description = SR.FilterCreateDateDescription,
- },
  }
  });
  }
@@ -871,19 +871,19 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Description = SR.FilterSchemaDescription,
  },
  new NodeFilterProperty
- {
- Name = "Owner",
- DisplayName = SR.FilterOwner,
- Type = NodeFilterPropertyDataType.String,
- Description = SR.FilterOwnerDescription,
- },
- new NodeFilterProperty
  {
  Name = "CreateDate",
  DisplayName = SR.FilterCreateDate,
  Type = NodeFilterPropertyDataType.Date,
  Description = SR.FilterCreateDateDescription,
  },
+ new NodeFilterProperty
+ {
+ Name = "Owner",
+ DisplayName = SR.FilterOwner,
+ Type = NodeFilterPropertyDataType.String,
+ Description = SR.FilterOwnerDescription,
+ },
  }
  });
  }
@@ -1081,6 +1081,13 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Description = SR.FilterSchemaDescription,
  },
  new NodeFilterProperty
+ {
+ Name = "CreateDate",
+ DisplayName = SR.FilterCreateDate,
+ Type = NodeFilterPropertyDataType.Date,
+ Description = SR.FilterCreateDateDescription,
+ },
+ new NodeFilterProperty
  {
  Name = "Owner",
  DisplayName = SR.FilterOwner,
@@ -1111,13 +1118,6 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Type = NodeFilterPropertyDataType.Boolean,
  Description = SR.FilterIsMemoryOptimizedDescription,
  },
- new NodeFilterProperty
- {
- Name = "CreateDate",
- DisplayName = SR.FilterCreateDate,
- Type = NodeFilterPropertyDataType.Date,
- Description = SR.FilterCreateDateDescription,
- },
  }
  });
  currentChildren.Add(new FolderNode {
@@ -1142,19 +1142,19 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Description = SR.FilterSchemaDescription,
  },
  new NodeFilterProperty
- {
- Name = "Owner",
- DisplayName = SR.FilterOwner,
- Type = NodeFilterPropertyDataType.String,
- Description = SR.FilterOwnerDescription,
- },
- new NodeFilterProperty
  {
  Name = "CreateDate",
  DisplayName = SR.FilterCreateDate,
  Type = NodeFilterPropertyDataType.Date,
  Description = SR.FilterCreateDateDescription,
  },
+ new NodeFilterProperty
+ {
+ Name = "Owner",
+ DisplayName = SR.FilterOwner,
+ Type = NodeFilterPropertyDataType.String,
+ Description = SR.FilterOwnerDescription,
+ },
  }
  });
  currentChildren.Add(new FolderNode {
@@ -1310,6 +1310,13 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Description = SR.FilterSchemaDescription,
  },
  new NodeFilterProperty
+ {
+ Name = "CreateDate",
+ DisplayName = SR.FilterCreateDate,
+ Type = NodeFilterPropertyDataType.Date,
+ Description = SR.FilterCreateDateDescription,
+ },
+ new NodeFilterProperty
  {
  Name = "Owner",
  DisplayName = SR.FilterOwner,
@@ -1340,13 +1347,6 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Type = NodeFilterPropertyDataType.Boolean,
  Description = SR.FilterIsMemoryOptimizedDescription,
  },
- new NodeFilterProperty
- {
- Name = "CreateDate",
- DisplayName = SR.FilterCreateDate,
- Type = NodeFilterPropertyDataType.Date,
- Description = SR.FilterCreateDateDescription,
- },
  }
  });
  currentChildren.Add(new FolderNode {
@@ -1372,6 +1372,13 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Description = SR.FilterSchemaDescription,
  },
  new NodeFilterProperty
+ {
+ Name = "CreateDate",
+ DisplayName = SR.FilterCreateDate,
+ Type = NodeFilterPropertyDataType.Date,
+ Description = SR.FilterCreateDateDescription,
+ },
+ new NodeFilterProperty
  {
  Name = "Owner",
  DisplayName = SR.FilterOwner,
@@ -1402,13 +1409,6 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Type = NodeFilterPropertyDataType.Boolean,
  Description = SR.FilterIsMemoryOptimizedDescription,
  },
- new NodeFilterProperty
- {
- Name = "CreateDate",
- DisplayName = SR.FilterCreateDate,
- Type = NodeFilterPropertyDataType.Date,
- Description = SR.FilterCreateDateDescription,
- },
  }
  });
  }
@@ -1504,19 +1504,19 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Description = SR.FilterSchemaDescription,
  },
  new NodeFilterProperty
- {
- Name = "Owner",
- DisplayName = SR.FilterOwner,
- Type = NodeFilterPropertyDataType.String,
- Description = SR.FilterOwnerDescription,
- },
- new NodeFilterProperty
  {
  Name = "CreateDate",
  DisplayName = SR.FilterCreateDate,
  Type = NodeFilterPropertyDataType.Date,
  Description = SR.FilterCreateDateDescription,
  },
+ new NodeFilterProperty
+ {
+ Name = "Owner",
+ DisplayName = SR.FilterOwner,
+ Type = NodeFilterPropertyDataType.String,
+ Description = SR.FilterOwnerDescription,
+ },
  }
  });
  }
@@ -1593,6 +1593,13 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Description = SR.FilterSchemaDescription,
  },
  new NodeFilterProperty
+ {
+ Name = "CreateDate",
+ DisplayName = SR.FilterCreateDate,
+ Type = NodeFilterPropertyDataType.Date,
+ Description = SR.FilterCreateDateDescription,
+ },
+ new NodeFilterProperty
  {
  Name = "Owner",
  DisplayName = SR.FilterOwner,
@@ -1606,13 +1613,6 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Type = NodeFilterPropertyDataType.Boolean,
  Description = SR.FilterIsNativelyCompiledDescription,
  },
- new NodeFilterProperty
- {
- Name = "CreateDate",
- DisplayName = SR.FilterCreateDate,
- Type = NodeFilterPropertyDataType.Date,
- Description = SR.FilterCreateDateDescription,
- },
  }
  });
  }
@@ -1675,19 +1675,19 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Description = SR.FilterSchemaDescription,
  },
  new NodeFilterProperty
- {
- Name = "Owner",
- DisplayName = SR.FilterOwner,
- Type = NodeFilterPropertyDataType.String,
- Description = SR.FilterOwnerDescription,
- },
- new NodeFilterProperty
  {
  Name = "CreateDate",
  DisplayName = SR.FilterCreateDate,
  Type = NodeFilterPropertyDataType.Date,
  Description = SR.FilterCreateDateDescription,
  },
+ new NodeFilterProperty
+ {
+ Name = "Owner",
+ DisplayName = SR.FilterOwner,
+ Type = NodeFilterPropertyDataType.String,
+ Description = SR.FilterOwnerDescription,
+ },
  }
  });
  }
@@ -1732,6 +1732,13 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Description = SR.FilterSchemaDescription,
  },
  new NodeFilterProperty
+ {
+ Name = "CreateDate",
+ DisplayName = SR.FilterCreateDate,
+ Type = NodeFilterPropertyDataType.Date,
+ Description = SR.FilterCreateDateDescription,
+ },
+ new NodeFilterProperty
  {
  Name = "Owner",
  DisplayName = SR.FilterOwner,
@@ -1745,13 +1752,6 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Type = NodeFilterPropertyDataType.Boolean,
  Description = SR.FilterIsNativelyCompiledDescription,
  },
- new NodeFilterProperty
- {
- Name = "CreateDate",
- DisplayName = SR.FilterCreateDate,
- Type = NodeFilterPropertyDataType.Date,
- Description = SR.FilterCreateDateDescription,
- },
  }
  });
  currentChildren.Add(new FolderNode {
@@ -1791,19 +1791,19 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Description = SR.FilterSchemaDescription,
  },
  new NodeFilterProperty
- {
- Name = "Owner",
- DisplayName = SR.FilterOwner,
- Type = NodeFilterPropertyDataType.String,
- Description = SR.FilterOwnerDescription,
- },
- new NodeFilterProperty
  {
  Name = "CreateDate",
  DisplayName = SR.FilterCreateDate,
  Type = NodeFilterPropertyDataType.Date,
  Description = SR.FilterCreateDateDescription,
  },
+ new NodeFilterProperty
+ {
+ Name = "Owner",
+ DisplayName = SR.FilterOwner,
+ Type = NodeFilterPropertyDataType.String,
+ Description = SR.FilterOwnerDescription,
+ },
  }
  });
  }
@@ -2915,6 +2915,13 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Description = SR.FilterSchemaDescription,
  },
  new NodeFilterProperty
+ {
+ Name = "CreateDate",
+ DisplayName = SR.FilterCreateDate,
+ Type = NodeFilterPropertyDataType.Date,
+ Description = SR.FilterCreateDateDescription,
+ },
+ new NodeFilterProperty
  {
  Name = "Owner",
  DisplayName = SR.FilterOwner,
@@ -2928,13 +2935,6 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Type = NodeFilterPropertyDataType.Boolean,
  Description = SR.FilterIsNativelyCompiledDescription,
  },
- new NodeFilterProperty
- {
- Name = "CreateDate",
- DisplayName = SR.FilterCreateDate,
- Type = NodeFilterPropertyDataType.Date,
- Description = SR.FilterCreateDateDescription,
- },
  }
  });
  currentChildren.Add(new FolderNode {
@@ -2959,6 +2959,13 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Description = SR.FilterSchemaDescription,
  },
  new NodeFilterProperty
+ {
+ Name = "CreateDate",
+ DisplayName = SR.FilterCreateDate,
+ Type = NodeFilterPropertyDataType.Date,
+ Description = SR.FilterCreateDateDescription,
+ },
+ new NodeFilterProperty
  {
  Name = "Owner",
  DisplayName = SR.FilterOwner,
@@ -2972,13 +2979,6 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Type = NodeFilterPropertyDataType.Boolean,
  Description = SR.FilterIsNativelyCompiledDescription,
  },
- new NodeFilterProperty
- {
- Name = "CreateDate",
- DisplayName = SR.FilterCreateDate,
- Type = NodeFilterPropertyDataType.Date,
- Description = SR.FilterCreateDateDescription,
- },
  }
  });
  currentChildren.Add(new FolderNode {
@@ -3004,19 +3004,19 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
  Description = SR.FilterSchemaDescription,
  },
  new NodeFilterProperty
- {
- Name = "Owner",
- DisplayName = SR.FilterOwner,
- Type = NodeFilterPropertyDataType.String,
- Description = SR.FilterOwnerDescription,
- },
- new NodeFilterProperty
  {
  Name = "CreateDate",
  DisplayName = SR.FilterCreateDate,
  Type = NodeFilterPropertyDataType.Date,
  Description = SR.FilterCreateDateDescription,
  },
+ new NodeFilterProperty
+ {
+ Name = "Owner",
+ DisplayName = SR.FilterOwner,
+ Type = NodeFilterPropertyDataType.String,
+ Description = SR.FilterOwnerDescription,
+ },
  }
  });
  }