Add existing indices as a source data option; improve config autofill…

…ing (#346) (#347) --------- Signed-off-by: Tyler Ohlsen <[email protected]> (cherry picked from commit 6408c43) Co-authored-by: Tyler Ohlsen <[email protected]>
opensearch-project · Sep 5, 2024 · 7dfc375 · 7dfc375
1 parent cc510e6
commit 7dfc375
Show file tree

Hide file tree

Showing 16 changed files with 373 additions and 66 deletions.
diff --git a/common/constants.ts b/common/constants.ts
@@ -34,6 +34,7 @@ export const BASE_NODE_API_PATH = '/api/flow_framework';
 // OpenSearch node APIs
 export const BASE_OPENSEARCH_NODE_API_PATH = `${BASE_NODE_API_PATH}/opensearch`;
 export const CAT_INDICES_NODE_API_PATH = `${BASE_OPENSEARCH_NODE_API_PATH}/catIndices`;
+export const GET_MAPPINGS_NODE_API_PATH = `${BASE_OPENSEARCH_NODE_API_PATH}/mappings`;
 export const SEARCH_INDEX_NODE_API_PATH = `${BASE_OPENSEARCH_NODE_API_PATH}/search`;
 export const INGEST_NODE_API_PATH = `${BASE_OPENSEARCH_NODE_API_PATH}/ingest`;
 export const BULK_NODE_API_PATH = `${BASE_OPENSEARCH_NODE_API_PATH}/bulk`;

diff --git a/common/interfaces.ts b/common/interfaces.ts
@@ -238,12 +238,12 @@ export type NormalizationProcessor = SearchProcessor & {
 };
 
 export type IndexConfiguration = {
-  settings: {};
+  settings: { [key: string]: any };
   mappings: IndexMappings;
 };
 
 export type IndexMappings = {
-  properties: {};
+  properties: { [key: string]: any };
 };
 
 export type TemplateNode = {

diff --git a/common/utils.ts b/common/utils.ts
@@ -4,7 +4,7 @@
  */
 
 import moment from 'moment';
-import { DATE_FORMAT_PATTERN } from './';
+import { DATE_FORMAT_PATTERN, WORKFLOW_TYPE, Workflow } from './';
 import { isEmpty } from 'lodash';
 
 export function toFormattedDate(timestampMillis: number): String {
@@ -39,3 +39,14 @@ export function getCharacterLimitedString(
 export function customStringify(jsonObj: {}): string {
   return JSON.stringify(jsonObj, undefined, 2);
 }
+
+export function isVectorSearchUseCase(workflow: Workflow | undefined): boolean {
+  return (
+    workflow?.ui_metadata?.type !== undefined &&
+    [
+      WORKFLOW_TYPE.HYBRID_SEARCH,
+      WORKFLOW_TYPE.MULTIMODAL_SEARCH,
+      WORKFLOW_TYPE.SEMANTIC_SEARCH,
+    ].includes(workflow?.ui_metadata?.type)
+  );
+}
diff --git a/public/pages/workflow_detail/resizable_workspace.tsx b/public/pages/workflow_detail/resizable_workspace.tsx
@@ -4,7 +4,6 @@
  */
 
 import React, { useRef, useState, useEffect } from 'react';
-import { useSelector } from 'react-redux';
 import { Form, Formik } from 'formik';
 import * as yup from 'yup';
 import {
@@ -21,6 +20,7 @@ import {
   WorkflowConfig,
   WorkflowFormValues,
   WorkflowSchema,
+  customStringify,
 } from '../../../common';
 import {
   isValidUiWorkflow,
@@ -286,11 +286,7 @@ export function ResizableWorkspace(props: ResizableWorkspaceProps) {
       </EuiFlexItem>
       <EuiFlexItem grow={7}>
         <EuiCodeBlock language="json" fontSize="m" isCopyable={false}>
-          {JSON.stringify(
-            reduceToTemplate(props.workflow as Workflow),
-            undefined,
-            2
-          )}
+          {customStringify(reduceToTemplate(props.workflow as Workflow))}
         </EuiCodeBlock>
       </EuiFlexItem>
     </EuiFlexGroup>

diff --git a/public/pages/workflow_detail/workflow_detail.tsx b/public/pages/workflow_detail/workflow_detail.tsx
@@ -21,6 +21,7 @@ import { getCore } from '../../services';
 import { WorkflowDetailHeader } from './components';
 import {
   AppState,
+  catIndices,
   getWorkflow,
   searchModels,
   useAppDispatch,
@@ -101,9 +102,11 @@ export function WorkflowDetail(props: WorkflowDetailProps) {
   // On initial load:
   // - fetch workflow
   // - fetch available models as their IDs may be used when building flows
+  // - fetch all indices
   useEffect(() => {
     dispatch(getWorkflow({ workflowId, dataSourceId }));
     dispatch(searchModels({ apiBody: FETCH_ALL_QUERY, dataSourceId }));
+    dispatch(catIndices({ pattern: '*,-.*', dataSourceId }));
   }, []);
 
   return errorMessage.includes(ERROR_GETTING_WORKFLOW_MSG) ||

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
@@ -8,12 +8,13 @@ import { EuiFlexGroup, EuiFlexItem, EuiHorizontalRule } from '@elastic/eui';
 import { SourceData } from './source_data';
 import { EnrichData } from './enrich_data';
 import { IngestData } from './ingest_data';
-import { WorkflowConfig } from '../../../../../common';
+import { Workflow, WorkflowConfig } from '../../../../../common';
 
 interface IngestInputsProps {
   setIngestDocs: (docs: string) => void;
   uiConfig: WorkflowConfig;
   setUiConfig: (uiConfig: WorkflowConfig) => void;
+  workflow: Workflow | undefined;
 }
 
 /**
@@ -23,7 +24,11 @@ export function IngestInputs(props: IngestInputsProps) {
   return (
     <EuiFlexGroup direction="column">
       <EuiFlexItem grow={false}>
-        <SourceData setIngestDocs={props.setIngestDocs} />
+        <SourceData
+          workflow={props.workflow}
+          uiConfig={props.uiConfig}
+          setIngestDocs={props.setIngestDocs}
+        />
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
         <EuiHorizontalRule margin="none" />