Merge branch 'master' into sourcerer_kip_as

src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker

@@ -375,6 +375,7 @@ kibana_vars=(
     xpack.task_manager.poll_interval
     xpack.task_manager.request_capacity
     xpack.task_manager.version_conflict_threshold
+    xpack.uptime.index
 )
 
 longopts=''

src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.ts

@@ -12,10 +12,17 @@ import {
   EmbeddableStateWithType,
 } from '../../../embeddable/common';
 import { SavedObjectReference } from '../../../../core/types';
-import { DashboardContainerStateWithType, DashboardPanelState } from '../types';
+import {
+  DashboardContainerControlGroupInput,
+  DashboardContainerStateWithType,
+  DashboardPanelState,
+} from '../types';
+import { CONTROL_GROUP_TYPE } from '../../../presentation_util/common/lib';
 
 const getPanelStatePrefix = (state: DashboardPanelState) => `${state.explicitInput.id}:`;
 
+const controlGroupReferencePrefix = 'controlGroup_';
+
 export const createInject = (
   persistableStateService: EmbeddablePersistableStateService
 ): EmbeddablePersistableStateService['inject'] => {
@@ -69,6 +76,26 @@ export const createInject = (
       }
     }
 
+    // since the controlGroup is not part of the panels array, its references need to be injected separately
+    if ('controlGroupInput' in workingState && workingState.controlGroupInput) {
+      const controlGroupReferences = references
+        .filter((reference) => reference.name.indexOf(controlGroupReferencePrefix) === 0)
+        .map((reference) => ({
+          ...reference,
+          name: reference.name.replace(controlGroupReferencePrefix, ''),
+        }));
+
+      const { type, ...injectedControlGroupState } = persistableStateService.inject(
+        {
+          ...workingState.controlGroupInput,
+          type: CONTROL_GROUP_TYPE,
+        },
+        controlGroupReferences
+      );
+      workingState.controlGroupInput =
+        injectedControlGroupState as DashboardContainerControlGroupInput;
+    }
+
     return workingState as EmbeddableStateWithType;
   };
 };
@@ -120,6 +147,22 @@ export const createExtract = (
       }
     }
 
+    // since the controlGroup is not part of the panels array, its references need to be extracted separately
+    if ('controlGroupInput' in workingState && workingState.controlGroupInput) {
+      const { state: extractedControlGroupState, references: controlGroupReferences } =
+        persistableStateService.extract({
+          ...workingState.controlGroupInput,
+          type: CONTROL_GROUP_TYPE,
+        });
+      workingState.controlGroupInput =
+        extractedControlGroupState as DashboardContainerControlGroupInput;
+      const prefixedControlGroupReferences = controlGroupReferences.map((reference) => ({
+        ...reference,
+        name: `${controlGroupReferencePrefix}${reference.name}`,
+      }));
+      references.push(...prefixedControlGroupReferences);
+    }
+
     return { state: workingState as EmbeddableStateWithType, references };
   };
 };

src/plugins/dashboard/common/saved_dashboard_references.ts

@@ -7,13 +7,20 @@
  */
 import semverGt from 'semver/functions/gt';
 import { SavedObjectAttributes, SavedObjectReference } from '../../../core/types';
-import { DashboardContainerStateWithType, DashboardPanelState } from './types';
+import {
+  DashboardContainerControlGroupInput,
+  DashboardContainerStateWithType,
+  DashboardPanelState,
+  RawControlGroupAttributes,
+} from './types';
 import { EmbeddablePersistableStateService } from '../../embeddable/common/types';
 import {
   convertPanelStateToSavedDashboardPanel,
   convertSavedDashboardPanelToPanelState,
 } from './embeddable/embeddable_saved_object_converters';
 import { SavedDashboardPanel } from './types';
+import { CONTROL_GROUP_TYPE } from '../../presentation_util/common/lib';
+
 export interface ExtractDeps {
   embeddablePersistableStateService: EmbeddablePersistableStateService;
 }
