fix(naturalCompare): null values are properly sorted

infra-geo-ouverte · Oct 17, 2019 · eaa7565 · eaa7565
1 parent 96afac9
commit eaa7565
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/packages/common/src/lib/entity/shared/view.ts b/packages/common/src/lib/entity/shared/view.ts
@@ -254,7 +254,8 @@ export class EntityView<E extends object, V extends object = E> {
       return ObjectUtils.naturalCompare(
         clause.valueAccessor(v1),
         clause.valueAccessor(v2),
-        clause.direction
+        clause.direction,
+        false
       );
     });
   }

diff --git a/packages/geo/src/lib/filter/shared/filterable-datasource.pipe.ts b/packages/geo/src/lib/filter/shared/filterable-datasource.pipe.ts
@@ -47,7 +47,7 @@ export class FilterableDataSourcePipe implements PipeTransform {
       dataSource.options.ogcFilters.editable
     ) {
       isOgcFilterable = true;
-    } 
+    }
     if (
       dataSource.options.ogcFilters &&
       dataSource.options.ogcFilters.enabled &&

diff --git a/packages/utils/src/lib/object-utils.ts b/packages/utils/src/lib/object-utils.ts
@@ -99,22 +99,22 @@ export class ObjectUtils {
     return obj;
   }
 
-  static naturalCompare(a, b, direction = 'asc', nullFirst = false) {
+  static naturalCompare(a, b, direction = 'asc', nullsFirst?: boolean) {
     if (direction === 'desc') {
       b = [a, (a = b)][0];
     }
 
-    if (a === undefined || a === null || a === '') {
+    // nullsFirst = undefined : end if direction = 'asc', first if direction = 'dess'
+    // nullsFirst = true : always first
+    // nullsFirst = false : always end
+    // *** 'undefined' values are always at the end of array despite the 'nullsFirst' option
+    if (a === null || a === '' || b === null || b === '') {
+      const nullScore =
+        a === b ? 0 : a === null ? 2 : b === null ? -2 : a === '' ? 1 : -1;
       if (direction === 'desc') {
-        return nullFirst ? -1 : 1;
+        return nullsFirst !== false ? nullScore : nullScore * -1;
       }
-      return nullFirst ? 1 : -1;
-    }
-    if (b === undefined || b === null || b === '') {
-      if (direction === 'desc') {
-        return nullFirst ? 1 : -1;
-      }
-      return nullFirst ? -1 : 1;
+      return nullsFirst === true ? nullScore * -1 : nullScore;
     }
 
     const ax = [];