fix(search): use locator to navigate to playground

elastic · Dec 2, 2024 · 732cb8c · 732cb8c
1 parent 5871e2d
commit 732cb8c
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 64 deletions.
diff --git a/x-pack/plugins/enterprise_search/common/locators/index.ts b/x-pack/plugins/enterprise_search/common/locators/index.ts
@@ -13,10 +13,8 @@ import {
   type CreateIndexLocatorParams,
 } from './create_index_locator';
 import { SearchInferenceEndpointLocatorDefinition } from './inference_locator';
-import { PlaygroundLocatorDefinition, type PlaygroundLocatorParams } from './playground_locator';
 
 export function registerLocators(share: SharePluginSetup) {
   share.url.locators.create<CreateIndexLocatorParams>(new CreateIndexLocatorDefinition());
-  share.url.locators.create<PlaygroundLocatorParams>(new PlaygroundLocatorDefinition());
   share.url.locators.create<SerializableRecord>(new SearchInferenceEndpointLocatorDefinition());
 }
diff --git a/x-pack/plugins/enterprise_search/common/locators/playground_locator.tsx b/x-pack/plugins/enterprise_search/common/locators/playground_locator.tsx
diff --git a/...tions/enterprise_search_content/components/connector_detail/components/whats_next_box.tsx b/...tions/enterprise_search_content/components/connector_detail/components/whats_next_box.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React from 'react';
+import React, { useCallback } from 'react';
 
 import { useValues } from 'kea';
 
@@ -25,9 +25,6 @@ import { FormattedMessage } from '@kbn/i18n-react';
 
 import { ConnectorStatus } from '@kbn/search-connectors';
 
-import { APPLICATIONS_PLUGIN } from '../../../../../../common/constants';
-
-import { PLAYGROUND_PATH } from '../../../../applications/routes';
 import { generateEncodedPath } from '../../../../shared/encode_path_params';
 import { KibanaLogic } from '../../../../shared/kibana';
 import { EuiButtonTo } from '../../../../shared/react_router_helpers';
