Merge branch 'main' into eui/v98.2.0

src/plugins/controls/public/controls/timeslider_control/components/time_slider_popover_content.tsx

@@ -8,6 +8,8 @@
  */
 
 import React from 'react';
+import { useMemo, useEffect, useState } from 'react';
+import { debounce } from 'lodash';
 import { EuiButtonIcon, EuiRangeTick, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 
 import { TimeSliderStrings } from './time_slider_strings';
@@ -27,29 +29,63 @@ interface Props {
   compressed: boolean;
 }
 
-export function TimeSliderPopoverContent(props: Props) {
-  const rangeInput = props.isAnchored ? (
+export function TimeSliderPopoverContent({
+  isAnchored,
+  setIsAnchored,
+  value,
+  onChange,
+  stepSize,
+  ticks,
+  timeRangeMin,
+  timeRangeMax,
+  compressed,
+}: Props) {
+  const [displayedValue, setDisplayedValue] = useState<Timeslice>(value);
+
+  const debouncedOnChange = useMemo(
+    () =>
+      debounce((updateTimeslice: Timeslice | undefined) => {
+        onChange(updateTimeslice);
+      }, 750),
+    [onChange]
+  );
+
+  /**
+   * The following `useEffect` ensures that the changes to the value that come from the embeddable (for example,
+   * from the `clear` button on the dashboard) are reflected in the displayed value
+   */
+  useEffect(() => {
+    setDisplayedValue(value);
+  }, [value]);
+
+  const rangeInput = isAnchored ? (
     <TimeSliderAnchoredRange
-      value={props.value}
-      onChange={props.onChange}
-      stepSize={props.stepSize}
-      ticks={props.ticks}
-      timeRangeMin={props.timeRangeMin}
-      timeRangeMax={props.timeRangeMax}
-      compressed={props.compressed}
+      value={[displayedValue[0] || timeRangeMin, displayedValue[1] || timeRangeMax]}
+      onChange={(newValue) => {
+        setDisplayedValue(newValue as Timeslice);
+        debouncedOnChange(newValue);
+      }}
+      stepSize={stepSize}
+      ticks={ticks}
+      timeRangeMin={timeRangeMin}
+      timeRangeMax={timeRangeMax}
+      compressed={compressed}
     />
   ) : (
     <TimeSliderSlidingWindowRange
-      value={props.value}
-      onChange={props.onChange}
-      stepSize={props.stepSize}
-      ticks={props.ticks}
-      timeRangeMin={props.timeRangeMin}
-      timeRangeMax={props.timeRangeMax}
-      compressed={props.compressed}
+      value={[displayedValue[0] || timeRangeMin, displayedValue[1] || timeRangeMax]}
+      onChange={(newValue) => {
+        setDisplayedValue(newValue as Timeslice);
+        debouncedOnChange(newValue);
+      }}
+      stepSize={stepSize}
+      ticks={ticks}
+      timeRangeMin={timeRangeMin}
+      timeRangeMax={timeRangeMax}
+      compressed={compressed}
     />
   );
-  const anchorStartToggleButtonLabel = props.isAnchored
+  const anchorStartToggleButtonLabel = isAnchored
     ? TimeSliderStrings.control.getUnpinStart()
     : TimeSliderStrings.control.getPinStart();
 
@@ -59,17 +95,24 @@ export function TimeSliderPopoverContent(props: Props) {
       gutterSize="none"
       data-test-subj="timeSlider-popoverContents"
       responsive={false}
+      onMouseUp={() => {
+        // when the pin is dropped (on mouse up), cancel any pending debounced changes and force the change
+        // in value to happen instantly (which, in turn, will re-calculate the from/to for the slider due to
+        // the `useEffect` above.
+        debouncedOnChange.cancel();
+        onChange(displayedValue);
+      }}
     >
       <EuiFlexItem grow={false}>
         <EuiToolTip content={anchorStartToggleButtonLabel} position="left">
           <EuiButtonIcon
-            iconType={props.isAnchored ? 'pinFilled' : 'pin'}
+            iconType={isAnchored ? 'pinFilled' : 'pin'}
             onClick={() => {
-              const nextIsAnchored = !props.isAnchored;
+              const nextIsAnchored = !isAnchored;
               if (nextIsAnchored) {
-                props.onChange([props.timeRangeMin, props.value[1]]);
+                onChange([timeRangeMin, value[1]]);
               }
-              props.setIsAnchored(nextIsAnchored);
+              setIsAnchored(nextIsAnchored);
             }}
             aria-label={anchorStartToggleButtonLabel}
             data-test-subj="timeSlider__anchorStartToggleButton"

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

@@ -270,7 +270,6 @@ export const getTimesliderControlFactory = (): ControlFactory<
         Component: (controlPanelClassNames) => {
           const [isAnchored, isPopoverOpen, timeRangeMeta, timeslice] =
             useBatchedPublishingSubjects(isAnchored$, isPopoverOpen$, timeRangeMeta$, timeslice$);
-
           useEffect(() => {
             return () => {
               cleanupTimeRangeSubscription();
@@ -284,6 +283,9 @@ export const getTimesliderControlFactory = (): ControlFactory<
           const to = useMemo(() => {
             return timeslice ? timeslice[TO_INDEX] : timeRangeMeta.timeRangeMax;
           }, [timeslice, timeRangeMeta.timeRangeMax]);
+          const value: Timeslice = useMemo(() => {
+            return [from, to];
+          }, [from, to]);
 
           return (
             <EuiInputPopover
@@ -306,7 +308,7 @@ export const getTimesliderControlFactory = (): ControlFactory<
               <TimeSliderPopoverContent
                 isAnchored={typeof isAnchored === 'boolean' ? isAnchored : false}
                 setIsAnchored={setIsAnchored}
-                value={[from, to]}
+                value={value}
                 onChange={onChange}
                 stepSize={timeRangeMeta.stepSize}
                 ticks={timeRangeMeta.ticks}

src/plugins/files/server/blob_storage_service/adapters/es/content_stream/content_stream.test.ts

@@ -14,7 +14,7 @@ import { encode, decode } from '@kbn/cbor';
 import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { ContentStream, ContentStreamEncoding, ContentStreamParameters } from './content_stream';
 import type { GetResponse } from '@elastic/elasticsearch/lib/api/types';
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { FileDocument } from '../../../../file_client/file_metadata_client/adapters/es_index';
 import { IndexRequest } from '@elastic/elasticsearch/lib/api/types';
 

src/plugins/files/server/blob_storage_service/adapters/es/content_stream/content_stream.ts

@@ -15,7 +15,7 @@ import { ByteSizeValue } from '@kbn/config-schema';
 import { defaults } from 'lodash';
 import { Duplex, Writable, Readable } from 'stream';
 
-import { GetResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { GetResponse } from '@elastic/elasticsearch/lib/api/types';
 import { inspect } from 'util';
 import { wrapErrorAndReThrow } from '../../../../file_client/utils';
 import type { FileChunkDocument } from '../mappings';

src/plugins/files/server/blob_storage_service/adapters/es/mappings.ts

@@ -7,10 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import type {
-  MappingTypeMapping,
-  MappingProperty,
-} from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { MappingTypeMapping, MappingProperty } from '@elastic/elasticsearch/lib/api/types';
 
 /**
  * These are the fields we expect to find a given document acting as a file chunk.

src/plugins/files/server/file_client/create_es_file_client.test.ts

@@ -16,7 +16,7 @@ import { MockedLogger } from '@kbn/logging-mocks';
 import { createEsFileClient } from './create_es_file_client';
 import { FileClient } from './types';
 import { ElasticsearchBlobStorageClient } from '../blob_storage_service';
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { FileDocument } from './file_metadata_client/adapters/es_index';
 
 describe('When initializing file client via createESFileClient()', () => {

src/plugins/kibana_overview/public/components/app.tsx

@@ -13,11 +13,11 @@ import { I18nProvider } from '@kbn/i18n-react';
 import type { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
 import type { FetchResult } from '@kbn/newsfeed-plugin/public';
 import { Route, Routes } from '@kbn/shared-ux-router';
+import { withSuspense } from '@kbn/shared-ux-utility';
 import React, { useEffect, useState } from 'react';
 import { HashRouter as Router } from 'react-router-dom';
 import useObservable from 'react-use/lib/useObservable';
 import type { Observable } from 'rxjs';
-import { Overview } from './overview';
 
 interface KibanaOverviewAppDeps {
   basename: string;
@@ -48,6 +48,14 @@ export const KibanaOverviewApp = ({
     }
   }, [newsfeed$]);
 
+  const Overview = withSuspense(
+    React.lazy(() =>
+      import('./overview').then(({ Overview: OverviewComponent }) => {
+        return { default: OverviewComponent };
+      })
+    )
+  );
+
   return (
     <Router basename={basename}>
       <I18nProvider>

src/plugins/kibana_overview/public/components/overview/overview.tsx

@@ -7,6 +7,8 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
+import './overview.scss';
+
 import { snakeCase } from 'lodash';
 import React, { FC, useState, useEffect } from 'react';
 import useObservable from 'react-use/lib/useObservable';

src/plugins/kibana_overview/public/index.ts

@@ -7,8 +7,6 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import './index.scss';
-
 import { KibanaOverviewPlugin } from './plugin';
 
 // This exports static code and TypeScript types,

x-pack/platform/packages/shared/kbn-cloud-security-posture/common/schema/graph/v1.ts

@@ -99,4 +99,5 @@ export const edgeDataSchema = schema.object({
   source: schema.string(),
   target: schema.string(),
   color: colorSchema,
+  type: schema.maybe(schema.oneOf([schema.literal('solid'), schema.literal('dashed')])),
 });

x-pack/platform/plugins/shared/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_modal.tsx

@@ -14,6 +14,7 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EUI_MODAL_CONFIRM_BUTTON,
+  EuiSpacer,
 } from '@elastic/eui';
 
 import type { DeleteAction } from './use_delete_action';
@@ -79,16 +80,22 @@ export const DeleteActionModal: FC<DeleteAction> = ({
         </EuiFlexItem>
         <EuiFlexItem>
           {userCanDeleteIndex && dataViewExists && (
-            <EuiSwitch
-              data-test-subj="mlAnalyticsJobDeleteDataViewSwitch"
-              label={i18n.translate('xpack.ml.dataframe.analyticsList.deleteTargetDataViewTitle', {
-                defaultMessage: 'Delete data view {dataView}',
-                values: { dataView: indexName },
-              })}
-              checked={deleteDataView}
-              onChange={toggleDeleteDataView}
-              disabled={userCanDeleteDataView === false}
-            />
+            <>
+              <EuiSpacer size="s" />
+              <EuiSwitch
+                data-test-subj="mlAnalyticsJobDeleteDataViewSwitch"
+                label={i18n.translate(
+                  'xpack.ml.dataframe.analyticsList.deleteTargetDataViewTitle',
+                  {
+                    defaultMessage: 'Delete data view {dataView}',
+                    values: { dataView: indexName },
+                  }
+                )}
+                checked={deleteDataView}
+                onChange={toggleDeleteDataView}
+                disabled={userCanDeleteDataView === false}
+              />
+            </>
           )}
         </EuiFlexItem>
       </EuiFlexGroup>

x-pack/platform/plugins/shared/ml/public/application/data_frame_analytics/pages/components/analytics_selector/analytics_id_selector.tsx

@@ -281,7 +281,18 @@ export function AnalyticsIdSelector({
       </EuiFlyoutHeader>
       <EuiFlyoutBody data-test-subj={'mlJobSelectorFlyoutBody'}>{renderTabs()}</EuiFlyoutBody>
       <EuiFlyoutFooter>
-        <EuiFlexGroup>
+        <EuiFlexGroup justifyContent="spaceBetween">
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty
+              iconType="cross"
+              onClick={closeFlyout}
+              data-test-subj="mlFlyoutAnalyticsSelectorButtonClose"
+            >
+              {i18n.translate('xpack.ml.analyticsSelector.closeFlyoutButton', {
+                defaultMessage: 'Close',
+              })}
+            </EuiButtonEmpty>
+          </EuiFlexItem>
           <EuiFlexItem grow={false}>
             <EuiButton
               onClick={applySelection}
@@ -295,17 +306,6 @@ export function AnalyticsIdSelector({
               />
             </EuiButton>
           </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <EuiButtonEmpty
-              iconType="cross"
-              onClick={closeFlyout}
-              data-test-subj="mlFlyoutAnalyticsSelectorButtonClose"
-            >
-              {i18n.translate('xpack.ml.analyticsSelector.closeFlyoutButton', {
-                defaultMessage: 'Close',
-              })}
-            </EuiButtonEmpty>
-          </EuiFlexItem>
         </EuiFlexGroup>
       </EuiFlyoutFooter>
     </EuiFlyout>

x-pack/plugins/reporting/server/lib/store/store.test.ts

@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { JOB_STATUS } from '@kbn/reporting-common';
 import { ReportDocument } from '@kbn/reporting-common/types';
@@ -212,7 +212,7 @@ describe('ReportingStore', () => {
 
     const [[updateCall]] = mockEsClient.update.mock.calls;
 
-    const response = (updateCall as estypes.UpdateRequest).body?.doc as Report;
+    const response = (updateCall as estypes.UpdateRequest)?.doc as Report;
     expect(response.migration_version).toBe(`7.14.0`);
     expect(response.status).toBe(`processing`);
     expect(updateCall.if_seq_no).toBe(42);
@@ -242,7 +242,7 @@ describe('ReportingStore', () => {
     await store.setReportFailed(report, { errors: 'yes' } as any);
 
     const [[updateCall]] = mockEsClient.update.mock.calls;
-    const response = (updateCall as estypes.UpdateRequest).body?.doc as Report;
+    const response = (updateCall as estypes.UpdateRequest)?.doc as Report;
     expect(response.migration_version).toBe(`7.14.0`);
     expect(response.status).toBe(`failed`);
     expect(updateCall.if_seq_no).toBe(43);
@@ -272,7 +272,7 @@ describe('ReportingStore', () => {
     await store.setReportError(report, { errors: 'yes' } as any);
 
     const [[updateCall]] = mockEsClient.update.mock.calls;
-    const response = (updateCall as estypes.UpdateRequest).body?.doc as Report;
+    const response = (updateCall as estypes.UpdateRequest)?.doc as Report;
     expect(response.migration_version).toBe(`7.14.0`);
     expect(updateCall.if_seq_no).toBe(43);
     expect(updateCall.if_primary_term).toBe(10002);
@@ -301,7 +301,7 @@ describe('ReportingStore', () => {
     await store.setReportCompleted(report, { certainly_completed: 'yes' } as any);
 
     const [[updateCall]] = mockEsClient.update.mock.calls;
-    const response = (updateCall as estypes.UpdateRequest).body?.doc as Report;
+    const response = (updateCall as estypes.UpdateRequest)?.doc as Report;
     expect(response.migration_version).toBe(`7.14.0`);
     expect(response.status).toBe(`completed`);
     expect(updateCall.if_seq_no).toBe(44);
@@ -336,7 +336,7 @@ describe('ReportingStore', () => {
     } as any);
 
     const [[updateCall]] = mockEsClient.update.mock.calls;
-    const response = (updateCall as estypes.UpdateRequest).body?.doc as Report;
+    const response = (updateCall as estypes.UpdateRequest)?.doc as Report;
 
     expect(response.migration_version).toBe(`7.14.0`);
     expect(response.status).toBe(`completed_with_warnings`);

x-pack/plugins/reporting/server/lib/store/store.ts

@@ -86,7 +86,7 @@ const esDocForUpdate = (
     if_seq_no: report._seq_no,
     if_primary_term: report._primary_term,
     refresh: 'wait_for' as estypes.Refresh,
-    body: { doc },
+    doc,
   };
 };
 

x-pack/plugins/reporting/server/lib/tasks/execute_report.ts

@@ -12,7 +12,7 @@ import { Writable } from 'stream';
 import { finished } from 'stream/promises';
 import { setTimeout } from 'timers/promises';
 
-import { UpdateResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { UpdateResponse } from '@elastic/elasticsearch/lib/api/types';
 import type { Logger } from '@kbn/core/server';
 import {
   CancellationToken,