Minor cleanup

Signed-off-by: Tyler Ohlsen <[email protected]>
opensearch-project · Aug 20, 2024 · 4c41897 · 4c41897
1 parent 055b1ee
commit 4c41897
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/public/pages/workflow_detail/workflow_inputs/search_inputs/configure_search_request.tsx b/public/pages/workflow_detail/workflow_inputs/search_inputs/configure_search_request.tsx
@@ -83,7 +83,12 @@ export function ConfigureSearchRequest(props: ConfigureSearchRequestProps) {
 
   return (
     <>
-      {isEditModalOpen && <EditQueryModal setModalOpen={setIsEditModalOpen} />}
+      {isEditModalOpen && (
+        <EditQueryModal
+          setModalOpen={setIsEditModalOpen}
+          queryFieldPath="search.request"
+        />
+      )}
       <EuiFlexGroup direction="column">
         <EuiFlexItem grow={false}>
           <EuiTitle size="s">

diff --git a/public/pages/workflow_detail/workflow_inputs/search_inputs/edit_query_modal.tsx b/public/pages/workflow_detail/workflow_inputs/search_inputs/edit_query_modal.tsx
@@ -25,15 +25,13 @@ import {
 } from '../../../../../common';
 
 interface EditQueryModalProps {
+  queryFieldPath: string;
   setModalOpen(isOpen: boolean): void;
 }
 
 /**
- * Specialized component to render the text chunking ingest processor. The list of optional
- * params we display is dependent on the source algorithm that is chosen. Internally, we persist
- * all of the params, but only choose the relevant ones when constructing the final ingest processor
- * template. This is to minimize the amount of ui config / form / schema updates we would need
- * to do if we only persisted the subset of optional params specific to the currently-chosen algorithm.
+ * Basic modal for configuring a query. Provides a dropdown to select from
+ * a set of pre-defined queries targeted for different use cases.
  */
 export function EditQueryModal(props: EditQueryModalProps) {
   // Form state
@@ -48,7 +46,7 @@ export function EditQueryModal(props: EditQueryModalProps) {
   useEffect(() => {
     setQueryPreset(
       QUERY_PRESETS.find(
-        (preset) => preset.query === getIn(values, 'search.request')
+        (preset) => preset.query === getIn(values, props.queryFieldPath)
       )?.name
     );
   }, []);
@@ -86,7 +84,7 @@ export function EditQueryModal(props: EditQueryModalProps) {
           onChange={(option: string) => {
             setQueryPreset(option);
             setFieldValue(
-              'search.request',
+              props.queryFieldPath,
               QUERY_PRESETS.find((preset) => preset.name === option)?.query
             );
           }}
@@ -95,7 +93,7 @@ export function EditQueryModal(props: EditQueryModalProps) {
         <EuiSpacer size="s" />
         <JsonField
           label="Query"
-          fieldPath={'search.request'}
+          fieldPath={props.queryFieldPath}
           editorHeight="25vh"
           readOnly={false}
         />

diff --git a/public/pages/workflows/new_workflow/utils.ts b/public/pages/workflows/new_workflow/utils.ts
@@ -118,8 +118,6 @@ function fetchEmptyMetadata(): UIState {
 }
 
 function fetchSemanticSearchMetadata(): UIState {
-  // We can reuse the base state. Only need to override a few things,
-  // such as preset ingest processors.
   let baseState = fetchEmptyMetadata();
   baseState.type = WORKFLOW_TYPE.SEMANTIC_SEARCH;
   baseState.config.ingest.enrich.processors = [new MLIngestProcessor().toObj()];
@@ -134,8 +132,6 @@ function fetchSemanticSearchMetadata(): UIState {
 }
 
 function fetchMultimodalSearchMetadata(): UIState {
-  // We can reuse the base state. Only need to override a few things,
-  // such as preset ingest processors.
   let baseState = fetchEmptyMetadata();
   baseState.type = WORKFLOW_TYPE.MULTIMODAL_SEARCH;
   baseState.config.ingest.enrich.processors = [new MLIngestProcessor().toObj()];
@@ -150,8 +146,6 @@ function fetchMultimodalSearchMetadata(): UIState {
 }
 
 function fetchHybridSearchMetadata(): UIState {
-  // We can reuse the base state. Only need to override a few things,
-  // such as preset ingest processors.
   let baseState = fetchEmptyMetadata();
   baseState.type = WORKFLOW_TYPE.HYBRID_SEARCH;
   baseState.config.ingest.enrich.processors = [new MLIngestProcessor().toObj()];