[Enterprise Search] Fix minor text issues in create index (#155892)

## Summary This fixes some minor issues and adds a few enhancements in the create search index flow.
elastic · Apr 26, 2023 · a5b51f8 · a5b51f8
1 parent e2ea83d
commit a5b51f8
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 83 deletions.
diff --git a/...ions/enterprise_search_content/components/new_index/method_connector/method_connector.tsx b/...ions/enterprise_search_content/components/new_index/method_connector/method_connector.tsx
@@ -55,7 +55,7 @@ export const MethodConnector: React.FC<MethodConnectorProps> = ({ serviceType })
 
   const isNative =
     Boolean(NATIVE_CONNECTORS.find((connector) => connector.serviceType === serviceType)) &&
-    isCloud;
+    (isCloud || hasPlatinumLicense);
 
   const isGated = isNative && !isCloud && !hasPlatinumLicense;
   const hasLowMemory =

diff --git a/...e_search/public/applications/enterprise_search_content/components/new_index/new_index.tsx b/...e_search/public/applications/enterprise_search_content/components/new_index/new_index.tsx
@@ -7,23 +7,18 @@
 
 import React, { useState } from 'react';
 
-import { useLocation } from 'react-router-dom';
-
 import { useValues } from 'kea';
 
-import { EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 import { INGESTION_METHOD_IDS } from '../../../../../common/constants';
 
 import { ProductFeatures } from '../../../../../common/types';
 
-import { CONTINUE_BUTTON_LABEL } from '../../../shared/constants';
-
 import { generateEncodedPath } from '../../../shared/encode_path_params';
 import { KibanaLogic } from '../../../shared/kibana/kibana_logic';
 
-import { parseQueryParams } from '../../../shared/query_params';
 import { EuiLinkTo } from '../../../shared/react_router_helpers';
 import { NEW_INDEX_METHOD_PATH, NEW_INDEX_SELECT_CONNECTOR_PATH } from '../../routes';
 import { EnterpriseSearchContentPageTemplate } from '../layout/page_template';
@@ -34,20 +29,16 @@ import { NewIndexCard } from './new_index_card';
 const getAvailableMethodOptions = (productFeatures: ProductFeatures): INGESTION_METHOD_IDS[] => {
   return [
     ...(productFeatures.hasWebCrawler ? [INGESTION_METHOD_IDS.CRAWLER] : []),
-    INGESTION_METHOD_IDS.API,
     ...(productFeatures.hasConnectors ? [INGESTION_METHOD_IDS.CONNECTOR] : []),
+    INGESTION_METHOD_IDS.API,
   ];
 };
 
 export const NewIndex: React.FC = () => {
-  const { search } = useLocation();
-  const { method } = parseQueryParams(search);
   const { capabilities, productFeatures } = useValues(KibanaLogic);
   const availableIngestionMethodOptions = getAvailableMethodOptions(productFeatures);
 
-  const [selectedMethod, setSelectedMethod] = useState<string>(
-    Array.isArray(method) ? method[0] : method ?? INGESTION_METHOD_IDS.CRAWLER
-  );
+  const [selectedMethod, setSelectedMethod] = useState<string>('');
   return (
     <EnterpriseSearchContentPageTemplate
       pageChrome={[
@@ -78,53 +69,29 @@ export const NewIndex: React.FC = () => {
                     type={type}
                     onSelect={() => {
                       setSelectedMethod(type);
+                      if (type === INGESTION_METHOD_IDS.CONNECTOR) {
+                        KibanaLogic.values.navigateToUrl(NEW_INDEX_SELECT_CONNECTOR_PATH);
+                      } else {
+                        KibanaLogic.values.navigateToUrl(
+                          generateEncodedPath(NEW_INDEX_METHOD_PATH, { type })
+                        );
+                      }
                     }}
                     isSelected={selectedMethod === type}
                   />
                 </EuiFlexItem>
               ))}
             </EuiFlexGroup>
           </EuiFlexItem>
-          <EuiFlexItem>
-            <EuiFlexGroup alignItems="center" justifyContent="spaceBetween">
-              <EuiFlexItem>
-                {capabilities.navLinks.integrations && (
-                  <>
-                    <EuiLinkTo to="/app/integrations" shouldNotCreateHref>
-                      {i18n.translate(
-                        'xpack.enterpriseSearch.content.newIndex.viewIntegrationsLink',
-                        {
-                          defaultMessage: 'View additional integrations',
-                        }
-                      )}
-                    </EuiLinkTo>
-                  </>
-                )}
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <EuiButton
-                  color="primary"
-                  disabled={
-                    !Object.values(INGESTION_METHOD_IDS as Record<string, string>).includes(
-                      selectedMethod
-                    )
-                  }
-                  fill
-                  onClick={() => {
-                    if (selectedMethod === INGESTION_METHOD_IDS.CONNECTOR) {
-                      KibanaLogic.values.navigateToUrl(NEW_INDEX_SELECT_CONNECTOR_PATH);
-                    } else {
-                      KibanaLogic.values.navigateToUrl(
-                        generateEncodedPath(NEW_INDEX_METHOD_PATH, { type: selectedMethod })
-                      );
-                    }
-                  }}
-                >
-                  {CONTINUE_BUTTON_LABEL}
-                </EuiButton>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiFlexItem>
+          {capabilities.navLinks.integrations && (
+            <EuiFlexItem>
+              <EuiLinkTo to="/app/integrations" shouldNotCreateHref>
+                {i18n.translate('xpack.enterpriseSearch.content.newIndex.viewIntegrationsLink', {
+                  defaultMessage: 'View additional integrations',
+                })}
+              </EuiLinkTo>
+            </EuiFlexItem>
+          )}
         </>
       </EuiFlexGroup>
     </EnterpriseSearchContentPageTemplate>

diff --git a/...rch/public/applications/enterprise_search_content/components/new_index/new_index_card.tsx b/...rch/public/applications/enterprise_search_content/components/new_index/new_index_card.tsx
@@ -29,13 +29,6 @@ export interface MethodCardOptions {
   title: EuiCardProps['title'];
 }
 
-const NO_DEVELOPMENT_LABEL = i18n.translate(
-  'xpack.enterpriseSearch.content.newIndex.methodCard.noDevelopment.label',
-  {
-    defaultMessage: 'No development required',
-  }
-);
-
 const METHOD_CARD_OPTIONS: Record<INGESTION_METHOD_IDS, MethodCardOptions> = {
   [INGESTION_METHOD_IDS.CRAWLER]: {
     description: i18n.translate(
@@ -51,7 +44,6 @@ const METHOD_CARD_OPTIONS: Record<INGESTION_METHOD_IDS, MethodCardOptions> = {
           defaultMessage: 'Use a web crawler',
         }
       ),
-      label: NO_DEVELOPMENT_LABEL,
     },
     icon: getIngestionMethodIconType(INGESTION_METHOD_IDS.CRAWLER),
     title: i18n.translate('xpack.enterpriseSearch.content.newIndex.methodCard.crawler.title', {
@@ -73,7 +65,6 @@ const METHOD_CARD_OPTIONS: Record<INGESTION_METHOD_IDS, MethodCardOptions> = {
           defaultMessage: 'Use a connector',
         }
       ),
-      label: NO_DEVELOPMENT_LABEL,
     },
     icon: getIngestionMethodIconType(INGESTION_METHOD_IDS.CONNECTOR),
     title: i18n.translate('xpack.enterpriseSearch.content.newIndex.methodCard.connector.title', {
@@ -91,9 +82,6 @@ const METHOD_CARD_OPTIONS: Record<INGESTION_METHOD_IDS, MethodCardOptions> = {
       buttonLabel: i18n.translate('xpack.enterpriseSearch.content.newIndex.methodCard.api.label', {
         defaultMessage: 'Use the API',
       }),
-      label: i18n.translate('xpack.enterpriseSearch.content.newIndex.methodCard.api.footer', {
-        defaultMessage: 'Some development required',
-      }),
     },
     icon: getIngestionMethodIconType(INGESTION_METHOD_IDS.API),
     title: i18n.translate('xpack.enterpriseSearch.content.newIndex.methodCard.api.title', {
@@ -115,8 +103,12 @@ export const NewIndexCard: React.FC<NewIndexCardProps> = ({ onSelect, isSelected
       description={<EuiTextColor color="subdued">{description}</EuiTextColor>}
       footer={
         <>
-          <EuiBadge color="hollow">{footer.label}</EuiBadge>
-          <EuiSpacer size="m" />
+          {footer.label && (
+            <>
+              <EuiBadge color="hollow">{footer.label}</EuiBadge>
+              <EuiSpacer size="m" />
+            </>
+          )}
           <EuiButton
             fullWidth
             onClick={onSelect}

diff --git a/...s/enterprise_search_content/components/new_index/select_connector/connector_checkable.tsx b/...s/enterprise_search_content/components/new_index/select_connector/connector_checkable.tsx
@@ -65,21 +65,27 @@ export const ConnectorCheckable: React.FC<ConnectorCheckableProps> = ({
       name={name}
       value={serviceType}
     >
-      {documentationUrl && (
-        <EuiLink target="_blank" href={documentationUrl}>
-          {i18n.translate(
-            'xpack.enterpriseSearch.content.indices.selectConnector.connectorCheckable.documentationLinkLabel',
-            {
-              defaultMessage: 'Documentation',
-            }
-          )}
-        </EuiLink>
-      )}
-      {isBeta && (
-        <EuiBadge color="hollow" iconType="beaker">
-          <EuiText size="xs">{BETA_LABEL}</EuiText>
-        </EuiBadge>
-      )}
+      <EuiFlexGroup alignItems="center" justifyContent="spaceBetween" gutterSize="s">
+        {documentationUrl && (
+          <EuiFlexItem grow={false}>
+            <EuiLink target="_blank" href={documentationUrl}>
+              {i18n.translate(
+                'xpack.enterpriseSearch.content.indices.selectConnector.connectorCheckable.documentationLinkLabel',
+                {
+                  defaultMessage: 'Documentation',
+                }
+              )}
+            </EuiLink>
+          </EuiFlexItem>
+        )}
+        {isBeta && (
+          <EuiFlexItem grow={false}>
+            <EuiBadge color="hollow" iconType="beaker">
+              <EuiText size="xs">{BETA_LABEL}</EuiText>
+            </EuiBadge>
+          </EuiFlexItem>
+        )}
+      </EuiFlexGroup>
     </EuiCheckableCard>
   );
 };
diff --git a/...ions/enterprise_search_content/components/new_index/select_connector/select_connector.tsx b/...ions/enterprise_search_content/components/new_index/select_connector/select_connector.tsx
@@ -55,7 +55,7 @@ export const SelectConnector: React.FC = () => {
         description: i18n.translate(
           'xpack.enterpriseSearch.content.indices.selectConnector.description',
           {
-            defaultMessage: 'A search connector syncs data from a third party source.',
+            defaultMessage: 'A connector will sync data from a data source.',
           }
         ),
         pageTitle: i18n.translate('xpack.enterpriseSearch.content.indices.selectConnector.title', {

diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.ts b/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.ts
@@ -317,8 +317,16 @@ class DocLinks {
     this.clientsRustOverview = docLinks.links.clients.rustOverview;
     this.cloudIndexManagement = docLinks.links.cloud.indexManagement;
     this.connectors = docLinks.links.enterpriseSearch.connectors;
+    this.connectorsAzureBlobStorage = docLinks.links.enterpriseSearch.connectorsAzureBlobStorage;
+    this.connectorsGoogleCloudStorage =
+      docLinks.links.enterpriseSearch.connectorsGoogleCloudStorage;
+    this.connectorsMicrosoftSQL = docLinks.links.enterpriseSearch.connectorsMicrosoftSQL;
     this.connectorsMongoDB = docLinks.links.enterpriseSearch.connectorsMongoDB;
     this.connectorsMySQL = docLinks.links.enterpriseSearch.connectorsMySQL;
+    this.connectorsNetworkDrive = docLinks.links.enterpriseSearch.connectorsNetworkDrive;
+    this.connectorsOracle = docLinks.links.enterpriseSearch.connectorsOracle;
+    this.connectorsPostgreSQL = docLinks.links.enterpriseSearch.connectorsPostgreSQL;
+    this.connectorsS3 = docLinks.links.enterpriseSearch.connectorsS3;
     this.connectorsWorkplaceSearch = docLinks.links.enterpriseSearch.connectorsWorkplaceSearch;
     this.crawlerExtractionRules = docLinks.links.enterpriseSearch.crawlerExtractionRules;
     this.crawlerManaging = docLinks.links.enterpriseSearch.crawlerManaging;