fix: remove unnecessary & unused functions

flanksource · Sep 20, 2021 · facd0fb · facd0fb
1 parent 291fae3
commit facd0fb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 49 deletions.
diff --git a/src/components/Canary/aggregate.js b/src/components/Canary/aggregate.js
@@ -132,14 +132,12 @@ export function aggregate(title, items) {
   };
 }
 
-export const getAggregatedGroupedChecks = (groupedChecks) => {
-  const groupKeys = Object.keys(groupedChecks);
-  const aggregated = groupKeys.map((key) => {
-    const aggr = aggregate(key, groupedChecks[key]);
-    aggr.groupKey = key;
-    aggr.subRows = groupedChecks[key];
-    return aggr;
-  });
-
-  return aggregated;
-};
+export const getAggregatedGroupedChecks = (groupedChecks) =>
+  Object.entries(groupedChecks).reduce((acc, [k, v]) => {
+    acc[k] = {
+      ...aggregate(k, v),
+      subRows: v,
+      name: k
+    };
+    return acc;
+  }, {});
diff --git a/src/components/Canary/sorting.js b/src/components/Canary/sorting.js
@@ -1,5 +1,3 @@
-import { getAggregatedGroupedChecks } from "./aggregate";
-
 export const sortValues = ["none", "asc", "desc"];
 
 export const getHealthPercentageScore = (check) => {
@@ -31,39 +29,3 @@ export const getLatency = (check) => {
   }
   return Number.POSITIVE_INFINITY;
 };
-
-// sorting functions for each of the columns
-export const sortingFunctions = {
-  check: (a, b) =>
-    a.description === b.description
-      ? 0
-      : a.description > b.description
-      ? 1
-      : -1,
-  health: (a, b) => getHealthPercentageScore(b) - getHealthPercentageScore(a),
-  uptime: (a, b) => getUptimeScore(b) - getUptimeScore(a),
-  latency: (a, b) => getLatency(a) - getLatency(b)
-};
-
-// sort checks based on a column's sorting function
-export const sortChecks = (checks, sortFunc, sortDirection) => {
-  let newChecks = [...checks];
-  newChecks = newChecks.sort(sortingFunctions[sortFunc]);
-  if (sortDirection === "desc") {
-    newChecks = newChecks.reverse();
-  }
-  return newChecks;
-};
-
-// sorts aggregated groupedChecks based on a sorting function
-// returns a sorted string array (of group key names).
-export const sortGroupedChecks = (groupedChecks, sortFunc, sortDirection) => {
-  let aggregated = getAggregatedGroupedChecks(groupedChecks);
-  // perform sorting based on aggregated values
-  aggregated = aggregated.sort(sortingFunctions[sortFunc]);
-  let sortedKeys = aggregated.map((group) => group.groupKey);
-  if (sortDirection === "desc") {
-    sortedKeys = sortedKeys.reverse();
-  }
-  return sortedKeys;
-};