fix translations for log rate message and add sorting

elastic · Jun 20, 2024 · ff861eb · ff861eb
1 parent 8f0a4ee
commit ff861eb
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 46 deletions.
diff --git a/...ops/public/components/log_rate_analysis_results_table/get_baseline_and_deviation_rates.ts b/...ops/public/components/log_rate_analysis_results_table/get_baseline_and_deviation_rates.ts
@@ -13,28 +13,44 @@ export function getLogRateChange(
   baselineBucketRate: number,
   deviationBucketRate: number
 ) {
-  const logRateChange =
-    baselineBucketRate > 0
-      ? analysisType === LOG_RATE_ANALYSIS_TYPE.SPIKE
-        ? `${Math.round((deviationBucketRate / baselineBucketRate) * 100) / 100}x higher`
-        : `${Math.round((baselineBucketRate / deviationBucketRate) * 100) / 100}x lower`
-      : analysisType === LOG_RATE_ANALYSIS_TYPE.SPIKE
-      ? i18n.translate(
-          'xpack.aiops.logRateAnalysis.resultsTableGroups.logRateIncreaseLabelColumnTooltip',
-          {
-            defaultMessage: '{deviationBucketRate} docs from 0 in baseline',
-            values: { deviationBucketRate },
-          }
-        )
-      : i18n.translate(
-          'xpack.aiops.logRateAnalysis.resultsTableGroups.logRateDecreaseLabelColumnTooltip',
-          {
-            defaultMessage: '0 docs from ${baselineBucketRate} in baseline',
-            values: { baselineBucketRate },
-          }
-        );
+  let message;
+  let factor;
 
-  return logRateChange;
+  if (baselineBucketRate > 0) {
+    if (analysisType === LOG_RATE_ANALYSIS_TYPE.SPIKE) {
+      factor = Math.round(((deviationBucketRate / baselineBucketRate) * 100) / 100);
+      message = i18n.translate(
+        'xpack.aiops.logRateAnalysis.resultsTableGroups.logRateFactorIncreaseLabel',
+        {
+          defaultMessage: '{factor}x higher',
+          values: {
+            factor: Math.round(((deviationBucketRate / baselineBucketRate) * 100) / 100),
+          },
+        }
+      );
+    } else {
+      factor = Math.round(((baselineBucketRate / deviationBucketRate) * 100) / 100);
+      message = i18n.translate(
+        'xpack.aiops.logRateAnalysis.resultsTableGroups.logRateFactorDecreaseLabel',
+        {
+          defaultMessage: '{factor}x lower',
+          values: {
+            factor,
+          },
+        }
+      );
+    }
+  } else {
+    // If the baseline rate is 0, then it can't be LOG_RATE_ANALYSIS_TYPE.DIP so we know it's a SPIKE
+    message = i18n.translate(
+      'xpack.aiops.logRateAnalysis.resultsTableGroups.logRateDocIncreaseLabel',
+      {
+        defaultMessage: '{deviationBucketRate} docs up from 0 in baseline',
+        values: { deviationBucketRate },
+      }
+    );
+  }
+  return { message, factor };
 }
 
 export function getBaselineAndDeviationRates(

diff --git a/...ops/public/components/log_rate_analysis_results_table/log_rate_analysis_results_table.tsx b/...ops/public/components/log_rate_analysis_results_table/log_rate_analysis_results_table.tsx
@@ -83,11 +83,6 @@ export const LogRateAnalysisResultsTable: FC<LogRateAnalysisResultsTableProps> =
   const selectedSignificantItem = useAppSelector(
     (s) => s.logRateAnalysisTableRow.selectedSignificantItem
   );
-  const {
-    analysisType,
-    windowParameters,
-    documentStats: { documentCountStats },
-  } = useAppSelector((s) => s.logRateAnalysis);
 
   const dispatch = useAppDispatch();
 
@@ -102,9 +97,6 @@ export const LogRateAnalysisResultsTable: FC<LogRateAnalysisResultsTableProps> =
 
   const columns = useColumns(
     LOG_RATE_ANALYSIS_RESULTS_TABLE_TYPE.SIGNIFICANT_ITEMS,
-    analysisType,
-    windowParameters,
-    documentCountStats?.interval ?? 0,
     skippedColumns,
     searchQuery,
     barColorOverride,

diff --git a/...lic/components/log_rate_analysis_results_table/log_rate_analysis_results_table_groups.tsx b/...lic/components/log_rate_analysis_results_table/log_rate_analysis_results_table_groups.tsx
@@ -93,11 +93,6 @@ export const LogRateAnalysisResultsGroupsTable: FC<LogRateAnalysisResultsTablePr
 
   const pinnedGroup = useAppSelector((s) => s.logRateAnalysisTableRow.pinnedGroup);
   const selectedGroup = useAppSelector((s) => s.logRateAnalysisTableRow.selectedGroup);
-  const {
-    analysisType,
-    windowParameters,
-    documentStats: { documentCountStats },
-  } = useAppSelector((s) => s.logRateAnalysis);
   const dispatch = useAppDispatch();
   const isMounted = useMountedState();
 
@@ -244,9 +239,6 @@ export const LogRateAnalysisResultsGroupsTable: FC<LogRateAnalysisResultsTablePr
 
   const columns = useColumns(
     LOG_RATE_ANALYSIS_RESULTS_TABLE_TYPE.GROUPS,
-    analysisType,
-    windowParameters,
-    documentCountStats?.interval ?? 0,
     skippedColumns,
     searchQuery,
     barColorOverride,

diff --git a/x-pack/plugins/aiops/public/components/log_rate_analysis_results_table/use_columns.tsx b/x-pack/plugins/aiops/public/components/log_rate_analysis_results_table/use_columns.tsx
@@ -21,7 +21,7 @@ import { type SignificantItem, SIGNIFICANT_ITEM_TYPE } from '@kbn/ml-agg-utils';
 import { getCategoryQuery } from '@kbn/aiops-log-pattern-analysis/get_category_query';
 import type { FieldStatsServices } from '@kbn/unified-field-list/src/components/field_stats';
 import { useAppSelector } from '@kbn/aiops-log-rate-analysis/state';
-import { type WindowParameters, LOG_RATE_ANALYSIS_TYPE } from '@kbn/aiops-log-rate-analysis';
+import { LOG_RATE_ANALYSIS_TYPE } from '@kbn/aiops-log-rate-analysis';
 import { getFailedTransactionsCorrelationImpactLabel } from './get_failed_transactions_correlation_impact_label';
 import { FieldStatsPopover } from '../field_stats_popover';
 import { useAiopsAppContext } from '../../hooks/use_aiops_app_context';
@@ -143,9 +143,6 @@ const deviationRateMessage = i18n.translate(
 
 export const useColumns = (
   tableType: LogRateAnalysisResultsTableType,
-  analysisType: typeof LOG_RATE_ANALYSIS_TYPE[keyof typeof LOG_RATE_ANALYSIS_TYPE],
-  windowParameters: WindowParameters | undefined,
-  interval: number,
   skippedColumns: string[],
   searchQuery: estypes.QueryDslQueryContainer,
   barColorOverride?: string,
@@ -164,8 +161,14 @@ export const useColumns = (
 
   const loading = useAppSelector((s) => s.logRateAnalysisStream.isRunning);
   const zeroDocsFallback = useAppSelector((s) => s.logRateAnalysisResults.zeroDocsFallback);
+  const {
+    analysisType,
+    windowParameters,
+    documentStats: { documentCountStats },
+  } = useAppSelector((s) => s.logRateAnalysis);
 
   const isGroupsTable = tableType === LOG_RATE_ANALYSIS_RESULTS_TABLE_TYPE.GROUPS;
+  const interval = documentCountStats?.interval ?? 0;
 
   const fieldStatsServices: FieldStatsServices = useMemo(() => {
     return {
@@ -370,7 +373,7 @@ export const useColumns = (
 
           return <>{baselineBucketRate}</>;
         },
-        sortable: false,
+        sortable: true,
         valign: 'middle',
       },
       ['Deviation rate']: {
@@ -411,12 +414,12 @@ export const useColumns = (
 
           return <>{deviationBucketRate}</>;
         },
-        sortable: false,
+        sortable: true,
         valign: 'middle',
       },
       ['Log rate change']: {
         'data-test-subj': 'aiopsLogRateAnalysisResultsTableColumnLogRateChange',
-        field: 'histogram',
+        field: 'pValue',
         name: (
           <>
             <FormattedMessage
@@ -465,11 +468,11 @@ export const useColumns = (
                 className="eui-alignTop"
               />
               &nbsp;
-              {logRateChange}
+              {logRateChange.message}
             </>
           );
         },
-        sortable: false,
+        sortable: true,
         valign: 'middle',
       },
       ['p-value']: {