addressing comments made on 12/19

Signed-off-by: Kama Huang <[email protected]>
opensearch-project · Dec 20, 2024 · 9999d01 · 9999d01
1 parent d66d230
commit 9999d01
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 35 deletions.
diff --git a/common/constants.ts b/common/constants.ts
@@ -286,17 +286,20 @@ export const MULTIMODAL_SEARCH_QUERY_NEURAL = {
   },
 };
 export const MULTIMODAL_SEARCH_QUERY_BOOL = {
-  _source: {
-    excludes: [VECTOR_FIELD_PATTERN],
-  },
   query: {
-    neural: {
-      [VECTOR_FIELD_PATTERN]: {
-        query_text: QUERY_TEXT_PATTERN,
-        query_image: QUERY_IMAGE_PATTERN,
-        model_id: MODEL_ID_PATTERN,
-        k: DEFAULT_K,
-      },
+    bool: {
+      must: [
+        {
+          match: {
+            [TEXT_FIELD_PATTERN]: QUERY_TEXT_PATTERN,
+          },
+        },
+        {
+          match: {
+            [IMAGE_FIELD_PATTERN]: QUERY_IMAGE_PATTERN,
+          },
+        },
+      ],
     },
   },
 };

diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json
@@ -1,7 +1,7 @@
 {
   "id": "flowFrameworkDashboards",
   "version": "2.19.0.0",
-  "opensearchDashboardsVersion": "2.18.0",
+  "opensearchDashboardsVersion": "2.19.0",
   "server": true,
   "ui": true,
   "requiredBundles": [],

diff --git a/public/pages/workflow_detail/components/header.tsx b/public/pages/workflow_detail/components/header.tsx
@@ -120,7 +120,7 @@ export function WorkflowDetailHeader(props: WorkflowDetailHeaderProps) {
 
   // get & render the data source component, if applicable
   let DataSourceComponent: ReactElement | null = null;
-  if (dataSourceEnabled && getDataSourceManagementPlugin()) {
+  if (dataSourceEnabled && getDataSourceManagementPlugin() && dataSourceId) {
     const DataSourceMenu = getDataSourceManagementPlugin().ui.getDataSourceMenu<
       DataSourceViewConfig
     >();

diff --git a/public/pages/workflow_detail/workflow_inputs/ingest_inputs/enrich_data.tsx b/public/pages/workflow_detail/workflow_inputs/ingest_inputs/enrich_data.tsx
@@ -8,13 +8,9 @@ import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { ProcessorsList } from '../processors_list';
 import { PROCESSOR_CONTEXT, WorkflowConfig } from '../../../../../common';
 import { ProcessorsTitle } from '../../../../general_components';
-import { SavedObject } from '../../../../../../../src/core/public';
-import { DataSourceAttributes } from '../../../../../../../src/plugins/data_source/common/data_sources';
-
 interface EnrichDataProps {
   uiConfig: WorkflowConfig;
   setUiConfig: (uiConfig: WorkflowConfig) => void;
-  dataSource?: SavedObject<DataSourceAttributes>;
 }
 
 /**

diff --git a/public/pages/workflow_detail/workflow_inputs/ingest_inputs/ingest_inputs.tsx b/public/pages/workflow_detail/workflow_inputs/ingest_inputs/ingest_inputs.tsx
@@ -36,11 +36,7 @@ export function IngestInputs(props: IngestInputsProps) {
         <EuiHorizontalRule margin="none" />
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
-        <EnrichData
-          uiConfig={props.uiConfig}
-          setUiConfig={props.setUiConfig}
-          dataSource={(props.workflow as any)?.dataSource}
-        />
+        <EnrichData uiConfig={props.uiConfig} setUiConfig={props.setUiConfig} />
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
         <EuiHorizontalRule margin="none" />

diff --git a/public/pages/workflow_detail/workflow_inputs/processors_list.tsx b/public/pages/workflow_detail/workflow_inputs/processors_list.tsx
@@ -49,7 +49,6 @@ interface ProcessorsListProps {
   uiConfig: WorkflowConfig;
   setUiConfig: (uiConfig: WorkflowConfig) => void;
   context: PROCESSOR_CONTEXT;
-  onProcessorsChange?: (count: number) => void;
 }
 
 const PANEL_ID = 0;
@@ -95,7 +94,6 @@ export function ProcessorsList(props: ProcessorsListProps) {
             : props.uiConfig.search.enrichResponse.processors;
 
         setProcessors(currentProcessors || []);
-        props.onProcessorsChange?.(currentProcessors?.length || 0);
       }
     };
 

diff --git a/public/pages/workflow_detail/workflow_inputs/search_inputs/enrich_search_request.tsx b/public/pages/workflow_detail/workflow_inputs/search_inputs/enrich_search_request.tsx
@@ -8,13 +8,10 @@ import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { ProcessorsTitle } from '../../../../general_components';
 import { PROCESSOR_CONTEXT, WorkflowConfig } from '../../../../../common';
 import { ProcessorsList } from '../processors_list';
-import { SavedObject } from '../../../../../../../src/core/public';
-import { DataSourceAttributes } from '../../../../../../../src/plugins/data_source/common/data_sources';
 
 interface EnrichSearchRequestProps {
   uiConfig: WorkflowConfig;
   setUiConfig: (uiConfig: WorkflowConfig) => void;
-  dataSource?: SavedObject<DataSourceAttributes>;
 }
 
 /**

diff --git a/public/pages/workflow_detail/workflow_inputs/search_inputs/enrich_search_response.tsx b/public/pages/workflow_detail/workflow_inputs/search_inputs/enrich_search_response.tsx
@@ -8,13 +8,10 @@ import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { ProcessorsTitle } from '../../../../general_components';
 import { PROCESSOR_CONTEXT, WorkflowConfig } from '../../../../../common';
 import { ProcessorsList } from '../processors_list';
-import { SavedObject } from '../../../../../../../src/core/public';
-import { DataSourceAttributes } from '../../../../../../../src/plugins/data_source/common/data_sources';
 
 interface EnrichSearchResponseProps {
   uiConfig: WorkflowConfig;
   setUiConfig: (uiConfig: WorkflowConfig) => void;
-  dataSource?: SavedObject<DataSourceAttributes>;
 }
 
 /**

diff --git a/public/pages/workflow_detail/workflow_inputs/search_inputs/search_inputs.tsx b/public/pages/workflow_detail/workflow_inputs/search_inputs/search_inputs.tsx
@@ -14,13 +14,10 @@ import {
 } from '../../../../../common';
 import { catIndices, useAppDispatch } from '../../../../store';
 import { getDataSourceId } from '../../../../utils';
-import { SavedObject } from '../../../../../../../src/core/public';
-import { DataSourceAttributes } from '../../../../../../../src/plugins/data_source/common/data_sources';
 
 interface SearchInputsProps {
   uiConfig: WorkflowConfig;
   setUiConfig: (uiConfig: WorkflowConfig) => void;
-  dataSource?: SavedObject<DataSourceAttributes>;
 }
 
 /**
@@ -48,7 +45,6 @@ export function SearchInputs(props: SearchInputsProps) {
         <EnrichSearchRequest
           uiConfig={props.uiConfig}
           setUiConfig={props.setUiConfig}
-          dataSource={props.dataSource}
         />
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
@@ -58,7 +54,6 @@ export function SearchInputs(props: SearchInputsProps) {
         <EnrichSearchResponse
           uiConfig={props.uiConfig}
           setUiConfig={props.setUiConfig}
-          dataSource={props.dataSource}
         />
       </EuiFlexItem>
     </EuiFlexGroup>

diff --git a/public/plugin.ts b/public/plugin.ts
@@ -31,7 +31,6 @@ import {
   setHeaderActionMenu,
 } from './services';
 import { configureRoutes } from './route_service';
-import { dataSourceFilterFn } from './utils';
 
 export class FlowFrameworkDashboardsPlugin
   implements