Integrate query into form (not persisted in config) (#188) (#193)

Signed-off-by: Tyler Ohlsen <[email protected]> (cherry picked from commit 8afac97) Co-authored-by: Tyler Ohlsen <[email protected]>
opensearch-project · Jun 20, 2024 · ba936c6 · ba936c6
1 parent d3dde08
commit ba936c6
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 100 deletions.
diff --git a/common/interfaces.ts b/common/interfaces.ts
@@ -59,7 +59,7 @@ export type IngestConfig = {
 };
 
 export type SearchConfig = {
-  request: IConfig;
+  request: {};
   enrichRequest: ProcessorsConfig;
   enrichResponse: ProcessorsConfig;
 };

diff --git a/public/pages/workflow_detail/resizable_workspace.tsx b/public/pages/workflow_detail/resizable_workspace.tsx
@@ -58,6 +58,9 @@ export function ResizableWorkspace(props: ResizableWorkspaceProps) {
   // ingest state
   const [ingestDocs, setIngestDocs] = useState<string>('');
 
+  // query state
+  const [query, setQuery] = useState<string>('');
+
   // Temp UI config state. For persisting changes to the UI config that may
   // not be saved in the backend (e.g., adding / removing an ingest processor)
   const [uiConfig, setUiConfig] = useState<WorkflowConfig | undefined>(
@@ -123,7 +126,7 @@ export function ResizableWorkspace(props: ResizableWorkspaceProps) {
   // Initialize the form state based on the current UI config
   useEffect(() => {
     if (uiConfig) {
-      const initFormValues = uiConfigToFormik(uiConfig, ingestDocs);
+      const initFormValues = uiConfigToFormik(uiConfig, ingestDocs, query);
       const initFormSchema = uiConfigToSchema(uiConfig);
       setFormValues(initFormValues);
       setFormSchema(initFormSchema);
@@ -187,6 +190,8 @@ export function ResizableWorkspace(props: ResizableWorkspaceProps) {
                       setQueryResponse={setQueryResponse}
                       ingestDocs={ingestDocs}
                       setIngestDocs={setIngestDocs}
+                      query={query}
+                      setQuery={setQuery}
                     />
                   </EuiResizablePanel>
                   <EuiResizableButton />

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
@@ -3,38 +3,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { useEffect, useState } from 'react';
-import {
-  EuiCodeEditor,
-  EuiFieldText,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiFormRow,
-  EuiTitle,
-} from '@elastic/eui';
-import { Field, FieldProps } from 'formik';
+import React, { useEffect } from 'react';
+import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
+import { useFormikContext } from 'formik';
+import { IConfigField, WorkspaceFormValues } from '../../../../../common';
+import { JsonField } from '../input_fields';
 
 interface ConfigureSearchRequestProps {
-  setQuery: (query: {}) => void;
+  setQuery: (query: string) => void;
+  onFormChange: () => void;
 }
 
 /**
  * Input component for configuring a search request
  */
 export function ConfigureSearchRequest(props: ConfigureSearchRequestProps) {
-  const indexFieldPath = 'ingest.index.name';
-
-  // query state
-  const [queryStr, setQueryStr] = useState<string>('{}');
+  const { values } = useFormikContext<WorkspaceFormValues>();
 
+  // Hook to listen when the query form value changes.
+  // Try to set the query request if possible
   useEffect(() => {
-    try {
-      const query = JSON.parse(queryStr);
-      props.setQuery(query);
-    } catch (e) {
-      props.setQuery({});
+    if (values?.search?.request) {
+      props.setQuery(values.search.request);
     }
-  }, [queryStr]);
+  }, [values?.search?.request]);
 
   return (
     <EuiFlexGroup direction="column">
@@ -43,46 +35,20 @@ export function ConfigureSearchRequest(props: ConfigureSearchRequestProps) {
           <h2>Configure query</h2>
         </EuiTitle>
       </EuiFlexItem>
-      <EuiFlexItem>
-        <EuiFlexGroup direction="column">
-          <EuiFlexItem grow={false}>
-            <Field name={indexFieldPath}>
-              {({ field, form }: FieldProps) => {
-                return (
-                  // TODO: make this dynamic depending on if ingest is defined or not.
-                  // 1/ (incomplete) if no ingest, make this a dropdown to select existing indices
-                  // 2/ (complete) if ingest, show the defined index from ingest config, make it readonly
-                  <EuiFormRow key={indexFieldPath} label={'Retrieval index'}>
-                    <EuiFieldText
-                      {...field}
-                      compressed={false}
-                      value={field.value}
-                      readOnly={true}
-                    />
-                  </EuiFormRow>
-                );
-              }}
-            </Field>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <EuiCodeEditor
-              mode="json"
-              theme="textmate"
-              width="100%"
-              height="25vh"
-              value={queryStr}
-              onChange={(input) => {
-                setQueryStr(input);
-              }}
-              readOnly={false}
-              setOptions={{
-                fontSize: '14px',
-              }}
-              aria-label="Code Editor"
-              tabSize={2}
-            />
-          </EuiFlexItem>
-        </EuiFlexGroup>
+      <EuiFlexItem grow={false}>
+        <JsonField
+          // We want to integrate query into the form, but not persist in the config.
+          // So, we create the ConfigField explicitly inline, instead of pulling
+          // from the config.
+          field={
+            {
+              label: 'Define query',
+            } as IConfigField
+          }
+          fieldPath={'search.request'}
+          onFormChange={props.onFormChange}
+          editorHeight="25vh"
+        />
       </EuiFlexItem>
     </EuiFlexGroup>
   );

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
@@ -13,7 +13,7 @@ import { WorkflowConfig } from '../../../../../common';
 interface SearchInputsProps {
   uiConfig: WorkflowConfig;
   setUiConfig: (uiConfig: WorkflowConfig) => void;
-  setQuery: (query: {}) => void;
+  setQuery: (query: string) => void;
   onFormChange: () => void;
 }
 
@@ -24,7 +24,10 @@ export function SearchInputs(props: SearchInputsProps) {
   return (
     <EuiFlexGroup direction="column">
       <EuiFlexItem grow={false}>
-        <ConfigureSearchRequest setQuery={props.setQuery} />
+        <ConfigureSearchRequest
+          setQuery={props.setQuery}
+          onFormChange={props.onFormChange}
+        />
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
         <EuiHorizontalRule margin="none" />

diff --git a/public/pages/workflow_detail/workflow_inputs/workflow_inputs.tsx b/public/pages/workflow_detail/workflow_inputs/workflow_inputs.tsx
@@ -53,6 +53,8 @@ interface WorkflowInputsProps {
   setQueryResponse: (queryResponse: string) => void;
   ingestDocs: string;
   setIngestDocs: (docs: string) => void;
+  query: string;
+  setQuery: (query: string) => void;
 }
 
 export enum STEP {
@@ -77,9 +79,6 @@ export function WorkflowInputs(props: WorkflowInputsProps) {
   // ingest state
   const [ingestProvisioned, setIngestProvisioned] = useState<boolean>(false);
 
-  // query state
-  const [query, setQuery] = useState<{}>({});
-
   // maintain global states
   const onIngest = selectedStep === STEP.INGEST;
   const onIngestAndProvisioned = onIngest && ingestProvisioned;
@@ -145,6 +144,9 @@ export function WorkflowInputs(props: WorkflowInputsProps) {
     await validateForm()
       .then(async (validationResults: {}) => {
         if (Object.keys(validationResults).length > 0) {
+          // TODO: may want to persist more fine-grained form validation (ingest vs. search)
+          // For example, running an ingest should be possible, even with some
+          // invalid query or search processor config. And vice versa.
           console.error('Form invalid');
         } else {
           const updatedConfig = formikToUiConfig(
@@ -206,11 +208,15 @@ export function WorkflowInputs(props: WorkflowInputsProps) {
   async function validateAndRunQuery(): Promise<boolean> {
     let success = false;
     try {
-      if (!isEmpty(query)) {
+      let queryObj = {};
+      try {
+        queryObj = JSON.parse(props.query);
+      } catch (e) {}
+      if (!isEmpty(queryObj)) {
         success = await validateAndUpdateWorkflow();
         if (success) {
           const indexName = values.ingest.index.name;
-          dispatch(searchIndex({ index: indexName, body: query }))
+          dispatch(searchIndex({ index: indexName, body: props.query }))
             .unwrap()
             .then(async (resp) => {
               const hits = resp.hits.hits;
@@ -290,7 +296,7 @@ export function WorkflowInputs(props: WorkflowInputsProps) {
               <SearchInputs
                 uiConfig={props.uiConfig}
                 setUiConfig={props.setUiConfig}
-                setQuery={setQuery}
+                setQuery={props.setQuery}
                 onFormChange={props.onFormChange}
               />
             )}

diff --git a/public/pages/workflows/new_workflow/utils.ts b/public/pages/workflows/new_workflow/utils.ts
@@ -91,11 +91,7 @@ function fetchEmptyMetadata(): UIState {
         },
       },
       search: {
-        request: {
-          id: 'request',
-          name: 'Request',
-          fields: [],
-        },
+        request: {},
         enrichRequest: {
           processors: [],
         },

diff --git a/public/utils/config_to_form_utils.ts b/public/utils/config_to_form_utils.ts
@@ -26,11 +26,12 @@ import {
 // and can be extremely large. so we pass that as a standalone field
 export function uiConfigToFormik(
   config: WorkflowConfig,
-  ingestDocs: string
+  ingestDocs: string,
+  query: string
 ): WorkflowFormValues {
   const formikValues = {} as WorkflowFormValues;
   formikValues['ingest'] = ingestConfigToFormik(config.ingest, ingestDocs);
-  formikValues['search'] = searchConfigToFormik(config.search);
+  formikValues['search'] = searchConfigToFormik(config.search, query);
   return formikValues;
 }
 
@@ -81,12 +82,12 @@ function indexConfigToFormik(indexConfig: IndexConfig): FormikValues {
 }
 
 function searchConfigToFormik(
-  searchConfig: SearchConfig | undefined
+  searchConfig: SearchConfig | undefined,
+  query: string
 ): FormikValues {
   let searchFormikValues = {} as FormikValues;
   if (searchConfig) {
-    // TODO: implement for request
-    searchFormikValues['request'] = {};
+    searchFormikValues['request'] = query || getInitialValue('json');
     searchFormikValues['enrichRequest'] = processorsConfigToFormik(
       searchConfig.enrichRequest
     );

diff --git a/public/utils/config_to_schema_utils.ts b/public/utils/config_to_schema_utils.ts
@@ -39,19 +39,6 @@ function ingestConfigToSchema(
   return yup.object(ingestSchemaObj);
 }
 
-function processorsConfigToSchema(processorsConfig: ProcessorsConfig): Schema {
-  const processorsSchemaObj = {} as { [key: string]: Schema };
-  processorsConfig.processors.forEach((processorConfig) => {
-    const processorSchemaObj = {} as { [key: string]: Schema };
-    processorConfig.fields.forEach((field) => {
-      processorSchemaObj[field.id] = getFieldSchema(field.type);
-    });
-    processorsSchemaObj[processorConfig.id] = yup.object(processorSchemaObj);
-  });
-
-  return yup.object(processorsSchemaObj);
-}
-
 function indexConfigToSchema(indexConfig: IndexConfig): Schema {
   const indexSchemaObj = {} as { [key: string]: Schema };
   indexSchemaObj['name'] = getFieldSchema(indexConfig.name.type);
@@ -60,15 +47,35 @@ function indexConfigToSchema(indexConfig: IndexConfig): Schema {
   return yup.object(indexSchemaObj);
 }
 
-// TODO: implement this
 function searchConfigToSchema(
   searchConfig: SearchConfig | undefined
 ): ObjectSchema<any> {
   const searchSchemaObj = {} as { [key: string]: Schema };
-
+  if (searchConfig) {
+    searchSchemaObj['request'] = getFieldSchema('json');
+    searchSchemaObj['enrichRequest'] = processorsConfigToSchema(
+      searchConfig.enrichRequest
+    );
+    searchSchemaObj['enrichResponse'] = processorsConfigToSchema(
+      searchConfig.enrichResponse
+    );
+  }
   return yup.object(searchSchemaObj);
 }
 
+function processorsConfigToSchema(processorsConfig: ProcessorsConfig): Schema {
+  const processorsSchemaObj = {} as { [key: string]: Schema };
+  processorsConfig.processors.forEach((processorConfig) => {
+    const processorSchemaObj = {} as { [key: string]: Schema };
+    processorConfig.fields.forEach((field) => {
+      processorSchemaObj[field.id] = getFieldSchema(field.type);
+    });
+    processorsSchemaObj[processorConfig.id] = yup.object(processorSchemaObj);
+  });
+
+  return yup.object(processorsSchemaObj);
+}
+
 /*
  **************** Yup (validation) utils **********************
  */

diff --git a/public/utils/config_to_workspace_utils.ts b/public/utils/config_to_workspace_utils.ts
@@ -33,10 +33,6 @@ import { generateId } from './utils';
  **************** Config -> workspace utils **********************
  */
 
-/*
- **************** ReactFlow workspace utils **********************
- */
-
 const PARENT_NODE_HEIGHT = 350;
 const NODE_HEIGHT_Y = 70;
 const NODE_WIDTH = 300; // based off of the value set in reactflow-styles.scss