fix: sorting when data is incomplete

Kanaries · Oct 17, 2023 · b2af72d · b2af72d
1 parent 73e796d
commit b2af72d
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 27 deletions.
diff --git a/packages/graphic-walker/src/components/pivotTable/utils.ts b/packages/graphic-walker/src/components/pivotTable/utils.ts
@@ -26,7 +26,7 @@ function insertNode(
         child = {
             key,
             value: key,
-            sort: depth === layerKeys.length - 1 && sort ? nodeData[sort.fid] : key,
+            sort: depth === layerKeys.length - 1 && sort ? nodeData[sort.fid] ?? `_${key}` : key,
             uniqueKey: uniqueKey,
             fieldKey: layerKeys[depth],
             children: [],
@@ -93,7 +93,8 @@ export function buildNestTree(
     sort?: {
         fid: string;
         type: 'ascending' | 'descending';
-    }
+    },
+    dataWithoutSort?: IRow[]
 ): INestNode {
     const tree: INestNode = {
         key: ROOT_KEY,
@@ -109,6 +110,11 @@ export function buildNestTree(
     for (let row of data) {
         insertNode(tree, layerKeys, row, 0, collapsedKeyList, sort);
     }
+    if (dataWithoutSort) {
+        for (let row of dataWithoutSort) {
+            insertNode(tree, layerKeys, row, 0, collapsedKeyList, { fid: '', type: sort?.type ?? 'ascending' });
+        }
+    }
     if (showSummary) {
         insertSummaryNode(tree);
     }

diff --git a/packages/graphic-walker/src/workers/buildPivotTable.ts b/packages/graphic-walker/src/workers/buildPivotTable.ts
@@ -7,7 +7,7 @@ const getFirsts = (item: INestNode): INestNode[] => {
         return [item, ...getFirsts(item.children[0])];
     }
     return [item];
-}
+};
 
 export function buildPivotTable(
     dimsInRow: IViewField[],
@@ -31,39 +31,61 @@ export function buildPivotTable(
             collapsedKeyList,
             showTableSummary
         );
-        let data = allData;
-        if (dimsInColumn.length > 0 ) {
-            const ks = dimsInColumn.map(x => x.fid);
-            const vs = getFirsts(tt.children[0]).map(x => x.value);
-            data = allData.filter(x => ks.every((k, i) => x[k] === vs[i]));
+        if (dimsInColumn.length > 0) {
+            const ks = dimsInColumn.map((x) => x.fid);
+            const vs = getFirsts(tt.children[0]).map((x) => x.value);
+            // move data of First column to first
+            const mentioned: IRow[] = [];
+            const rest: IRow[] = [];
+            allData.forEach((x) => (ks.every((k, i) => x[k] === vs[i]) ? mentioned.push(x) : rest.push(x)));
+            lt = buildNestTree(
+                dimsInRow.map((d) => d.fid),
+                mentioned,
+                collapsedKeyList,
+                showTableSummary,
+                sort,
+                rest
+            );
+        } else {
+            lt = buildNestTree(
+                dimsInRow.map((d) => d.fid),
+                allData,
+                collapsedKeyList,
+                showTableSummary,
+                sort
+            );
         }
-        lt = buildNestTree(
-            dimsInRow.map((d) => d.fid),
-            data,
-            collapsedKeyList,
-            showTableSummary,
-            sort
-        );
     } else {
         lt = buildNestTree(
             dimsInRow.map((d) => d.fid),
             allData,
             collapsedKeyList,
             showTableSummary
         );
-        let data = allData;
-        if (sort && dimsInRow.length > 0 ) {
-            const ks = dimsInRow.map(x => x.fid);
-            const vs = getFirsts(lt.children[0]).map(x => x.value);
-            data = allData.filter(x => ks.every((k, i) => x[k] === vs[i]));
+        if (sort && dimsInRow.length > 0) {
+            const ks = dimsInRow.map((x) => x.fid);
+            const vs = getFirsts(lt.children[0]).map((x) => x.value);
+            // move data of First row to first
+            const mentioned: IRow[] = [];
+            const rest: IRow[] = [];
+            allData.forEach((x) => (ks.every((k, i) => x[k] === vs[i]) ? mentioned.push(x) : rest.push(x)));
+            tt = buildNestTree(
+                dimsInColumn.map((d) => d.fid),
+                mentioned,
+                collapsedKeyList,
+                showTableSummary,
+                sort,
+                rest
+            );
+        } else {
+            tt = buildNestTree(
+                dimsInColumn.map((d) => d.fid),
+                allData,
+                collapsedKeyList,
+                showTableSummary,
+                sort
+            );
         }
-        tt = buildNestTree(
-            dimsInColumn.map((d) => d.fid),
-            data,
-            collapsedKeyList,
-            showTableSummary,
-            sort?.mode === 'column' ? sort : undefined
-        );
     }
 
     const metric = buildMetricTableFromNestTree(lt, tt, [...allData, ...aggData]);