@@ -53,7 +50,14 @@ export const WhatsNextBox: React.FC<WhatsNextBoxProps> = ({
   isSyncing = false,
   isWaitingForConnector = false,
 }) => {
-  const { navigateToUrl } = useValues(KibanaLogic);
+  const { share } = useValues(KibanaLogic);
+  const onStartPlaygroundClick = useCallback(() => {
+    if (!share) return;
+    const playgroundLocator = share.url.locators.get('PLAYGROUND_LOCATOR_ID');
+    if (playgroundLocator) {
+      playgroundLocator.navigate({ 'default-index': connectorIndex });
+    }
+  }, [connectorIndex, share]);
   const isConfigured = !(
     connectorStatus === ConnectorStatus.NEEDS_CONFIGURATION ||
     connectorStatus === ConnectorStatus.CREATED
@@ -84,14 +88,7 @@ export const WhatsNextBox: React.FC<WhatsNextBoxProps> = ({
             data-test-subj="enterpriseSearchWhatsNextBoxSearchPlaygroundButton"
             iconType="sparkles"
             disabled={!connectorIndex || disabled}
-            onClick={() => {
-              navigateToUrl(
-                `${APPLICATIONS_PLUGIN.URL}${PLAYGROUND_PATH}?default-index=${connectorIndex}`,
-                {
-                  shouldNotCreateHref: true,
-                }
-              );
-            }}
+            onClick={onStartPlaygroundClick}
           >
             <FormattedMessage
               id="xpack.enterpriseSearch.whatsNextBox.searchPlaygroundButtonLabel"

diff --git a/...tions/enterprise_search_content/components/connectors/create_connector/finish_up_step.tsx b/...tions/enterprise_search_content/components/connectors/create_connector/finish_up_step.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 
 import { css } from '@emotion/react';
 
@@ -30,11 +30,10 @@ import { i18n } from '@kbn/i18n';
 
 import { useKibana } from '@kbn/kibana-react-plugin/public';
 
-import { APPLICATIONS_PLUGIN, ELASTICSEARCH_PLUGIN } from '../../../../../../common/constants';
+import { ELASTICSEARCH_PLUGIN } from '../../../../../../common/constants';
 
 import { KibanaDeps } from '../../../../../../common/types';
 
-import { PLAYGROUND_PATH } from '../../../../applications/routes';
 import { generateEncodedPath } from '../../../../shared/encode_path_params';
 import { HttpLogic } from '../../../../shared/http';
 import { KibanaLogic } from '../../../../shared/kibana';
@@ -66,7 +65,14 @@ export const FinishUpStep: React.FC<FinishUpStepProps> = ({ title }) => {
   const isSyncing = isWaitingForSync || isSyncingProp;
 
   const { http } = useValues(HttpLogic);
-  const { application } = useValues(KibanaLogic);
+  const { application, share } = useValues(KibanaLogic);
+  const onStartPlaygroundClick = useCallback(() => {
+    if (!share) return;
+    const playgroundLocator = share.url.locators.get('PLAYGROUND_LOCATOR_ID');
+    if (playgroundLocator) {
+      playgroundLocator.navigate({ 'default-index': connector?.index_name });
+    }
+  }, [connector, share]);
   useEffect(() => {
     setTimeout(() => {
       window.scrollTo({
@@ -134,14 +140,7 @@ export const FinishUpStep: React.FC<FinishUpStepProps> = ({ title }) => {
                             'xpack.enterpriseSearch.createConnector.finishUpStep.euiButton.startSearchPlaygroundLabel',
                             { defaultMessage: 'Start Search Playground' }
                           )}
-                          onClick={() => {
-                            if (connector) {
-                              KibanaLogic.values.navigateToUrl(
-                                `${APPLICATIONS_PLUGIN.URL}${PLAYGROUND_PATH}?default-index=${connector.index_name}`,
-                                { shouldNotCreateHref: true }
-                              );
-                            }
-                          }}
+                          onClick={onStartPlaygroundClick}
                         >
                           {i18n.translate(
                             'xpack.enterpriseSearch.createConnector.finishUpStep.startSearchPlaygroundButtonLabel',

diff --git a/...h_content/components/search_index/components/header_actions/search_playground_popover.tsx b/...h_content/components/search_index/components/header_actions/search_playground_popover.tsx
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import React from 'react';
+import React, { useCallback } from 'react';
+
+import { useValues } from 'kea';
 
 import { EuiButton } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 
-import { APPLICATIONS_PLUGIN } from '../../../../../../../common/constants';
-import { PLAYGROUND_PATH } from '../../../../../applications/routes';
 import { KibanaLogic } from '../../../../../shared/kibana';
 
 export interface SearchPlaygroundPopoverProps {
@@ -24,18 +24,21 @@ export const SearchPlaygroundPopover: React.FC<SearchPlaygroundPopoverProps> = (
   indexName,
   ingestionMethod,
 }) => {
-  const playgroundUrl = `${APPLICATIONS_PLUGIN.URL}${PLAYGROUND_PATH}?default-index=${indexName}`;
+  const { share } = useValues(KibanaLogic);
+  const onStartPlaygroundClick = useCallback(() => {
+    if (!share) return;
+    const playgroundLocator = share.url.locators.get('PLAYGROUND_LOCATOR_ID');
+    if (playgroundLocator) {
+      playgroundLocator.navigate({ 'default-index': indexName });
+    }
+  }, [indexName, share]);
 
   return (
     <EuiButton
       data-test-subj="enterpriseSearchSearchPlaygroundPopoverViewInPlaygroundButton"
       data-telemetry-id={`entSearchContent-${ingestionMethod}-header-viewPlayground`}
       iconType="eye"
-      onClick={() => {
-        KibanaLogic.values.navigateToUrl(playgroundUrl, {
-          shouldNotCreateHref: true,
-        });
-      }}
+      onClick={onStartPlaygroundClick}
     >
       {i18n.translate('xpack.enterpriseSearch.content.index.viewPlayground', {
         defaultMessage: 'View in Playground',