Merge branch 'main' into 152289-tm-health-logs

.buildkite/pipelines/pull_request/exploratory_view_plugin.yml

@@ -1,5 +1,5 @@
 steps:
-  - command: .buildkite/scripts/steps/functional/observability_plugin.sh
+  - command: .buildkite/scripts/steps/functional/exploratory_view_plugin.sh
     label: 'Exploratory View @elastic/synthetics Tests'
     agents:
       queue: n2-4-spot

.buildkite/scripts/steps/functional/observability_plugin.sh → .buildkite/scripts/steps/functional/exploratory_view_plugin.sh

@@ -9,8 +9,8 @@ source .buildkite/scripts/common/util.sh
 
 export JOB=kibana-observability-plugin
 
-echo "--- Observability plugin @elastic/synthetics Tests"
+echo "--- Exploratory View plugin @elastic/synthetics Tests"
 
 cd "$XPACK_DIR"
 
-node plugins/observability/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
+node plugins/exploratory_view/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}

.github/CODEOWNERS

@@ -459,6 +459,7 @@ x-pack/packages/ml/local_storage @elastic/ml-ui
 x-pack/packages/ml/nested_property @elastic/ml-ui
 x-pack/plugins/ml @elastic/ml-ui
 x-pack/packages/ml/query_utils @elastic/ml-ui
+x-pack/packages/ml/route_utils @elastic/ml-ui
 x-pack/packages/ml/string_hash @elastic/ml-ui
 x-pack/packages/ml/url_state @elastic/ml-ui
 packages/kbn-monaco @elastic/appex-sharedux

docs/user/dashboard/dashboard.asciidoc

@@ -363,7 +363,7 @@ Apply a set of design options to the entire dashboard.
 
 . If you're in view mode, click *Edit* in the toolbar.
 
-. In the toolbar, *Options*, then use the following options:
+. In the toolbar, click *Settings*, to open the *Dashboard settings* flyout, then use the following options:
 
 * *Use margins between panels* — Adds a margin of space between each panel.
 

package.json

@@ -474,6 +474,7 @@
     "@kbn/ml-nested-property": "link:x-pack/packages/ml/nested_property",
     "@kbn/ml-plugin": "link:x-pack/plugins/ml",
     "@kbn/ml-query-utils": "link:x-pack/packages/ml/query_utils",
+    "@kbn/ml-route-utils": "link:x-pack/packages/ml/route_utils",
     "@kbn/ml-string-hash": "link:x-pack/packages/ml/string_hash",
     "@kbn/ml-url-state": "link:x-pack/packages/ml/url_state",
     "@kbn/monaco": "link:packages/kbn-monaco",

src/plugins/dashboard/public/dashboard_app/_dashboard_app_strings.ts

@@ -323,12 +323,12 @@ export const topNavStrings = {
       defaultMessage: 'Share Dashboard',
     }),
   },
-  options: {
-    label: i18n.translate('dashboard.topNave.optionsButtonAriaLabel', {
-      defaultMessage: 'options',
+  settings: {
+    label: i18n.translate('dashboard.topNave.settingsButtonAriaLabel', {
+      defaultMessage: 'settings',
     }),
-    description: i18n.translate('dashboard.topNave.optionsConfigDescription', {
-      defaultMessage: 'Options',
+    description: i18n.translate('dashboard.topNave.settingsConfigDescription', {
+      defaultMessage: 'Open dashboard settings',
     }),
   },
   clone: {

src/plugins/dashboard/public/dashboard_app/top_nav/use_dashboard_menu_items.tsx

@@ -55,6 +55,7 @@ export const useDashboardMenuItems = ({
   const dispatch = useEmbeddableDispatch();
 
   const hasUnsavedChanges = select((state) => state.componentState.hasUnsavedChanges);
+  const hasOverlays = select((state) => state.componentState.hasOverlays);
   const lastSavedId = select((state) => state.componentState.lastSavedId);
   const dashboardTitle = select((state) => state.explicitInput.title);
 
@@ -169,13 +170,13 @@ export const useDashboardMenuItems = ({
         emphasize: true,
         isLoading: isSaveInProgress,
         testId: 'dashboardQuickSaveMenuItem',
-        disableButton: !hasUnsavedChanges || isSaveInProgress,
+        disableButton: !hasUnsavedChanges || isSaveInProgress || hasOverlays,
         run: () => quickSaveDashboard(),
       } as TopNavMenuData,
 
       saveAs: {
         description: topNavStrings.saveAs.description,
-        disableButton: isSaveInProgress,
+        disableButton: isSaveInProgress || hasOverlays,
         id: 'save',
         emphasize: !Boolean(lastSavedId),
         testId: 'dashboardSaveMenuItem',
@@ -187,7 +188,7 @@ export const useDashboardMenuItems = ({
       switchToViewMode: {
         ...topNavStrings.switchToViewMode,
         id: 'cancel',
-        disableButton: isSaveInProgress || !lastSavedId,
+        disableButton: isSaveInProgress || !lastSavedId || hasOverlays,
         testId: 'dashboardViewOnlyMode',
         run: () => returnToViewMode(),
       } as TopNavMenuData,
@@ -196,16 +197,16 @@ export const useDashboardMenuItems = ({
         ...topNavStrings.share,
         id: 'share',
         testId: 'shareTopNavButton',
-        disableButton: isSaveInProgress,
+        disableButton: isSaveInProgress || hasOverlays,
         run: showShare,
       } as TopNavMenuData,
 
-      options: {
-        ...topNavStrings.options,
-        id: 'options',
-        testId: 'dashboardOptionsButton',
-        disableButton: isSaveInProgress,
-        run: (anchor) => dashboardContainer.showOptions(anchor),
+      settings: {
+        ...topNavStrings.settings,
+        id: 'settings',
+        testId: 'dashboardSettingsButton',
+        disableButton: isSaveInProgress || hasOverlays,
+        run: () => dashboardContainer.showSettings(),
       } as TopNavMenuData,
 
       clone: {
@@ -220,6 +221,7 @@ export const useDashboardMenuItems = ({
     quickSaveDashboard,
     dashboardContainer,
     hasUnsavedChanges,
+    hasOverlays,
     setFullScreenMode,
     isSaveInProgress,
     returnToViewMode,
@@ -252,7 +254,7 @@ export const useDashboardMenuItems = ({
     } else {
       editModeItems.push(menuItems.switchToViewMode, menuItems.saveAs);
     }
-    return [...labsMenuItem, menuItems.options, ...shareMenuItem, ...editModeItems];
+    return [...labsMenuItem, menuItems.settings, ...shareMenuItem, ...editModeItems];
   }, [lastSavedId, menuItems, share, isLabsEnabled]);
 
   return { viewModeTopNavConfig, editModeTopNavConfig };

src/plugins/saved_objects/public/finder/index.ts → src/plugins/dashboard/public/dashboard_container/component/settings/index.ts

@@ -6,5 +6,4 @@
  * Side Public License, v 1.
  */
 
-export type { SavedObjectMetaData, SavedObjectFinderUiProps } from './saved_object_finder';
-export { SavedObjectFinderUi, getSavedObjectFinder } from './saved_object_finder';
+export { DashboardSettings } from './settings_flyout';