Devextreme SortIterVar Override

coronabytes · Sep 14, 2023 · 594a39e · 594a39e
1 parent a08d06b
commit 594a39e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/Core.Arango.DevExtreme/ArangoTransform.cs b/Core.Arango.DevExtreme/ArangoTransform.cs
@@ -481,26 +481,26 @@ private string Sort()
             if (_loadOption.Sort != null)
                 sortingInfos.AddRange(_loadOption.Sort.Where(x => x.Selector != null).ToList());
             else
-                return _settings.StableSort ? $"SORT {_settings.IteratorVar}._key" : string.Empty;
+                return _settings.StableSort ? $"SORT {_settings.SortIteratorVar ?? _settings.IteratorVar}._key" : string.Empty;
 
 
             var sort = "SORT " + string.Join(", ",
                 sortingInfos.Select(x =>
                 {
                     var prop = PropertyName(_settings.ValidPropertyName(x.Selector)
-                        .FirstCharOfPropertiesToUpper());
+                        .FirstCharOfPropertiesToUpper(), _settings.SortIteratorVar);
                     return $"{prop} {(x.Desc ? "DESC" : "ASC")}";
                 }));
 
             if (_settings.StableSort && !sort.Contains("_key"))
-                sort += $", {_settings.IteratorVar}._key";
+                sort += $", {_settings.SortIteratorVar ?? _settings.IteratorVar}._key";
 
             return sort;
         }
 
-        bool IsCriteria(IList item) {
+        /*bool IsCriteria(IList item) {
             return (item[0] is IList);
-        }
+        }*/
 
 
         private string GetMatchingFilter(IList dxFilter, bool not = false)

diff --git a/Core.Arango.DevExtreme/ArangoTransformSettings.cs b/Core.Arango.DevExtreme/ArangoTransformSettings.cs
@@ -34,6 +34,11 @@ public class ArangoTransformSettings
         /// </summary>
         public string IteratorVar { get; set; } = "x";
 
+        /// <summary>
+        ///     SORT {SortIteratorVar}.{...} ASC
+        /// </summary>
+        public string SortIteratorVar { get; set; } = null;
+
         /// <summary>
         ///     Name of primary key in client side model - default: key
         /// </summary>