correct default sort direction - fixes #139

dj-fiorex · Oct 23, 2023 · d1cce09 · d1cce09
1 parent c43a639
commit d1cce09
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ This document lists the changes introduced by this fork.
 ## Version 3.1.0
 
 * The `strict` setting for `list` default filters is no longer overriding a custom provided filter function
+* Fix that the default sort direction for all columns is `asc` instead of "no sort"
 
 ## Version 3.0.0
 

diff --git a/projects/angular2-smart-table/CHANGELOG.md b/projects/angular2-smart-table/CHANGELOG.md
@@ -5,6 +5,7 @@ This document lists the changes introduced by this fork.
 ## Version 3.1.0
 
 * The `strict` setting for `list` default filters is no longer overriding a custom provided filter function
+* Fix that the default sort direction for all columns is `asc` instead of "no sort"
 
 ## Version 3.0.0
 

diff --git a/projects/angular2-smart-table/src/lib/lib/data-set/column.ts b/projects/angular2-smart-table/src/lib/lib/data-set/column.ts
@@ -37,7 +37,6 @@ export class Column {
   isEditable: boolean;
   isAddable: boolean;
   isFilterable?: boolean = false;
-  sortDirection: ISortDirection;
   defaultSortDirection: ISortDirection;
   editor: EditorSettings;
   filter: FilterSettings;
@@ -66,8 +65,7 @@ export class Column {
     this.isEditable = this.settings.isEditable ?? true;
     this.isAddable = this.settings.isAddable ?? true;
 
-    this.defaultSortDirection = this.settings.sortDirection ?? 'asc';
-    this.sortDirection = this.defaultSortDirection;
+    this.defaultSortDirection = this.settings.sortDirection ?? null;
 
     this.compareFunction = this.settings.compareFunction;
     this.valuePrepareFunction = this.settings.valuePrepareFunction;

diff --git a/projects/angular2-smart-table/src/lib/lib/grid.ts b/projects/angular2-smart-table/src/lib/lib/grid.ts
@@ -280,7 +280,7 @@ export class Grid {
 
   getInitialSort(): ISortConfig | null {
     for (const column of this.getColumns()) {
-      if (column.isSortable && column.defaultSortDirection) {
+      if (column.isSortable && column.defaultSortDirection !== null) {
         return {
           field: column.id,
           direction: column.defaultSortDirection,