[Search] Fix web crawler enabled without enterprise search (elastic#1…

…74453) ## Summary This fixes the web crawler being accessible in Search without a running Enterprise Search node.
e40pud · Jan 8, 2024 · 0109320 · 0109320
1 parent c3801ce
commit 0109320
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/...search/public/applications/enterprise_search_content/components/connectors/connectors.tsx b/...search/public/applications/enterprise_search_content/components/connectors/connectors.tsx
@@ -24,6 +24,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { INGESTION_METHOD_IDS } from '../../../../../common/constants';
 
 import { generateEncodedPath } from '../../../shared/encode_path_params';
+import { HttpLogic } from '../../../shared/http';
 import { KibanaLogic } from '../../../shared/kibana';
 import { handlePageChange } from '../../../shared/table_pagination';
 import {
@@ -35,6 +36,8 @@ import {
 import { EnterpriseSearchContentPageTemplate } from '../layout';
 import { SelectConnector } from '../new_index/select_connector/select_connector';
 
+import { CannotConnect } from '../search_index/components/cannot_connect';
+
 import { ConnectorStats } from './connector_stats';
 import { ConnectorsLogic } from './connectors_logic';
 import { ConnectorsTable } from './connectors_table';
@@ -52,6 +55,7 @@ export interface ConnectorsProps {
 export const Connectors: React.FC<ConnectorsProps> = ({ isCrawler }) => {
   const { fetchConnectors, onPaginate, setIsFirstRequest } = useActions(ConnectorsLogic);
   const { data, isLoading, searchParams, isEmpty, connectors } = useValues(ConnectorsLogic);
+  const { errorConnectingMessage } = useValues(HttpLogic);
   const [searchQuery, setSearchValue] = useState('');
 
   useEffect(() => {
@@ -122,6 +126,7 @@ export const Connectors: React.FC<ConnectorsProps> = ({ isCrawler }) => {
             ]
           : [
               <EuiButton
+                disabled={Boolean(errorConnectingMessage)}
                 key="newCrawler"
                 color="primary"
                 iconType="plusInCircle"
@@ -141,6 +146,12 @@ export const Connectors: React.FC<ConnectorsProps> = ({ isCrawler }) => {
             ],
       }}
     >
+      {Boolean(errorConnectingMessage) && (
+        <>
+          <CannotConnect />
+          <EuiSpacer />
+        </>
+      )}
       <ConnectorStats isCrawler={isCrawler} />
       <EuiSpacer />
 

diff --git a/...blic/applications/enterprise_search_content/components/connectors/crawler_empty_state.tsx b/...blic/applications/enterprise_search_content/components/connectors/crawler_empty_state.tsx
@@ -6,14 +6,18 @@
  */
 import React from 'react';
 
+import { useValues } from 'kea';
+
 import { EuiButton, EuiEmptyPrompt, EuiPanel } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 import { generateEncodedPath } from '../../../shared/encode_path_params';
+import { HttpLogic } from '../../../shared/http';
 import { KibanaLogic } from '../../../shared/kibana';
 import { NEW_INDEX_METHOD_PATH } from '../../routes';
 
 export const CrawlerEmptyState: React.FC = () => {
+  const { errorConnectingMessage } = useValues(HttpLogic);
   return (
     <EuiPanel hasBorder>
       <EuiEmptyPrompt
@@ -39,6 +43,7 @@ export const CrawlerEmptyState: React.FC = () => {
         actions={
           <EuiButton
             color="primary"
+            disabled={Boolean(errorConnectingMessage)}
             fill
             iconType="plusInCircle"
             onClick={() =>

diff --git a/...ications/enterprise_search_content/components/new_index/method_crawler/method_crawler.tsx b/...ications/enterprise_search_content/components/new_index/method_crawler/method_crawler.tsx
@@ -13,13 +13,15 @@ import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
 import { Status } from '../../../../../../common/types/api';
 import { docLinks } from '../../../../shared/doc_links';
+import { HttpLogic } from '../../../../shared/http';
 import { KibanaLogic } from '../../../../shared/kibana';
 import { LicensingLogic } from '../../../../shared/licensing';
 import {
   LicensingCallout,
   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';
@@ -29,6 +31,7 @@ export const MethodCrawler: React.FC = () => {
   const { makeRequest } = useActions(CreateCrawlerIndexApiLogic);
   const { isCloud } = useValues(KibanaLogic);
   const { hasPlatinumLicense } = useValues(LicensingLogic);
+  const { errorConnectingMessage } = useValues(HttpLogic);
 
   const isGated = !isCloud && !hasPlatinumLicense;
 
@@ -41,11 +44,16 @@ export const MethodCrawler: React.FC = () => {
           <LicensingCallout feature={LICENSING_FEATURE.CRAWLER} />
         </EuiFlexItem>
       )}
+      {Boolean(errorConnectingMessage) && (
+        <EuiFlexItem>
+          <CannotConnect />
+        </EuiFlexItem>
+      )}
       <EuiFlexItem>
         <NewSearchIndexTemplate
           type="crawler"
           onSubmit={(indexName, language) => makeRequest({ indexName, language })}
-          disabled={isGated}
+          disabled={isGated || Boolean(errorConnectingMessage)}
           buttonLoading={status === Status.LOADING}
           docsUrl={docLinks.crawlerOverview}
         />

diff --git a/...lic/applications/enterprise_search_content/components/new_index/new_search_index_page.tsx b/...lic/applications/enterprise_search_content/components/new_index/new_search_index_page.tsx
@@ -147,7 +147,9 @@ export const NewSearchIndexPage: React.FC = () => {
               <EuiIcon type={getIngestionMethodIconType(type)} size="xxl" />
             </EuiFlexItem>
             <EuiFlexItem grow={false}>{getTitle(type, serviceType)}</EuiFlexItem>
-            <EuiFlexItem grow={false}>{getConnectorModeBadge(isNative)}</EuiFlexItem>
+            {type === INGESTION_METHOD_IDS.CONNECTOR && (
+              <EuiFlexItem grow={false}>{getConnectorModeBadge(isNative)}</EuiFlexItem>
+            )}
           </EuiFlexGroup>
         ),
       }}