Merge branch '7.x' into backport/7.x/pr-74915

examples/ui_actions_explorer/public/actions/actions.tsx

@@ -21,7 +21,11 @@ import { OverlayStart } from 'kibana/public';
 import { EuiFieldText, EuiModalBody, EuiButton } from '@elastic/eui';
 import { useState } from 'react';
 import { toMountPoint } from '../../../../src/plugins/kibana_react/public';
-import { createAction, UiActionsStart } from '../../../../src/plugins/ui_actions/public';
+import {
+  ActionExecutionContext,
+  createAction,
+  UiActionsStart,
+} from '../../../../src/plugins/ui_actions/public';
 
 export const USER_TRIGGER = 'USER_TRIGGER';
 export const COUNTRY_TRIGGER = 'COUNTRY_TRIGGER';
@@ -37,7 +41,8 @@ export const ACTION_SHOWCASE_PLUGGABILITY = 'ACTION_SHOWCASE_PLUGGABILITY';
 export const showcasePluggability = createAction<typeof ACTION_SHOWCASE_PLUGGABILITY>({
   type: ACTION_SHOWCASE_PLUGGABILITY,
   getDisplayName: () => 'This is pluggable! Any plugin can inject their actions here.',
-  execute: async () => alert("Isn't that cool?!"),
+  execute: async (context: ActionExecutionContext) =>
+    alert(`Isn't that cool?! Triggered by ${context.trigger?.id} trigger`),
 });
 
 export interface PhoneContext {

examples/ui_actions_explorer/public/app.tsx

@@ -97,9 +97,9 @@ const ActionsExplorer = ({ uiActionsApi, openModal }: Props) => {
                   });
                   uiActionsApi.addTriggerAction(HELLO_WORLD_TRIGGER_ID, dynamicAction);
                   setConfirmationText(
-                    `You've successfully added a new action: ${dynamicAction.getDisplayName(
-                      {}
-                    )}. Refresh the page to reset state.  It's up to the user of the system to persist state like this.`
+                    `You've successfully added a new action: ${dynamicAction.getDisplayName({
+                      trigger: uiActionsApi.getTrigger(HELLO_WORLD_TRIGGER_ID),
+                    })}. Refresh the page to reset state.  It's up to the user of the system to persist state like this.`
                   );
                 }}
               >

src/core/server/elasticsearch/status.test.ts

@@ -65,7 +65,7 @@ describe('calculateStatus', () => {
     });
   });
 
