From 2b5873f57edbd27545b7b5b50c9d8906b05d833a Mon Sep 17 00:00:00 2001
From: Bartosz Prusinowski <bartosz@interactivethings.com>
Date: Tue, 14 Oct 2025 12:11:42 +0200
Subject: [PATCH] feat: Improve sorting by totalSize

---
 CHANGELOG.md                     |  1 +
 app/utils/sorting-values.spec.ts | 28 ++++++++++++++++++++++++++++
 app/utils/sorting-values.ts      | 17 ++++++++++++++---
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c807969d4..d5f5883c06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ You can also check the
 - Features
   - Table sorting is not reset anymore on data / filter change
   - Visualize now supports multiple cube contact points
+  - Order of groups when sorting by total segment size is now more intuitive
 - Fixes
   - Hiding a temporal column and then enabling an interactive filter doesn't
     result in broken state anymore
diff --git a/app/utils/sorting-values.spec.ts b/app/utils/sorting-values.spec.ts
index af5a693d77..a1140830eb 100644
--- a/app/utils/sorting-values.spec.ts
+++ b/app/utils/sorting-values.spec.ts
@@ -249,4 +249,32 @@ describe("makeDimensionValueSorters", () => {
       "2020-01-01",
     ]);
   });
+
+  it("should correctly sort byTotalSize (reversed order)", () => {
+    const totalSizeDimension = {
+      values: [
+        { value: "A", label: "A" },
+        { value: "B", label: "B" },
+        { value: "C", label: "C" },
+        { value: "D", label: "D" },
+      ],
+    } as unknown as Dimension;
+    const values = totalSizeDimension.values.map((d) => d.value);
+    const sorting: NonNullable<SortingField["sorting"]> = {
+      sortingType: "byTotalSize",
+      sortingOrder: "asc",
+    };
+    const sorters = makeDimensionValueSorters(totalSizeDimension, {
+      sorting,
+      sumsBySegment: { A: 1, B: 2, C: 3, D: 4 },
+    });
+    const sortingOrders = getSortingOrders(sorters, sorting);
+    // Should be reversed
+    expect(orderBy(values, sorters, sortingOrders)).toEqual([
+      "D",
+      "C",
+      "B",
+      "A",
+    ]);
+  });
 });
diff --git a/app/utils/sorting-values.ts b/app/utils/sorting-values.ts
index f0d6d352c8..c4299bb817 100644
--- a/app/utils/sorting-values.ts
+++ b/app/utils/sorting-values.ts
@@ -175,7 +175,18 @@ export const getSortingOrders = (
   sorters: ((...args: any[]) => any)[],
   sorting: SortingField["sorting"]
 ) => {
-  return Array(sorters.length).fill(
-    sorting?.sortingOrder === "desc" ? "desc" : "asc"
-  );
+  const order = sorting?.sortingOrder;
+  const type = sorting?.sortingType;
+  const result = Array(sorters.length);
+
+  switch (order) {
+    case "desc":
+      return result.fill(type === "byTotalSize" ? "asc" : "desc");
+    case "asc":
+    case undefined:
+      return result.fill(type === "byTotalSize" ? "desc" : "asc");
+    default:
+      const _exhaustiveCheck: never = order;
+      return _exhaustiveCheck;
+  }
 };