[8.11] [Profiling] Fix Diff TopN bug (#169549)

x-pack/plugins/observability/server/ui_settings.ts

@@ -396,7 +396,7 @@ export const uiSettings: Record<string, UiSettings> = {
       defaultMessage: `The average amortized per-core power consumption (based on 100% CPU utilization).`,
     }),
     schema: schema.number({ min: 0 }),
-    requiresPageReload: false,
+    requiresPageReload: true,
   },
   [profilingDatacenterPUE]: {
     category: [observabilityFeatureId],
@@ -425,7 +425,7 @@ export const uiSettings: Record<string, UiSettings> = {
       },
     }),
     schema: schema.number({ min: 0 }),
-    requiresPageReload: false,
+    requiresPageReload: true,
   },
   [profilingCo2PerKWH]: {
     category: [observabilityFeatureId],
@@ -448,7 +448,7 @@ export const uiSettings: Record<string, UiSettings> = {
       },
     }),
     schema: schema.number({ min: 0 }),
-    requiresPageReload: false,
+    requiresPageReload: true,
   },
 };
 

x-pack/plugins/profiling/e2e/cypress/e2e/profiling_views/functions.cy.ts

@@ -203,6 +203,10 @@ describe('Functions page', () => {
         .clear()
         .type('20');
       cy.contains('Save changes').click();
+      cy.getByTestSubj('kbnLoadingMessage').should('exist');
+      cy.getByTestSubj('kbnLoadingMessage').should('not.exist', {
+        timeout: 50000,
+      });
       cy.go('back');
       cy.wait('@getTopNFunctions');
       cy.get(firstRowSelector).eq(5).contains('24.22k lbs / 10.99k');

x-pack/plugins/profiling/public/components/topn_functions/function_row.tsx

@@ -15,8 +15,8 @@ import {
   useEuiTheme,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import React from 'react';
 import { TopNFunctionSortField } from '@kbn/profiling-utils';
+import React, { useEffect } from 'react';
 import { asCost } from '../../utils/formatters/as_cost';
 import { asWeight } from '../../utils/formatters/as_weight';
 import { StackFrameSummary } from '../stack_frame_summary';
@@ -39,38 +39,8 @@ export function FunctionRow({
   onFrameClick,
   setCellProps,
 }: Props) {
-  const theme = useEuiTheme();
-  const successColor = useEuiBackgroundColor('success');
-  const dangerColor = useEuiBackgroundColor('danger');
-
   if (columnId === TopNFunctionSortField.Diff) {
-    if (!functionRow.diff) {
-      return (
-        <EuiText size="xs" color={theme.euiTheme.colors.primaryText}>
-          {i18n.translate('xpack.profiling.functionsView.newLabel', {
-            defaultMessage: 'New',
-          })}
-        </EuiText>
-      );
-    }
-
-    if (functionRow.diff.rank === 0) {
-      return null;
-    }
-
-    const color = functionRow.diff.rank > 0 ? 'success' : 'danger';
-    setCellProps({ style: { backgroundColor: color === 'success' ? successColor : dangerColor } });
-
-    return (
-      <EuiFlexGroup direction="row" gutterSize="xs">
-        <EuiFlexItem grow={false}>
-          <EuiIcon type={functionRow.diff.rank > 0 ? 'sortUp' : 'sortDown'} color={color} />
-        </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          <EuiText size="s">{Math.abs(functionRow.diff.rank)}</EuiText>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    );
+    return <DiffColumn diff={functionRow.diff} setCellProps={setCellProps} />;
   }
 
   if (columnId === TopNFunctionSortField.Rank) {
@@ -82,12 +52,12 @@ export function FunctionRow({
   }
 
   if (columnId === TopNFunctionSortField.Samples) {
-    setCellProps({ css: { textAlign: 'right' } });
     return (
-      <SampleStat
+      <SamplesColumn
         samples={functionRow.samples}
         diffSamples={functionRow.diff?.samples}
         totalSamples={totalCount}
+        setCellProps={setCellProps}
       />
     );
   }
@@ -116,3 +86,65 @@ export function FunctionRow({
 
   return null;
 }
+
+interface SamplesColumnProps {
+  samples: number;
+  diffSamples?: number;
+  totalSamples: number;
+  setCellProps: EuiDataGridCellValueElementProps['setCellProps'];
+}
+
+function SamplesColumn({ samples, totalSamples, diffSamples, setCellProps }: SamplesColumnProps) {
+  useEffect(() => {
+    setCellProps({ css: { textAlign: 'right' } });
+  }, [setCellProps]);
+  return <SampleStat samples={samples} diffSamples={diffSamples} totalSamples={totalSamples} />;
+}
+
+interface DiffColumnProps {
+  diff: IFunctionRow['diff'];
+  setCellProps: EuiDataGridCellValueElementProps['setCellProps'];
+}
+
+function DiffColumn({ diff, setCellProps }: DiffColumnProps) {
+  const theme = useEuiTheme();
+  const successColor = useEuiBackgroundColor('success');
+  const dangerColor = useEuiBackgroundColor('danger');
+
+  useEffect(() => {
+    if (diff && diff.rank > 0) {
+      const color = diff.rank > 0 ? 'success' : 'danger';
+      setCellProps({
+        style: { backgroundColor: color === 'success' ? successColor : dangerColor },
+      });
+    }
+  }, [dangerColor, diff, setCellProps, successColor]);
+
+  if (!diff) {
+    return (
+      <EuiText size="xs" color={theme.euiTheme.colors.primaryText}>
+        {i18n.translate('xpack.profiling.functionsView.newLabel', {
+          defaultMessage: 'New',
+        })}
+      </EuiText>
+    );
+  }
+
+  if (diff.rank === 0) {
+    return null;
+  }
+
+  return (
+    <EuiFlexGroup direction="row" gutterSize="xs">
+      <EuiFlexItem grow={false}>
+        <EuiIcon
+          type={diff.rank > 0 ? 'sortUp' : 'sortDown'}
+          color={diff.rank > 0 ? 'success' : 'danger'}
+        />
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiText size="s">{Math.abs(diff.rank)}</EuiText>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}