merge with main

config/serverless.es.yml

@@ -116,9 +116,6 @@ xpack.ml.compatibleModuleType: 'search'
 
 data_visualizer.resultLinks.fileBeat.enabled: false
 
-# Search InferenceEndpoints
-xpack.searchInferenceEndpoints.ui.enabled: true
-
 # Search Notebooks
 xpack.search.notebooks.catalog.url: https://elastic-enterprise-search.s3.us-east-2.amazonaws.com/serverless/catalog.json
 

config/serverless.oblt.yml

@@ -8,6 +8,7 @@ xpack.uptime.enabled: true
 xpack.securitySolution.enabled: false
 xpack.search.notebooks.enabled: false
 xpack.searchPlayground.enabled: false
+xpack.searchInferenceEndpoints.enabled: false
 
 ## Fine-tune the observability solution feature privileges. Also, refer to `serverless.yml` for the project-agnostic overrides.
 xpack.features.overrides:

config/serverless.security.yml

@@ -9,6 +9,7 @@ xpack.observability.enabled: false
 xpack.observabilityAIAssistant.enabled: false
 xpack.search.notebooks.enabled: false
 xpack.searchPlayground.enabled: false
+xpack.searchInferenceEndpoints.enabled: false
 
 ## Fine-tune the security solution feature privileges. Also, refer to `serverless.yml` for the project-agnostic overrides.
 xpack.features.overrides:

examples/embeddable_examples/public/app/presentation_container_example/page_api.ts

@@ -250,6 +250,7 @@ export function getPageApi() {
           children$.next(children);
         }
         newPanels = {};
+        return true;
       },
       timeRange$,
       unsavedChanges: unsavedChanges$ as PublishingSubject<object | undefined>,

packages/deeplinks/search/constants.ts

@@ -9,7 +9,6 @@
 
 export const ENTERPRISE_SEARCH_APP_ID = 'enterpriseSearch';
 export const ENTERPRISE_SEARCH_CONTENT_APP_ID = 'enterpriseSearchContent';
-export const ENTERPRISE_SEARCH_RELEVANCE_APP_ID = 'searchInferenceEndpoints';
 export const ENTERPRISE_SEARCH_APPLICATIONS_APP_ID = 'enterpriseSearchApplications';
 export const ENTERPRISE_SEARCH_ANALYTICS_APP_ID = 'enterpriseSearchAnalytics';
 export const ENTERPRISE_SEARCH_APPSEARCH_APP_ID = 'appSearch';

packages/deeplinks/search/deep_links.ts

