Merge branch 'drilldowns' into drilldown-demo-2

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md

@@ -49,6 +49,7 @@ esFilters: {
     generateFilters: typeof generateFilters;
     onlyDisabledFiltersChanged: (newFilters?: import("../common").Filter[] | undefined, oldFilters?: import("../common").Filter[] | undefined) => boolean;
     changeTimeFilter: typeof changeTimeFilter;
+    convertRangeFilterToTimeRangeString: typeof convertRangeFilterToTimeRangeString;
     mapAndFlattenFilters: (filters: import("../common").Filter[]) => import("../common").Filter[];
     extractTimeFilter: typeof extractTimeFilter;
 }

src/plugins/dashboard/public/application/actions/clone_panel_action.tsx

@@ -39,7 +39,7 @@ export interface ClonePanelActionContext {
 export class ClonePanelAction implements ActionByType<typeof ACTION_CLONE_PANEL> {
   public readonly type = ACTION_CLONE_PANEL;
   public readonly id = ACTION_CLONE_PANEL;
-  public order = 11;
+  public order = 45;
 
   constructor(private core: CoreStart) {}
 

src/plugins/data/public/actions/apply_filter_action.ts

@@ -42,6 +42,7 @@ export function createFilterAction(
   return createAction<typeof ACTION_GLOBAL_APPLY_FILTER>({
     type: ACTION_GLOBAL_APPLY_FILTER,
     id: ACTION_GLOBAL_APPLY_FILTER,
+    getIconType: () => 'filter',
     getDisplayName: () => {
       return i18n.translate('data.filter.applyFilterActionTitle', {
         defaultMessage: 'Apply filter to current view',

src/plugins/data/public/index.ts

@@ -59,6 +59,7 @@ import {
   changeTimeFilter,
   mapAndFlattenFilters,
   extractTimeFilter,
+  convertRangeFilterToTimeRangeString,
 } from './query';
 
 // Filter helpers namespace:
@@ -96,6 +97,7 @@ export const esFilters = {
   onlyDisabledFiltersChanged,
 
   changeTimeFilter,
+  convertRangeFilterToTimeRangeString,
   mapAndFlattenFilters,
   extractTimeFilter,
 };

src/plugins/data/public/query/timefilter/index.ts

@@ -23,5 +23,5 @@ export * from './types';
 export { Timefilter, TimefilterContract } from './timefilter';
 export { TimeHistory, TimeHistoryContract } from './time_history';
 export { getTime } from './get_time';
-export { changeTimeFilter } from './lib/change_time_filter';
+export { changeTimeFilter, convertRangeFilterToTimeRangeString } from './lib/change_time_filter';
 export { extractTimeFilter } from './lib/extract_time_filter';

src/plugins/data/public/query/timefilter/lib/change_time_filter.ts

@@ -20,7 +20,7 @@
 import moment from 'moment';
 import { keys } from 'lodash';
 import { TimefilterContract } from '../../timefilter';
-import { RangeFilter } from '../../../../common';
+import { RangeFilter, TimeRange } from '../../../../common';
 
 export function convertRangeFilterToTimeRange(filter: RangeFilter) {
   const key = keys(filter.range)[0];
@@ -32,6 +32,14 @@ export function convertRangeFilterToTimeRange(filter: RangeFilter) {
   };
 }
 
+export function convertRangeFilterToTimeRangeString(filter: RangeFilter): TimeRange {
+  const { from, to } = convertRangeFilterToTimeRange(filter);
+  return {
+    from: from?.toISOString(),
+    to: to?.toISOString(),
+  };
+}
+
 export function changeTimeFilter(timeFilter: TimefilterContract, filter: RangeFilter) {
   timeFilter.setTime(convertRangeFilterToTimeRange(filter));
 }

src/plugins/embeddable/public/index.ts

@@ -67,6 +67,8 @@ export {
   withEmbeddableSubscription,
   SavedObjectEmbeddableInput,
   isSavedObjectEmbeddableInput,
+  isRangeSelectTriggerContext,
+  isValueClickTriggerContext,
 } from './lib';
 
 export function plugin(initializerContext: PluginInitializerContext) {

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

@@ -64,6 +64,7 @@ function renderNotifications(
 ) {
   return notifications.map(notification => (
     <EuiNotificationBadge
+      data-test-subj={`embeddablePanelNotification-${notification.id}`}
       key={notification.id}
       style={{ marginTop: '4px', marginRight: '4px' }}
       onClick={() => notification.execute({ embeddable })}

src/plugins/embeddable/public/lib/triggers/triggers.ts

@@ -17,16 +17,16 @@
  * under the License.
  */
 
-import { Trigger } from '../../../../ui_actions/public';
 import { KibanaDatatable } from '../../../../expressions';
+import { Trigger } from '../../../../ui_actions/public';
 import { IEmbeddable } from '..';
 
 export interface EmbeddableContext {
   embeddable: IEmbeddable;
 }
 
-export interface ValueClickTriggerContext {
-  embeddable?: IEmbeddable;
+export interface ValueClickTriggerContext<T extends IEmbeddable = IEmbeddable> {
+  embeddable?: T;
   timeFieldName?: string;
   data: {
     data: Array<{
@@ -39,8 +39,12 @@ export interface ValueClickTriggerContext {
   };
 }
 
-export interface RangeSelectTriggerContext {
-  embeddable?: IEmbeddable;
+export const isValueClickTriggerContext = (
+  context: ValueClickTriggerContext | RangeSelectTriggerContext
+): context is ValueClickTriggerContext => context.data && 'data' in context.data;
+
+export interface RangeSelectTriggerContext<T extends IEmbeddable = IEmbeddable> {
+  embeddable?: T;
   timeFieldName?: string;
   data: {
     table: KibanaDatatable;
@@ -49,6 +53,10 @@ export interface RangeSelectTriggerContext {
   };
 }
 
+export const isRangeSelectTriggerContext = (
+  context: ValueClickTriggerContext | RangeSelectTriggerContext
+): context is RangeSelectTriggerContext => context.data && 'range' in context.data;
+
 export const CONTEXT_MENU_TRIGGER = 'CONTEXT_MENU_TRIGGER';
 export const contextMenuTrigger: Trigger<'CONTEXT_MENU_TRIGGER'> = {
   id: CONTEXT_MENU_TRIGGER,

src/plugins/kibana_utils/public/index.ts

@@ -76,6 +76,7 @@ export {
 } from './state_sync';
 export { removeQueryParam, redirectWhenMissing, ensureDefaultIndexPattern } from './history';
 export { applyDiff } from './state_management/utils/diff_object';
+export { createStartServicesGetter } from './core/create_start_service_getter';
 
 /** dummy plugin, we just want kibanaUtils to have its own bundle */
 export function plugin() {

src/plugins/ui_actions/public/context_menu/open_context_menu.tsx

@@ -149,7 +149,11 @@ export function openContextMenu(
       anchorPosition="downRight"
       withTitle
     >
-      <EuiContextMenu initialPanelId="mainMenu" panels={panels} />
+      <EuiContextMenu
+        initialPanelId="mainMenu"
+        panels={panels}
+        data-test-subj={props['data-test-subj']}
+      />
     </EuiPopover>,
     container
   );

src/plugins/ui_actions/public/triggers/trigger_internal.ts

@@ -68,6 +68,8 @@ export class TriggerInternal<T extends TriggerId> {
       title: this.trigger.title,
       closeMenu: () => session.close(),
     });
-    const session = openContextMenu([panel]);
+    const session = openContextMenu([panel], {
+      'data-test-subj': 'multipleActionsContextMenu',
+    });
   }
 }

src/plugins/ui_actions/public/util/configurable.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { UiComponent } from 'src/plugins/kibana_utils/common';
+import { UiComponent } from 'src/plugins/kibana_utils/public';
 
 /**
  * Represents something that can be configured by user using UI.

test/functional/page_objects/dashboard_page.ts

@@ -104,16 +104,21 @@ export function DashboardPageProvider({ getService, getPageObjects }: FtrProvide
 
     public async getDashboardIdFromCurrentUrl() {
       const currentUrl = await browser.getCurrentUrl();
-      const urlSubstring = 'kibana#/dashboard/';
-      const startOfIdIndex = currentUrl.indexOf(urlSubstring) + urlSubstring.length;
-      const endIndex = currentUrl.indexOf('?');
-      const id = currentUrl.substring(startOfIdIndex, endIndex < 0 ? currentUrl.length : endIndex);
+      const id = this.getDashboardIdFromUrl(currentUrl);
 
       log.debug(`Dashboard id extracted from ${currentUrl} is ${id}`);
 
       return id;
     }
 
+    public getDashboardIdFromUrl(url: string) {
+      const urlSubstring = 'kibana#/dashboard/';
+      const startOfIdIndex = url.indexOf(urlSubstring) + urlSubstring.length;
+      const endIndex = url.indexOf('?');
+      const id = url.substring(startOfIdIndex, endIndex < 0 ? url.length : endIndex);
+      return id;
+    }
+
     /**
      * Returns true if already on the dashboard landing page (that page doesn't have a link to itself).
      * @returns {Promise<boolean>}
@@ -512,6 +517,20 @@ export function DashboardPageProvider({ getService, getPageObjects }: FtrProvide
 
       return checkList.filter(viz => viz.isPresent === false).map(viz => viz.name);
     }
+
+    public async getPanelDrilldownCount(panelIndex = 0): Promise<number> {
+      log.debug('getPanelDrilldownCount');
+      const panel = (await this.getDashboardPanels())[panelIndex];
+      try {
+        const count = await panel.findByTestSubject(
+          'embeddablePanelNotification-ACTION_PANEL_NOTIFICATIONS'
+        );
+        return Number.parseInt(await count.getVisibleText(), 10);
+      } catch (e) {
+        // if not found then this is 0 (we don't show badge with 0)
+        return 0;
+      }
+    }
   }
 
   return new DashboardPage();

x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.test.tsx

@@ -18,7 +18,7 @@ test('Pick and configure action', () => {
   const screen = render(<Demo actionFactories={[dashboardFactory, urlFactory]} />);
 
   // check that all factories are displayed to pick
-  expect(screen.getAllByTestId(TEST_SUBJ_ACTION_FACTORY_ITEM)).toHaveLength(2);
+  expect(screen.getAllByTestId(new RegExp(TEST_SUBJ_ACTION_FACTORY_ITEM))).toHaveLength(2);
 
   // select URL one
   fireEvent.click(screen.getByText(/Go to URL/i));
@@ -43,8 +43,8 @@ test('If only one actions factory is available then actionFactory selection is e
   const screen = render(<Demo actionFactories={[urlFactory]} />);
 
   // check that no factories are displayed to pick from
-  expect(screen.queryByTestId(TEST_SUBJ_ACTION_FACTORY_ITEM)).not.toBeInTheDocument();
-  expect(screen.queryByTestId(TEST_SUBJ_SELECTED_ACTION_FACTORY)).toBeInTheDocument();
+  expect(screen.queryByTestId(new RegExp(TEST_SUBJ_ACTION_FACTORY_ITEM))).not.toBeInTheDocument();
+  expect(screen.queryByTestId(new RegExp(TEST_SUBJ_SELECTED_ACTION_FACTORY))).toBeInTheDocument();
 
   // Input url
   const URL = 'https://elastic.co';

x-pack/plugins/advanced_ui_actions/public/components/action_wizard/action_wizard.tsx

@@ -105,7 +105,7 @@ interface SelectedActionFactoryProps {
   onDeselect: () => void;
 }
 
-export const TEST_SUBJ_SELECTED_ACTION_FACTORY = 'selected-action-factory';
+export const TEST_SUBJ_SELECTED_ACTION_FACTORY = 'selectedActionFactory';
 
 const SelectedActionFactory: React.FC<SelectedActionFactoryProps> = ({
   actionFactory,
@@ -118,7 +118,7 @@ const SelectedActionFactory: React.FC<SelectedActionFactoryProps> = ({
   return (
     <div
       className="auaActionWizard__selectedActionFactoryContainer"
-      data-test-subj={TEST_SUBJ_SELECTED_ACTION_FACTORY}
+      data-test-subj={`${TEST_SUBJ_SELECTED_ACTION_FACTORY}-${actionFactory.id}`}
     >
       <header>
         <EuiFlexGroup alignItems="center" gutterSize="s">
@@ -159,7 +159,7 @@ interface ActionFactorySelectorProps {
   onActionFactorySelected: (actionFactory: ActionFactory) => void;
 }
 
-export const TEST_SUBJ_ACTION_FACTORY_ITEM = 'action-factory-item';
+export const TEST_SUBJ_ACTION_FACTORY_ITEM = 'actionFactoryItem';
 
 const ActionFactorySelector: React.FC<ActionFactorySelectorProps> = ({
   actionFactories,
@@ -181,7 +181,7 @@ const ActionFactorySelector: React.FC<ActionFactorySelectorProps> = ({
             <EuiKeyPadMenuItem
               className="auaActionWizard__actionFactoryItem"
               label={actionFactory.getDisplayName(context)}
-              data-test-subj={TEST_SUBJ_ACTION_FACTORY_ITEM}
+              data-test-subj={`${TEST_SUBJ_ACTION_FACTORY_ITEM}-${actionFactory.id}`}
               onClick={() => onActionFactorySelected(actionFactory)}
             >
               {actionFactory.getIconType(context) && (

x-pack/plugins/dashboard_enhanced/kibana.json

@@ -3,6 +3,6 @@
   "version": "kibana",
   "server": false,
   "ui": true,
-  "requiredPlugins": ["uiActions", "embeddable", "dashboard", "drilldowns"],
+  "requiredPlugins": ["data","uiActions", "embeddable", "dashboard", "drilldowns", "share"],
   "configPath": ["xpack", "dashboardEnhanced"]
 }

x-pack/plugins/dashboard_enhanced/public/plugin.ts

@@ -5,21 +5,26 @@
  */
 
 import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
+import { SharePluginStart, SharePluginSetup } from '../../../../src/plugins/share/public';
 import { UiActionsSetup, UiActionsStart } from '../../../../src/plugins/ui_actions/public';
 import { EmbeddableSetup, EmbeddableStart } from '../../../../src/plugins/embeddable/public';
 import { DashboardDrilldownsService } from './services';
+import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
 import { DrilldownsSetup, DrilldownsStart } from '../../drilldowns/public';
 
 export interface SetupDependencies {
   drilldowns: DrilldownsSetup;
   embeddable: EmbeddableSetup;
   uiActions: UiActionsSetup;
+  share: SharePluginSetup;
 }
 
 export interface StartDependencies {
   drilldowns: DrilldownsStart;
   embeddable: EmbeddableStart;
   uiActions: UiActionsStart;
+  share: SharePluginStart;
+  data: DataPublicPluginStart;
 }
 
 // eslint-disable-next-line

x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.test.tsx

@@ -20,8 +20,8 @@ const drilldowns = drilldownsPluginMock.createStartContract();
 const uiActions = uiActionsPluginMock.createStartContract();
 
 const actionParams: OpenFlyoutAddDrilldownParams = {
-  drilldowns: () => Promise.resolve(drilldowns),
-  overlays: () => Promise.resolve(overlays),
+  drilldowns: () => drilldowns,
+  overlays: () => overlays,
 };
 
 test('should create', () => {

x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.tsx

@@ -16,8 +16,8 @@ import { EmbeddableContext } from '../../../../../../../../src/plugins/embeddabl
 export const OPEN_FLYOUT_ADD_DRILLDOWN = 'OPEN_FLYOUT_ADD_DRILLDOWN';
 
 export interface OpenFlyoutAddDrilldownParams {
-  overlays: () => Promise<CoreStart['overlays']>;
-  drilldowns: () => Promise<DrilldownsStart>;
+  overlays: () => CoreStart['overlays'];
+  drilldowns: () => DrilldownsStart;
 }
 
 export class FlyoutCreateDrilldownAction implements ActionByType<typeof OPEN_FLYOUT_ADD_DRILLDOWN> {
@@ -50,8 +50,8 @@ export class FlyoutCreateDrilldownAction implements ActionByType<typeof OPEN_FLY
   }
 
   public async execute(context: EmbeddableContext) {
-    const overlays = await this.params.overlays();
-    const drilldowns = await this.params.drilldowns();
+    const overlays = this.params.overlays();
+    const drilldowns = this.params.drilldowns();
     const { embeddable } = context;
 
     if (!isEnhancedEmbeddable(embeddable)) {
@@ -71,6 +71,7 @@ export class FlyoutCreateDrilldownAction implements ActionByType<typeof OPEN_FLY
       ),
       {
         ownFocus: true,
+        'data-test-subj': 'createDrilldownFlyout',
       }
     );
   }

x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx

@@ -29,8 +29,8 @@ uiActionsPlugin.setup.registerActionFactory({
 });
 
 const actionParams: FlyoutEditDrilldownParams = {
-  drilldowns: () => Promise.resolve(drilldowns),
-  overlays: () => Promise.resolve(overlays),
+  drilldowns: () => drilldowns,
+  overlays: () => overlays,
 };
 
 test('should create', () => {