@@ -35,10 +42,27 @@ function dashboardAttributesToState(attributes: SavedObjectAttributes): {
     inputPanels = JSON.parse(attributes.panelsJSON) as SavedDashboardPanel[];
   }
 
+  let controlGroupInput: DashboardContainerControlGroupInput | undefined;
+  if (attributes.controlGroupInput) {
+    const rawControlGroupInput =
+      attributes.controlGroupInput as unknown as RawControlGroupAttributes;
+    if (rawControlGroupInput.panelsJSON && typeof rawControlGroupInput.panelsJSON === 'string') {
+      const controlGroupPanels = JSON.parse(rawControlGroupInput.panelsJSON);
+      if (controlGroupPanels && typeof controlGroupPanels === 'object') {
+        controlGroupInput = {
+          ...rawControlGroupInput,
+          type: CONTROL_GROUP_TYPE,
+          panels: controlGroupPanels,
+        };
+      }
+    }
+  }
+
   return {
     panels: inputPanels,
     state: {
       id: attributes.id as string,
+      controlGroupInput,
       type: 'dashboard',
       panels: inputPanels.reduce<Record<string, DashboardPanelState>>((current, panel, index) => {
         const panelIndex = panel.panelIndex || `${index}`;
@@ -92,20 +116,27 @@ export function extractReferences(
     throw new Error(`"type" attribute is missing from panel "${missingTypeIndex}"`);
   }
 
-  const { state: extractedState, references: extractedReferences } =
+  const { references: extractedReferences, state: rawExtractedState } =
     deps.embeddablePersistableStateService.extract(state);
+  const extractedState = rawExtractedState as DashboardContainerStateWithType;
+
+  const extractedPanels = panelStatesToPanels(extractedState.panels, panels);
 
-  const extractedPanels = panelStatesToPanels(
-    (extractedState as DashboardContainerStateWithType).panels,
-    panels
-  );
+  const newAttributes = {
+    ...attributes,
+    panelsJSON: JSON.stringify(extractedPanels),
+  } as SavedObjectAttributes;
+
+  if (extractedState.controlGroupInput) {
+    newAttributes.controlGroupInput = {
+      ...(attributes.controlGroupInput as SavedObjectAttributes),
+      panelsJSON: JSON.stringify(extractedState.controlGroupInput.panels),
+    };
+  }
 
   return {
     references: [...references, ...extractedReferences],
-    attributes: {
-      ...attributes,
-      panelsJSON: JSON.stringify(extractedPanels),
-    },
+    attributes: newAttributes,
   };
 }
 
@@ -131,16 +162,25 @@ export function injectReferences(
 
   const { panels, state } = dashboardAttributesToState(attributes);
 
-  const injectedState = deps.embeddablePersistableStateService.inject(state, references);
-  const injectedPanels = panelStatesToPanels(
-    (injectedState as DashboardContainerStateWithType).panels,
-    panels
-  );
+  const injectedState = deps.embeddablePersistableStateService.inject(
+    state,
+    references
+  ) as DashboardContainerStateWithType;
+  const injectedPanels = panelStatesToPanels(injectedState.panels, panels);
 
-  return {
+  const newAttributes = {
     ...attributes,
     panelsJSON: JSON.stringify(injectedPanels),
-  };
+  } as SavedObjectAttributes;
+
+  if (injectedState.controlGroupInput) {
+    newAttributes.controlGroupInput = {
+      ...(attributes.controlGroupInput as SavedObjectAttributes),
+      panelsJSON: JSON.stringify(injectedState.controlGroupInput.panels),
+    };
+  }
+
+  return newAttributes;
 }
 
 function pre730ExtractReferences(

src/plugins/dashboard/common/types.ts

@@ -22,6 +22,7 @@ import {
 } from './bwc/types';
 
 import { GridData } from './embeddable/types';
+import { ControlGroupInput } from '../../presentation_util/common/controls/control_group/types';
 export type PanelId = string;
 export type SavedObjectId = string;
 
@@ -96,8 +97,22 @@ export type SavedDashboardPanel730ToLatest = Pick<
 
 // Making this interface because so much of the Container type from embeddable is tied up in public
 // Once that is all available from common, we should be able to move the dashboard_container type to our common as well
+
+export interface DashboardContainerControlGroupInput extends EmbeddableStateWithType {
+  panels: ControlGroupInput['panels'];
+  controlStyle: ControlGroupInput['controlStyle'];
+  id: string;
+}
+
+export interface RawControlGroupAttributes {
+  controlStyle: ControlGroupInput['controlStyle'];
+  panelsJSON: string;
+  id: string;
+}
+
 export interface DashboardContainerStateWithType extends EmbeddableStateWithType {
   panels: {
     [panelId: string]: DashboardPanelState<EmbeddableInput & { [k: string]: unknown }>;
   };
+  controlGroupInput?: DashboardContainerControlGroupInput;
 }

src/plugins/dashboard/public/application/actions/add_to_library_action.test.tsx

@@ -7,7 +7,7 @@
  */
 
 import { AddToLibraryAction } from '.';
-import { DashboardContainer } from '../embeddable';
+import { DashboardContainer } from '../embeddable/dashboard_container';
 import { getSampleDashboardInput } from '../test_helpers';
 
 import { CoreStart } from 'kibana/public';

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

@@ -6,7 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { DashboardContainer, DashboardPanelState } from '../embeddable';
+import { DashboardPanelState } from '../embeddable';
+import { DashboardContainer } from '../embeddable/dashboard_container';
 import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
 
 import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';

src/plugins/dashboard/public/application/actions/expand_panel_action.test.tsx

@@ -7,7 +7,7 @@
  */
 
 import { ExpandPanelAction } from './expand_panel_action';
-import { DashboardContainer } from '../embeddable';
+import { DashboardContainer } from '../embeddable/dashboard_container';
 import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
 
 import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';

src/plugins/dashboard/public/application/actions/export_csv_action.test.tsx

@@ -9,7 +9,7 @@
 import { CoreStart } from 'kibana/public';
 
 import { isErrorEmbeddable, IContainer, ErrorEmbeddable } from '../../services/embeddable';
-import { DashboardContainer } from '../../application/embeddable';
+import { DashboardContainer } from '../../application/embeddable/dashboard_container';
 import { getSampleDashboardInput, getSampleDashboardPanel } from '../../application/test_helpers';
 import {
   ContactCardEmbeddable,

src/plugins/dashboard/public/application/actions/library_notification_action.test.tsx

@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { DashboardContainer } from '../embeddable';
 import { getSampleDashboardInput } from '../test_helpers';
+import { DashboardContainer } from '../embeddable/dashboard_container';
 
 import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
 import { CoreStart } from 'kibana/public';

src/plugins/dashboard/public/application/actions/library_notification_popover.test.tsx

@@ -7,8 +7,9 @@
  */
 
 import React from 'react';
-import { DashboardContainer } from '..';
 import { mountWithIntl } from '@kbn/test/jest';
+
+import { DashboardContainer } from '../embeddable/dashboard_container';
 import { embeddablePluginMock } from '../../../../embeddable/public/mocks';
 import { getSampleDashboardInput } from '../test_helpers';
 import {

src/plugins/dashboard/public/application/actions/replace_panel_action.test.tsx

@@ -7,7 +7,7 @@
  */
 
 import { ReplacePanelAction } from './replace_panel_action';
-import { DashboardContainer } from '../embeddable';
+import { DashboardContainer } from '../embeddable/dashboard_container';
 import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
 
 import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';

src/plugins/dashboard/public/application/actions/unlink_from_library_action.test.tsx

@@ -17,8 +17,8 @@ import {
   SavedObjectEmbeddableInput,
 } from '../../services/embeddable';
 import { UnlinkFromLibraryAction } from '.';
-import { DashboardContainer } from '../embeddable';
 import { getSampleDashboardInput } from '../test_helpers';
+import { DashboardContainer } from '../embeddable/dashboard_container';
 import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
 
 import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';