Merge branch 'main' into console/improve-selection-color-contrast

oas_docs/makefile

@@ -16,12 +16,12 @@
 .PHONY: api-docs
 api-docs: ## Generate kibana.serverless.yaml and kibana.yaml
 	@npx @redocly/cli join "kibana.info.serverless.yaml" "../x-pack/plugins/observability_solution/apm/docs/openapi/apm.yaml" "../x-pack/plugins/actions/docs/openapi/bundled_serverless.yaml" "../src/plugins/data_views/docs/openapi/bundled.yaml" "../x-pack/plugins/ml/common/openapi/ml_apis_serverless.yaml" "../packages/core/saved-objects/docs/openapi/bundled_serverless.yaml" "../x-pack/plugins/observability_solution/slo/docs/openapi/slo/bundled.yaml" -o "output/kibana.serverless.yaml" "bundle.serverless.json" --prefix-components-with-info-prop title
-	@npx @redocly/cli join "kibana.info.yaml" "../x-pack/plugins/observability_solution/apm/docs/openapi/apm.yaml" "../x-pack/plugins/actions/docs/openapi/bundled.yaml" "../src/plugins/data_views/docs/openapi/bundled.yaml" "../x-pack/plugins/ml/common/openapi/ml_apis.yaml" "../packages/core/saved-objects/docs/openapi/bundled.yaml" "../x-pack/plugins/observability_solution/slo/docs/openapi/slo/bundled.yaml" "bundle.json" -o "output/kibana.yaml" --prefix-components-with-info-prop title
+	@npx @redocly/cli join "kibana.info.yaml" "../x-pack/plugins/observability_solution/apm/docs/openapi/apm.yaml"  "../x-pack/plugins/cases/docs/openapi/bundled.yaml" "../x-pack/plugins/actions/docs/openapi/bundled.yaml" "../src/plugins/data_views/docs/openapi/bundled.yaml" "../x-pack/plugins/ml/common/openapi/ml_apis.yaml" "../packages/core/saved-objects/docs/openapi/bundled.yaml" "../x-pack/plugins/observability_solution/slo/docs/openapi/slo/bundled.yaml" "bundle.json" -o "output/kibana.yaml" --prefix-components-with-info-prop title
 
 .PHONY: api-docs-stateful
 api-docs-stateful: ## Generate only kibana.yaml
-	@npx @redocly/cli join "kibana.info.yaml" "../x-pack/plugins/observability_solution/apm/docs/openapi/apm.yaml" "../x-pack/plugins/actions/docs/openapi/bundled.yaml" "../src/plugins/data_views/docs/openapi/bundled.yaml" "../x-pack/plugins/ml/common/openapi/ml_apis.yaml" "../packages/core/saved-objects/docs/openapi/bundled.yaml" "../x-pack/plugins/observability_solution/slo/docs/openapi/slo/bundled.yaml" "bundle.json" -o "output/kibana.yaml" --prefix-components-with-info-prop title
-# Temporarily omit "../x-pack/plugins/alerting/docs/openapi/bundled.yaml" and "../x-pack/plugins/cases/docs/openapi/bundled.yaml" due to OAS version
+	@npx @redocly/cli join "kibana.info.yaml" "../x-pack/plugins/observability_solution/apm/docs/openapi/apm.yaml" "../x-pack/plugins/cases/docs/openapi/bundled.yaml" "../x-pack/plugins/actions/docs/openapi/bundled.yaml" "../src/plugins/data_views/docs/openapi/bundled.yaml" "../x-pack/plugins/ml/common/openapi/ml_apis.yaml" "../packages/core/saved-objects/docs/openapi/bundled.yaml" "../x-pack/plugins/observability_solution/slo/docs/openapi/slo/bundled.yaml" "bundle.json" -o "output/kibana.yaml" --prefix-components-with-info-prop title
+# Temporarily omit "../x-pack/plugins/alerting/docs/openapi/bundled.yaml" due to OAS version
 # Temporarily omit "../x-pack/plugins/fleet/common/openapi/bundled.yaml" due to internals tag and tag sorting
 
 .PHONY: api-docs-serverless

