fix: insertinsortedlist

Author: Gérard Collin

libs/xt-store/projects/store/src/store-provider/xt-store-provider-helper.spec.ts

@@ -1,6 +1,6 @@
 import {XtStoreProviderHelper} from './xt-store-provider-helper';
 import { XtStoreGroupByAggregate, XtStoreGroupBy } from '../xt-reporting';
-import { XtGroupByOperation, XtSortByDirection } from '../xt-store-parameters';
+import { XtGroupByOperation, XtSortBy, XtSortByDirection } from '../xt-store-parameters';
 import { ManagedData, ManagedDataHandler, SpecialFields, xtTypeManager } from 'xt-type';
 import { describe, expect, it } from 'vitest';
 
@@ -311,5 +311,48 @@ describe('Store Provider Helper', () => {
       expect(byNameSort.map((val)=> val.name+val.value)).toEqual(['cTest4','cTest10', 'aTest1']);
 
     })
+
+    it ('should support sorted insertion correctly', () => {
+      const testArray=[{
+        name: 'cTest',
+        value: 4,
+        date: new Date (1970,10,5)
+      },{
+        name:'cTest',
+        value: 10,
+        date: new Date(2010,8,4)
+      },{
+        name:'aTest',
+        value:1,
+        date: new Date(1960, 5,10)
+      },];
+
+      const sortOptions=[{
+        by:'name',
+        direction:XtSortByDirection.Descending
+      }, {
+        by:'value',
+        direction:XtSortByDirection.Ascending
+      }] as XtSortBy<any>[];
+
+      const byNameInsert = XtStoreProviderHelper.insertInSortedList({
+          name:'bTest',
+          value:7,
+          date:new Date()
+        },
+        [...testArray], sortOptions);
+
+      expect(byNameInsert.map((val)=> val.name+val.value)).toEqual(['cTest4','cTest10','bTest7', 'aTest1']);
+
+      const byValueInsert = XtStoreProviderHelper.insertInSortedList({
+          name:'cTest',
+          value:6,
+          date:new Date()
+        },
+        [...testArray], sortOptions);
+
+      expect(byValueInsert.map((val)=> val.name+val.value)).toEqual(['cTest4','cTest6','cTest10', 'aTest1']);
+
+    })
   }
 );

libs/xt-store/projects/store/src/store-provider/xt-store-provider-helper.ts

@@ -147,8 +147,9 @@ export class XtStoreProviderHelper {
     } else {
       const compareFunction=this.compareFunction(sortOptions);
       for (let index=0;index<list.length;index++) {
-        if (list[index]>toInsert) {
-          return list.splice(index, 0, toInsert);
+        if (compareFunction(list[index],toInsert)>0) {
+          list.splice(index, 0, toInsert);
+          return list;
         }
       }
       list.push(toInsert);