work on copies + fix group sorting

lineupjs · Mar 13, 2019 · 6cc9993 · 6cc9993
1 parent af4ff2a
commit 6cc9993
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/model/internal.ts b/src/model/internal.ts
@@ -93,13 +93,14 @@ export function unifyParents<T extends IOrderedGroup>(groups: T[]) {
       }
       // first time seeing this parent
       if (!currentParent || currentParent.parent !== node.parent || currentParent.name !== node.name) {
-        currentParent = node;
+        currentParent = Object.assign({}, node); // copy
         const firstChild = path[level + 1];
         // reset parent
         if (firstChild) {
-          node.subGroups = [firstChild];
+          currentParent.subGroups = [firstChild];
+          firstChild.parent = currentParent;
         } else {
-          node.subGroups = [];
+          currentParent.subGroups = [];
         }
         continue;
       }

diff --git a/src/provider/ADataProvider.ts b/src/provider/ADataProvider.ts
@@ -350,7 +350,7 @@ abstract class ADataProvider extends AEventDispatcher implements IDataProvider {
     this.fireBusy(true);
     const reason = dirtyReason || [EDirtyReason.UNKNOWN];
     Promise.resolve(this.sort(ranking, reason)).then(({groups, index2pos}) => {
-      unifyParents(groups);
+      groups = unifyParents(groups);
       this.initAggregateState(ranking, groups);
       ranking.setGroups(groups, index2pos, reason);
       this.fireBusy(false);

diff --git a/src/provider/LocalDataProvider.ts b/src/provider/LocalDataProvider.ts
@@ -386,9 +386,9 @@ export default class LocalDataProvider extends ACommonDataProvider {
     if (groupLookup) {
       const groupIndices = groups.map((_, i) => i);
       sortComplex(groupIndices, groupLookup.sortOrders);
-      groups = groupIndices.map((i) => groups[i]);
+      return groupIndices.map((i) => groups[i]);
     }
-    return groups;
+    return groups.sort((a, b) => a.name.localeCompare(b.name));
   }
 
   private index2pos(groups: IOrderedGroup[], maxDataIndex: number) {