src/plugins/controls/public/control_group/component/control_group_component.tsx

@@ -137,7 +137,8 @@ export const ControlGroup = () => {
       !renderTourStep ||
       !controlGroup.canShowInvalidSelectionsWarning() ||
       !tourStepOpen ||
-      !controlWithInvalidSelectionsId
+      !controlWithInvalidSelectionsId ||
+      !panels[controlWithInvalidSelectionsId]
     ) {
       return null;
     }

src/plugins/controls/public/control_group/embeddable/control_group_container.tsx

@@ -104,7 +104,7 @@ export class ControlGroupContainer extends Container<
   private recalculateFilters$: Subject<null>;
   private relevantDataViewId?: string;
   private lastUsedDataViewId?: string;
-  private invalidSelectionsState: { [childId: string]: boolean };
+  private invalidSelectionsState: { [childId: string]: boolean } = {};
 
   public diffingSubscription: Subscription = new Subscription();
 
@@ -170,12 +170,12 @@ export class ControlGroupContainer extends Container<
 
     this.store = reduxEmbeddableTools.store;
 
-    this.invalidSelectionsState = this.getChildIds().reduce((prev, id) => {
-      return { ...prev, [id]: false };
-    }, {});
-
     // when all children are ready setup subscriptions
     this.untilAllChildrenReady().then(() => {
+      this.invalidSelectionsState = this.getChildIds().reduce((prev, id) => {
+        return { ...prev, [id]: false };
+      }, {});
+
       this.recalculateDataViews();
       this.setupSubscriptions();
       const { filters, timeslice } = this.recalculateFilters();
@@ -324,7 +324,13 @@ export class ControlGroupContainer extends Container<
     this.subscriptions = new Subscription();
     this.initialized$.next(false);
     this.updateInput(newInput);
+
     this.untilAllChildrenReady().then(() => {
+      this.dispatch.setControlWithInvalidSelectionsId(undefined);
+      this.invalidSelectionsState = this.getChildIds().reduce((prev, id) => {
+        return { ...prev, [id]: false };
+      }, {});
+
       this.recalculateDataViews();
       const { filters, timeslice } = this.recalculateFilters();
       this.publishFilters({ filters, timeslice });

src/plugins/discover/public/embeddable/actions/view_saved_search_action.ts

@@ -7,40 +7,15 @@
  */
 
 import type { ApplicationStart } from '@kbn/core/public';
-import { SEARCH_EMBEDDABLE_TYPE } from '@kbn/discover-utils';
-import { ViewMode } from '@kbn/embeddable-plugin/public';
 import { i18n } from '@kbn/i18n';
-import {
-  apiCanAccessViewMode,
-  apiHasType,
-  apiIsOfType,
-  CanAccessViewMode,
-  EmbeddableApiContext,
-  getInheritedViewMode,
-  HasType,
-} from '@kbn/presentation-publishing';
+import type { EmbeddableApiContext } from '@kbn/presentation-publishing';
 import type { Action } from '@kbn/ui-actions-plugin/public';
 
 import type { DiscoverAppLocator } from '../../../common';
-import { PublishesSavedSearch, apiPublishesSavedSearch } from '../types';
 import { getDiscoverLocatorParams } from '../utils/get_discover_locator_params';
 
 export const ACTION_VIEW_SAVED_SEARCH = 'ACTION_VIEW_SAVED_SEARCH';
 
-type ViewSavedSearchActionApi = CanAccessViewMode & HasType & PublishesSavedSearch;
-
-const compatibilityCheck = (
-  api: EmbeddableApiContext['embeddable']
-): api is ViewSavedSearchActionApi => {
-  return (
-    apiCanAccessViewMode(api) &&
-    getInheritedViewMode(api) === ViewMode.VIEW &&
-    apiHasType(api) &&
-    apiIsOfType(api, SEARCH_EMBEDDABLE_TYPE) &&
-    apiPublishesSavedSearch(api)
-  );
-};
-
 export class ViewSavedSearchAction implements Action<EmbeddableApiContext> {
   public id = ACTION_VIEW_SAVED_SEARCH;
   public readonly type = ACTION_VIEW_SAVED_SEARCH;
@@ -51,6 +26,7 @@ export class ViewSavedSearchAction implements Action<EmbeddableApiContext> {
   ) {}
 
   async execute({ embeddable }: EmbeddableApiContext): Promise<void> {
+    const { compatibilityCheck } = await import('./view_saved_search_compatibility_check');
     if (!compatibilityCheck(embeddable)) {
       return;
     }
@@ -73,6 +49,9 @@ export class ViewSavedSearchAction implements Action<EmbeddableApiContext> {
     const { capabilities } = this.application;
     const hasDiscoverPermissions =
       (capabilities.discover.show as boolean) || (capabilities.discover.save as boolean);
-    return compatibilityCheck(embeddable) && hasDiscoverPermissions;
+
+    if (!hasDiscoverPermissions) return false; // early return to delay async import until absolutely necessary
+    const { compatibilityCheck } = await import('./view_saved_search_compatibility_check');
+    return compatibilityCheck(embeddable);
   }
 }

src/plugins/discover/public/embeddable/actions/view_saved_search_compatibility_check.ts

@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { SEARCH_EMBEDDABLE_TYPE } from '@kbn/discover-utils';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
+import {
+  apiCanAccessViewMode,
+  apiHasType,
+  apiIsOfType,
+  CanAccessViewMode,
+  EmbeddableApiContext,
+  getInheritedViewMode,
+  HasType,
+} from '@kbn/presentation-publishing';
+
+import { apiPublishesSavedSearch, PublishesSavedSearch } from '../types';
+
+type ViewSavedSearchActionApi = CanAccessViewMode & HasType & PublishesSavedSearch;
+
+export const compatibilityCheck = (
+  api: EmbeddableApiContext['embeddable']
+): api is ViewSavedSearchActionApi => {
+  return (
+    apiCanAccessViewMode(api) &&
+    getInheritedViewMode(api) === ViewMode.VIEW &&
+    apiHasType(api) &&
+    apiIsOfType(api, SEARCH_EMBEDDABLE_TYPE) &&
+    apiPublishesSavedSearch(api)
+  );
+};

src/plugins/discover/public/embeddable/utils/get_discover_locator_params.ts

@@ -7,7 +7,7 @@
  */
 
 import type { Filter } from '@kbn/es-query';
-import { PublishesSavedObjectId, PublishesUnifiedSearch } from '@kbn/presentation-publishing';
+import type { PublishesSavedObjectId, PublishesUnifiedSearch } from '@kbn/presentation-publishing';
 import { DiscoverAppLocatorParams } from '../../../common';
 import { PublishesSavedSearch } from '../types';
 

x-pack/plugins/cases/docs/openapi/README.md

@@ -13,22 +13,11 @@ A guide about the openApi specification can be found at [https://swagger.io/docs
 
 ## Tools
 
-It is possible to validate the docs before bundling them with the following
-command in the `x-pack/plugins/cases/docs/openapi/` folder:
-
-  ```bash
-    npx swagger-cli validate entrypoint.yaml
-  ```
-
-Then you can generate the `bundled` files by running the following commands:
+Generate the `bundled` files by running the following commands:
 
   ```bash
     npx @redocly/cli bundle entrypoint.yaml --output bundled.yaml --ext yaml
     npx @redocly/cli bundle entrypoint.yaml --output bundled.json --ext json
   ```
 
-After generating the json bundle ensure that it is also valid by running the following command:
-
-  ```bash
-     npx @redocly/cli lint bundled.json
-  ```
+Then join these files with the rest of the Kibana APIs per `oas_docs/README.md`