-  it('changes to degraded when isCompatible and warningNodes present', async () => {
+  it('changes to available with a differemnt message when isCompatible and warningNodes present', async () => {
     expect(
       await calculateStatus$(
         of({
@@ -81,7 +81,7 @@ describe('calculateStatus', () => {
         .pipe(take(2))
         .toPromise()
     ).toEqual({
-      level: ServiceStatusLevels.degraded,
+      level: ServiceStatusLevels.available,
       summary: 'Some nodes are a different version',
       meta: {
         incompatibleNodes: [],
@@ -188,7 +188,7 @@ describe('calculateStatus', () => {
           "summary": "Incompatible with Elasticsearch",
         },
         Object {
-          "level": degraded,
+          "level": available,
           "meta": Object {
             "incompatibleNodes": Array [],
             "warningNodes": Array [

src/core/server/elasticsearch/status.ts

@@ -55,7 +55,7 @@ export const calculateStatus$ = (
             };
           } else if (warningNodes.length > 0) {
             return {
-              level: ServiceStatusLevels.degraded,
+              level: ServiceStatusLevels.available,
               summary:
                 // Message should always be present, but this is a safe fallback
                 message ??

src/plugins/embeddable/public/lib/actions/apply_filter_action.test.ts

@@ -19,6 +19,7 @@
 
 import { createFilterAction } from './apply_filter_action';
 import { expectErrorAsync } from '../../tests/helpers';
+import { defaultTrigger } from '../../../../ui_actions/public/triggers';
 
 test('has ACTION_APPLY_FILTER type and id', () => {
   const action = createFilterAction();
@@ -51,6 +52,7 @@ describe('isCompatible()', () => {
         }),
       } as any,
       filters: [],
+      trigger: defaultTrigger,
     });
     expect(result).toBe(true);
   });
@@ -66,6 +68,7 @@ describe('isCompatible()', () => {
         }),
       } as any,
       filters: [],
+      trigger: defaultTrigger,
     });
     expect(result).toBe(false);
   });
@@ -119,6 +122,7 @@ describe('execute()', () => {
       await action.execute({
         embeddable,
         filters: ['FILTER' as any],
+        trigger: defaultTrigger,
       });
 
       expect(root.updateInput).toHaveBeenCalledTimes(1);

src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx

@@ -30,6 +30,7 @@ import {
   PANEL_BADGE_TRIGGER,
   PANEL_NOTIFICATION_TRIGGER,
   EmbeddableContext,
+  contextMenuTrigger,
 } from '../triggers';
 import { IEmbeddable, EmbeddableOutput, EmbeddableError } from '../embeddables/i_embeddable';
 import { ViewMode } from '../types';
@@ -311,7 +312,11 @@ export class EmbeddablePanel extends React.Component<Props, State> {
     const sortedActions = [...regularActions, ...extraActions].sort(sortByOrderField);
 
     return await buildContextMenuForActions({
-      actions: sortedActions.map((action) => [action, { embeddable: this.props.embeddable }]),
+      actions: sortedActions.map((action) => ({
+        action,
+        context: { embeddable: this.props.embeddable },
+        trigger: contextMenuTrigger,
+      })),
       closeMenu: this.closeMyContextMenuPanel,
     });
   };

src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx

@@ -31,6 +31,7 @@ import { ContactCardEmbeddable } from '../../../../test_samples';
 import { esFilters, Filter } from '../../../../../../../../plugins/data/public';
 import { EmbeddableStart } from '../../../../../plugin';
 import { embeddablePluginMock } from '../../../../../mocks';
+import { defaultTrigger } from '../../../../../../../ui_actions/public/triggers';
 
 const { setup, doStart } = embeddablePluginMock.createInstance();
 setup.registerEmbeddableFactory(FILTERABLE_EMBEDDABLE, new FilterableEmbeddableFactory());
@@ -85,7 +86,9 @@ test('Is not compatible when container is in view mode', async () => {
     () => null
   );
   container.updateInput({ viewMode: ViewMode.VIEW });
-  expect(await addPanelAction.isCompatible({ embeddable: container })).toBe(false);
+  expect(
+    await addPanelAction.isCompatible({ embeddable: container, trigger: defaultTrigger })
+  ).toBe(false);
 });
 
 test('Is not compatible when embeddable is not a container', async () => {
@@ -94,7 +97,7 @@ test('Is not compatible when embeddable is not a container', async () => {
 
 test('Is compatible when embeddable is a parent and in edit mode', async () => {
   container.updateInput({ viewMode: ViewMode.EDIT });
-  expect(await action.isCompatible({ embeddable: container })).toBe(true);
+  expect(await action.isCompatible({ embeddable: container, trigger: defaultTrigger })).toBe(true);
 });
 
 test('Execute throws an error when called with an embeddable that is not a container', async () => {
@@ -108,6 +111,7 @@ test('Execute throws an error when called with an embeddable that is not a conta
         },
         {} as any
       ),
+      trigger: defaultTrigger,
     } as any);
   }
   await expect(check()).rejects.toThrow(Error);
@@ -116,6 +120,7 @@ test('Execute does not throw an error when called with a compatible container',
   container.updateInput({ viewMode: ViewMode.EDIT });
   await action.execute({
     embeddable: container,
+    trigger: defaultTrigger,
   });
 });
 

src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 import { i18n } from '@kbn/i18n';
-import { Action } from 'src/plugins/ui_actions/public';
+import { Action, ActionExecutionContext } from 'src/plugins/ui_actions/public';
 import { NotificationsStart, OverlayStart } from 'src/core/public';
 import { EmbeddableStart } from 'src/plugins/embeddable/public/plugin';
 import { ViewMode } from '../../../../types';
@@ -52,12 +52,14 @@ export class AddPanelAction implements Action<ActionContext> {
     return 'plusInCircleFilled';
   }
 
-  public async isCompatible({ embeddable }: ActionContext) {
+  public async isCompatible(context: ActionExecutionContext<ActionContext>) {
+    const { embeddable } = context;
     return embeddable.getIsContainer() && embeddable.getInput().viewMode === ViewMode.EDIT;
   }
 
-  public async execute({ embeddable }: ActionContext) {
-    if (!embeddable.getIsContainer() || !(await this.isCompatible({ embeddable }))) {
+  public async execute(context: ActionExecutionContext<ActionContext>) {
+    const { embeddable } = context;
+    if (!embeddable.getIsContainer() || !(await this.isCompatible(context))) {
       throw new Error('Context is incompatible');
     }
 

src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx

@@ -30,7 +30,7 @@ import React from 'react';
 import { Action } from 'src/plugins/ui_actions/public';
 import { PanelOptionsMenu } from './panel_options_menu';
 import { IEmbeddable } from '../../embeddables';
-import { EmbeddableContext } from '../../triggers';
+import { EmbeddableContext, panelBadgeTrigger, panelNotificationTrigger } from '../../triggers';
 
 export interface PanelHeaderProps {
   title?: string;
@@ -49,11 +49,11 @@ function renderBadges(badges: Array<Action<EmbeddableContext>>, embeddable: IEmb
     <EuiBadge
       key={badge.id}
       className="embPanel__headerBadge"
-      iconType={badge.getIconType({ embeddable })}
-      onClick={() => badge.execute({ embeddable })}
-      onClickAriaLabel={badge.getDisplayName({ embeddable })}
+      iconType={badge.getIconType({ embeddable, trigger: panelBadgeTrigger })}
+      onClick={() => badge.execute({ embeddable, trigger: panelBadgeTrigger })}
+      onClickAriaLabel={badge.getDisplayName({ embeddable, trigger: panelBadgeTrigger })}
     >
-      {badge.getDisplayName({ embeddable })}
+      {badge.getDisplayName({ embeddable, trigger: panelBadgeTrigger })}
     </EuiBadge>
   ));
 }
@@ -70,14 +70,17 @@ function renderNotifications(
         data-test-subj={`embeddablePanelNotification-${notification.id}`}
         key={notification.id}
         style={{ marginTop: '4px', marginRight: '4px' }}
-        onClick={() => notification.execute(context)}
+        onClick={() => notification.execute({ ...context, trigger: panelNotificationTrigger })}
       >
-        {notification.getDisplayName(context)}
+        {notification.getDisplayName({ ...context, trigger: panelNotificationTrigger })}
       </EuiNotificationBadge>
     );
 
     if (notification.getDisplayNameTooltip) {
-      const tooltip = notification.getDisplayNameTooltip(context);
+      const tooltip = notification.getDisplayNameTooltip({
+        ...context,
+        trigger: panelNotificationTrigger,
+      });
 
       if (tooltip) {
         badge = (

src/plugins/embeddable/public/lib/test_samples/actions/say_hello_action.tsx

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { ActionByType, IncompatibleActionError, ActionType } from '../../ui_actions';
+import { IncompatibleActionError, ActionType, ActionDefinitionByType } from '../../ui_actions';
 import { EmbeddableInput, Embeddable, EmbeddableOutput, IEmbeddable } from '../../embeddables';
 
 // Casting to ActionType is a hack - in a real situation use
@@ -42,7 +42,7 @@ export interface SayHelloActionContext {
   message?: string;
 }
 
-export class SayHelloAction implements ActionByType<typeof SAY_HELLO_ACTION> {
+export class SayHelloAction implements ActionDefinitionByType<typeof SAY_HELLO_ACTION> {
   public readonly type = SAY_HELLO_ACTION;
   public readonly id = SAY_HELLO_ACTION;
 

src/plugins/embeddable/public/tests/apply_filter_action.test.ts

@@ -31,6 +31,7 @@ import {
   FilterableEmbeddableInput,
 } from '../lib/test_samples';
 import { esFilters } from '../../../data/public';
+import { applyFilterTrigger } from '../../../ui_actions/public';
 
 test('ApplyFilterAction applies the filter to the root of the container tree', async () => {
   const { doStart, setup } = testPlugin();
@@ -85,7 +86,7 @@ test('ApplyFilterAction applies the filter to the root of the container tree', a
     query: { match: { extension: { query: 'foo' } } },
   };
 
-  await applyFilterAction.execute({ embeddable, filters: [filter] });
+  await applyFilterAction.execute({ embeddable, filters: [filter], trigger: applyFilterTrigger });
   expect(root.getInput().filters.length).toBe(1);
   expect(node1.getInput().filters.length).toBe(1);
   expect(embeddable.getInput().filters.length).toBe(1);

src/plugins/ui_actions/public/actions/action.test.ts

@@ -17,8 +17,9 @@
  * under the License.
  */
 
-import { createAction } from '../../../ui_actions/public';
+import { ActionExecutionContext, createAction } from '../../../ui_actions/public';
 import { ActionType } from '../types';
+import { defaultTrigger } from '../triggers';
 
 const sayHelloAction = createAction({
   // Casting to ActionType is a hack - in a real situation use
@@ -29,11 +30,17 @@ const sayHelloAction = createAction({
 });
 
 test('action is not compatible based on context', async () => {
-  const isCompatible = await sayHelloAction.isCompatible({ amICompatible: false });
+  const isCompatible = await sayHelloAction.isCompatible({
+    amICompatible: false,
+    trigger: defaultTrigger,
+  } as ActionExecutionContext);
   expect(isCompatible).toBe(false);
 });
 
 test('action is compatible based on context', async () => {
-  const isCompatible = await sayHelloAction.isCompatible({ amICompatible: true });
+  const isCompatible = await sayHelloAction.isCompatible({
+    amICompatible: true,
+    trigger: defaultTrigger,
+  } as ActionExecutionContext);
   expect(isCompatible).toBe(true);
 });