[ML] Simplify sorting.

elastic · Sep 7, 2021 · 6076fbf · 6076fbf
1 parent b665413
commit 6076fbf
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 47 deletions.
diff --git a/x-pack/plugins/apm/public/components/app/correlations/failed_transactions_correlations.tsx b/x-pack/plugins/apm/public/components/app/correlations/failed_transactions_correlations.tsx
@@ -322,25 +322,22 @@ export function FailedTransactionsCorrelations({
     setSortDirection(currentSortDirection);
   }, []);
 
-  const { sorting, correlationTerms } = useMemo(() => {
-    const orderedTerms = orderBy(
-      response.failedTransactionsCorrelations,
-      // The smaller the p value the higher the impact
-      // So we want to sort by the normalized score here
-      // which goes from 0 -> 1
-      sortField === 'pValue' ? 'normalizedScore' : sortField,
-      sortDirection
-    );
-    return {
-      correlationTerms: orderedTerms,
-      sorting: {
-        sort: {
-          field: sortField,
-          direction: sortDirection,
-        },
-      } as EuiTableSortingType<FailedTransactionsCorrelation>,
-    };
-  }, [response.failedTransactionsCorrelations, sortField, sortDirection]);
+  const sorting: EuiTableSortingType<FailedTransactionsCorrelation> = {
+    sort: { field: sortField, direction: sortDirection },
+  };
+
+  const correlationTerms = useMemo(
+    () =>
+      orderBy(
+        response.failedTransactionsCorrelations,
+        // The smaller the p value the higher the impact
+        // So we want to sort by the normalized score here
+        // which goes from 0 -> 1
+        sortField === 'pValue' ? 'normalizedScore' : sortField,
+        sortDirection
+      ),
+    [response.failedTransactionsCorrelations, sortField, sortDirection]
+  );
 
   const showCorrelationsTable =
     progress.isRunning || correlationTerms.length > 0;

diff --git a/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.tsx b/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.tsx
@@ -225,26 +225,14 @@ export function LatencyCorrelations({ onFilter }: { onFilter: () => void }) {
     setSortDirection(currentSortDirection);
   }, []);
 
-  const { histogramTerms, sorting } = useMemo(() => {
-    if (!response.latencyCorrelations) {
-      return { histogramTerms: [], sorting: undefined };
-    }
-    const orderedTerms = orderBy(
-      response.latencyCorrelations,
-      sortField,
-      sortDirection
-    );
-
-    return {
-      histogramTerms: orderedTerms,
-      sorting: {
-        sort: {
-          field: sortField,
-          direction: sortDirection,
-        },
-      } as EuiTableSortingType<LatencyCorrelation>,
-    };
-  }, [response.latencyCorrelations, sortField, sortDirection]);
+  const sorting: EuiTableSortingType<LatencyCorrelation> = {
+    sort: { field: sortField, direction: sortDirection },
+  };
+
+  const histogramTerms = useMemo(
+    () => orderBy(response.latencyCorrelations ?? [], sortField, sortDirection),
+    [response.latencyCorrelations, sortField, sortDirection]
+  );
 
   const showCorrelationsTable = progress.isRunning || histogramTerms.length > 0;
   const showCorrelationsEmptyStatePrompt =
@@ -323,14 +311,7 @@ export function LatencyCorrelations({ onFilter }: { onFilter: () => void }) {
               progress.isRunning ? FETCH_STATUS.LOADING : FETCH_STATUS.SUCCESS
             }
             setSelectedSignificantTerm={setSelectedSignificantTerm}
-            selectedTerm={
-              selectedHistogram !== undefined
-                ? {
-                    fieldName: selectedHistogram.fieldName,
-                    fieldValue: selectedHistogram.fieldValue,
-                  }
-                : undefined
-            }
+            selectedTerm={selectedHistogram}
             onTableChange={onTableChange}
             sorting={sorting}
           />