Add standalone form state for query editing modal

common/interfaces.ts

@@ -114,9 +114,14 @@ export type WorkflowSchema = ObjectSchema<WorkflowSchemaObj>;
 export type IngestDocsFormValues = {
   docs: FormikValues;
 };
-export type IngestDocsSchemaObj = WorkflowSchemaObj;
 export type IngestDocsSchema = WorkflowSchema;
 
+// Form / schema interfaces for the request query sub-form
+export type RequestFormValues = {
+  request: ConfigFieldValue;
+};
+export type RequestSchema = WorkflowSchema;
+
 /**
  ********** WORKSPACE TYPES/INTERFACES **********
  */

public/pages/workflow_detail/workflow_detail.test.tsx

@@ -229,9 +229,9 @@ describe('WorkflowDetail Page with skip ingestion option (Hybrid Search Workflow
     });
     const searchQueryPresetButton = getByTestId('searchQueryPresetButton');
     expect(searchQueryPresetButton).toBeInTheDocument();
-    const searchQueryCloseButton = getByTestId('searchQueryCloseButton');
-    expect(searchQueryCloseButton).toBeInTheDocument();
-    userEvent.click(searchQueryCloseButton);
+    const updateSearchQueryButton = getByTestId('updateSearchQueryButton');
+    expect(updateSearchQueryButton).toBeInTheDocument();
+    userEvent.click(updateSearchQueryButton);
 
     // Add request processor
     const addRequestProcessorButton = await waitFor(

public/pages/workflow_detail/workflow_inputs/ingest_inputs/source_data_modal.tsx

@@ -30,6 +30,7 @@ import {
   IConfigField,
   IndexMappings,
   IngestDocsFormValues,
+  IngestDocsSchema,
   isVectorSearchUseCase,
   SearchHit,
   SOURCE_OPTIONS,
@@ -76,7 +77,7 @@ export function SourceDataModal(props: SourceDataProps) {
     docs: getFieldSchema({
       type: 'jsonArray',
     } as IConfigField),
-  });
+  }) as IngestDocsSchema;
 
   // persist standalone values. update / initialize when it is first opened
   const [tempDocs, setTempDocs] = useState<string>('[]');

public/pages/workflow_detail/workflow_inputs/search_inputs/edit_query_modal.tsx

