diff --git a/common/constants.ts b/common/constants.ts index e52e4028..d55b6019 100644 --- a/common/constants.ts +++ b/common/constants.ts @@ -442,18 +442,10 @@ export const QUERY_PRESETS = [ name: 'Basic k-NN', query: customStringify(KNN_QUERY), }, - { - name: `${WORKFLOW_TYPE.SEMANTIC_SEARCH} (neural)`, - query: customStringify(SEMANTIC_SEARCH_QUERY_NEURAL), - }, { name: WORKFLOW_TYPE.MULTIMODAL_SEARCH, query: customStringify(MULTIMODAL_SEARCH_QUERY_BOOL), }, - { - name: `${WORKFLOW_TYPE.MULTIMODAL_SEARCH} (neural)`, - query: customStringify(MULTIMODAL_SEARCH_QUERY_NEURAL), - }, { name: `Hybrid search (match & k-NN queries)`, query: customStringify(HYBRID_SEARCH_QUERY_MATCH_KNN), @@ -462,10 +454,6 @@ export const QUERY_PRESETS = [ name: `Hybrid search (match & term queries)`, query: customStringify(HYBRID_SEARCH_QUERY_MATCH_TERM), }, - { - name: `Hybrid search (match & neural queries)`, - query: customStringify(HYBRID_SEARCH_QUERY_MATCH_NEURAL), - }, ] as QueryPreset[]; /** diff --git a/documentation/tutorial.md b/documentation/tutorial.md index d511d6ae..c70106b3 100644 --- a/documentation/tutorial.md +++ b/documentation/tutorial.md @@ -1,4 +1,4 @@ -The following tutorial is an accurate representation of the experimental OpenSearch Flow OSD Plugin as of 11/27/2024, based on OSD 2.18. +The following tutorial is an accurate representation of the OpenSearch Flow OSD Plugin as of 12/30/2024, based on OSD 2.18. Changelog: diff --git a/public/general_components/experimental_badge.tsx b/public/general_components/experimental_badge.tsx deleted file mode 100644 index b1d098d0..00000000 --- a/public/general_components/experimental_badge.tsx +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright OpenSearch Contributors - * SPDX-License-Identifier: Apache-2.0 - */ - -import React, { useState } from 'react'; -import { - EuiBetaBadge, - EuiPopover, - EuiPopoverFooter, - EuiPopoverTitle, - EuiSmallButton, - EuiText, - PopoverAnchorPosition, -} from '@elastic/eui'; -import { GITHUB_FEEDBACK_LINK } from '../../common'; - -interface ExperimentalBadgeProps { - popoverEnabled: boolean; - popoverAnchorPosition?: PopoverAnchorPosition; -} - -/** - * Experimental/beta badge with an optional popover for users to provide feedback - */ -export function ExperimentalBadge(props: ExperimentalBadgeProps) { - const [popoverOpen, setPopoverOpen] = useState(false); - - return props.popoverEnabled ? ( - setPopoverOpen(!popoverOpen)} - /> - } - isOpen={popoverOpen} - closePopover={() => setPopoverOpen(false)} - panelPaddingSize="s" - anchorPosition={props.popoverAnchorPosition || 'downCenter'} - > - EXPERIMENTAL FEATURE - - {`OpenSearch Flow is experimental and should not be used in a\n - production environment.`} - - - - Provide feedback on GitHub - - - - ) : ( - - ); -} diff --git a/public/general_components/index.ts b/public/general_components/index.ts index ed0d4957..2e9241f8 100644 --- a/public/general_components/index.ts +++ b/public/general_components/index.ts @@ -5,7 +5,6 @@ export { MultiSelectFilter } from './multi_select_filter'; export { ProcessorsTitle } from './processors_title'; -export { ExperimentalBadge } from './experimental_badge'; export { QueryParamsList } from './query_params_list'; export { JsonPathExamplesTable } from './jsonpath_examples_table'; export * from './results'; diff --git a/public/general_components/service_card/plugin_card.tsx b/public/general_components/service_card/plugin_card.tsx index 43dee810..62f8f6d9 100644 --- a/public/general_components/service_card/plugin_card.tsx +++ b/public/general_components/service_card/plugin_card.tsx @@ -16,7 +16,6 @@ import { PLUGIN_ID } from '../../../common'; import { ContentManagementPluginStart } from '../../../../../src/plugins/content_management/public'; import { CoreStart } from '../../../../../src/core/public'; import pluginIcon from './icon.svg'; -import { ExperimentalBadge } from '../experimental_badge'; const HEADER_TEXT = 'Design and test your search solutions with ease'; const DESCRIPTION_TEXT = @@ -67,12 +66,6 @@ export const registerPluginCard = ( - - - ); }, diff --git a/public/pages/workflow_detail/components/header.tsx b/public/pages/workflow_detail/components/header.tsx index 4f6e4952..ca1edd29 100644 --- a/public/pages/workflow_detail/components/header.tsx +++ b/public/pages/workflow_detail/components/header.tsx @@ -54,7 +54,6 @@ import { MountPoint } from '../../../../../../src/core/public'; import { getWorkflow, updateWorkflow, useAppDispatch } from '../../../store'; import { useFormikContext } from 'formik'; import { isEmpty, isEqual } from 'lodash'; -import { ExperimentalBadge } from '../../../general_components'; interface WorkflowDetailHeaderProps { workflow?: Workflow; @@ -333,14 +332,6 @@ export function WorkflowDetailHeader(props: WorkflowDetailHeaderProps) { - ), - }, { text: `Last saved: ${workflowLastUpdated}`, color: 'subdued', @@ -415,10 +406,6 @@ export function WorkflowDetailHeader(props: WorkflowDetailHeaderProps) { {`Last saved: ${workflowLastUpdated}`} , - , ]} bottomBorder={false} rightSideGroupProps={{ diff --git a/public/pages/workflows/workflows.tsx b/public/pages/workflows/workflows.tsx index ff139ce0..224f8b64 100644 --- a/public/pages/workflows/workflows.tsx +++ b/public/pages/workflows/workflows.tsx @@ -42,7 +42,6 @@ import { } from '../../services'; import { prettifyErrorMessage } from '../../../common/utils'; import { DataSourceOption } from '../../../../../src/plugins/data_source_management/public/components/data_source_menu/types'; -import { ExperimentalBadge } from '../../general_components'; import { TopNavControlData } from '../../../../../src/plugins/navigation/public'; export interface WorkflowsRouterProps {} @@ -217,22 +216,6 @@ export function Workflows(props: WorkflowsProps) { }, [getSavedObjectsClient, getNotifications(), props.setActionMenu]); } - const experimentalBadgeInHeader = ( - - ), - } as TopNavControlData, - ]} - /> - ); - const DESCRIPTION = `Design, experiment, and prototype your solutions with ${PLUGIN_NAME}. Build your search and last mile ingestion flows with a visual interface. Experiment with different configurations with prototyping tools and launch them into your environment.`; @@ -254,12 +237,6 @@ export function Workflows(props: WorkflowsProps) {

{PLUGIN_NAME}

- - - {DESCRIPTION} @@ -275,7 +252,6 @@ export function Workflows(props: WorkflowsProps) { /> )} {dataSourceEnabled && renderDataSourceComponent} - {USE_NEW_HOME_PAGE && experimentalBadgeInHeader}