Merge branch 'main' into eui-v76.0.0

package.json

@@ -1254,7 +1254,7 @@
     "@types/redux-logger": "^3.0.8",
     "@types/resolve": "^1.20.1",
     "@types/seedrandom": ">=2.0.0 <4.0.0",
-    "@types/selenium-webdriver": "^4.1.12",
+    "@types/selenium-webdriver": "^4.1.13",
     "@types/semver": "^7",
     "@types/set-value": "^2.0.0",
     "@types/sharp": "^0.30.4",

test/plugin_functional/test_suites/core_plugins/rendering.ts

@@ -103,6 +103,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
         'data.search.sessions.management.refreshTimeout (duration)',
         'data.search.sessions.maxUpdateRetries (number)',
         'data.search.sessions.notTouchedTimeout (duration)',
+        'enterpriseSearch.canDeployEntSearch (boolean)',
         'enterpriseSearch.host (string)',
         'home.disableWelcomeScreen (boolean)',
         'map.emsFileApiUrl (string)',

x-pack/plugins/enterprise_search/common/__mocks__/initial_app_data.ts

@@ -32,6 +32,13 @@ export const DEFAULT_INITIAL_APP_DATA = {
     hasSearchEnginesAccess: false,
     hasWorkplaceSearchAccess: true,
   },
