From af23c0df395d4c37d01402bbc505c9e750af0e82 Mon Sep 17 00:00:00 2001
From: Thomas Heartman <thomas@getunleash.io>
Date: Thu, 23 Nov 2023 14:16:39 +0100
Subject: [PATCH] feat: cleanup

---
 .../sort-strategies.ts                        | 29 ++++---------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/frontend/src/component/segments/SegmentDelete/SegmentDeleteUsedSegment/sort-strategies.ts b/frontend/src/component/segments/SegmentDelete/SegmentDeleteUsedSegment/sort-strategies.ts
index 1eb6d387b9..9fbc5de0e9 100644
--- a/frontend/src/component/segments/SegmentDelete/SegmentDeleteUsedSegment/sort-strategies.ts
+++ b/frontend/src/component/segments/SegmentDelete/SegmentDeleteUsedSegment/sort-strategies.ts
@@ -13,7 +13,7 @@ export const sortStrategiesByFeature = <
     strategies: ExistingStrategy[],
     changeRequestStrategies: (UpdatedStrategy | NewStrategy)[],
 ): (ExistingStrategy | UpdatedStrategy | NewStrategy)[] => {
-    const collected = [...strategies, ...changeRequestStrategies].reduce(
+    const strategiesByFlag = [...strategies, ...changeRequestStrategies].reduce(
         (acc, strategy) => {
             if (!strategy.featureName) {
                 // this shouldn't ever happen here, but because the
@@ -39,19 +39,17 @@ export const sortStrategiesByFeature = <
         },
     );
 
-    const flags: [
-        string,
-        (ExistingStrategy | UpdatedStrategy | NewStrategy)[],
-    ][] = Object.entries(collected);
+    const flagToStrategiesList = Object.entries(strategiesByFlag);
 
-    flags.sort(([flagA], [flagB]) => {
+    flagToStrategiesList.sort(([flagA], [flagB]) => {
         return flagA.localeCompare(flagB);
     });
 
-    return flags.flatMap(([_, strategies]) => {
+    return flagToStrategiesList.flatMap(([_, strategies]) => {
         const isExistingStrategy = (
             strategy: ExistingStrategy | UpdatedStrategy | NewStrategy,
         ): strategy is ExistingStrategy | UpdatedStrategy => 'id' in strategy;
+
         const isChangeRequest = (
             strategy: ExistingStrategy | UpdatedStrategy | NewStrategy,
         ): strategy is UpdatedStrategy | NewStrategy =>
@@ -92,20 +90,3 @@ export const sortStrategiesByFeature = <
         return strategies;
     });
 };
-
-export const sortAndFlattenStrategies = <
-    T extends { id: string; featureName?: string },
-    U extends {
-        id?: string;
-        featureName: string;
-        changeRequest: { id: number };
-    },
->(
-    strategies: T[],
-    changeRequestStrategies: U[],
-): (T | U)[] => {
-    const sorted = sortStrategiesByFeature(strategies, changeRequestStrategies);
-
-    // flatten list of
-    return Object.values(sorted).flat();
-};