Skip to content

Commit 60f5b1d

Browse files
JoseLuisGJJoseLuisGJ
authored
[Search][Stack] Web Crawlers coming soon pages (#205718)
## Summary This PR shows the `SearchEmptyPrompts` for the Web Crawlers section in Stack in Stack 9.0 as we do in ES3 due to Web Crawlers will not be available as Elastic Managed since this version. We are also leveraging as shared code as possible consuming the `@kbn/search-shared-ui` content. ![CleanShot 2025-01-07 at 12 08 36@2x](https://github.com/user-attachments/assets/6483fa0b-21ee-40fa-b749-3a04e0732c92) ![CleanShot 2025-01-07 at 12 09 00@2x](https://github.com/user-attachments/assets/91f3bf8f-6b33-4e7f-9e24-b7844bb60768)
1 parent bcdf942 commit 60f5b1d

File tree

13 files changed

+401
-149
lines changed

13 files changed

+401
-149
lines changed

‎x-pack/platform/plugins/private/translations/translations/fr-FR.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17073,7 +17073,6 @@
1707317073
"xpack.enterpriseSearch.connectors.more.ariaLabel": "Plus d'options",
1707417074
"xpack.enterpriseSearch.connectors.newConnectorButtonLabel": "Nouveau connecteur",
1707517075
"xpack.enterpriseSearch.connectors.newConnectorsClientButtonLabel": "Nouveau connecteur autogéré",
17076-
"xpack.enterpriseSearch.connectors.newCrawlerButtonLabel": "Nouveau robot d'indexation",
1707717076
"xpack.enterpriseSearch.connectors.newNativeConnectorButtonLabel": "Nouveau connecteur géré par Elastic",
1707817077
"xpack.enterpriseSearch.connectors.title": "Connecteurs Elasticsearch",
1707917078
"xpack.enterpriseSearch.connectorsTable.euiSearchBar.filterConnectorsLabel": "Filtrer les connecteurs",
@@ -17998,10 +17997,6 @@
1799817997
"xpack.enterpriseSearch.crawler.startCrawlContextMenu.crawlCustomSettingsMenuLabel": "Indexation avec des paramètres personnalisés",
1799917998
"xpack.enterpriseSearch.crawler.startCrawlContextMenu.reapplyCrawlRulesMenuLabel": "Réappliquer les règles d'indexation",
1800017999
"xpack.enterpriseSearch.crawler.urlComboBox.invalidUrlErrorMessage": "Veuillez entrer une URL valide",
18001-
"xpack.enterpriseSearch.crawlerEmptyState.h2.createYourFirstWebLabel": "Créer votre premier robot d'indexation",
18002-
"xpack.enterpriseSearch.crawlerEmptyState.newWebCrawlerButtonLabel": "Nouveau robot d'indexation",
18003-
"xpack.enterpriseSearch.crawlerEmptyState.openSourceCrawlerButtonLabel": "Code source",
18004-
"xpack.enterpriseSearch.crawlerEmptyState.p.discoverExtractAndIndexLabel": "Découvrir, extraire et indexer du contenu interrogeable provenant de sites web et de bases de connaissances",
1800518000
"xpack.enterpriseSearch.crawlers.title": "Robot d'indexation Elasticsearch",
1800618001
"xpack.enterpriseSearch.createConnector..breadcrumb": "Nouveau connecteur",
1800718002
"xpack.enterpriseSearch.createConnector..title": "Créer un connecteur",

‎x-pack/platform/plugins/private/translations/translations/ja-JP.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16934,7 +16934,6 @@
1693416934
"xpack.enterpriseSearch.connectors.more.ariaLabel": "その他のオプション",
1693516935
"xpack.enterpriseSearch.connectors.newConnectorButtonLabel": "新しいコネクター",
1693616936
"xpack.enterpriseSearch.connectors.newConnectorsClientButtonLabel": "新しいセルフマネージドコネクター",
16937-
"xpack.enterpriseSearch.connectors.newCrawlerButtonLabel": "新しいWebクローラー",
1693816937
"xpack.enterpriseSearch.connectors.newNativeConnectorButtonLabel": "新しいElasticマネージドコネクター",
1693916938
"xpack.enterpriseSearch.connectors.title": "Elasticsearchコネクター",
1694016939
"xpack.enterpriseSearch.connectorsTable.euiSearchBar.filterConnectorsLabel": "コネクターをフィルター",
@@ -17858,10 +17857,6 @@
1785817857
"xpack.enterpriseSearch.crawler.startCrawlContextMenu.crawlCustomSettingsMenuLabel": "カスタム設定でクロール",
1785917858
"xpack.enterpriseSearch.crawler.startCrawlContextMenu.reapplyCrawlRulesMenuLabel": "クローリングルールを再適用",
1786017859
"xpack.enterpriseSearch.crawler.urlComboBox.invalidUrlErrorMessage": "有効なURLを入力してください",
17861-
"xpack.enterpriseSearch.crawlerEmptyState.h2.createYourFirstWebLabel": "最初のWebクローラーを作成",
17862-
"xpack.enterpriseSearch.crawlerEmptyState.newWebCrawlerButtonLabel": "新しいWebクローラー",
17863-
"xpack.enterpriseSearch.crawlerEmptyState.openSourceCrawlerButtonLabel": "ソースコード",
17864-
"xpack.enterpriseSearch.crawlerEmptyState.p.discoverExtractAndIndexLabel": "Webサイトやナレッジベースから検索可能なコンテンツを検出、抽出、インデックス化します",
1786517860
"xpack.enterpriseSearch.crawlers.title": "Elasticsearch Webクローラー",
1786617861
"xpack.enterpriseSearch.createConnector..breadcrumb": "新しいコネクター",
1786717862
"xpack.enterpriseSearch.createConnector..title": "コネクターを作成する",

‎x-pack/platform/plugins/private/translations/translations/zh-CN.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16639,7 +16639,6 @@
1663916639
"xpack.enterpriseSearch.connectors.more.ariaLabel": "更多选项",
1664016640
"xpack.enterpriseSearch.connectors.newConnectorButtonLabel": "新连接器",
1664116641
"xpack.enterpriseSearch.connectors.newConnectorsClientButtonLabel": "全新自管型连接器",
16642-
"xpack.enterpriseSearch.connectors.newCrawlerButtonLabel": "新网络爬虫",
1664316642
"xpack.enterpriseSearch.connectors.newNativeConnectorButtonLabel": "全新 Elastic 托管连接器",
1664416643
"xpack.enterpriseSearch.connectors.title": "Elasticsearch 连接器",
1664516644
"xpack.enterpriseSearch.connectorsTable.euiSearchBar.filterConnectorsLabel": "筛选连接器",
@@ -17558,10 +17557,6 @@
1755817557
"xpack.enterpriseSearch.crawler.startCrawlContextMenu.crawlCustomSettingsMenuLabel": "使用定制设置执行爬网",
1755917558
"xpack.enterpriseSearch.crawler.startCrawlContextMenu.reapplyCrawlRulesMenuLabel": "重新应用爬网规则",
1756017559
"xpack.enterpriseSearch.crawler.urlComboBox.invalidUrlErrorMessage": "请输入有效 URL",
17561-
"xpack.enterpriseSearch.crawlerEmptyState.h2.createYourFirstWebLabel": "创建您的首个网络爬虫",
17562-
"xpack.enterpriseSearch.crawlerEmptyState.newWebCrawlerButtonLabel": "新网络爬虫",
17563-
"xpack.enterpriseSearch.crawlerEmptyState.openSourceCrawlerButtonLabel": "源代码",
17564-
"xpack.enterpriseSearch.crawlerEmptyState.p.discoverExtractAndIndexLabel": "发现、提取和索引网站和知识库中的可搜索内容",
1756517560
"xpack.enterpriseSearch.crawlers.title": "Elasticsearch 网络爬虫",
1756617561
"xpack.enterpriseSearch.createConnector..breadcrumb": "新连接器",
1756717562
"xpack.enterpriseSearch.createConnector..title": "创建连接器",

‎x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/connectors.tsx‎

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,21 @@ import {
1616
EuiContextMenuPanel,
1717
EuiFlexGroup,
1818
EuiFlexItem,
19+
EuiLink,
1920
EuiPopover,
2021
EuiSearchBar,
2122
EuiSpacer,
23+
EuiText,
2224
EuiTitle,
2325
} from '@elastic/eui';
2426

2527
import { i18n } from '@kbn/i18n';
2628
import { FormattedMessage } from '@kbn/i18n-react';
2729

28-
import { HttpLogic } from '../../../shared/http';
30+
import { LEARN_MORE_LINK } from '../../../shared/constants';
2931
import { KibanaLogic } from '../../../shared/kibana';
3032
import { handlePageChange } from '../../../shared/table_pagination';
3133
import {
32-
NEW_CRAWLER_PATH,
3334
NEW_INDEX_SELECT_CONNECTOR_CLIENTS_PATH,
3435
NEW_INDEX_SELECT_CONNECTOR_NATIVE_PATH,
3536
NEW_INDEX_SELECT_CONNECTOR_PATH,
@@ -41,9 +42,10 @@ import { DefaultSettingsFlyout } from '../settings/default_settings_flyout';
4142
import { ConnectorStats } from './connector_stats';
4243
import { ConnectorsLogic } from './connectors_logic';
4344
import { ConnectorsTable } from './connectors_table';
44-
import { CrawlerEmptyState } from './crawler_empty_state';
4545
import { CreateConnector } from './create_connector';
4646
import { DeleteConnectorModal } from './delete_connector_modal';
47+
import { ElasticManagedWebCrawlerEmptyPrompt } from './elastic_managed_web_crawler_empty_prompt';
48+
import { SelfManagedWebCrawlerEmptyPrompt } from './self_managed_web_crawler_empty_prompt';
4749

4850
export const connectorsBreadcrumbs = [
4951
i18n.translate('xpack.enterpriseSearch.content.connectors.breadcrumb', {
@@ -59,12 +61,12 @@ export const crawlersBreadcrumbs = [
5961

6062
export interface ConnectorsProps {
6163
isCrawler: boolean;
64+
isCrawlerSelfManaged?: boolean;
6265
}
63-
export const Connectors: React.FC<ConnectorsProps> = ({ isCrawler }) => {
66+
export const Connectors: React.FC<ConnectorsProps> = ({ isCrawler, isCrawlerSelfManaged }) => {
6467
const { fetchConnectors, onPaginate, setIsFirstRequest, openDeleteModal } =
6568
useActions(ConnectorsLogic);
6669
const { data, isLoading, searchParams, isEmpty, connectors } = useValues(ConnectorsLogic);
67-
const { errorConnectingMessage } = useValues(HttpLogic);
6870
const [searchQuery, setSearchValue] = useState('');
6971
const [showMoreOptionsPopover, setShowMoreOptionsPopover] = useState<boolean>(false);
7072
const [showDefaultSettingsFlyout, setShowDefaultSettingsFlyout] = useState<boolean>(false);
@@ -95,6 +97,29 @@ export const Connectors: React.FC<ConnectorsProps> = ({ isCrawler }) => {
9597
: i18n.translate('xpack.enterpriseSearch.crawlers.title', {
9698
defaultMessage: 'Elastic Web Crawler',
9799
}),
100+
description: [
101+
<EuiText>
102+
<p>
103+
<FormattedMessage
104+
id="xpack.enterpriseSearch.webcrawlers.headerContent"
105+
defaultMessage="Discover extract and index searchable content from websites and knowledge bases {learnMoreLink}"
106+
values={{
107+
learnMoreLink: (
108+
<EuiLink
109+
data-test-subj="entSearchContentConnectorsLearnMoreLink"
110+
external
111+
target="_blank"
112+
href={'https://github.com/elastic/crawler'}
113+
>
114+
{LEARN_MORE_LINK}
115+
</EuiLink>
116+
),
117+
}}
118+
/>
119+
</p>
120+
</EuiText>,
121+
],
122+
98123
rightSideGroupProps: {
99124
gutterSize: 's',
100125
responsive: false,
@@ -199,52 +224,26 @@ export const Connectors: React.FC<ConnectorsProps> = ({ isCrawler }) => {
199224
]
200225
: []),
201226
]
202-
: [
203-
<EuiButton
204-
data-test-subj="entSearchContent-crawlers-newCrawlerButton"
205-
data-telemetry-id="entSearchContent-crawlers-newCrawlerButton"
206-
disabled={Boolean(errorConnectingMessage)}
207-
key="newCrawler"
208-
color="primary"
209-
iconType="plusInCircle"
210-
fill
211-
onClick={() => {
212-
KibanaLogic.values.navigateToUrl(NEW_CRAWLER_PATH);
213-
}}
214-
>
215-
{i18n.translate('xpack.enterpriseSearch.connectors.newCrawlerButtonLabel', {
216-
defaultMessage: 'New web crawler',
217-
})}
218-
</EuiButton>,
219-
...(productFeatures.hasDefaultIngestPipeline
220-
? [
221-
<EuiButton
222-
color="primary"
223-
data-test-subj="entSearchContent-connectors-defaultSettingsPopover"
224-
data-telemetry-id="entSearchContent-connectors-defaultSettingsPopover"
225-
onClick={() => setShowDefaultSettingsFlyout(true)}
226-
>
227-
{i18n.translate(
228-
'xpack.enterpriseSearch.content.searchIndices.defaultSettings',
229-
{
230-
defaultMessage: 'Default settings',
231-
}
232-
)}
233-
</EuiButton>,
234-
]
235-
: []),
236-
],
227+
: undefined,
237228
}}
238229
>
239230
{productFeatures.hasDefaultIngestPipeline && showDefaultSettingsFlyout && (
240231
<DefaultSettingsFlyout closeFlyout={() => setShowDefaultSettingsFlyout(false)} />
241232
)}
242-
<ConnectorStats isCrawler={isCrawler} />
243-
<EuiSpacer />
233+
{!isCrawler && (
234+
<>
235+
<ConnectorStats isCrawler={isCrawler} />
236+
<EuiSpacer />
237+
</>
238+
)}
244239

245240
<EuiFlexGroup direction="column">
246241
{isEmpty && isCrawler ? (
247-
<CrawlerEmptyState />
242+
isCrawlerSelfManaged ? (
243+
<SelfManagedWebCrawlerEmptyPrompt />
244+
) : (
245+
<ElasticManagedWebCrawlerEmptyPrompt />
246+
)
248247
) : (
249248
<>
250249
<EuiFlexItem>

‎x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/crawler_empty_state.tsx‎

Lines changed: 0 additions & 79 deletions
This file was deleted.

‎x-pack/solutions/search/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/crawlers_router.tsx‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import React from 'react';
99

1010
import { Routes, Route } from '@kbn/shared-ux-router';
1111

12-
import { CRAWLERS_PATH, NEW_CRAWLER_PATH } from '../../routes';
12+
import { CRAWLERS_PATH, CRAWLERS_ELASTIC_MANAGED_PATH, NEW_CRAWLER_PATH } from '../../routes';
1313
import { NewSearchIndexPage } from '../new_index/new_search_index_page';
1414

1515
import { Connectors } from './connectors';
@@ -20,8 +20,11 @@ export const CrawlersRouter: React.FC = () => {
2020
<Route path={NEW_CRAWLER_PATH}>
2121
<NewSearchIndexPage type="crawler" />
2222
</Route>
23-
<Route path={CRAWLERS_PATH}>
24-
<Connectors isCrawler />
23+
<Route exact path={CRAWLERS_PATH}>
24+
<Connectors isCrawler isCrawlerSelfManaged />
25+
</Route>
26+
<Route exact path={CRAWLERS_ELASTIC_MANAGED_PATH}>
27+
<Connectors isCrawler isCrawlerSelfManaged={false} />
2528
</Route>
2629
</Routes>
2730
);

0 commit comments

Comments
 (0)