Merge branch 'ro-task-partitioning' into assign-partitions-to-nodes

.github/CODEOWNERS

@@ -1724,6 +1724,10 @@ packages/react @elastic/appex-sharedux
 /x-pack/plugins/ml/common/openapi             @elastic/platform-docs
 /packages/core/saved-objects/docs/openapi     @elastic/platform-docs
 /plugins/data_views/docs/openapi              @elastic/platform-docs
+oas_docs/.spectral.yaml                       @elastic/platform-docs
+oas_docs/kibana.info.serverless.yaml          @elastic/platform-docs
+oas_docs/kibana.serverless.yaml               @elastic/platform-docs
+oas_docs/makefile                             @elastic/platform-docs
 
 # Plugin manifests
 /src/plugins/**/kibana.jsonc @elastic/kibana-core

examples/controls_example/public/react_controls/control_group/get_control_group_factory.tsx

@@ -8,7 +8,6 @@
 
 import React, { useEffect } from 'react';
 import { BehaviorSubject } from 'rxjs';
-
 import {
   ControlGroupChainingSystem,
   ControlWidth,
@@ -32,21 +31,20 @@ import {
   PublishesDataViews,
   PublishesFilters,
   PublishesTimeslice,
-  PublishingSubject,
   useStateFromPublishingSubject,
 } from '@kbn/presentation-publishing';
 
 import { EuiFlexGroup } from '@elastic/eui';
 import { ControlRenderer } from '../control_renderer';
-import { DefaultControlApi } from '../types';
 import { openEditControlGroupFlyout } from './open_edit_control_group_flyout';
-import { deserializeControlGroup, serializeControlGroup } from './serialization_utils';
+import { deserializeControlGroup } from './serialization_utils';
 import {
   ControlGroupApi,
   ControlGroupRuntimeState,
   ControlGroupSerializedState,
   ControlGroupUnsavedChanges,
 } from './types';
+import { initControlsManager } from './init_controls_manager';
 import { controlGroupFetch$, chaining$, controlFetch$ } from './control_fetch';
 
 export const getControlGroupEmbeddableFactory = (services: {
@@ -62,7 +60,7 @@ export const getControlGroupEmbeddableFactory = (services: {
     deserializeState: (state) => deserializeControlGroup(state),
     buildEmbeddable: async (initialState, buildApi, uuid, parentApi, setApi) => {
       const {
-        initialChildControlState: childControlState,
+        initialChildControlState,
         defaultControlGrow,
         defaultControlWidth,
         labelPosition,
@@ -71,12 +69,9 @@ export const getControlGroupEmbeddableFactory = (services: {
         ignoreParentSettings,
       } = initialState;
 
+      const controlsManager = initControlsManager(initialChildControlState);
       const autoApplySelections$ = new BehaviorSubject<boolean>(autoApplySelections);
       const timeslice$ = new BehaviorSubject<[number, number] | undefined>(undefined);
-      const children$ = new BehaviorSubject<{ [key: string]: DefaultControlApi }>({});
-      function getControlApi(controlUuid: string) {
-        return children$.value[controlUuid];
-      }
       const filters$ = new BehaviorSubject<Filter[] | undefined>([]);
       const dataViews = new BehaviorSubject<DataView[] | undefined>(undefined);
       const chainingSystem$ = new BehaviorSubject<ControlGroupChainingSystem>(chainingSystem);
@@ -108,19 +103,16 @@ export const getControlGroupEmbeddableFactory = (services: {
         undefined
       );
 
-      const controlsInOrder$ = new BehaviorSubject<Array<{ id: string; type: string }>>(
-        Object.keys(childControlState)
-          .map((key) => ({
-            id: key,
-            order: childControlState[key].order,
-            type: childControlState[key].type,
-          }))
-          .sort((a, b) => (a.order > b.order ? 1 : -1))
-      );
       const api = setApi({
+        ...controlsManager.api,
         controlFetch$: (controlUuid: string) =>
           controlFetch$(
-            chaining$(controlUuid, chainingSystem$, controlsInOrder$, getControlApi),
+            chaining$(
+              controlUuid,
+              chainingSystem$,
+              controlsManager.controlsInOrder$,
+              controlsManager.getControlApi
+            ),
             controlGroupFetch$(ignoreParentSettings$, parentApi ? parentApi : {})
           ),
         ignoreParentSettings$,
@@ -134,9 +126,6 @@ export const getControlGroupEmbeddableFactory = (services: {
           return {} as unknown as ControlGroupRuntimeState;
         },
         dataLoading: dataLoading$,
-        children$: children$ as PublishingSubject<{
-          [key: string]: unknown;
-        }>,
         onEdit: async () => {
           openEditControlGroupFlyout(
             api,
@@ -154,34 +143,18 @@ export const getControlGroupEmbeddableFactory = (services: {
           i18n.translate('controls.controlGroup.displayName', {
             defaultMessage: 'Controls',
           }),
-        getSerializedStateForChild: (childId) => {
-          return { rawState: childControlState[childId] };
-        },
         serializeState: () => {
-          return serializeControlGroup(
-            children$.getValue(),
-            controlsInOrder$.getValue().map(({ id }) => id),
-            {
-              labelPosition: labelPosition$.getValue(),
+          const { panelsJSON, references } = controlsManager.serializeControls();
+          return {
+            rawState: {
               chainingSystem: chainingSystem$.getValue(),
-              autoApplySelections: autoApplySelections$.getValue(),
-              ignoreParentSettings: ignoreParentSettings$.getValue(),
-            }
-          );
-        },
-        getPanelCount: () => {
-          return (Object.keys(children$.getValue()) ?? []).length;
-        },
-        addNewPanel: (panel) => {
-          // TODO: Add a new child control
-          return Promise.resolve(undefined);
-        },
-        removePanel: (panelId) => {
-          // TODO: Remove a child control
-        },
-        replacePanel: async (panelId, newPanel) => {
-          // TODO: Replace a child control
-          return Promise.resolve(panelId);
+              controlStyle: labelPosition$.getValue(), // Rename "labelPosition" to "controlStyle"
+              showApplySelections: !autoApplySelections$.getValue(),
+              ignoreParentSettingsJSON: JSON.stringify(ignoreParentSettings$.getValue()),
+              panelsJSON,
+            },
+            references,
+          };
         },
         grow,
         width,
@@ -238,7 +211,7 @@ export const getControlGroupEmbeddableFactory = (services: {
       return {
         api,
         Component: () => {
-          const controlsInOrder = useStateFromPublishingSubject(controlsInOrder$);
+          const controlsInOrder = useStateFromPublishingSubject(controlsManager.controlsInOrder$);
 
           useEffect(() => {
             return () => {
@@ -253,14 +226,11 @@ export const getControlGroupEmbeddableFactory = (services: {
               {controlsInOrder.map(({ id, type }) => (
                 <ControlRenderer
                   key={id}
-                  maybeId={id}
+                  uuid={id}
                   type={type}
                   getParentApi={() => api}
                   onApiAvailable={(controlApi) => {
-                    children$.next({
-                      ...children$.getValue(),
-                      [id]: controlApi,
-                    });
+                    controlsManager.setControlApi(id, controlApi);
                   }}
                 />
               ))}

examples/controls_example/public/react_controls/control_group/init_controls_manager.test.ts

@@ -0,0 +1,68 @@
+/*
+ * 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 { DefaultControlApi } from '../types';
+import { initControlsManager } from './init_controls_manager';
+
+jest.mock('uuid', () => ({
+  v4: jest.fn().mockReturnValue('delta'),
+}));
+
+describe('PresentationContainer api', () => {
+  test('addNewPanel should add control at end of controls', async () => {
+    const controlsManager = initControlsManager({
+      alpha: { type: 'whatever', order: 0 },
+      bravo: { type: 'whatever', order: 1 },
+      charlie: { type: 'whatever', order: 2 },
+    });
+    const addNewPanelPromise = controlsManager.api.addNewPanel({
+      panelType: 'whatever',
+      initialState: {},
+    });
+    controlsManager.setControlApi('delta', {} as unknown as DefaultControlApi);
+    await addNewPanelPromise;
+    expect(controlsManager.controlsInOrder$.value.map((element) => element.id)).toEqual([
+      'alpha',
+      'bravo',
+      'charlie',
+      'delta',
+    ]);
+  });
+
+  test('removePanel should remove control', () => {
+    const controlsManager = initControlsManager({
+      alpha: { type: 'whatever', order: 0 },
+      bravo: { type: 'whatever', order: 1 },
+      charlie: { type: 'whatever', order: 2 },
+    });
+    controlsManager.api.removePanel('bravo');
+    expect(controlsManager.controlsInOrder$.value.map((element) => element.id)).toEqual([
+      'alpha',
+      'charlie',
+    ]);
+  });
+
+  test('replacePanel should replace control', async () => {
+    const controlsManager = initControlsManager({
+      alpha: { type: 'whatever', order: 0 },
+      bravo: { type: 'whatever', order: 1 },
+      charlie: { type: 'whatever', order: 2 },
+    });
+    const replacePanelPromise = controlsManager.api.replacePanel('bravo', {
+      panelType: 'whatever',
+      initialState: {},
+    });
+    controlsManager.setControlApi('delta', {} as unknown as DefaultControlApi);
+    await replacePanelPromise;
+    expect(controlsManager.controlsInOrder$.value.map((element) => element.id)).toEqual([
+      'alpha',
+      'delta',
+      'charlie',
+    ]);
+  });
+});