Pass props on wrapper and not data provider

elastic · May 9, 2022 · 1eb3fe0 · 1eb3fe0
1 parent 691dbe2
commit 1eb3fe0
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 7 deletions.
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/entity_draggable.tsx b/x-pack/plugins/security_solution/public/common/components/ml/entity_draggable.tsx
@@ -40,8 +40,6 @@ export const EntityDraggableComponent: React.FC<Props> = ({
         value: entityValue,
         operator: IS_OPERATOR as QueryOperator,
       },
-      isAggregatable: true,
-      fieldType: 'keyword',
     }),
     [entityName, entityValue, id]
   );
@@ -58,7 +56,15 @@ export const EntityDraggableComponent: React.FC<Props> = ({
     [entityName, entityValue]
   );
 
-  return <DraggableWrapper key={id} dataProvider={dataProviderProp} render={render} />;
+  return (
+    <DraggableWrapper
+      key={id}
+      dataProvider={dataProviderProp}
+      render={render}
+      isAggregatable={true}
+      fieldType={'keyword'}
+    />
+  );
 };
 
 EntityDraggableComponent.displayName = 'EntityDraggableComponent';

diff --git a/x-pack/plugins/security_solution/public/common/components/ml/score/draggable_score.tsx b/x-pack/plugins/security_solution/public/common/components/ml/score/draggable_score.tsx
@@ -40,8 +40,6 @@ export const DraggableScoreComponent = ({
         value: score.entityValue,
         operator: IS_OPERATOR as QueryOperator,
       },
-      isAggregatable: true,
-      fieldType: 'number',
     }),
     [id, score.entityName, score.entityValue]
   );
@@ -71,6 +69,8 @@ export const DraggableScoreComponent = ({
       key={`draggable-score-draggable-wrapper-${id}`}
       dataProvider={dataProviderProp}
       render={render}
+      isAggregatable={true}
+      fieldType={'keyword'}
     />
   );
 };

diff --git a/...ution/public/timelines/components/timeline/body/renderers/suricata/suricata_signature.tsx b/...ution/public/timelines/components/timeline/body/renderers/suricata/suricata_signature.tsx
@@ -100,7 +100,13 @@ export const DraggableSignatureId = React.memo<{
 
   return (
     <SignatureFlexItem grow={false}>
-      <DraggableWrapper dataProvider={dataProviderProp} isDraggable={isDraggable} render={render} />
+      <DraggableWrapper
+        dataProvider={dataProviderProp}
+        isDraggable={isDraggable}
+        render={render}
+        isAggregatable={true}
+        fieldType={'keyword'}
+      />
     </SignatureFlexItem>
   );
 });

diff --git a/...rity_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_signature.tsx b/...rity_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_signature.tsx
@@ -106,7 +106,13 @@ export const DraggableZeekElement = React.memo<{
 
   return value != null ? (
     <TokensFlexItem grow={false}>
-      <DraggableWrapper dataProvider={dataProviderProp} isDraggable={isDraggable} render={render} />
+      <DraggableWrapper
+        dataProvider={dataProviderProp}
+        isDraggable={isDraggable}
+        render={render}
+        isAggregatable={true}
+        fieldType={'keyword'}
+      />
     </TokensFlexItem>
   ) : null;
 });

diff --git a/x-pack/plugins/security_solution/public/users/components/user_risk_score_table/columns.tsx b/x-pack/plugins/security_solution/public/users/components/user_risk_score_table/columns.tsx
@@ -58,6 +58,8 @@ export const getUserRiskScoreColumns = ({
                 <UserDetailsLink userName={userName} />
               )
             }
+            isAggregatable={true}
+            fieldType={'keyword'}
           />
         );
       }
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,6 +58,8 @@ export const getUserRiskScoreColumns = ({ @@
                     <UserDetailsLink userName={userName} />
                   )
                 }
+                isAggregatable={true}
+                fieldType={'keyword'}
               />
             );
           }
@@ Expand Down @@