Skip to content

Commit

Permalink
[Search][Ent Search deprecation] Removing Callouts (elastic#202401)
Browse files Browse the repository at this point in the history 
## Summary

This PR removes all the CallOuts regarding Enterprise Search due to this
node will not be available in 9.0 as a part of this initiative:
elastic/search-team#8231


![image](https://github.com/user-attachments/assets/290aac33-4dc7-455f-bf77-e8d872727a27)


![image](https://github.com/user-attachments/assets/90b17deb-b779-4c27-b837-b399b086d6ac)
  • Loading branch information
@JoseLuisGJ @CAWilson94
JoseLuisGJ authored and CAWilson94 committed Dec 9, 2024
1 parent e58ffca commit ceafeb1
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 188 deletions.
40 changes: 3 additions & 37 deletions .../enterprise_search_content/components/connector_detail/native_connector_configuration.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { useValues } from 'kea';

import {
EuiBadge,
EuiCallOut,
EuiFlexGroup,
EuiFlexItem,
EuiIcon,
Expand All @@ -23,7 +22,6 @@ import {
import { i18n } from '@kbn/i18n';

import { BetaConnectorCallout } from '../../../shared/beta/beta_connector_callout';
import { HttpLogic } from '../../../shared/http';
import { KibanaLogic } from '../../../shared/kibana';

import { ConvertConnector } from '../search_index/connector/native_connector_configuration/convert_connector';
Expand All @@ -36,8 +34,7 @@ import { ConnectorViewLogic } from './connector_view_logic';

export const NativeConnectorConfiguration: React.FC = () => {
const { connector } = useValues(ConnectorViewLogic);
const { config, connectorTypes: connectors } = useValues(KibanaLogic);
const { errorConnectingMessage } = useValues(HttpLogic);
const { connectorTypes: connectors } = useValues(KibanaLogic);

const NATIVE_CONNECTORS = useMemo(
() => connectors.filter(({ isNative }) => isNative),
Expand Down Expand Up @@ -109,39 +106,8 @@ export const NativeConnectorConfiguration: React.FC = () => {
</EuiBadge>
</EuiFlexItem>
</EuiFlexGroup>
{config.host && config.canDeployEntSearch && errorConnectingMessage && (
<>
<EuiCallOut
color="warning"
size="m"
title={i18n.translate(
'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.entSearchWarning.title',
{
defaultMessage: 'No running Enterprise Search instance detected',
}
)}
iconType="warning"
>
<p>
{i18n.translate(
'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.entSearchWarning.text',
{
defaultMessage:
'Elastic managed connectors require a running Enterprise Search instance.',
}
)}
</p>
</EuiCallOut>

<EuiSpacer />
</>
)}
{
<>
<EuiSpacer />
<AttachIndexBox connector={connector} />
</>
}
<EuiSpacer />
<AttachIndexBox connector={connector} />
{connector.index_name && (
<>
<EuiSpacer />
Expand Down
8 changes: 0 additions & 8 deletions ...search/public/applications/enterprise_search_content/components/connectors/connectors.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ import {
} from '../../routes';
import { EnterpriseSearchContentPageTemplate } from '../layout';

import { CannotConnect } from '../search_index/components/cannot_connect';

import { DefaultSettingsFlyout } from '../settings/default_settings_flyout';

import { ConnectorStats } from './connector_stats';
Expand Down Expand Up @@ -241,12 +239,6 @@ export const Connectors: React.FC<ConnectorsProps> = ({ isCrawler }) => {
{productFeatures.hasDefaultIngestPipeline && showDefaultSettingsFlyout && (
<DefaultSettingsFlyout closeFlyout={() => setShowDefaultSettingsFlyout(false)} />
)}
{Boolean(errorConnectingMessage) && (
<>
<CannotConnect />
<EuiSpacer />
</>
)}
<ConnectorStats isCrawler={isCrawler} />
<EuiSpacer />

Expand Down
6 changes: 0 additions & 6 deletions ...ications/enterprise_search_content/components/new_index/method_crawler/method_crawler.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import {
LICENSING_FEATURE,
} from '../../../../shared/licensing_callout/licensing_callout';
import { CreateCrawlerIndexApiLogic } from '../../../api/crawler/create_crawler_index_api_logic';
import { CannotConnect } from '../../search_index/components/cannot_connect';
import { NewSearchIndexTemplate } from '../new_search_index_template';

import { MethodCrawlerLogic } from './method_crawler_logic';
Expand All @@ -44,11 +43,6 @@ export const MethodCrawler: React.FC = () => {
<LicensingCallout feature={LICENSING_FEATURE.CRAWLER} />
</EuiFlexItem>
)}
{Boolean(errorConnectingMessage) && (
<EuiFlexItem>
<CannotConnect />
</EuiFlexItem>
)}
<EuiFlexItem>
<NewSearchIndexTemplate
type="crawler"
Expand Down
52 changes: 24 additions & 28 deletions ...e_search/public/applications/enterprise_search_content/components/new_index/new_index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import { KibanaLogic } from '../../../shared/kibana/kibana_logic';

import { NEW_API_PATH, NEW_CRAWLER_PATH, NEW_INDEX_SELECT_CONNECTOR_PATH } from '../../routes';
import { EnterpriseSearchContentPageTemplate } from '../layout/page_template';
import { CannotConnect } from '../search_index/components/cannot_connect';
import { baseBreadcrumbs } from '../search_indices';

import { NewIndexCard } from './new_index_card';
Expand Down Expand Up @@ -60,33 +59,30 @@ export const NewIndex: React.FC = () => {
}}
>
<EuiFlexGroup direction="column">
{errorConnectingMessage && productFeatures.hasWebCrawler && <CannotConnect />}
<>
<EuiFlexItem>
<EuiFlexGroup>
{availableIngestionMethodOptions.map((type) => (
<EuiFlexItem key={type}>
<NewIndexCard
disabled={Boolean(
type === INGESTION_METHOD_IDS.CRAWLER &&
(errorConnectingMessage || !config.host)
)}
type={type}
onSelect={() => {
if (type === INGESTION_METHOD_IDS.CONNECTOR) {
KibanaLogic.values.navigateToUrl(NEW_INDEX_SELECT_CONNECTOR_PATH);
} else if (type === INGESTION_METHOD_IDS.CRAWLER) {
KibanaLogic.values.navigateToUrl(NEW_CRAWLER_PATH);
} else {
KibanaLogic.values.navigateToUrl(NEW_API_PATH);
}
}}
/>
</EuiFlexItem>
))}
</EuiFlexGroup>
</EuiFlexItem>
</>
<EuiFlexItem>
<EuiFlexGroup>
{availableIngestionMethodOptions.map((type) => (
<EuiFlexItem key={type}>
<NewIndexCard
disabled={Boolean(
type === INGESTION_METHOD_IDS.CRAWLER &&
(errorConnectingMessage || !config.host)
)}
type={type}
onSelect={() => {
if (type === INGESTION_METHOD_IDS.CONNECTOR) {
KibanaLogic.values.navigateToUrl(NEW_INDEX_SELECT_CONNECTOR_PATH);
} else if (type === INGESTION_METHOD_IDS.CRAWLER) {
KibanaLogic.values.navigateToUrl(NEW_CRAWLER_PATH);
} else {
KibanaLogic.values.navigateToUrl(NEW_API_PATH);
}
}}
/>
</EuiFlexItem>
))}
</EuiFlexGroup>
</EuiFlexItem>
</EuiFlexGroup>
</EnterpriseSearchContentPageTemplate>
);
Expand Down
47 changes: 0 additions & 47 deletions ...lications/enterprise_search_content/components/search_index/components/cannot_connect.tsx
View file

This file was deleted.

41 changes: 3 additions & 38 deletions ...ublic/applications/enterprise_search_content/components/search_indices/search_indices.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ import { useValues, useActions } from 'kea';

import {
EuiButton,
EuiCallOut,
EuiFlexGroup,
EuiFlexItem,
EuiSpacer,
EuiTitle,
EuiSwitch,
EuiSearchBar,
Expand All @@ -26,14 +24,13 @@ import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n-react';

import { AddContentEmptyPrompt } from '../../../shared/add_content_empty_prompt';
import { HttpLogic } from '../../../shared/http/http_logic';
import { KibanaLogic } from '../../../shared/kibana';
import { EuiButtonTo, EuiLinkTo } from '../../../shared/react_router_helpers';
import { EuiLinkTo } from '../../../shared/react_router_helpers';
import { handlePageChange } from '../../../shared/table_pagination';
import { NEW_API_PATH } from '../../routes';
import { EnterpriseSearchContentPageTemplate } from '../layout/page_template';

import { CannotConnect } from '../search_index/components/cannot_connect';
// import { CannotConnect } from '../search_index/components/cannot_connect';
import { DefaultSettingsFlyout } from '../settings/default_settings_flyout';

import { DeleteIndexModal } from './delete_index_modal';
Expand All @@ -53,8 +50,7 @@ export const SearchIndices: React.FC = () => {
const [showHiddenIndices, setShowHiddenIndices] = useState(false);
const [onlyShowSearchOptimizedIndices, setOnlyShowSearchOptimizedIndices] = useState(false);
const [searchQuery, setSearchValue] = useState('');
const { config, productFeatures } = useValues(KibanaLogic);
const { errorConnectingMessage } = useValues(HttpLogic);
const { productFeatures } = useValues(KibanaLogic);
const [showDefaultSettingsFlyout, setShowDefaultSettingsFlyout] = useState<boolean>(false);

useEffect(() => {
Expand Down Expand Up @@ -142,37 +138,6 @@ export const SearchIndices: React.FC = () => {
{productFeatures.hasDefaultIngestPipeline && showDefaultSettingsFlyout && (
<DefaultSettingsFlyout closeFlyout={() => setShowDefaultSettingsFlyout(false)} />
)}
{config.host && config.canDeployEntSearch && errorConnectingMessage && (
<>
<CannotConnect />
<EuiSpacer />
</>
)}
{!config.host && config.canDeployEntSearch && (
<>
<EuiCallOut
title={i18n.translate('xpack.enterpriseSearch.noEntSearchConfigured.title', {
defaultMessage: 'Enterprise Search has not been configured',
})}
iconType="warning"
color="warning"
>
<p>
<FormattedMessage
id="xpack.enterpriseSearch.noEntSearch.noCrawler"
defaultMessage="The Elastic web crawler is not available without Enterprise Search."
/>
</p>
<EuiButtonTo iconType="help" fill to="/setup_guide" color="warning">
<FormattedMessage
id="xpack.enterpriseSearch.noEntSearch.setupGuideCta"
defaultMessage="Review setup guide"
/>
</EuiButtonTo>
</EuiCallOut>
<EuiSpacer />
</>
)}
{!hasNoIndices ? (
<EuiFlexGroup direction="column">
<EuiFlexItem>
Expand Down
8 changes: 0 additions & 8 deletions x-pack/plugins/translations/translations/fr-FR.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17410,8 +17410,6 @@
"xpack.enterpriseSearch.content.analytics.api.generateAnalyticsApiKeyModal.done": "Terminé",
"xpack.enterpriseSearch.content.analytics.api.generateAnalyticsApiKeyModal.generateButton": "Générer une clé",
"xpack.enterpriseSearch.content.analytics.api.generateAnalyticsApiKeyModal.title": "Créer une clé d'API d'analyse",
"xpack.enterpriseSearch.content.cannotConnect.body": "En savoir plus.",
"xpack.enterpriseSearch.content.cannotConnect.title": "Impossible de se connecter à Enterprise Search",
"xpack.enterpriseSearch.content.conectors.indexHealth": "Intègre",
"xpack.enterpriseSearch.content.connector_detail.configurationConnector.badgeType.connectorClient": "Connecteur autogéré",
"xpack.enterpriseSearch.content.connector_detail.configurationConnector.badgeType.nativeConnector": "Connecteur géré par Elastic",
Expand Down Expand Up @@ -17602,8 +17600,6 @@
"xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.convertConnector.description": "Vous souhaitez héberger vous-même ce connecteur ? Convertissez-le en {link} afin qu'il soit géré sur votre propre infrastructure. Vous devez convertir ce connecteur si vous souhaitez personnaliser le code à l'aide de notre cadre Python.",
"xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.convertConnector.linkTitle": "connecteur autogéré",
"xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.convertConnector.title": "Autogestion de ce connecteur",
"xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.entSearchWarning.text": "Les connecteurs gérés par Elastic nécessitent une instance Enterprise Search en cours d'exécution.",
"xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.entSearchWarning.title": "Aucune instance Enterprise Search en cours d'exécution détectée",
"xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnectorAdvancedConfiguration.description": "Finalisez votre connecteur en déclenchant une synchronisation unique, ou en définissant un calendrier de synchronisation récurrent.",
"xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnectorAdvancedConfiguration.schedulingButtonLabel": "Définir un calendrier et synchroniser",
"xpack.enterpriseSearch.content.indices.configurationConnector.researchConfiguration.connectorDocumentationLinkLabel": "Documentation",
Expand Down Expand Up @@ -17956,7 +17952,6 @@
"xpack.enterpriseSearch.content.playground.breadcrumb": "Playground",
"xpack.enterpriseSearch.content.searchIndex.cancelSync.successMessage": "Annulation réussie de la synchronisation",
"xpack.enterpriseSearch.content.searchIndex.cancelSyncs.successMessage": "Annulation réussie des synchronisations",
"xpack.enterpriseSearch.content.searchIndex.cannotConnect.body": "Le robot d'indexation Elastic requiert Enterprise Search. {link}",
"xpack.enterpriseSearch.content.searchIndex.configurationTabLabel": "Configuration",
"xpack.enterpriseSearch.content.searchIndex.connectorErrorCallOut.title": "Votre connecteur a rapporté une erreur",
"xpack.enterpriseSearch.content.searchIndex.crawlerConfigurationTabLabel": "Configuration",
Expand Down Expand Up @@ -18528,9 +18523,6 @@
"xpack.enterpriseSearch.navigation.contentPlaygroundLinkLabel": "Playground",
"xpack.enterpriseSearch.navigation.contentWebcrawlersLinkLabel": "Robots d'indexation",
"xpack.enterpriseSearch.navigation.relevanceInferenceEndpointsLinkLabel": "Points de terminaison d'inférence",
"xpack.enterpriseSearch.noEntSearch.noCrawler": "Le robot d'indexation d'Elastic n'est pas disponible sans Entreprise Search.",
"xpack.enterpriseSearch.noEntSearch.setupGuideCta": "Consulter le guide de configuration",
"xpack.enterpriseSearch.noEntSearchConfigured.title": "Enterprise Search n'a pas encore été configuré",
"xpack.enterpriseSearch.notFound.action1": "Retour à votre tableau de bord",
"xpack.enterpriseSearch.notFound.action2": "Contacter le support technique",
"xpack.enterpriseSearch.notFound.description": "Impossible de trouver la page que vous recherchez.",
Expand Down
8 changes: 0 additions & 8 deletions x-pack/plugins/translations/translations/ja-JP.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17385,8 +17385,6 @@
"xpack.enterpriseSearch.content.analytics.api.generateAnalyticsApiKeyModal.done": "完了",
"xpack.enterpriseSearch.content.analytics.api.generateAnalyticsApiKeyModal.generateButton": "キーを生成",
"xpack.enterpriseSearch.content.analytics.api.generateAnalyticsApiKeyModal.title": "分析APIキーを作成",
"xpack.enterpriseSearch.content.cannotConnect.body": "詳細。",
"xpack.enterpriseSearch.content.cannotConnect.title": "エンタープライズ サーチに接続できません",
"xpack.enterpriseSearch.content.conectors.indexHealth": "正常",
"xpack.enterpriseSearch.content.connector_detail.configurationConnector.badgeType.connectorClient": "セルフマネージドコネクター",
"xpack.enterpriseSearch.content.connector_detail.configurationConnector.badgeType.nativeConnector": "Elasticマネージドコネクター",
Expand Down Expand Up @@ -17577,8 +17575,6 @@
"xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.convertConnector.description": "このコネクターをセルフホスティングしますか？独自のインフラで管理される{link}に変換します。Pythonフレームワークを使用してコードをカスタマイズしたい場合は、このコネクターを変換する必要があります。",
"xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.convertConnector.linkTitle": "セルフマネージドコネクター",
"xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.convertConnector.title": "このコネクターを自己管理",
"xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.entSearchWarning.text": "Elasticマネージドコネクターは、実行中のエンタープライズ サーチインスタンスが必要です。",
"xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.entSearchWarning.title": "実行中のエンタープライズ サーチインスタンスが検出されません",
"xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnectorAdvancedConfiguration.description": "ワンタイム同期をトリガーするか、繰り返し同期スケジュールを設定して、コネクターを確定します。",
"xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnectorAdvancedConfiguration.schedulingButtonLabel": "スケジュールを設定して同期",
"xpack.enterpriseSearch.content.indices.configurationConnector.researchConfiguration.connectorDocumentationLinkLabel": "ドキュメント",
Expand Down Expand Up @@ -17930,7 +17926,6 @@
"xpack.enterpriseSearch.content.playground.breadcrumb": "Playground",
"xpack.enterpriseSearch.content.searchIndex.cancelSync.successMessage": "同期が正常にキャンセルされました",
"xpack.enterpriseSearch.content.searchIndex.cancelSyncs.successMessage": "同期が正常にキャンセルされました",
"xpack.enterpriseSearch.content.searchIndex.cannotConnect.body": "Elastic Webクローラーにはエンタープライズ サーチが必要です。{link}",
"xpack.enterpriseSearch.content.searchIndex.configurationTabLabel": "構成",
"xpack.enterpriseSearch.content.searchIndex.connectorErrorCallOut.title": "コネクターでエラーが発生しました",
"xpack.enterpriseSearch.content.searchIndex.crawlerConfigurationTabLabel": "構成",
Expand Down Expand Up @@ -18500,9 +18495,6 @@
"xpack.enterpriseSearch.navigation.contentPlaygroundLinkLabel": "Playground",
"xpack.enterpriseSearch.navigation.contentWebcrawlersLinkLabel": "Webクローラー",
"xpack.enterpriseSearch.navigation.relevanceInferenceEndpointsLinkLabel": "推論エンドポイント",
"xpack.enterpriseSearch.noEntSearch.noCrawler": "Elastic Webクローラーはエンタープライズ サーチなしでは利用できません。",
"xpack.enterpriseSearch.noEntSearch.setupGuideCta": "セットアップガイドを確認",
"xpack.enterpriseSearch.noEntSearchConfigured.title": "エンタープライズ サーチが構成されていません",
"xpack.enterpriseSearch.notFound.action1": "ダッシュボードに戻す",
"xpack.enterpriseSearch.notFound.action2": "サポートに問い合わせる",
"xpack.enterpriseSearch.notFound.description": "お探しのページは見つかりませんでした。",
Expand Down
Loading

0 comments on commit ceafeb1

Please sign in to comment.