wip fix ti filters

lgestc · lgestc · commit 6a1b84001049 · 2024-03-26T10:45:07.000+01:00
diff --git a/x-pack/plugins/security_solution/public/threat_intelligence/routes.tsx b/x-pack/plugins/security_solution/public/threat_intelligence/routes.tsx
@@ -8,7 +8,6 @@
 import React, { memo, useMemo } from 'react';
 import type { SecuritySolutionPluginContext } from '@kbn/threat-intelligence-plugin/public';
 import { THREAT_INTELLIGENCE_BASE_PATH } from '@kbn/threat-intelligence-plugin/public';
-import type { SourcererDataView } from '@kbn/threat-intelligence-plugin/public/types';
 import type { Store } from 'redux';
 import { useSelector } from 'react-redux';
 import { useUserPrivileges } from '../common/components/user_privileges';
@@ -45,11 +44,11 @@ const ThreatIntelligence = memo(() => {
   const securitySolutionContext: SecuritySolutionPluginContext = useMemo(
     () => ({
       securitySolutionStore,
+      selectedDataView: sourcererDataView,
 
       getFiltersGlobalComponent: () => FiltersGlobal,
       getPageWrapper: () => SecuritySolutionPageWrapper,
       licenseService,
-      sourcererDataView: sourcererDataView as unknown as SourcererDataView,
       getUseInvestigateInTimeline: useInvestigateInTimeline,
 
       blockList: {
@@ -62,10 +61,6 @@ const ThreatIntelligence = memo(() => {
         getFormComponent: () => BlockListForm,
       } as unknown as SecuritySolutionPluginContext['blockList'],
 
-      useQuery: () => useSelector(inputsSelectors.globalQuerySelector()),
-      useFilters: () => useSelector(inputsSelectors.globalFiltersQuerySelector()),
-      useGlobalTime,
-
       registerQuery: (query) =>
         securitySolutionStore.dispatch(
           setQuery({
@@ -85,6 +80,10 @@ const ThreatIntelligence = memo(() => {
         ),
 
       SiemSearchBar,
+
+      useQuery: () => useSelector(inputsSelectors.globalQuerySelector()),
+      useFilters: () => useSelector(inputsSelectors.globalFiltersQuerySelector()),
+      useGlobalTime,
     }),
     [canWriteBlocklist, http, securitySolutionStore, sourcererDataView]
   );
diff --git a/x-pack/plugins/threat_intelligence/public/containers/field_types_provider.tsx b/x-pack/plugins/threat_intelligence/public/containers/field_types_provider.tsx
@@ -21,7 +21,7 @@ export const FieldTypesProvider: FC = ({ children }) => {
   // field name to field type map to allow the cell_renderer to format dates
   const fieldTypes: FieldTypesContextValue = useMemo(
     () =>
-      indexPattern.fields.reduce((acc, field) => {
+      Object.values(indexPattern.fields).reduce((acc, field) => {
         acc[field.name] = field.type;
         return acc;
       }, {} as FieldTypesContextValue),
diff --git a/x-pack/plugins/threat_intelligence/public/mocks/mock_security_context.tsx b/x-pack/plugins/threat_intelligence/public/mocks/mock_security_context.tsx
@@ -26,11 +26,12 @@ export const getSecuritySolutionContextMock = (): SecuritySolutionPluginContext
       return true;
     },
   },
-  sourcererDataView: {
+  selectedDataView: {
     browserFields: {},
-    selectedPatterns: [],
     indexPattern: { fields: [], title: '' },
     loading: false,
+    indicesExist: true,
+    sourcererDataView: {},
   },
   securitySolutionStore: {
     // @ts-ignore
diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/barchart/field_selector.tsx b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/barchart/field_selector.tsx
@@ -27,7 +27,7 @@ const COMBOBOX_SINGLE_SELECTION = { asPlainText: true };
 export const IndicatorsFieldSelector = memo<IndicatorsFieldSelectorProps>(
   ({ indexPattern, valueChange, defaultStackByValue = DEFAULT_STACK_BY_VALUE }) => {
     const styles = useStyles();
-    const defaultStackByValueInfo = indexPattern.fields.find(
+    const defaultStackByValueInfo = Object.values(indexPattern.fields).find(
       (f: DataViewField) => f.name === defaultStackByValue
     );
     const [selectedField, setSelectedField] = useState<Array<EuiComboBoxOptionOption<string>>>([
@@ -39,7 +39,7 @@ export const IndicatorsFieldSelector = memo<IndicatorsFieldSelectorProps>(
     const fields: Array<EuiComboBoxOptionOption<string>> = useMemo(
       () =>
         indexPattern
-          ? indexPattern.fields.map((f: DataViewField) => ({
+          ? Object.values(indexPattern.fields).map((f: DataViewField) => ({
               label: f.name,
               value: f.type,
             }))
diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_sourcerer_data_view.ts b/x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_sourcerer_data_view.ts
@@ -25,40 +25,40 @@ const indicatorNameField = {
 } as const;
 
 export const useSourcererDataView = () => {
-  const { sourcererDataView } = useSecurityContext();
+  const { selectedDataView } = useSecurityContext();
 
   const updatedPattern = useMemo(() => {
-    const fields = [...sourcererDataView.indexPattern.fields, indicatorNameField];
+    const fields = selectedDataView.sourcererDataView.fields;
 
     return {
-      ...sourcererDataView.indexPattern,
+      ...selectedDataView.indexPattern,
       fields,
     } as SecuritySolutionDataViewBase;
-  }, [sourcererDataView.indexPattern]);
+  }, [selectedDataView.indexPattern, selectedDataView.sourcererDataView.fields]);
 
   const indexPatterns = useMemo(() => [updatedPattern], [updatedPattern]);
 
   const browserFields = useMemo(() => {
-    const { threat = { fields: {} } } = sourcererDataView.browserFields;
+    const { threat = { fields: {} } } = selectedDataView.browserFields;
 
     return {
-      ...sourcererDataView.browserFields,
+      ...selectedDataView.browserFields,
       threat: {
         fields: {
           ...threat.fields,
           [indicatorNameField.name]: indicatorNameField,
         },
       },
     };
-  }, [sourcererDataView.browserFields]);
+  }, [selectedDataView.browserFields]);
 
   return useMemo(
     () => ({
-      sourcererDataView,
+      sourcererDataView: selectedDataView,
       indexPatterns,
       indexPattern: updatedPattern,
       browserFields,
     }),
-    [browserFields, indexPatterns, sourcererDataView, updatedPattern]
+    [browserFields, indexPatterns, selectedDataView, updatedPattern]
   );
 };
diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/pages/indicators.tsx b/x-pack/plugins/threat_intelligence/public/modules/indicators/pages/indicators.tsx
@@ -84,7 +84,7 @@ const IndicatorsPageContent: VFC = () => {
           <QueryBar
             queries={[indicatorChartQuery, indicatorListQuery]}
             indexPattern={indexPattern}
-            sourcererDataView={sourcererDataView}
+            sourcererDataView={sourcererDataView.sourcererDataView}
           />
         </FiltersGlobal>
 
diff --git a/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/query_bar.tsx b/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/query_bar.tsx
@@ -7,7 +7,7 @@
 
 import React, { useEffect, VFC } from 'react';
 import { useSecurityContext } from '../../../hooks/use_security_context';
-import { SecuritySolutionDataViewBase, SourcererDataView } from '../../../types';
+import { SecuritySolutionDataViewBase, SelectedDataView } from '../../../types';
 
 interface QueryBarProps {
   indexPattern: SecuritySolutionDataViewBase;
@@ -16,7 +16,7 @@ interface QueryBarProps {
     refetch: VoidFunction;
     loading: boolean;
   }>;
-  sourcererDataView: SourcererDataView | undefined;
+  sourcererDataView: SelectedDataView | undefined;
 }
 
 export const QueryBar: VFC<QueryBarProps> = ({ queries, sourcererDataView }) => {
diff --git a/x-pack/plugins/threat_intelligence/public/types.ts b/x-pack/plugins/threat_intelligence/public/types.ts
@@ -8,11 +8,7 @@
 import { ComponentType, NamedExoticComponent, ReactElement, ReactNode, VFC } from 'react';
 import { CoreStart } from '@kbn/core/public';
 import { DataPublicPluginStart } from '@kbn/data-plugin/public';
-import {
-  DataViewField,
-  DataViewsPublicPluginStart,
-  FieldSpec,
-} from '@kbn/data-views-plugin/public';
+import { DataViewsPublicPluginStart, FieldSpec } from '@kbn/data-views-plugin/public';
 import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { TimelinesUIStart } from '@kbn/timelines-plugin/public';
 import type { TriggersAndActionsUIPublicPluginStart as TriggersActionsStart } from '@kbn/triggers-actions-ui-plugin/public';
@@ -26,7 +22,7 @@ import { CreateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-
 import { Policy } from './modules/block_list/hooks/use_policies';
 
 export interface SecuritySolutionDataViewBase extends DataViewBase {
-  fields: Array<FieldSpec & DataViewField>;
+  fields: FieldSpec[];
 }
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
@@ -64,12 +60,7 @@ export interface LicenseAware {
 
 export type BrowserFields = Readonly<Record<string, Partial<BrowserField>>>;
 
-export interface SourcererDataView {
-  indexPattern: SecuritySolutionDataViewBase;
-  browserFields: BrowserFields;
-  selectedPatterns: string[];
-  loading: boolean;
-}
+export type SourcererDataView = any;
 
 export interface UseInvestigateInTimelineProps {
   dataProviders: DataProvider[];
@@ -101,6 +92,35 @@ export interface Blocking {
   getFormComponent: () => NamedExoticComponent<BlockListFormProps>;
 }
 
+/**
+ * Combined data from SourcererDataView and SourcererScope to create
+ * selected data view state
+ */
+export interface SelectedDataView {
+  /**
+   * @deprecated use EcsFlat or fields / indexFields from data view
+   */
+  browserFields: SourcererDataView['browserFields'];
+
+  /**
+   * @deprecated use sourcererDataView
+   * DataViewBase with enhanced index fields used in timelines
+   */
+  indexPattern: SecuritySolutionDataViewBase;
+  /** do the selected indices exist  */
+  indicesExist: boolean;
+  /** is an update being made to the data view */
+  loading: boolean;
+
+  /**
+   * Easier to add this additional data rather than
+   * try to extend the SelectedDataView type from DataView.
+   */
+  sourcererDataView: SourcererDataView;
+
+  selectedPatterns: string[];
+}
+
 /**
  * Methods exposed from the security solution to the threat intelligence application.
  */
@@ -123,7 +143,7 @@ export interface SecuritySolutionPluginContext {
   /**
    * Gets Security Solution shared information like browerFields, indexPattern and selectedPatterns in DataView.
    */
-  sourcererDataView: SourcererDataView;
+  selectedDataView: SelectedDataView;
 
   /**
    * Security Solution store
