Merge branch 'main' into case-screenshot-fixes

elastic · Sep 24, 2024 · 1ab44b5 · 1ab44b5
2 parents ca3b449 + ed9c3b5
commit 1ab44b5
Show file tree

Hide file tree

Showing 33 changed files with 714 additions and 521 deletions.
diff --git a/examples/embeddable_examples/public/react_embeddables/saved_book/saved_book_editor.tsx b/examples/embeddable_examples/public/react_embeddables/saved_book/saved_book_editor.tsx
@@ -17,7 +17,6 @@ import {
   EuiFlyoutBody,
   EuiFlyoutFooter,
   EuiFlyoutHeader,
-  EuiFormControlLayout,
   EuiFormRow,
   EuiSwitch,
   EuiTextArea,
@@ -128,48 +127,46 @@ export const SavedBookEditor = ({
         </EuiTitle>
       </EuiFlyoutHeader>
       <EuiFlyoutBody>
-        <EuiFormControlLayout>
-          <EuiFormRow
-            label={i18n.translate('embeddableExamples.savedBook.editor.authorLabel', {
-              defaultMessage: 'Author',
-            })}
-          >
-            <EuiFieldText
-              value={authorName ?? ''}
-              onChange={(e) => attributesManager.authorName.next(e.target.value)}
-            />
-          </EuiFormRow>
-          <EuiFormRow
-            label={i18n.translate('embeddableExamples.savedBook.editor.titleLabel', {
-              defaultMessage: 'Title',
-            })}
-          >
-            <EuiFieldText
-              value={bookTitle ?? ''}
-              onChange={(e) => attributesManager.bookTitle.next(e.target.value)}
-            />
-          </EuiFormRow>
-          <EuiFormRow
-            label={i18n.translate('embeddableExamples.savedBook.editor.pagesLabel', {
-              defaultMessage: 'Number of pages',
-            })}
-          >
-            <EuiFieldNumber
-              value={numberOfPages ?? ''}
-              onChange={(e) => attributesManager.numberOfPages.next(+e.target.value)}
-            />
-          </EuiFormRow>
-          <EuiFormRow
-            label={i18n.translate('embeddableExamples.savedBook.editor.synopsisLabel', {
-              defaultMessage: 'Synopsis',
-            })}
-          >
-            <EuiTextArea
-              value={synopsis ?? ''}
-              onChange={(e) => attributesManager.bookSynopsis.next(e.target.value)}
-            />
-          </EuiFormRow>
-        </EuiFormControlLayout>
+        <EuiFormRow
+          label={i18n.translate('embeddableExamples.savedBook.editor.authorLabel', {
+            defaultMessage: 'Author',
+          })}
+        >
+          <EuiFieldText
+            value={authorName ?? ''}
+            onChange={(e) => attributesManager.authorName.next(e.target.value)}
+          />
+        </EuiFormRow>
+        <EuiFormRow
+          label={i18n.translate('embeddableExamples.savedBook.editor.titleLabel', {
+            defaultMessage: 'Title',
+          })}
+        >
+          <EuiFieldText
+            value={bookTitle ?? ''}
+            onChange={(e) => attributesManager.bookTitle.next(e.target.value)}
+          />
+        </EuiFormRow>
+        <EuiFormRow
+          label={i18n.translate('embeddableExamples.savedBook.editor.pagesLabel', {
+            defaultMessage: 'Number of pages',
+          })}
+        >
+          <EuiFieldNumber
+            value={numberOfPages ?? ''}
+            onChange={(e) => attributesManager.numberOfPages.next(+e.target.value)}
+          />
+        </EuiFormRow>
+        <EuiFormRow
+          label={i18n.translate('embeddableExamples.savedBook.editor.synopsisLabel', {
+            defaultMessage: 'Synopsis',
+          })}
+        >
+          <EuiTextArea
+            value={synopsis ?? ''}
+            onChange={(e) => attributesManager.bookSynopsis.next(e.target.value)}
+          />
+        </EuiFormRow>
       </EuiFlyoutBody>
       <EuiFlyoutFooter>
         <EuiFlexGroup justifyContent="spaceBetween">

diff --git a/package.json b/package.json
@@ -1814,7 +1814,7 @@
     "swagger-ui-express": "^5.0.1",
     "table": "^6.8.1",
     "tape": "^5.0.1",
-    "terser": "^5.32.0",
+    "terser": "^5.33.0",
     "terser-webpack-plugin": "^4.2.3",
     "tough-cookie": "^5.0.0",
     "tree-kill": "^1.2.2",

diff --git a/packages/kbn-event-annotation-components/components/annotation_editor_controls/index.scss b/packages/kbn-event-annotation-components/components/annotation_editor_controls/index.scss
@@ -2,12 +2,8 @@
   margin-top: $euiSizeS;
 }
 
-.lnsConfigPanelNoPadding {
-  padding: 0;
-}
-
-.lnsConfigPanelDate__label {
-  min-width: 56px; // makes both labels ("from" and "to") the same width
+.lnsConfigPanelAnnotations__date .euiFormControlLayout__prepend {
+  min-width: $euiSize * 3.25; // makes both labels ("from" and "to") the same width
 }
 
 .lnsConfigPanelAnnotations__addButton {

diff --git a/...nt-annotation-components/components/annotation_editor_controls/range_annotation_panel.tsx b/...nt-annotation-components/components/annotation_editor_controls/range_annotation_panel.tsx
@@ -9,14 +9,7 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import {
-  EuiFormRow,
-  EuiSwitch,
-  EuiText,
-  EuiFormControlLayout,
-  EuiFormLabel,
-  EuiDatePicker,
-} from '@elastic/eui';
+import { EuiFormRow, EuiSwitch, EuiText, EuiDatePicker } from '@elastic/eui';
 import moment from 'moment';
 import type {
   PointInTimeEventAnnotationConfig,
@@ -107,36 +100,23 @@ export const ConfigPanelRangeDatePicker = ({
   dataTestSubj?: string;
 }) => {
   return (
-    <EuiFormRow display="rowCompressed" fullWidth label={label} className="lnsRowCompressedMargin">
-      {prependLabel ? (
-        <EuiFormControlLayout
-          fullWidth
-          className="lnsConfigPanelNoPadding"
-          prepend={
-            <EuiFormLabel className="lnsConfigPanelDate__label">{prependLabel}</EuiFormLabel>
-          }
-        >
-          <EuiDatePicker
-            calendarClassName={calendarClassName}
-            fullWidth
-            showTimeSelect
-            selected={value}
-            onChange={onChange}
-            dateFormat="MMM D, YYYY @ HH:mm:ss.SSS"
-            data-test-subj={dataTestSubj}
-          />
-        </EuiFormControlLayout>
-      ) : (
-        <EuiDatePicker
-          calendarClassName={calendarClassName}
-          fullWidth
-          showTimeSelect
-          selected={value}
-          onChange={onChange}
-          dateFormat="MMM D, YYYY @ HH:mm:ss.SSS"
-          data-test-subj={dataTestSubj}
-        />
-      )}
+    <EuiFormRow
+      display="rowCompressed"
+      fullWidth
+      label={label}
+      className="lnsConfigPanelAnnotations__date lnsRowCompressedMargin"
+    >
+      <EuiDatePicker
+        compressed
+        calendarClassName={calendarClassName}
+        fullWidth
+        showTimeSelect
+        selected={value}
+        onChange={onChange}
+        dateFormat="MMM D, YYYY @ HH:mm:ss.SSS"
+        data-test-subj={dataTestSubj}
+        prepend={prependLabel}
+      />
     </EuiFormRow>
   );
 };
diff --git a/src/plugins/discover/public/build_services.ts b/src/plugins/discover/public/build_services.ts
@@ -63,6 +63,7 @@ import type { DiscoverContextAppLocator } from './application/context/services/l
 import type { DiscoverSingleDocLocator } from './application/doc/locator';
 import type { DiscoverAppLocator } from '../common';
 import type { ProfilesManager } from './context_awareness';
+import type { DiscoverEBTContextManager } from './services/discover_ebt_context_manager';
 
 /**
  * Location state of internal Discover history instance
@@ -130,6 +131,7 @@ export interface DiscoverServices {
   noDataPage?: NoDataPagePluginStart;
   observabilityAIAssistant?: ObservabilityAIAssistantPublicStart;
   profilesManager: ProfilesManager;
+  ebtContextManager: DiscoverEBTContextManager;
   fieldsMetadata?: FieldsMetadataPublicStart;
 }
 
@@ -145,6 +147,7 @@ export const buildServices = memoize(
     scopedHistory,
     urlTracker,
     profilesManager,
+    ebtContextManager,
     setHeaderActionMenu = noop,
   }: {
     core: CoreStart;
@@ -157,6 +160,7 @@ export const buildServices = memoize(
     scopedHistory?: ScopedHistory;
     urlTracker: UrlTracker;
     profilesManager: ProfilesManager;
+    ebtContextManager: DiscoverEBTContextManager;
     setHeaderActionMenu?: AppMountParameters['setHeaderActionMenu'];
   }): DiscoverServices => {
     const { usageCollection } = plugins;
@@ -217,6 +221,7 @@ export const buildServices = memoize(
       noDataPage: plugins.noDataPage,
       observabilityAIAssistant: plugins.observabilityAIAssistant,
       profilesManager,
+      ebtContextManager,
       fieldsMetadata: plugins.fieldsMetadata,
     };
   }

diff --git a/src/plugins/discover/public/context_awareness/__mocks__/index.tsx b/src/plugins/discover/public/context_awareness/__mocks__/index.tsx
@@ -22,6 +22,7 @@ import {
   SolutionType,
 } from '../profiles';
 import { ProfilesManager } from '../profiles_manager';
+import { DiscoverEBTContextManager } from '../../services/discover_ebt_context_manager';
 import { createLogsContextServiceMock } from '@kbn/discover-utils/src/__mocks__';
 
 export const createContextAwarenessMocks = ({
@@ -150,10 +151,12 @@ export const createContextAwarenessMocks = ({
     documentProfileServiceMock.registerProvider(documentProfileProviderMock);
   }
 
+  const ebtContextManagerMock = new DiscoverEBTContextManager();
   const profilesManagerMock = new ProfilesManager(
     rootProfileServiceMock,
     dataSourceProfileServiceMock,
-    documentProfileServiceMock
+    documentProfileServiceMock,
+    ebtContextManagerMock
   );
 
   const profileProviderServices = createProfileProviderServicesMock();
@@ -169,6 +172,7 @@ export const createContextAwarenessMocks = ({
     contextRecordMock2,
     profilesManagerMock,
     profileProviderServices,
+    ebtContextManagerMock,
   };
 };
 

diff --git a/src/plugins/discover/public/context_awareness/profiles_manager.test.ts b/src/plugins/discover/public/context_awareness/profiles_manager.test.ts
@@ -21,6 +21,7 @@ describe('ProfilesManager', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mocks = createContextAwarenessMocks();
+    jest.spyOn(mocks.ebtContextManagerMock, 'updateProfilesContextWith');
   });
 
   it('should return default profiles', () => {
@@ -60,6 +61,11 @@ describe('ProfilesManager', () => {
       mocks.dataSourceProfileProviderMock.profile,
       mocks.documentProfileProviderMock.profile,
     ]);
+
+    expect(mocks.ebtContextManagerMock.updateProfilesContextWith).toHaveBeenCalledWith([
+      'root-profile',
+      'data-source-profile',
+    ]);
   });
 
   it('should expose profiles as an observable', async () => {

diff --git a/src/plugins/discover/public/context_awareness/profiles_manager.ts b/src/plugins/discover/public/context_awareness/profiles_manager.ts
@@ -25,6 +25,7 @@ import type {
   DocumentContext,
 } from './profiles';
 import type { ContextWithProfileId } from './profile_service';
+import { DiscoverEBTContextManager } from '../services/discover_ebt_context_manager';
 
 interface SerializedRootProfileParams {
   solutionNavId: RootProfileProviderParams['solutionNavId'];
@@ -52,6 +53,7 @@ export interface GetProfilesOptions {
 export class ProfilesManager {
   private readonly rootContext$: BehaviorSubject<ContextWithProfileId<RootContext>>;
   private readonly dataSourceContext$: BehaviorSubject<ContextWithProfileId<DataSourceContext>>;
+  private readonly ebtContextManager: DiscoverEBTContextManager;
 
   private prevRootProfileParams?: SerializedRootProfileParams;
   private prevDataSourceProfileParams?: SerializedDataSourceProfileParams;
@@ -61,10 +63,12 @@ export class ProfilesManager {
   constructor(
     private readonly rootProfileService: RootProfileService,
     private readonly dataSourceProfileService: DataSourceProfileService,
-    private readonly documentProfileService: DocumentProfileService
+    private readonly documentProfileService: DocumentProfileService,
+    ebtContextManager: DiscoverEBTContextManager
   ) {
     this.rootContext$ = new BehaviorSubject(rootProfileService.defaultContext);
     this.dataSourceContext$ = new BehaviorSubject(dataSourceProfileService.defaultContext);
+    this.ebtContextManager = ebtContextManager;
   }
 
   /**
@@ -130,6 +134,7 @@ export class ProfilesManager {
       return;
     }
 
+    this.trackActiveProfiles(this.rootContext$.getValue().profileId, context.profileId);
     this.dataSourceContext$.next(context);
     this.prevDataSourceProfileParams = serializedParams;
   }
@@ -194,6 +199,15 @@ export class ProfilesManager {
       map(() => this.getProfiles(options))
     );
   }
+
+  /**
+   * Tracks the active profiles in the EBT context
+   */
+  private trackActiveProfiles(rootContextProfileId: string, dataSourceContextProfileId: string) {
+    const dscProfiles = [rootContextProfileId, dataSourceContextProfileId];
+
+    this.ebtContextManager.updateProfilesContextWith(dscProfiles);
+  }
 }
 
 const serializeRootProfileParams = (