fix: getCellRenderers

elastic · Nov 8, 2024 · 2a300b9 · 2a300b9
1 parent e2798b7
commit 2a300b9
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 18 deletions.
diff --git a/...ver/public/context_awareness/profile_providers/security/security_root_profile/profile.tsx b/...ver/public/context_awareness/profile_providers/security/security_root_profile/profile.tsx
@@ -9,6 +9,7 @@
 
 import React, { useMemo } from 'react';
 import { SecuritySolutionAppWrapperFeature } from '@kbn/discover-shared-plugin/public/services/discover_features';
+import { CustomCellRenderer } from '@kbn/unified-data-table';
 import { RootProfileProvider, SolutionType } from '../../../profiles';
 import { ProfileProviderServices } from '../../profile_provider_services';
 import { SecurityProfileProviderFactory } from '../types';
@@ -40,29 +41,39 @@ export const createSecurityRootProfileProvider: SecurityProfileProviderFactory<
           const AppWrapper = useMemo(() => appWrapperGetter?.({ store }) ?? PrevWrapper, []);
           return <AppWrapper>{children}</AppWrapper>;
         }),
-      getCellRenderers: (prev) => (params) => ({
-        ...prev(params),
-        'host.name': getCellRenderer('host.name') ?? prev(params)['host.name'],
-        'user.name': getCellRenderer('user.name') ?? prev(params)['user.name'],
-        'source.ip': getCellRenderer('source.ip') ?? prev(params)['source.ip'],
-        'destination.ip': getCellRenderer('destination.ip') ?? prev(params)['destination.ip'],
-      }),
+      getCellRenderers: (prev) => (params) => {
+        const entries = prev(params);
+        const customCellRenderers = [
+          'host.name',
+          'user.name',
+          'source.ip',
+          'destination.ip',
+        ].reduce<CustomCellRenderer>((acc, fieldName) => {
+          if (!entries[fieldName]) return acc;
+          acc[fieldName] = getCellRenderer(fieldName) ?? entries[fieldName];
+          return acc;
+        }, {});
+        return {
+          ...entries,
+          ...customCellRenderers,
+        };
+      },
     },
     resolve: async (params) => {
-      if (params.solutionNavId === SolutionType.Security) {
-        store = await reduxStoreInitFeature?.get();
-        appWrapperGetter = await appWrapperFeature?.getWrapper();
-
+      if (params.solutionNavId !== SolutionType.Security) {
         return {
-          isMatch: true,
-          context: {
-            solutionType: SolutionType.Security,
-          },
+          isMatch: false,
         };
       }
 
+      store = await reduxStoreInitFeature?.get();
+      appWrapperGetter = await appWrapperFeature?.getWrapper();
+
       return {
-        isMatch: false,
+        isMatch: true,
+        context: {
+          solutionType: SolutionType.Security,
+        },
       };
     },
   };

diff --git a/x-pack/plugins/security_solution/public/one_discover/app_wrapper/index.tsx b/x-pack/plugins/security_solution/public/one_discover/app_wrapper/index.tsx
@@ -38,7 +38,7 @@ export const createSecuritySolutionDiscoverAppWrapperGetter = ({
 }) => {
   const getSecuritySolutionDiscoverAppWrapper: Awaited<
     ReturnType<SecuritySolutionAppWrapperFeature['getWrapper']>
-  > = (args) => {
+  > = ({ store }) => {
     return function SecuritySolutionDiscoverAppWrapper({ children }) {
       const discoverServices = useKibana().services as DiscoverServices;
 
@@ -90,7 +90,7 @@ export const createSecuritySolutionDiscoverAppWrapperGetter = ({
                   <NavigationProvider core={core}>
                     <UpsellingProvider upsellingService={services.upselling}>
                       {/* ^_^ Needed for Alert Preview from Expanded Section of Entity Flyout */}
-                      <ReduxStoreProvider store={args.store as SecurityAppStore}>
+                      <ReduxStoreProvider store={store as SecurityAppStore}>
                         <ReactQueryClientProvider>
                           <ConsoleManager>
                             {/* ^_^ Needed for AlertPreview -> Alert Details Flyout Action */}