Merge branch 'main' into rep-et

docs/api-generated/rules/rule-apis-passthru.asciidoc

@@ -111,6 +111,7 @@ Any modifications made to this file will be overwritten.
     "warning" : "warning",
     "outcome" : "succeeded"
   },
+  "api_key_created_by_user" : false,
   "params" : {
     "key" : ""
   },
@@ -142,6 +143,7 @@ Any modifications made to this file will be overwritten.
     "params" : {
       "key" : ""
     },
+    "uuid" : "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61",
     "connector_type_id" : ".server-log",
     "frequency" : {
       "summary" : true,
@@ -154,6 +156,7 @@ Any modifications made to this file will be overwritten.
     "params" : {
       "key" : ""
     },
+    "uuid" : "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61",
     "connector_type_id" : ".server-log",
     "frequency" : {
       "summary" : true,
@@ -407,6 +410,7 @@ Any modifications made to this file will be overwritten.
       "warning" : "warning",
       "outcome" : "succeeded"
     },
+    "api_key_created_by_user" : false,
     "params" : {
       "key" : ""
     },
@@ -438,6 +442,7 @@ Any modifications made to this file will be overwritten.
       "params" : {
         "key" : ""
       },
+      "uuid" : "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61",
       "connector_type_id" : ".server-log",
       "frequency" : {
         "summary" : true,
@@ -450,6 +455,7 @@ Any modifications made to this file will be overwritten.
       "params" : {
         "key" : ""
       },
+      "uuid" : "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61",
       "connector_type_id" : ".server-log",
       "frequency" : {
         "summary" : true,
@@ -473,6 +479,7 @@ Any modifications made to this file will be overwritten.
       "warning" : "warning",
       "outcome" : "succeeded"
     },
+    "api_key_created_by_user" : false,
     "params" : {
       "key" : ""
     },
@@ -504,6 +511,7 @@ Any modifications made to this file will be overwritten.
       "params" : {
         "key" : ""
       },
+      "uuid" : "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61",
       "connector_type_id" : ".server-log",
       "frequency" : {
         "summary" : true,
@@ -516,6 +524,7 @@ Any modifications made to this file will be overwritten.
       "params" : {
         "key" : ""
       },
+      "uuid" : "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61",
       "connector_type_id" : ".server-log",
       "frequency" : {
         "summary" : true,
@@ -654,6 +663,7 @@ Any modifications made to this file will be overwritten.
     "warning" : "warning",
     "outcome" : "succeeded"
   },
+  "api_key_created_by_user" : false,
   "params" : {
     "key" : ""
   },
@@ -685,6 +695,7 @@ Any modifications made to this file will be overwritten.
     "params" : {
       "key" : ""
     },
+    "uuid" : "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61",
     "connector_type_id" : ".server-log",
     "frequency" : {
       "summary" : true,
@@ -697,6 +708,7 @@ Any modifications made to this file will be overwritten.
     "params" : {
       "key" : ""
     },
+    "uuid" : "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61",
     "connector_type_id" : ".server-log",
     "frequency" : {
       "summary" : true,
@@ -2012,6 +2024,7 @@ Any modifications made to this file will be overwritten.
     "warning" : "warning",
     "outcome" : "succeeded"
   },
+  "api_key_created_by_user" : false,
   "params" : {
     "key" : ""
   },
@@ -2043,6 +2056,7 @@ Any modifications made to this file will be overwritten.
     "params" : {
       "key" : ""
     },
+    "uuid" : "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61",
     "connector_type_id" : ".server-log",
     "frequency" : {
       "summary" : true,
@@ -2055,6 +2069,7 @@ Any modifications made to this file will be overwritten.
     "params" : {
       "key" : ""
     },
+    "uuid" : "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61",
     "connector_type_id" : ".server-log",
     "frequency" : {
       "summary" : true,
@@ -2231,6 +2246,7 @@ Any modifications made to this file will be overwritten.
 <div class="param">group (optional)</div><div class="param-desc"><span class="param-type"><a href="#string">String</a></span> The group name for the actions. If you don't need to group actions, set to <code>default</code>. </div>
 <div class="param">id (optional)</div><div class="param-desc"><span class="param-type"><a href="#string">String</a></span> The identifier for the connector saved object. </div>
 <div class="param">params (optional)</div><div class="param-desc"><span class="param-type"><a href="#AnyType">map[String, oas_any_type_not_mapped]</a></span> The parameters for the action, which are sent to the connector. The <code>params</code> are handled as Mustache templates and passed a default set of context. </div>
+<div class="param">uuid (optional)</div><div class="param-desc"><span class="param-type"><a href="#string">String</a></span> A universally unique identifier (UUID) for the action. </div>
     </div>  <!-- field-items -->
   </div>
   <div class="model">
@@ -2566,7 +2582,8 @@ Any modifications made to this file will be overwritten.
     <div class='model-description'></div>
     <div class="field-items">
       <div class="param">actions </div><div class="param-desc"><span class="param-type"><a href="#actions_inner">array[actions_inner]</a></span>  </div>
-<div class="param">api_key_owner </div><div class="param-desc"><span class="param-type"><a href="#string">String</a></span>  </div>
+<div class="param">api_key_created_by_user (optional)</div><div class="param-desc"><span class="param-type"><a href="#boolean">Boolean</a></span> Indicates whether the API key that is associated with the rule was created by the user. </div>
+<div class="param">api_key_owner </div><div class="param-desc"><span class="param-type"><a href="#string">String</a></span> The owner of the API key that is associated with the rule and used to run background tasks. </div>
 <div class="param">consumer </div><div class="param-desc"><span class="param-type"><a href="#string">String</a></span> The application or feature that owns the rule. For example, <code>alerts</code>, <code>apm</code>, <code>discover</code>, <code>infrastructure</code>, <code>logs</code>, <code>metrics</code>, <code>ml</code>, <code>monitoring</code>, <code>securitySolution</code>, <code>siem</code>, <code>stackAlerts</code>, or <code>uptime</code>. </div>
 <div class="param">created_at </div><div class="param-desc"><span class="param-type"><a href="#DateTime">Date</a></span> The date and time that the rule was created. format: date-time</div>
 <div class="param">created_by </div><div class="param-desc"><span class="param-type"><a href="#string">String</a></span> The identifier for the user that created the rule. </div>

src/plugins/dashboard/public/dashboard_container/component/panel/_dashboard_panel.scss

@@ -12,6 +12,10 @@
     border-radius: 0;
   }
 
+  .embPanel__content {
+    border-radius: 0;
+  }
+
   .dshDashboardGrid__item--highlighted {
     border-radius: 0;
   }

src/plugins/discover/public/application/main/components/layout/discover_layout.test.tsx

@@ -122,7 +122,6 @@ async function mountComponent(
     state: { columns: [], query, hideChart: false, interval: 'auto' },
     stateContainer,
     setExpandedDoc: jest.fn(),
-    persistDataView: jest.fn(),
     updateDataViewList: jest.fn(),
   };
   stateContainer.searchSessionManager = createSearchSessionMock(session).searchSessionManager;

src/plugins/discover/public/application/main/components/layout/discover_layout.tsx

@@ -22,7 +22,7 @@ import { METRIC_TYPE } from '@kbn/analytics';
 import classNames from 'classnames';
 import { generateFilters } from '@kbn/data-plugin/public';
 import { DragContext } from '@kbn/dom-drag-drop';
-import { DataView, DataViewField, DataViewType } from '@kbn/data-views-plugin/public';
+import { DataViewField, DataViewType } from '@kbn/data-views-plugin/public';
 import { useSavedSearchInitial } from '../../services/discover_state_provider';
 import { DiscoverStateContainer } from '../../services/discover_state';
 import { VIEW_MODE } from '../../../../../common/constants';
@@ -59,14 +59,9 @@ const TopNavMemoized = React.memo(DiscoverTopNav);
 export interface DiscoverLayoutProps {
   navigateTo: (url: string) => void;
   stateContainer: DiscoverStateContainer;
-  persistDataView: (dataView: DataView) => Promise<DataView | undefined>;
 }
 
-export function DiscoverLayout({
-  navigateTo,
-  stateContainer,
-  persistDataView,
-}: DiscoverLayoutProps) {
+export function DiscoverLayout({ navigateTo, stateContainer }: DiscoverLayoutProps) {
   const {
     trackUiMetric,
     capabilities,
@@ -284,7 +279,6 @@ export function DiscoverLayout({
         isPlainRecord={isPlainRecord}
         textBasedLanguageModeErrors={textBasedLanguageModeErrors}
         onFieldEdited={onFieldEdited}
-        persistDataView={persistDataView}
       />
       <EuiPageBody className="dscPageBody" aria-describedby="savedSearchTitle">
         <SavedSearchURLConflictCallout

src/plugins/discover/public/application/main/components/top_nav/discover_topnav.test.tsx

@@ -40,7 +40,6 @@ function getProps(savePermissions = true): DiscoverTopNavProps {
     onOpenInspector: jest.fn(),
     onFieldEdited: jest.fn(),
     isPlainRecord: false,
-    persistDataView: jest.fn(),
   };
 }
 

src/plugins/discover/public/application/main/components/top_nav/discover_topnav.tsx

@@ -31,7 +31,6 @@ export type DiscoverTopNavProps = Pick<DiscoverLayoutProps, 'navigateTo'> & {
   isPlainRecord: boolean;
   textBasedLanguageModeErrors?: Error;
   onFieldEdited: () => Promise<void>;
-  persistDataView: (dataView: DataView) => Promise<DataView | undefined>;
 };
 
 export const DiscoverTopNav = ({
@@ -44,7 +43,6 @@ export const DiscoverTopNav = ({
   isPlainRecord,
   textBasedLanguageModeErrors,
   onFieldEdited,
-  persistDataView,
 }: DiscoverTopNavProps) => {
   const adHocDataViews = useInternalStateSelector((state) => state.adHocDataViews);
   const dataView = useInternalStateSelector((state) => state.dataView!);
@@ -120,18 +118,8 @@ export const DiscoverTopNav = ({
         onOpenInspector,
         isPlainRecord,
         adHocDataViews,
-        persistDataView,
       }),
-    [
-      dataView,
-      navigateTo,
-      services,
-      stateContainer,
-      onOpenInspector,
-      isPlainRecord,
-      adHocDataViews,
-      persistDataView,
-    ]
+    [dataView, navigateTo, services, stateContainer, onOpenInspector, isPlainRecord, adHocDataViews]
   );
 
   const onEditDataView = async (editedDataView: DataView) => {

src/plugins/discover/public/application/main/components/top_nav/get_top_nav_links.test.ts

@@ -32,7 +32,6 @@ test('getTopNavLinks result', () => {
     services,
     state,
     isPlainRecord: false,
-    persistDataView: jest.fn(),
     adHocDataViews: [],
   });
   expect(topNavLinks).toMatchInlineSnapshot(`
@@ -93,7 +92,6 @@ test('getTopNavLinks result for sql mode', () => {
     services,
     state,
     isPlainRecord: true,
-    persistDataView: jest.fn(),
     adHocDataViews: [],
   });
   expect(topNavLinks).toMatchInlineSnapshot(`

src/plugins/discover/public/application/main/components/top_nav/get_top_nav_links.tsx

@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import type { DataView } from '@kbn/data-views-plugin/public';
-import { unhashUrl } from '@kbn/kibana-utils-plugin/public';
 import type { TopNavMenuData } from '@kbn/navigation-plugin/public';
+import type { DiscoverAppLocatorParams } from '../../../../../common';
 import { showOpenSearchPanel } from './show_open_search_panel';
 import { getSharingData, showPublicUrlSwitch } from '../../../../utils/get_sharing_data';
 import { DiscoverServices } from '../../../../build_services';
@@ -28,7 +28,6 @@ export const getTopNavLinks = ({
   state,
   onOpenInspector,
   isPlainRecord,
-  persistDataView,
   adHocDataViews,
 }: {
   dataView: DataView;
@@ -38,7 +37,6 @@ export const getTopNavLinks = ({
   onOpenInspector: () => void;
   isPlainRecord: boolean;
   adHocDataViews: DataView[];
-  persistDataView: (dataView: DataView) => Promise<DataView | undefined>;
 }): TopNavMenuData[] => {
   const options = {
     id: 'options',
@@ -143,17 +141,7 @@ export const getTopNavLinks = ({
     }),
     testId: 'shareTopNavButton',
     run: async (anchorElement: HTMLElement) => {
-      if (!services.share) {
-        return;
-      }
-      // this prompts the user to save the dataview if adhoc dataview is detected
-      // for text based languages we don't want this check
-      if (!isPlainRecord) {
-        const updatedDataView = await persistDataView(dataView);
-        if (!updatedDataView) {
-          return;
-        }
-      }
+      if (!services.share) return;
       const savedSearch = state.savedSearchState.getState();
       const sharingData = await getSharingData(
         savedSearch.searchSource,
@@ -162,11 +150,46 @@ export const getTopNavLinks = ({
         isPlainRecord
       );
 
+      const { locator } = services;
+      const appState = state.appState.getState();
+      const { timefilter } = services.data.query.timefilter;
+      const timeRange = timefilter.getTime();
+      const refreshInterval = timefilter.getRefreshInterval();
+      const { grid, ...otherState } = appState;
+      const filters = services.filterManager.getFilters();
+
+      // Share -> Get links -> Snapshot
+      const params: DiscoverAppLocatorParams = {
+        ...otherState,
+        ...(savedSearch.id ? { savedSearchId: savedSearch.id } : {}),
+        ...(dataView?.isPersisted()
+          ? { dataViewId: dataView?.id }
+          : { dataViewSpec: dataView?.toSpec() }),
+        filters,
+        timeRange,
+        refreshInterval,
+      };
+      const relativeUrl = locator.getRedirectUrl(params);
+
+      // This logic is duplicated from `relativeToAbsolute` (for bundle size reasons). Ultimately, this should be
+      // replaced when https://github.com/elastic/kibana/issues/153323 is implemented.
+      const link = document.createElement('a');
+      link.setAttribute('href', relativeUrl);
+      const shareableUrl = link.href;
+
+      // Share -> Get links -> Saved object
+      const shareableUrlForSavedObject = await locator.getUrl(
+        { savedSearchId: savedSearch.id },
+        { absolute: true }
+      );
+
       services.share.toggleShareContextMenu({
         anchorElement,
         allowEmbed: false,
         allowShortUrl: !!services.capabilities.discover.createShortUrl,
-        shareableUrl: unhashUrl(window.location.href),
+        shareableUrl,
+        shareableUrlForSavedObject,
+        shareableUrlLocatorParams: { locator, params },
         objectId: savedSearch.id,
         objectType: 'search',
         sharingData: {

src/plugins/discover/public/application/main/discover_main_app.tsx

@@ -52,10 +52,7 @@ export function DiscoverMainApp(props: DiscoverMainProps) {
   /**
    * Adhoc data views functionality
    */
-  const { persistDataView } = useAdHocDataViews({
-    stateContainer,
-    services,
-  });
+  useAdHocDataViews({ stateContainer, services });
 
   /**
    * State changes (data view, columns), when a text base query result is returned
@@ -97,11 +94,7 @@ export function DiscoverMainApp(props: DiscoverMainProps) {
 
   return (
     <RootDragDropProvider>
-      <DiscoverLayoutMemoized
-        navigateTo={navigateTo}
-        stateContainer={stateContainer}
-        persistDataView={persistDataView}
-      />
+      <DiscoverLayoutMemoized navigateTo={navigateTo} stateContainer={stateContainer} />
     </RootDragDropProvider>
   );
 }