@@ -14,7 +14,6 @@ import {
   ENTERPRISE_SEARCH_APP_ID,
   ENTERPRISE_SEARCH_CONTENT_APP_ID,
   ENTERPRISE_SEARCH_APPLICATIONS_APP_ID,
-  ENTERPRISE_SEARCH_RELEVANCE_APP_ID,
   ENTERPRISE_SEARCH_ANALYTICS_APP_ID,
   ENTERPRISE_SEARCH_APPSEARCH_APP_ID,
   ENTERPRISE_SEARCH_WORKPLACESEARCH_APP_ID,
@@ -33,7 +32,6 @@ import {
 export type EnterpriseSearchApp = typeof ENTERPRISE_SEARCH_APP_ID;
 export type EnterpriseSearchContentApp = typeof ENTERPRISE_SEARCH_CONTENT_APP_ID;
 export type EnterpriseSearchApplicationsApp = typeof ENTERPRISE_SEARCH_APPLICATIONS_APP_ID;
-export type EnterpriseSearchRelevanceApp = typeof ENTERPRISE_SEARCH_RELEVANCE_APP_ID;
 export type EnterpriseSearchAnalyticsApp = typeof ENTERPRISE_SEARCH_ANALYTICS_APP_ID;
 export type EnterpriseSearchAppsearchApp = typeof ENTERPRISE_SEARCH_APPSEARCH_APP_ID;
 export type EnterpriseSearchWorkplaceSearchApp = typeof ENTERPRISE_SEARCH_WORKPLACESEARCH_APP_ID;
@@ -56,15 +54,14 @@ export type ApplicationsLinkId = 'searchApplications';
 
 export type AppsearchLinkId = 'engines';
 
-export type RelevanceLinkId = 'inferenceEndpoints';
+export type SearchInferenceEndpointsLinkId = 'inferenceEndpoints';
 
 export type SearchIndicesLinkId = typeof SEARCH_INDICES_CREATE_INDEX;
 
 export type DeepLinkId =
   | EnterpriseSearchApp
   | EnterpriseSearchContentApp
   | EnterpriseSearchApplicationsApp
-  | EnterpriseSearchRelevanceApp
   | EnterpriseSearchAnalyticsApp
   | EnterpriseSearchAppsearchApp
   | EnterpriseSearchWorkplaceSearchApp
@@ -77,7 +74,7 @@ export type DeepLinkId =
   | `${EnterpriseSearchContentApp}:${ContentLinkId}`
   | `${EnterpriseSearchApplicationsApp}:${ApplicationsLinkId}`
   | `${EnterpriseSearchAppsearchApp}:${AppsearchLinkId}`
-  | `${EnterpriseSearchRelevanceApp}:${RelevanceLinkId}`
+  | `${SearchInferenceEndpointsId}:${SearchInferenceEndpointsLinkId}`
   | SearchStart
   | SearchIndices
   | SearchElasticsearch

packages/deeplinks/search/index.ts

@@ -10,7 +10,6 @@
 export {
   ENTERPRISE_SEARCH_APP_ID,
   ENTERPRISE_SEARCH_CONTENT_APP_ID,
-  ENTERPRISE_SEARCH_RELEVANCE_APP_ID,
   ENTERPRISE_SEARCH_APPLICATIONS_APP_ID,
   ENTERPRISE_SEARCH_ANALYTICS_APP_ID,
   ENTERPRISE_SEARCH_APPSEARCH_APP_ID,

packages/kbn-index-adapter/src/field_maps/types.ts

@@ -46,6 +46,7 @@ export type FieldMap<T extends string = string> = Record<
     array?: boolean;
     doc_values?: boolean;
     enabled?: boolean;
+    fields?: Record<string, { type: string }>;
     format?: string;
     ignore_above?: number;
     multi_fields?: MultiField[];

packages/kbn-mock-idp-plugin/public/plugin.tsx

@@ -49,7 +49,7 @@ export const plugin: PluginInitializer<
         ]);
 
         ReactDOM.render(
-          <KibanaThemeProvider theme={coreStart.theme}>
+          <KibanaThemeProvider {...coreStart}>
             <KibanaContextProvider services={coreStart}>
               <I18nProvider>
                 <LoginPage />
@@ -69,7 +69,7 @@ export const plugin: PluginInitializer<
       order: 4000 + 1, // Make sure it comes after the user menu
       mount: (element: HTMLElement) => {
         ReactDOM.render(
-          <KibanaThemeProvider theme={coreStart.theme}>
+          <KibanaThemeProvider {...coreStart}>
             <KibanaContextProvider services={coreStart}>
               <I18nProvider>
                 <RoleSwitcher />

packages/kbn-mock-idp-plugin/public/reload_page_toast.tsx

@@ -13,6 +13,7 @@ import React from 'react';
 import type { I18nStart } from '@kbn/core-i18n-browser';
 import type { ToastInput } from '@kbn/core-notifications-browser';
 import type { ThemeServiceStart } from '@kbn/core-theme-browser';
+import type { UserProfileService } from '@kbn/core-user-profile-browser';
 import { toMountPoint } from '@kbn/react-kibana-mount';
 import type { AuthenticatedUser } from '@kbn/security-plugin-types-common';
 
@@ -26,6 +27,7 @@ export const DATA_TEST_SUBJ_PAGE_RELOAD_BUTTON = 'pageReloadButton';
  */
 export const createReloadPageToast = (options: {
   user: Pick<AuthenticatedUser, 'roles'>;
+  userProfile: UserProfileService;
   theme: ThemeServiceStart;
   i18n: I18nStart;
 }): ToastInput => {
@@ -43,7 +45,7 @@ export const createReloadPageToast = (options: {
           </EuiButton>
         </EuiFlexItem>
       </EuiFlexGroup>,
-      { i18n: options.i18n, theme: options.theme }
+      options
     ),
     color: 'success',
     toastLifeTimeMs: 0x7fffffff, // Do not auto-hide toast since page is in an unknown state

packages/kbn-mock-idp-plugin/public/role_switcher.tsx

@@ -69,6 +69,7 @@ export const RoleSwitcher = () => {
       services.notifications.toasts.add(
         createReloadPageToast({
           user: authenticateUserState.value,
+          userProfile: services.userProfile,
           theme: services.theme,
           i18n: services.i18n,
         })

packages/kbn-mock-idp-plugin/tsconfig.json

@@ -26,5 +26,6 @@
     "@kbn/mock-idp-utils",
     "@kbn/cloud-plugin",
     "@kbn/es",
+    "@kbn/core-user-profile-browser",
   ]
 }

packages/kbn-user-profile-components/src/services.tsx

@@ -13,6 +13,7 @@ import React, { useContext } from 'react';
 import type { I18nStart } from '@kbn/core-i18n-browser';
 import type { NotificationsStart, ToastOptions } from '@kbn/core-notifications-browser';
 import type { ThemeServiceStart } from '@kbn/core-theme-browser';
+import type { UserProfileService } from '@kbn/core-user-profile-browser';
 import type { toMountPoint } from '@kbn/react-kibana-mount';
 
 import type { UserProfileAPIClient } from './types';
@@ -47,6 +48,7 @@ export interface UserProfilesKibanaDependencies {
   core: {
     notifications: NotificationsStart;
     theme: ThemeServiceStart;
+    userProfile: UserProfileService;
     i18n: I18nStart;
   };
   security: {
@@ -70,7 +72,7 @@ export const UserProfilesKibanaProvider: FC<PropsWithChildren<UserProfilesKibana
   ...services
 }) => {
   const {
-    core: { notifications, i18n, theme },
+    core: { notifications, ...startServices },
     security: { userProfiles: userProfileApiClient },
     toMountPoint: toMountPointUtility,
   } = services;
@@ -86,7 +88,7 @@ export const UserProfilesKibanaProvider: FC<PropsWithChildren<UserProfilesKibana
         notifications.toasts.addSuccess(
           {
             title,
-            text: text ? toMountPointUtility(text, { i18n, theme }) : undefined,
+            text: text ? toMountPointUtility(text, startServices) : undefined,
           },
           toastOptions
         );

packages/kbn-user-profile-components/tsconfig.json

@@ -21,6 +21,7 @@
     "@kbn/react-kibana-mount",
     "@kbn/core-i18n-browser",
     "@kbn/test-jest-helpers",
+    "@kbn/core-user-profile-browser",
   ],
   "exclude": [
     "target/**/*",

packages/presentation/presentation_containers/interfaces/unsaved_changes/children_unsaved_changes.test.ts

@@ -14,11 +14,11 @@ import { waitFor } from '@testing-library/react';
 describe('childrenUnsavedChanges$', () => {
   const child1Api = {
     unsavedChanges: new BehaviorSubject<object | undefined>(undefined),
-    resetUnsavedChanges: () => undefined,
+    resetUnsavedChanges: () => true,
   };
   const child2Api = {
     unsavedChanges: new BehaviorSubject<object | undefined>(undefined),
-    resetUnsavedChanges: () => undefined,
+    resetUnsavedChanges: () => true,
   };
   const children$ = new BehaviorSubject<{ [key: string]: unknown }>({});
   const onFireMock = jest.fn();
@@ -99,7 +99,7 @@ describe('childrenUnsavedChanges$', () => {
       ...children$.value,
       child3: {
         unsavedChanges: new BehaviorSubject<object | undefined>({ key1: 'modified value' }),
-        resetUnsavedChanges: () => undefined,
+        resetUnsavedChanges: () => true,
       },
     });
 

packages/presentation/presentation_containers/interfaces/unsaved_changes/initialize_unsaved_changes.ts

@@ -95,10 +95,19 @@ export const initializeUnsavedChanges = <RuntimeState extends {} = {}>(
       unsavedChanges,
       resetUnsavedChanges: () => {
         const lastSaved = lastSavedState$.getValue();
+
+        // Do not reset to undefined or empty last saved state
+        // Temporary fix for https://github.com/elastic/kibana/issues/201627
+        // TODO remove when architecture fix resolves issue.
+        if (comparatorKeys.length && (!lastSaved || Object.keys(lastSaved).length === 0)) {
+          return false;
+        }
+
         for (const key of comparatorKeys) {
           const setter = comparators[key][1]; // setter function is the 1st element of the tuple
           setter(lastSaved?.[key] as RuntimeState[typeof key]);
         }
+        return true;
       },
       snapshotRuntimeState,
     } as PublishesUnsavedChanges<RuntimeState> & HasSnapshottableState<RuntimeState>,

packages/presentation/presentation_publishing/interfaces/publishes_unsaved_changes.ts

@@ -11,7 +11,7 @@ import { PublishingSubject } from '../publishing_subject';
 
 export interface PublishesUnsavedChanges<Runtime extends object = object> {
   unsavedChanges: PublishingSubject<Partial<Runtime> | undefined>;
-  resetUnsavedChanges: () => void;
+  resetUnsavedChanges: () => boolean;
 }
 
 export const apiPublishesUnsavedChanges = (api: unknown): api is PublishesUnsavedChanges => {

src/plugins/controls/public/controls/mocks/control_mocks.ts

@@ -43,7 +43,9 @@ export const getMockedBuildApi =
       uuid,
       parentApi: controlGroupApi ?? getMockedControlGroupApi(),
       unsavedChanges: new BehaviorSubject<Partial<StateType> | undefined>(undefined),
-      resetUnsavedChanges: () => {},
+      resetUnsavedChanges: () => {
+        return true;
+      },
       type: factory.type,
     };
   };

src/plugins/controls/public/controls/timeslider_control/get_timeslider_control_factory.test.tsx

@@ -48,7 +48,9 @@ describe('TimesliderControlApi', () => {
       uuid,
       parentApi: controlGroupApi,
       unsavedChanges: new BehaviorSubject<Partial<TimesliderControlState> | undefined>(undefined),
-      resetUnsavedChanges: () => {},
+      resetUnsavedChanges: () => {
+        return true;
+      },
       type: factory.type,
     };
   }

src/plugins/dashboard/public/dashboard_api/panels_manager.ts

@@ -51,6 +51,7 @@ import { DashboardState } from './types';
 import { arePanelLayoutsEqual } from './are_panel_layouts_equal';
 import { dashboardClonePanelActionStrings } from '../dashboard_actions/_dashboard_actions_strings';
 import { placeClonePanel } from '../dashboard_container/panel_placement';
+import { i18n } from '@kbn/i18n';
 
 export function initializePanelsManager(
   incomingEmbeddable: EmbeddablePackageState | undefined,
@@ -395,7 +396,16 @@ export function initializePanelsManager(
         for (const panelId of Object.keys(currentChildren)) {
           if (panels$.value[panelId]) {
             const child = currentChildren[panelId];
-            if (apiPublishesUnsavedChanges(child)) child.resetUnsavedChanges();
+            if (apiPublishesUnsavedChanges(child)) {
+              const success = child.resetUnsavedChanges();
+              if (!success) {
+                coreServices.notifications.toasts.addWarning(
+                  i18n.translate('dashboard.reset.panelError', {
+                    defaultMessage: 'Unable to reset panel changes',
+                  })
+                );
+              }
+            }
           } else {
             // if reset resulted in panel removal, we need to update the list of children
             delete currentChildren[panelId];

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

@@ -10,7 +10,6 @@ import dedent from 'dedent';
 import {
   ENTERPRISE_SEARCH_APP_ID,
   ENTERPRISE_SEARCH_CONTENT_APP_ID,
-  ENTERPRISE_SEARCH_RELEVANCE_APP_ID,
   ENTERPRISE_SEARCH_APPLICATIONS_APP_ID,
   ENTERPRISE_SEARCH_ANALYTICS_APP_ID,
   ENTERPRISE_SEARCH_APPSEARCH_APP_ID,
@@ -200,22 +199,6 @@ export const SEMANTIC_SEARCH_PLUGIN = {
   URL: '/app/enterprise_search/semantic_search',
 };
 
-export const SEARCH_RELEVANCE_PLUGIN = {
-  ID: ENTERPRISE_SEARCH_RELEVANCE_APP_ID,
-  NAME: i18n.translate('xpack.enterpriseSearch.inferenceEndpoints.productName', {
-    defaultMessage: 'Inference Endpoints',
-  }),
-  NAV_TITLE: i18n.translate('xpack.enterpriseSearch.inferenceEndpoints.navTitle', {
-    defaultMessage: 'Relevance',
-  }),
-  DESCRIPTION: i18n.translate('xpack.enterpriseSearch.inferenceEndpoints.description', {
-    defaultMessage: 'Manage your inference endpoints for semantic search and AI use cases.',
-  }),
-  URL: '/app/elasticsearch/relevance',
-  LOGO: 'logoEnterpriseSearch',
-  SUPPORT_URL: 'https://discuss.elastic.co/c/enterprise-search/',
-};
-
 export const CREATE_CONNECTOR_PLUGIN = {
   CLI_SNIPPET: dedent`./bin/connectors connector create
   --index-name my-index

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

@@ -6,15 +6,12 @@
  */
 
 import type { SharePluginSetup } from '@kbn/share-plugin/public';
-import { SerializableRecord } from '@kbn/utility-types';
 
 import {
   CreateIndexLocatorDefinition,
   type CreateIndexLocatorParams,
 } from './create_index_locator';
-import { SearchInferenceEndpointLocatorDefinition } from './inference_locator';
 
 export function registerLocators(share: SharePluginSetup) {
   share.url.locators.create<CreateIndexLocatorParams>(new CreateIndexLocatorDefinition());
-  share.url.locators.create<SerializableRecord>(new SearchInferenceEndpointLocatorDefinition());
 }

x-pack/plugins/enterprise_search/kibana.jsonc

@@ -34,7 +34,6 @@
       "guidedOnboarding",
       "console",
       "searchConnectors",
-      "searchInferenceEndpoints",
       "searchNavigation",
       "searchPlayground",
       "embeddable",

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

@@ -65,7 +65,6 @@ export const mockKibanaValues = {
     hasWebCrawler: true,
   },
   renderHeaderActions: jest.fn(),
-  searchInferenceEndpoints: null,
   security: securityMock.createStart(),
   setBreadcrumbs: jest.fn(),
   setChromeIsVisible: jest.fn(),