datasets: error handling - missing sorting capabilities

riganti · Apr 27, 2024 · 1295be1 · 1295be1
1 parent ad878e7
commit 1295be1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/src/Framework/Core/Controls/Options/MultiCriteriaSortingOptions.cs b/src/Framework/Core/Controls/Options/MultiCriteriaSortingOptions.cs
@@ -24,6 +24,9 @@ public virtual IQueryable<T> ApplyToQueryable<T>(IQueryable<T> queryable)
 
     public virtual void SetSortExpression(string? sortExpression)
     {
+        if (sortExpression is {} && !IsSortingAllowed(sortExpression))
+            throw new ArgumentException($"Sorting by column '{sortExpression}' is not allowed.");
+
         if (sortExpression == null)
         {
             Criteria.Clear();

diff --git a/src/Framework/Core/Controls/Options/SortingOptions.cs b/src/Framework/Core/Controls/Options/SortingOptions.cs
@@ -32,6 +32,9 @@ public class SortingOptions : ISortingOptions, ISortingStateCapability, ISorting
         /// </summary>
         public virtual void SetSortExpression(string? sortExpression)
         {
+            if (sortExpression is {} && !IsSortingAllowed(sortExpression))
+                throw new ArgumentException($"Sorting by column '{sortExpression}' is not allowed.");
+
             if (sortExpression == null)
             {
                 SortExpression = null;

diff --git a/src/Framework/Framework/Controls/GridView.cs b/src/Framework/Framework/Controls/GridView.cs
@@ -258,7 +258,7 @@ protected virtual void CreateHeaderRow(IDotvvmRequestContext context)
                 SetCellAttributes(column, cell, true);
                 var decoratedCell = Decorator.ApplyDecorators(cell, column.HeaderCellDecorators);
                 headerRow.Children.Add(decoratedCell);
-                
+
                 column.CreateHeaderControls(context, this, gridViewCommands, sortCommandBindingOverride, cell, gridViewDataSet);
                 if (FilterPlacement == GridViewFilterPlacement.HeaderRow)
                 {

diff --git a/src/Framework/Framework/Controls/GridViewColumn.cs b/src/Framework/Framework/Controls/GridViewColumn.cs
@@ -207,6 +207,12 @@ public virtual void CreateHeaderControls(IDotvvmRequestContext context, GridView
 
                 var sortExpression = GetSortExpression();
 
+                if (string.IsNullOrEmpty(sortExpression))
+                    throw new DotvvmControlException(this, "The SortExpression property must be set when AllowSorting is true!");
+
+                if ((gridViewDataSet?.SortingOptions as ISortingSetSortExpressionCapability)?.IsSortingAllowed(sortExpression) == false)
+                    throw new DotvvmControlException(this, $"The sort expression '{sortExpression}' is not allowed in the sorting options!");
+
                 var linkButton = new LinkButton();
                 linkButton.SetValue(ButtonBase.TextProperty, GetValueRaw(HeaderTextProperty));
                 linkButton.ClickArguments = new object?[] { sortExpression };
@@ -236,10 +242,9 @@ public virtual void CreateFilterControls(IDotvvmRequestContext context, GridView
 
         private void SetSortedCssClass(HtmlGenericControl cell, ISortableGridViewDataSet? gridViewDataSet, GridViewCommands gridViewCommands)
         {
-            if (gridViewDataSet is ISortableGridViewDataSet<ISortingStateCapability> sortableGridViewDataSet)
+            if (gridViewDataSet is ISortableGridViewDataSet<ISortingStateCapability> sortableGridViewDataSet &&
+                GetSortExpression() is {} sortExpression)
             {
-                var sortExpression = GetSortExpression();
-
                 var cellAttributes = cell.Attributes;
                 if (!RenderOnServer)
                 {