+  features: {
+    hasConnectors: true,
+    hasDefaultIngestPipeline: true,
+    hasNativeConnectors: true,
+    hasSearchApplications: false,
+    hasWebCrawler: true,
+  },
   appSearch: {
     accountId: 'some-id-string',
     onboardingComplete: true,

x-pack/plugins/enterprise_search/common/constants.ts

@@ -7,6 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 
+import { ProductFeatures } from './types';
 import { IngestPipelineParams } from './types/connectors';
 
 export const ENTERPRISE_SEARCH_OVERVIEW_PLUGIN = {
@@ -161,3 +162,11 @@ export enum INGESTION_METHOD_IDS {
   crawler = 'crawler',
   native_connector = 'native_connector',
 }
+
+export const DEFAULT_PRODUCT_FEATURES: ProductFeatures = {
+  hasConnectors: true,
+  hasDefaultIngestPipeline: true,
+  hasNativeConnectors: true,
+  hasSearchApplications: false,
+  hasWebCrawler: true,
+};

x-pack/plugins/enterprise_search/common/types/index.ts

@@ -19,6 +19,7 @@ export interface InitialAppData {
   appSearch?: AppSearchAccount;
   configuredLimits?: ConfiguredLimits;
   enterpriseSearchVersion?: string;
+  features?: ProductFeatures;
   kibanaVersion?: string;
   readOnlyMode?: boolean;
   searchOAuth?: SearchOAuth;
@@ -36,6 +37,14 @@ export interface ProductAccess {
   hasWorkplaceSearchAccess: boolean;
 }
 
+export interface ProductFeatures {
+  hasConnectors: boolean;
+  hasDefaultIngestPipeline: boolean;
+  hasNativeConnectors: boolean;
+  hasSearchApplications: boolean;
+  hasWebCrawler: boolean;
+}
+
 export interface SearchOAuth {
   clientId: string;
   redirectUrl: string;
@@ -52,5 +61,10 @@ export interface Meta {
   page: MetaPage;
 }
 
+export interface ClientConfigType {
+  canDeployEntSearch: boolean;
+  host?: string;
+}
+
 export type { ElasticsearchIndexWithPrivileges } from './indices';
 export type { KibanaDeps } from './kibana_deps';

x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts

@@ -37,6 +37,11 @@ export const mockKibanaValues = {
     hasSearchEnginesAccess: false,
     hasWorkplaceSearchAccess: true,
   },
+  productFeatures: {
+    hasNativeConnectors: true,
+    hasSearchApplications: false,
+    hasWebCrawler: true,
+  },
   uiSettings: uiSettingsServiceMock.createStartContract(),
   security: securityMock.createStart(),
   setBreadcrumbs: jest.fn(),

x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/new_index.tsx

@@ -9,6 +9,8 @@ import React, { useState } from 'react';
 
 import { useLocation } from 'react-router-dom';
 
+import { useValues } from 'kea';
+
 import {
   EuiBadge,
   EuiFlexGroup,
@@ -22,7 +24,9 @@ import { i18n } from '@kbn/i18n';
 
 import { INGESTION_METHOD_IDS } from '../../../../../common/constants';
 
+import { ProductFeatures } from '../../../../../common/types';
 import { BETA_LABEL } from '../../../shared/constants/labels';
+import { KibanaLogic } from '../../../shared/kibana/kibana_logic';
 import { parseQueryParams } from '../../../shared/query_params';
 import { EuiLinkTo } from '../../../shared/react_router_helpers';
 
@@ -41,8 +45,8 @@ const betaBadge = (
   </EuiBadge>
 );
 
-const METHOD_BUTTON_GROUP_OPTIONS: ButtonGroupOption[] = [
-  {
+const METHOD_BUTTON_GROUP_OPTIONS: Record<INGESTION_METHOD_IDS, ButtonGroupOption> = {
+  [INGESTION_METHOD_IDS.crawler]: {
     description: i18n.translate(
       'xpack.enterpriseSearch.content.newIndex.buttonGroup.crawler.description',
       {
@@ -58,7 +62,7 @@ const METHOD_BUTTON_GROUP_OPTIONS: ButtonGroupOption[] = [
       defaultMessage: 'Use the web crawler',
     }),
   },
-  {
+  [INGESTION_METHOD_IDS.native_connector]: {
     badge: betaBadge,
     description: i18n.translate(
       'xpack.enterpriseSearch.content.newIndex.buttonGroup.nativeConnector.description',
@@ -82,7 +86,7 @@ const METHOD_BUTTON_GROUP_OPTIONS: ButtonGroupOption[] = [
       }
     ),
   },
-  {
+  [INGESTION_METHOD_IDS.api]: {
     description: i18n.translate(
       'xpack.enterpriseSearch.content.newIndex.buttonGroup.api.description',
       {
@@ -98,7 +102,7 @@ const METHOD_BUTTON_GROUP_OPTIONS: ButtonGroupOption[] = [
       defaultMessage: 'Use the API',
     }),
   },
-  {
+  [INGESTION_METHOD_IDS.connector]: {
     badge: betaBadge,
     description: i18n.translate(
       'xpack.enterpriseSearch.content.newIndex.buttonGroup.connector.description',
@@ -116,15 +120,32 @@ const METHOD_BUTTON_GROUP_OPTIONS: ButtonGroupOption[] = [
       defaultMessage: 'Build a connector',
     }),
   },
-];
+};
+
+const getAvailableMethodOptions = (productFeatures: ProductFeatures): ButtonGroupOption[] => {
+  return [
+    ...(productFeatures.hasWebCrawler
+      ? [METHOD_BUTTON_GROUP_OPTIONS[INGESTION_METHOD_IDS.crawler]]
+      : []),
+    ...(productFeatures.hasNativeConnectors
+      ? [METHOD_BUTTON_GROUP_OPTIONS[INGESTION_METHOD_IDS.native_connector]]
+      : []),
+    METHOD_BUTTON_GROUP_OPTIONS[INGESTION_METHOD_IDS.api],
+    ...(productFeatures.hasConnectors
+      ? [METHOD_BUTTON_GROUP_OPTIONS[INGESTION_METHOD_IDS.connector]]
+      : []),
+  ];
+};
 
 export const NewIndex: React.FC = () => {
   const { search } = useLocation();
+  const { capabilities, productFeatures } = useValues(KibanaLogic);
   const { method: methodParam } = parseQueryParams(search);
+  const availableIngestionMethodOptions = getAvailableMethodOptions(productFeatures);
 
   const initialSelectedMethod =
-    METHOD_BUTTON_GROUP_OPTIONS.find((option) => option.id === methodParam) ??
-    METHOD_BUTTON_GROUP_OPTIONS[0];
+    availableIngestionMethodOptions.find((option) => option.id === methodParam) ??
+    availableIngestionMethodOptions[0];
 
   const [selectedMethod, setSelectedMethod] = useState<ButtonGroupOption>(initialSelectedMethod);
 
@@ -168,16 +189,20 @@ export const NewIndex: React.FC = () => {
             </EuiText>
             <EuiSpacer size="m" />
             <ButtonGroup
-              options={METHOD_BUTTON_GROUP_OPTIONS}
+              options={availableIngestionMethodOptions}
               selected={selectedMethod}
               onChange={setSelectedMethod}
             />
-            <EuiSpacer size="xxl" />
-            <EuiLinkTo to="/app/integrations" shouldNotCreateHref>
-              {i18n.translate('xpack.enterpriseSearch.content.newIndex.viewIntegrationsLink', {
-                defaultMessage: 'View additional integrations',
-              })}
-            </EuiLinkTo>
+            {capabilities.navLinks.integrations && (
+              <>
+                <EuiSpacer size="xxl" />
+                <EuiLinkTo to="/app/integrations" shouldNotCreateHref>
+                  {i18n.translate('xpack.enterpriseSearch.content.newIndex.viewIntegrationsLink', {
+                    defaultMessage: 'View additional integrations',
+                  })}
+                </EuiLinkTo>
+              </>
+            )}
           </EuiPanel>
         </EuiFlexItem>
         <EuiFlexItem>

x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/new_search_index_logic.test.ts

@@ -16,6 +16,9 @@ import { flashIndexCreatedToast } from './new_index_created_toast';
 import { NewSearchIndexLogic, NewSearchIndexValues } from './new_search_index_logic';
 
 jest.mock('./new_index_created_toast', () => ({ flashIndexCreatedToast: jest.fn() }));
+jest.mock('../../../shared/kibana/kibana_logic', () => ({
+  KibanaLogic: { values: { productAccess: { hasAppSearchAccess: true } } },
+}));
 
 const DEFAULT_VALUES: NewSearchIndexValues = {
   data: undefined as any,
@@ -35,14 +38,12 @@ describe('NewSearchIndexLogic', () => {
   });
 
   it('has expected default values', () => {
-    mount();
     expect(NewSearchIndexLogic.values).toEqual(DEFAULT_VALUES);
   });
 
   describe('actions', () => {
     describe('setLanguageSelectValue', () => {
       it('sets language to the provided value', () => {
-        mount();
         NewSearchIndexLogic.actions.setLanguageSelectValue('en');
         expect(NewSearchIndexLogic.values).toEqual({
           ...DEFAULT_VALUES,

x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/new_search_index_logic.ts

@@ -8,6 +8,7 @@
 import { kea, MakeLogicType } from 'kea';
 
 import { Actions } from '../../../shared/api_logic/create_api_logic';
+import { KibanaLogic } from '../../../shared/kibana/kibana_logic';
 import {
   AddConnectorApiLogic,
   AddConnectorApiLogicArgs,
@@ -84,12 +85,15 @@ export const NewSearchIndexLogic = kea<MakeLogicType<NewSearchIndexValues, NewSe
   },
   listeners: ({ actions, values }) => ({
     apiIndexCreated: () => {
+      if (!KibanaLogic.values.productAccess.hasAppSearchAccess) return;
       flashIndexCreatedToast();
     },
     connectorIndexCreated: () => {
+      if (!KibanaLogic.values.productAccess.hasAppSearchAccess) return;
       flashIndexCreatedToast();
     },
     crawlerIndexCreated: () => {
+      if (!KibanaLogic.values.productAccess.hasAppSearchAccess) return;
       flashIndexCreatedToast();
     },
     setRawName: async (_, breakpoint) => {

x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/components/header_actions/header_actions.test.tsx

@@ -17,24 +17,27 @@ import { SyncsContextMenu } from './syncs_context_menu';
 
 describe('Header Actions', () => {
   it('renders api index', () => {
-    expect(getHeaderActions(apiIndex)).toEqual([
+    expect(getHeaderActions(apiIndex, true)).toEqual([
       <SearchEnginesPopover indexName="api" ingestionMethod="api" isHiddenIndex={false} />,
     ]);
+    expect(getHeaderActions(apiIndex, false)).toEqual([]);
   });
   it('renders connector index', () => {
-    expect(getHeaderActions(connectorIndex)).toEqual([
+    expect(getHeaderActions(connectorIndex, true)).toEqual([
       <SyncsContextMenu />,
       <SearchEnginesPopover
         indexName="connector"
         ingestionMethod="connector"
         isHiddenIndex={false}
       />,
     ]);
+    expect(getHeaderActions(connectorIndex, false)).toEqual([<SyncsContextMenu />]);
   });
   it('renders crawler index', () => {
-    expect(getHeaderActions(crawlerIndex)).toEqual([
+    expect(getHeaderActions(crawlerIndex, true)).toEqual([
       <CrawlerStatusIndicator />,
       <SearchEnginesPopover indexName="crawler" ingestionMethod="crawler" isHiddenIndex={false} />,
     ]);
+    expect(getHeaderActions(crawlerIndex, false)).toEqual([<CrawlerStatusIndicator />]);
   });
 });

x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/components/header_actions/header_actions.tsx

@@ -15,15 +15,22 @@ import { SearchEnginesPopover } from './search_engines_popover';
 import { SyncsContextMenu } from './syncs_context_menu';
 
 // Used to populate rightSideItems of an EuiPageTemplate, which is rendered right-to-left
-export const getHeaderActions = (indexData?: ElasticsearchIndexWithIngestion) => {
+export const getHeaderActions = (
+  indexData: ElasticsearchIndexWithIngestion | undefined,
+  hasAppSearchAccess: boolean
+) => {
   const ingestionMethod = getIngestionMethod(indexData);
   return [
     ...(isCrawlerIndex(indexData) && indexData.connector ? [<CrawlerStatusIndicator />] : []),
     ...(isConnectorIndex(indexData) ? [<SyncsContextMenu />] : []),
-    <SearchEnginesPopover
-      indexName={indexData?.name}
-      ingestionMethod={ingestionMethod}
-      isHiddenIndex={indexData?.hidden}
-    />,
+    ...(hasAppSearchAccess
+      ? [
+          <SearchEnginesPopover
+            indexName={indexData?.name}
+            ingestionMethod={ingestionMethod}
+            isHiddenIndex={indexData?.hidden}
+          />,
+        ]
+      : []),
   ];
 };

x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/components/manage_api_keys_popover/popover.tsx

@@ -46,6 +46,7 @@ export const ManageKeysPopover: React.FC = () => {
         size="s"
         items={[
           <EuiContextMenuItem
+            key="viewApiKeys"
             data-telemetry-id={`entSearchContent-${ingestionMethod}-overview-generateApiKeys-viewApiKeys`}
             icon="eye"
             onClick={() =>
@@ -64,6 +65,7 @@ export const ManageKeysPopover: React.FC = () => {
             </EuiText>
           </EuiContextMenuItem>,
           <EuiContextMenuItem
+            key="createNewApiKey"
             data-telemetry-id={`entSearchContent-${ingestionMethod}-overview-generateApiKeys-createNewApiKey`}
             icon="plusInCircle"
             onClick={openGenerateModal}

x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/search_index.tsx

@@ -75,7 +75,11 @@ export const SearchIndex: React.FC = () => {
    * This needs to be checked for any of the 3 registered search guideIds
    * Putting it here guarantees that if a user is viewing an index with data, it'll be marked as complete
    */
-  const { guidedOnboarding } = useValues(KibanaLogic);
+  const {
+    guidedOnboarding,
+    productAccess: { hasAppSearchAccess },
+    productFeatures: { hasDefaultIngestPipeline },
+  } = useValues(KibanaLogic);
   const isAppGuideActive = useObservable(
     guidedOnboarding.guidedOnboardingApi!.isGuideStepActive$('appSearch', 'add_data')
   );
@@ -199,7 +203,7 @@ export const SearchIndex: React.FC = () => {
     ...ALL_INDICES_TABS,
     ...(isConnectorIndex(index) ? CONNECTOR_TABS : []),
     ...(isCrawlerIndex(index) ? CRAWLER_TABS : []),
-    PIPELINES_TAB,
+    ...(hasDefaultIngestPipeline ? [PIPELINES_TAB] : []),
   ];
 
   const selectedTab = tabs.find((tab) => tab.id === tabId);
@@ -222,7 +226,7 @@ export const SearchIndex: React.FC = () => {
       isLoading={isInitialLoading}
       pageHeader={{
         pageTitle: indexName,
-        rightSideItems: getHeaderActions(index),
+        rightSideItems: getHeaderActions(index, hasAppSearchAccess),
       }}
     >
       {isCrawlerIndex(index) && !index.connector ? (

x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/settings/settings_logic.ts

@@ -14,6 +14,7 @@ import { Status } from '../../../../../common/types/api';
 
 import { IngestPipelineParams } from '../../../../../common/types/connectors';
 import { Actions } from '../../../shared/api_logic/create_api_logic';
+import { KibanaLogic } from '../../../shared/kibana';
 
 import {
   FetchDefaultPipelineApiLogic,
@@ -70,6 +71,7 @@ export const SettingsLogic = kea<MakeLogicType<PipelinesValues, PipelinesActions
   },
   events: ({ actions }) => ({
     afterMount: () => {
+      if (KibanaLogic.values.productFeatures.hasDefaultIngestPipeline === false) return;
       actions.fetchDefaultPipeline(undefined);
     },
   }),