diff --git a/examples/guided_onboarding_example/public/components/main.tsx b/examples/guided_onboarding_example/public/components/main.tsx index bf409520d8833..d172cfbb0c8f3 100644 --- a/examples/guided_onboarding_example/public/components/main.tsx +++ b/examples/guided_onboarding_example/public/components/main.tsx @@ -37,7 +37,6 @@ interface MainProps { } const exampleGuideIds: GuideId[] = [ - 'appSearch', 'websiteSearch', 'databaseSearch', 'siem', diff --git a/src/platform/packages/shared/kbn-guided-onboarding/src/components/landing_page/classic_version/__snapshots__/guide_cards.test.tsx.snap b/src/platform/packages/shared/kbn-guided-onboarding/src/components/landing_page/classic_version/__snapshots__/guide_cards.test.tsx.snap index eed9145e48736..2471b221f87dd 100644 --- a/src/platform/packages/shared/kbn-guided-onboarding/src/components/landing_page/classic_version/__snapshots__/guide_cards.test.tsx.snap +++ b/src/platform/packages/shared/kbn-guided-onboarding/src/components/landing_page/classic_version/__snapshots__/guide_cards.test.tsx.snap @@ -96,38 +96,6 @@ exports[`guide cards snapshots should render all cards 1`] = ` - , - } - } - />, - } - } - guidesState={Array []} - navigateToApp={[MockFunction]} - /> - - - , - }} - /> - ), - guideId: 'appSearch', - telemetryId: 'onboarding--search--application', - order: 10, - }, { solution: 'search', icon: 'search', diff --git a/src/platform/packages/shared/kbn-guided-onboarding/src/components/landing_page/guide/guide_cards.constants.tsx b/src/platform/packages/shared/kbn-guided-onboarding/src/components/landing_page/guide/guide_cards.constants.tsx index 4728b70c338aa..ed52a70dfdc4e 100644 --- a/src/platform/packages/shared/kbn-guided-onboarding/src/components/landing_page/guide/guide_cards.constants.tsx +++ b/src/platform/packages/shared/kbn-guided-onboarding/src/components/landing_page/guide/guide_cards.constants.tsx @@ -84,22 +84,6 @@ export const guideCards: GuideCardConstants[] = [ telemetryId: 'onboarding--search--ai', order: 7, }, - { - solution: 'search', - icon: 'wrench', - title: ( - , - }} - /> - ), - guideId: 'appSearch', - telemetryId: 'onboarding--search--application', - order: 10, - }, { solution: 'search', icon: 'search', diff --git a/src/platform/packages/shared/kbn-guided-onboarding/src/types.ts b/src/platform/packages/shared/kbn-guided-onboarding/src/types.ts index 9d53f30aed209..f9f1cbc2053bd 100644 --- a/src/platform/packages/shared/kbn-guided-onboarding/src/types.ts +++ b/src/platform/packages/shared/kbn-guided-onboarding/src/types.ts @@ -7,13 +7,7 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -export type GuideId = - | 'kubernetes' - | 'siem' - | 'appSearch' - | 'websiteSearch' - | 'databaseSearch' - | 'testGuide'; +export type GuideId = 'kubernetes' | 'siem' | 'websiteSearch' | 'databaseSearch' | 'testGuide'; type KubernetesStepIds = 'add_data' | 'view_dashboard' | 'tour_observability'; type SiemStepIds = 'add_data' | 'rules' | 'alertsCases'; diff --git a/src/platform/plugins/shared/guided_onboarding/README.md b/src/platform/plugins/shared/guided_onboarding/README.md index 1d0f87b32ff8f..c669f5e70f5ca 100755 --- a/src/platform/plugins/shared/guided_onboarding/README.md +++ b/src/platform/plugins/shared/guided_onboarding/README.md @@ -118,7 +118,7 @@ The value of the parameter `indexID` needs to be passed to the API service when ## Guides config -To use the API service, you need to know a guide ID (currently one of `appSearch`, `websiteSearch`, `databaseSearch`, `kubernetes`, `siem`) and a step ID (for example, `add_data`, `search_experience`, `rules` etc). The consumers of guided onboarding register their guide configs themselves and have therefore full control over the guide ID and step IDs used for their guide. For more details on registering a guide config, see below. +To use the API service, you need to know a guide ID (currently one of `websiteSearch`, `databaseSearch`, `kubernetes`, `siem`) and a step ID (for example, `add_data`, `search_experience`, `rules` etc). The consumers of guided onboarding register their guide configs themselves and have therefore full control over the guide ID and step IDs used for their guide. For more details on registering a guide config, see below. ## Server side: register a guide config diff --git a/test/api_integration/apis/guided_onboarding/get_config.ts b/test/api_integration/apis/guided_onboarding/get_config.ts index 6ab2095e594b8..617401e34d70d 100644 --- a/test/api_integration/apis/guided_onboarding/get_config.ts +++ b/test/api_integration/apis/guided_onboarding/get_config.ts @@ -18,7 +18,7 @@ export default function testGetGuideConfig({ getService }: FtrProviderContext) { describe(`GET ${getConfigsPath}`, () => { // check that production guides are present - ['siem', 'appSearch', 'websiteSearch', 'databaseSearch', 'kubernetes'].map((guideId) => { + ['siem', 'websiteSearch', 'databaseSearch', 'kubernetes'].map((guideId) => { it(`returns config for ${guideId}`, async () => { const response = await supertest .get(`${getConfigsPath}/${guideId}`) diff --git a/test/api_integration/apis/guided_onboarding/get_guides.ts b/test/api_integration/apis/guided_onboarding/get_guides.ts index 029a4b2eb33b7..f374d78096f2e 100644 --- a/test/api_integration/apis/guided_onboarding/get_guides.ts +++ b/test/api_integration/apis/guided_onboarding/get_guides.ts @@ -13,7 +13,7 @@ import { guideStateSavedObjectsType, pluginStateSavedObjectsType, } from '@kbn/guided-onboarding-plugin/server/saved_objects/guided_setup'; -import { appSearchGuideId } from '@kbn/enterprise-search-plugin/common/guided_onboarding/search_guide_config'; +import { websiteSearchGuideId } from '@kbn/enterprise-search-plugin/common/guided_onboarding/search_guide_config'; import { API_BASE_PATH } from '@kbn/guided-onboarding-plugin/common'; import { X_ELASTIC_INTERNAL_ORIGIN_REQUEST } from '@kbn/core-http-common'; import type { FtrProviderContext } from '../../ftr_provider_context'; @@ -44,7 +44,7 @@ export default function testGetGuidesState({ getService }: FtrProviderContext) { it('returns all created guides (active and inactive)', async () => { await createGuides(kibanaServer, [ testGuideStep1ActiveState, - { ...testGuideStep1ActiveState, guideId: appSearchGuideId }, + { ...testGuideStep1ActiveState, guideId: websiteSearchGuideId }, ]); const response = await supertest .get(getGuidesPath) @@ -53,7 +53,7 @@ export default function testGetGuidesState({ getService }: FtrProviderContext) { expect(response.body).not.to.be.empty(); expect(response.body.state).to.eql([ testGuideStep1ActiveState, - { ...testGuideStep1ActiveState, guideId: appSearchGuideId }, + { ...testGuideStep1ActiveState, guideId: websiteSearchGuideId }, ]); }); }); diff --git a/test/api_integration/apis/guided_onboarding/put_state.ts b/test/api_integration/apis/guided_onboarding/put_state.ts index c6682be76d528..bfa6aa0f32b97 100644 --- a/test/api_integration/apis/guided_onboarding/put_state.ts +++ b/test/api_integration/apis/guided_onboarding/put_state.ts @@ -21,7 +21,7 @@ import { guideStateSavedObjectsType, } from '@kbn/guided-onboarding-plugin/server/saved_objects/guided_setup'; import { testGuideId } from '@kbn/guided-onboarding'; -import { appSearchGuideId } from '@kbn/enterprise-search-plugin/common/guided_onboarding/search_guide_config'; +import { websiteSearchGuideId } from '@kbn/enterprise-search-plugin/common/guided_onboarding/search_guide_config'; import { API_BASE_PATH } from '@kbn/guided-onboarding-plugin/common'; import { X_ELASTIC_INTERNAL_ORIGIN_REQUEST } from '@kbn/core-http-common'; import type { FtrProviderContext } from '../../ftr_provider_context'; @@ -137,7 +137,7 @@ export default function testPutState({ getService }: FtrProviderContext) { // create an active guide and an inactive guide await createGuides(kibanaServer, [ testGuideStep1ActiveState, - { ...testGuideNotActiveState, guideId: appSearchGuideId }, + { ...testGuideNotActiveState, guideId: websiteSearchGuideId }, ]); // Create a new guide with isActive: true @@ -162,7 +162,7 @@ export default function testPutState({ getService }: FtrProviderContext) { const searchGuideSO = await kibanaServer.savedObjects.get({ type: guideStateSavedObjectsType, - id: appSearchGuideId, + id: websiteSearchGuideId, }); expect(searchGuideSO.attributes.isActive).to.eql(false); diff --git a/x-pack/platform/plugins/private/translations/translations/fr-FR.json b/x-pack/platform/plugins/private/translations/translations/fr-FR.json index 59bb6e6404e60..e2ffe7b70385e 100644 --- a/x-pack/platform/plugins/private/translations/translations/fr-FR.json +++ b/x-pack/platform/plugins/private/translations/translations/fr-FR.json @@ -3811,7 +3811,6 @@ "guidedOnboarding.quitGuideModal.quitButtonLabel": "Quitter le guide", "guidedOnboardingPackage.gettingStarted.cards.aiSearch.title": "Développer une expérience de recherche optimisée par l'IA", "guidedOnboardingPackage.gettingStarted.cards.apmObservability.title": "Surveiller les performances {lineBreak} de mon application (APM / traçage)", - "guidedOnboardingPackage.gettingStarted.cards.appSearch.title": "Développer une application {lineBreak} au-dessus d'Elasticsearch", "guidedOnboardingPackage.gettingStarted.cards.cloudSecurity.title": "Sécuriser mes ressources cloud {lineBreak} grâce à la gestion du niveau de sécurité du cloud (CSPM)", "guidedOnboardingPackage.gettingStarted.cards.completeLabel": "Guide terminé", "guidedOnboardingPackage.gettingStarted.cards.databaseSearch.title": "Rechercher dans les bases de données {lineBreak} et les systèmes d'entreprise", diff --git a/x-pack/platform/plugins/private/translations/translations/ja-JP.json b/x-pack/platform/plugins/private/translations/translations/ja-JP.json index f228052f48391..81eb50b3ac674 100644 --- a/x-pack/platform/plugins/private/translations/translations/ja-JP.json +++ b/x-pack/platform/plugins/private/translations/translations/ja-JP.json @@ -3806,7 +3806,6 @@ "guidedOnboarding.quitGuideModal.quitButtonLabel": "ガイドを終了", "guidedOnboardingPackage.gettingStarted.cards.aiSearch.title": "AIを活用した検索エクスペリエンスの構築", "guidedOnboardingPackage.gettingStarted.cards.apmObservability.title": "アプリケーション{lineBreak}パフォーマンスを監視（APM / トレース）", - "guidedOnboardingPackage.gettingStarted.cards.appSearch.title": "Elasticsearchの上に{lineBreak}アプリケーションを構築", "guidedOnboardingPackage.gettingStarted.cards.cloudSecurity.title": "クラウドセキュリティ態勢管理（CSPM）でクラウド{lineBreak}資産を保護", "guidedOnboardingPackage.gettingStarted.cards.completeLabel": "ガイド完了", "guidedOnboardingPackage.gettingStarted.cards.databaseSearch.title": "データベースと{lineBreak}ビジネスシステムで検索", diff --git a/x-pack/platform/plugins/private/translations/translations/zh-CN.json b/x-pack/platform/plugins/private/translations/translations/zh-CN.json index 4618a932f3e1a..176d597e78381 100644 --- a/x-pack/platform/plugins/private/translations/translations/zh-CN.json +++ b/x-pack/platform/plugins/private/translations/translations/zh-CN.json @@ -3786,7 +3786,6 @@ "guidedOnboarding.quitGuideModal.quitButtonLabel": "退出指南", "guidedOnboardingPackage.gettingStarted.cards.aiSearch.title": "构建 AI 驱动式搜索体验", "guidedOnboardingPackage.gettingStarted.cards.apmObservability.title": "监测我的应用程序{lineBreak}性能（APM/跟踪）", - "guidedOnboardingPackage.gettingStarted.cards.appSearch.title": "在 Elasticsearch 之上{lineBreak}构建应用程序", "guidedOnboardingPackage.gettingStarted.cards.cloudSecurity.title": "借助云{lineBreak}安全态势管理 (CSPM) 保护我的云资产", "guidedOnboardingPackage.gettingStarted.cards.completeLabel": "指南完成", "guidedOnboardingPackage.gettingStarted.cards.databaseSearch.title": "跨数据库和{lineBreak}业务系统进行搜索", diff --git a/x-pack/solutions/search/plugins/enterprise_search/common/guided_onboarding/search_guide_config.ts b/x-pack/solutions/search/plugins/enterprise_search/common/guided_onboarding/search_guide_config.ts index d46ab70628fd1..5d6c5e9f11dfd 100644 --- a/x-pack/solutions/search/plugins/enterprise_search/common/guided_onboarding/search_guide_config.ts +++ b/x-pack/solutions/search/plugins/enterprise_search/common/guided_onboarding/search_guide_config.ts @@ -8,20 +8,15 @@ import type { GuideConfig, StepConfig } from '@kbn/guided-onboarding'; import { i18n } from '@kbn/i18n'; -export const appSearchGuideId = 'appSearch'; export const websiteSearchGuideId = 'websiteSearch'; export const databaseSearchGuideId = 'databaseSearch'; const apiRoutes = { - [appSearchGuideId]: '/search_indices/new_index/api', [databaseSearchGuideId]: '/connectors/select_connector', [websiteSearchGuideId]: '/crawlers', }; -export type EnterpriseSearchGuideIds = - | typeof appSearchGuideId - | typeof websiteSearchGuideId - | typeof databaseSearchGuideId; +export type EnterpriseSearchGuideIds = typeof websiteSearchGuideId | typeof databaseSearchGuideId; const getAddDataStep: (method?: EnterpriseSearchGuideIds) => StepConfig = (method) => { return { @@ -88,8 +83,6 @@ const getGuideConfig: (telemetryId: EnterpriseSearchGuideIds) => GuideConfig = ( }; }; -export const appSearchGuideConfig: GuideConfig = getGuideConfig(appSearchGuideId); - export const websiteSearchGuideConfig: GuideConfig = getGuideConfig(websiteSearchGuideId); export const databaseSearchGuideConfig: GuideConfig = getGuideConfig(databaseSearchGuideId); diff --git a/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/search_index.tsx b/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/search_index.tsx index 4068b35c89283..e3d1dc4999b0f 100644 --- a/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/search_index.tsx +++ b/x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/search_index.tsx @@ -81,17 +81,6 @@ export const SearchIndex: React.FC = () => { updateSideNavDefinition, } = useValues(KibanaLogic); - useEffect(() => { - const subscription = guidedOnboarding?.guidedOnboardingApi - ?.isGuideStepActive$('appSearch', 'add_data') - .subscribe((isStepActive) => { - if (isStepActive && index?.count) { - guidedOnboarding?.guidedOnboardingApi?.completeGuideStep('appSearch', 'add_data'); - } - }); - return () => subscription?.unsubscribe(); - }, [guidedOnboarding, index?.count]); - useEffect(() => { const subscription = guidedOnboarding?.guidedOnboardingApi ?.isGuideStepActive$('websiteSearch', 'add_data') diff --git a/x-pack/solutions/search/plugins/enterprise_search/server/plugin.ts b/x-pack/solutions/search/plugins/enterprise_search/server/plugin.ts index e4657c3e8a373..acfbb6b5187c6 100644 --- a/x-pack/solutions/search/plugins/enterprise_search/server/plugin.ts +++ b/x-pack/solutions/search/plugins/enterprise_search/server/plugin.ts @@ -50,10 +50,8 @@ import { } from '../common/constants'; import { - appSearchGuideId, websiteSearchGuideId, databaseSearchGuideId, - appSearchGuideConfig, websiteSearchGuideConfig, databaseSearchGuideConfig, } from '../common/guided_onboarding/search_guide_config'; @@ -359,7 +357,6 @@ export class EnterpriseSearchPlugin implements Plugin