@@ -3,8 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { useState } from 'react';
-import { useFormikContext } from 'formik';
+import React, { useEffect, useState } from 'react';
+import { Formik, getIn, useFormikContext } from 'formik';
+import * as yup from 'yup';
+import { isEmpty } from 'lodash';
 import {
   EuiSmallButton,
   EuiContextMenu,
@@ -18,10 +20,14 @@ import {
 } from '@elastic/eui';
 import { JsonField } from '../input_fields';
 import {
+  IConfigField,
   QUERY_PRESETS,
   QueryPreset,
+  RequestFormValues,
+  RequestSchema,
   WorkflowFormValues,
 } from '../../../../../common';
+import { getFieldSchema, getInitialValue } from '../../../../utils';
 
 interface EditQueryModalProps {
   queryFieldPath: string;
@@ -33,75 +39,131 @@ interface EditQueryModalProps {
  * a set of pre-defined queries targeted for different use cases.
  */
 export function EditQueryModal(props: EditQueryModalProps) {
+  // sub-form values/schema
+  const requestFormValues = {
+    request: getInitialValue('json'),
+  } as RequestFormValues;
+  const requestFormSchema = yup.object({
+    request: getFieldSchema({
+      type: 'json',
+    } as IConfigField),
+  }) as RequestSchema;
+
+  // persist standalone values. update / initialize when it is first opened
+  const [tempRequest, setTempRequest] = useState<string>('{}');
+  const [tempErrors, setTempErrors] = useState<boolean>(false);
+
   // Form state
-  const { setFieldValue, setFieldTouched } = useFormikContext<
+  const { values, setFieldValue, setFieldTouched } = useFormikContext<
     WorkflowFormValues
   >();
 
   // popover state
   const [popoverOpen, setPopoverOpen] = useState<boolean>(false);
 
   return (
-    <EuiModal
-      onClose={() => props.setModalOpen(false)}
-      style={{ width: '70vw' }}
-      data-testid="editQueryModal"
+    <Formik
+      enableReinitialize={false}
+      initialValues={requestFormValues}
+      validationSchema={requestFormSchema}
+      onSubmit={(values) => {}}
+      validate={(values) => {}}
     >
-      <EuiModalHeader>
-        <EuiModalHeaderTitle>
-          <p>{`Edit query`}</p>
-        </EuiModalHeaderTitle>
-      </EuiModalHeader>
-      <EuiModalBody data-testid="editQueryModalBody">
-        <EuiPopover
-          button={
-            <EuiSmallButton
-              onClick={() => setPopoverOpen(!popoverOpen)}
-              data-testid="searchQueryPresetButton"
-            >
-              Choose from a preset
-            </EuiSmallButton>
-          }
-          isOpen={popoverOpen}
-          closePopover={() => setPopoverOpen(false)}
-          anchorPosition="downLeft"
-        >
-          <EuiContextMenu
-            size="s"
-            initialPanelId={0}
-            panels={[
-              {
-                id: 0,
-                items: QUERY_PRESETS.map((preset: QueryPreset) => ({
-                  name: preset.name,
-                  onClick: () => {
-                    setFieldValue(props.queryFieldPath, preset.query);
-                    setFieldTouched(props.queryFieldPath, true);
-                    setPopoverOpen(false);
-                  },
-                })),
-              },
-            ]}
-          />
-        </EuiPopover>
-        <EuiSpacer size="s" />
-        <JsonField
-          label="Query"
-          fieldPath={props.queryFieldPath}
-          editorHeight="25vh"
-          readOnly={false}
-        />
-      </EuiModalBody>
-      <EuiModalFooter>
-        <EuiSmallButton
-          onClick={() => props.setModalOpen(false)}
-          data-testid="searchQueryCloseButton"
-          fill={false}
-          color="primary"
-        >
-          Close
-        </EuiSmallButton>
-      </EuiModalFooter>
-    </EuiModal>
+      {(formikProps) => {
+        // override to parent form value when changes detected
+        useEffect(() => {
+          formikProps.setFieldValue(
+            'request',
+            getIn(values, props.queryFieldPath)
+          );
+        }, [getIn(values, props.queryFieldPath)]);
+
+        // update tempRequest when form changes are detected
+        useEffect(() => {
+          setTempRequest(getIn(formikProps.values, 'request'));
+        }, [getIn(formikProps.values, 'request')]);
+
+        // update tempErrors if errors detected
+        useEffect(() => {
+          setTempErrors(!isEmpty(formikProps.errors));
+        }, [formikProps.errors]);
+
+        return (
+          <EuiModal
+            onClose={() => props.setModalOpen(false)}
+            style={{ width: '70vw' }}
+            data-testid="editQueryModal"
+          >
+            <EuiModalHeader>
+              <EuiModalHeaderTitle>
+                <p>{`Edit query`}</p>
+              </EuiModalHeaderTitle>
+            </EuiModalHeader>
+            <EuiModalBody data-testid="editQueryModalBody">
+              <EuiPopover
+                button={
+                  <EuiSmallButton
+                    onClick={() => setPopoverOpen(!popoverOpen)}
+                    data-testid="searchQueryPresetButton"
+                  >
+                    Choose from a preset
+                  </EuiSmallButton>
+                }
+                isOpen={popoverOpen}
+                closePopover={() => setPopoverOpen(false)}
+                anchorPosition="downLeft"
+              >
+                <EuiContextMenu
+                  size="s"
+                  initialPanelId={0}
+                  panels={[
+                    {
+                      id: 0,
+                      items: QUERY_PRESETS.map((preset: QueryPreset) => ({
+                        name: preset.name,
+                        onClick: () => {
+                          formikProps.setFieldValue('request', preset.query);
+                          setPopoverOpen(false);
+                        },
+                      })),
+                    },
+                  ]}
+                />
+              </EuiPopover>
+              <EuiSpacer size="s" />
+              <JsonField
+                label="Query"
+                fieldPath={'request'}
+                editorHeight="25vh"
+                readOnly={false}
+              />
+            </EuiModalBody>
+            <EuiModalFooter>
+              <EuiSmallButton
+                onClick={() => props.setModalOpen(false)}
+                fill={false}
+                color="primary"
+                data-testid="cancelSearchQueryButton"
+              >
+                Cancel
+              </EuiSmallButton>
+              <EuiSmallButton
+                onClick={() => {
+                  setFieldValue(props.queryFieldPath, tempRequest);
+                  setFieldTouched(props.queryFieldPath, true);
+                  props.setModalOpen(false);
+                }}
+                isDisabled={tempErrors} // blocking update until valid input is given
+                fill={true}
+                color="primary"
+                data-testid="updateSearchQueryButton"
+              >
+                Update
+              </EuiSmallButton>
+            </EuiModalFooter>
+          </EuiModal>
+        );
+      }}
+    </Formik>
   );
 }