Merge branch 'main' into limit-rows-find-category-api

elastic · Jun 20, 2023 · f8ecc81 · f8ecc81
2 parents d54736d + ca0b739
commit f8ecc81
Show file tree

Hide file tree

Showing 49 changed files with 988 additions and 667 deletions.
diff --git a/packages/kbn-check-mappings-update-cli/current_mappings.json b/packages/kbn-check-mappings-update-cli/current_mappings.json
@@ -1898,9 +1898,6 @@
   "fleet-uninstall-tokens": {
     "dynamic": false,
     "properties": {
-      "created_at": {
-        "type": "date"
-      },
       "policy_id": {
         "type": "keyword"
       },

diff --git a/...e/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts b/...e/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts
@@ -96,7 +96,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "fleet-message-signing-keys": "93421f43fed2526b59092a4e3c65d64bc2266c0f",
         "fleet-preconfiguration-deletion-record": "c52ea1e13c919afe8a5e8e3adbb7080980ecc08e",
         "fleet-proxy": "6cb688f0d2dd856400c1dbc998b28704ff70363d",
-        "fleet-uninstall-tokens": "d25a8aedb522d2b839ab0950160777528122070f",
+        "fleet-uninstall-tokens": "ed8aa37e3cdd69e4360709e64944bb81cae0c025",
         "graph-workspace": "5cc6bb1455b078fd848c37324672163f09b5e376",
         "guided-onboarding-guide-state": "d338972ed887ac480c09a1a7fbf582d6a3827c91",
         "guided-onboarding-plugin-state": "bc109e5ef46ca594fdc179eda15f3095ca0a37a4",

diff --git a/src/plugins/chart_expressions/common/index.ts b/src/plugins/chart_expressions/common/index.ts
@@ -6,5 +6,10 @@
  * Side Public License, v 1.
  */
 
-export { extractContainerType, extractVisualizationType, getOverridesFor } from './utils';
+export {
+  extractContainerType,
+  extractVisualizationType,
+  getOverridesFor,
+  isOnAggBasedEditor,
+} from './utils';
 export type { Simplify, MakeOverridesSerializable } from './types';
diff --git a/src/plugins/chart_expressions/common/utils.test.ts b/src/plugins/chart_expressions/common/utils.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { getOverridesFor } from './utils';
+import { getOverridesFor, isOnAggBasedEditor } from './utils';
 
 describe('Overrides utilities', () => {
   describe('getOverridesFor', () => {
@@ -31,3 +31,77 @@ describe('Overrides utilities', () => {
     });
   });
 });
+
+describe('isOnAggBasedEditor', () => {
+  it('should return false if is on dashboard', () => {
+    const context = {
+      type: 'dashboard',
+      description: 'test',
+      child: {
+        type: 'lens',
+        name: 'lnsPie',
+        id: 'd8bb29a7-13a4-43fa-a162-d7705050bb6c',
+        description: 'test',
+        url: '/gdu/app/lens#/edit_by_value',
+      },
+    };
+    expect(isOnAggBasedEditor(context)).toEqual(false);
+  });
+
+  it('should return false if is on editor but lens', () => {
+    const context = {
+      type: 'application',
+      description: 'test',
+      child: {
+        type: 'lens',
+        name: 'lnsPie',
+        id: 'd8bb29a7-13a4-43fa-a162-d7705050bb6c',
+        description: 'test',
+        url: '/gdu/app/lens#/edit_by_value',
+      },
+    };
+    expect(isOnAggBasedEditor(context)).toEqual(false);
+  });
+
+  it('should return false if is on dashboard but agg_based', () => {
+    const context = {
+      type: 'dashboard',
+      description: 'test',
+      child: {
+        type: 'agg_based',
+        name: 'pie',
+        id: 'd8bb29a7-13a4-43fa-a162-d7705050bb6c',
+        description: 'test',
+        url: '',
+      },
+    };
+    expect(isOnAggBasedEditor(context)).toEqual(false);
+  });
+
+  it('should return true if is on editor but agg_based', () => {
+    const context = {
+      type: 'application',
+      description: 'test',
+      child: {
+        type: 'agg_based',
+        name: 'pie',
+        id: 'd8bb29a7-13a4-43fa-a162-d7705050bb6c',
+        description: 'test',
+        url: '',
+      },
+    };
+    expect(isOnAggBasedEditor(context)).toEqual(true);
+  });
+
+  it('should return false if child is missing', () => {
+    const context = {
+      type: 'application',
+      description: 'test',
+    };
+    expect(isOnAggBasedEditor(context)).toEqual(false);
+  });
+
+  it('should return false if context is missing', () => {
+    expect(isOnAggBasedEditor()).toEqual(false);
+  });
+});
diff --git a/src/plugins/chart_expressions/common/utils.ts b/src/plugins/chart_expressions/common/utils.ts
@@ -20,6 +20,31 @@ export const extractContainerType = (context?: KibanaExecutionContext): string |
   }
 };
 
+/* Function to identify if the pie is rendered inside the aggBased editor
+ Context comes with this format
+  {
+   type: 'dashboard', // application for lens, agg based charts
+   description: 'test',
+   child: {
+     type: 'lens', // agg_based for legacy editor
+     name: 'pie',
+     id: 'id',
+     description: 'test',
+     url: '',
+   },
+ }; */
+export const isOnAggBasedEditor = (context?: KibanaExecutionContext): boolean => {
+  if (context) {
+    return Boolean(
+      context.type &&
+        context.type === 'application' &&
+        context.child &&
+        context.child.type === 'agg_based'
+    );
+  }
+  return false;
+};
+
 export const extractVisualizationType = (context?: KibanaExecutionContext): string | undefined => {
   if (context) {
     const recursiveGet = (item: KibanaExecutionContext): KibanaExecutionContext | undefined => {

diff --git a/...t_expressions/expression_partition_vis/public/components/partition_vis_component.test.tsx b/...t_expressions/expression_partition_vis/public/components/partition_vis_component.test.tsx
@@ -83,6 +83,7 @@ describe('PartitionVisComponent', function () {
         data: dataPluginMock.createStartContract(),
         fieldFormats: fieldFormatsServiceMock.createStartContract(),
       },
+      hasOpenedOnAggBasedEditor: false,
     };
   });
 

diff --git a/.../chart_expressions/expression_partition_vis/public/components/partition_vis_component.tsx b/.../chart_expressions/expression_partition_vis/public/components/partition_vis_component.tsx
@@ -93,6 +93,7 @@ export type PartitionVisComponentProps = Omit<
   palettesRegistry: PaletteRegistry;
   services: Pick<StartDeps, 'data' | 'fieldFormats'>;
   columnCellValueActions: ColumnCellValueActions;
+  hasOpenedOnAggBasedEditor: boolean;
 };
 
 const PartitionVisComponent = (props: PartitionVisComponentProps) => {
@@ -105,6 +106,7 @@ const PartitionVisComponent = (props: PartitionVisComponentProps) => {
     syncColors,
     interactive,
     overrides,
+    hasOpenedOnAggBasedEditor,
   } = props;
   const visParams = useMemo(() => filterOutConfig(visType, preVisParams), [preVisParams, visType]);
   const chartTheme = props.chartsThemeService.useChartsTheme();
@@ -148,20 +150,22 @@ const PartitionVisComponent = (props: PartitionVisComponentProps) => {
   const [showLegend, setShowLegend] = useState<boolean>(() => showLegendDefault());
 
   const showToggleLegendElement = props.uiState !== undefined;
-
+  const [chartIsLoaded, setChartIsLoaded] = useState<boolean>(false);
   const [containerDimensions, setContainerDimensions] = useState<
     undefined | PieContainerDimensions
   >();
 
   const parentRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
-    if (parentRef && parentRef.current) {
+    // chart should be loaded to compute the dimensions
+    // otherwise the height is set to 0
+    if (parentRef && parentRef.current && chartIsLoaded) {
       const parentHeight = parentRef.current!.getBoundingClientRect().height;
       const parentWidth = parentRef.current!.getBoundingClientRect().width;
       setContainerDimensions({ width: parentWidth, height: parentHeight });
     }
-  }, [parentRef]);
+  }, [chartIsLoaded, parentRef]);
 
   useEffect(() => {
     const legendShow = showLegendDefault();
@@ -172,6 +176,7 @@ const PartitionVisComponent = (props: PartitionVisComponentProps) => {
     (isRendered: boolean = true) => {
       if (isRendered) {
         props.renderComplete();
+        setChartIsLoaded(true);
       }
     },
     [props]
@@ -363,8 +368,16 @@ const PartitionVisComponent = (props: PartitionVisComponentProps) => {
   ) as Partial<SettingsProps>;
 
   const themeOverrides = useMemo(
-    () => getPartitionTheme(visType, visParams, chartTheme, containerDimensions, rescaleFactor),
-    [visType, visParams, chartTheme, containerDimensions, rescaleFactor]
+    () =>
+      getPartitionTheme(
+        visType,
+        visParams,
+        chartTheme,
+        containerDimensions,
+        rescaleFactor,
+        hasOpenedOnAggBasedEditor
+      ),
+    [visType, visParams, chartTheme, containerDimensions, rescaleFactor, hasOpenedOnAggBasedEditor]
   );
 
   const fixedViewPort = document.getElementById('app-fixed-viewport');

diff --git a/...pressions/expression_partition_vis/public/expression_renderers/partition_vis_renderer.tsx b/...pressions/expression_partition_vis/public/expression_renderers/partition_vis_renderer.tsx
@@ -21,7 +21,11 @@ import { withSuspense } from '@kbn/presentation-util-plugin/public';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { getColumnByAccessor } from '@kbn/visualizations-plugin/common/utils';
-import { extractContainerType, extractVisualizationType } from '@kbn/chart-expressions-common';
+import {
+  extractContainerType,
+  extractVisualizationType,
+  isOnAggBasedEditor,
+} from '@kbn/chart-expressions-common';
 import { VisTypePieDependencies } from '../plugin';
 import { PARTITION_VIS_RENDERER_NAME } from '../../common/constants';
 import { CellValueAction, GetCompatibleCellValueActions } from '../types';
@@ -110,6 +114,8 @@ export const getPartitionVisRenderer: (
       plugins.charts.palettes.getPalettes(),
     ]);
 
+    const hasOpenedOnAggBasedEditor = isOnAggBasedEditor(handlers.getExecutionContext());
+
     render(
       <I18nProvider>
         <KibanaThemeProvider theme$={core.theme.theme$}>
@@ -128,6 +134,7 @@ export const getPartitionVisRenderer: (
               syncColors={syncColors}
               columnCellValueActions={columnCellValueActions}
               overrides={overrides}
+              hasOpenedOnAggBasedEditor={hasOpenedOnAggBasedEditor}
             />
           </div>
         </KibanaThemeProvider>

diff --git a/...ugins/chart_expressions/expression_partition_vis/public/utils/get_partition_theme.test.ts b/...ugins/chart_expressions/expression_partition_vis/public/utils/get_partition_theme.test.ts
@@ -144,9 +144,16 @@ const runPieDonutWaffleTestSuites = (chartType: ChartTypes, visParams: Partition
     });
   });
 
-  it('should return adjusted padding settings if dimensions are specified', () => {
+  it('should return adjusted padding settings if dimensions are specified and is on aggBased editor', () => {
     const specifiedDimensions = { width: 2000, height: 2000 };
-    const theme = getPartitionTheme(chartType, visParams, chartTheme, specifiedDimensions);
+    const theme = getPartitionTheme(
+      chartType,
+      visParams,
+      chartTheme,
+      specifiedDimensions,
+      undefined,
+      true
+    );
 
     expect(theme).toEqual({
       ...getStaticThemeOptions(chartTheme, visParams),
@@ -233,7 +240,6 @@ const runPieDonutWaffleTestSuites = (chartType: ChartTypes, visParams: Partition
 
       expect(theme).toEqual({
         ...getStaticThemeOptions(chartTheme, visParams),
-        chartPaddings: { top: 500, bottom: 500, left: 500, right: 500 },
         partition: {
           ...getStaticThemePartition(chartTheme, visParams),
           outerSizeRatio: rescaleFactor,
@@ -263,7 +269,6 @@ const runPieDonutWaffleTestSuites = (chartType: ChartTypes, visParams: Partition
 
       expect(theme).toEqual({
         ...getStaticThemeOptions(chartTheme, vParams),
-        chartPaddings: { top: 500, bottom: 500, left: 500, right: 500 },
         partition: {
           ...getStaticThemePartition(chartTheme, vParams),
           outerSizeRatio: 0.5,
@@ -285,7 +290,6 @@ const runPieDonutWaffleTestSuites = (chartType: ChartTypes, visParams: Partition
 
       expect(theme).toEqual({
         ...getStaticThemeOptions(chartTheme, vParams),
-        chartPaddings: { top: 500, bottom: 500, left: 500, right: 500 },
         partition: {
           ...getStaticThemePartition(chartTheme, vParams),
           linkLabel: linkLabelWithEnoughSpace(vParams),
@@ -420,7 +424,14 @@ const runTreemapMosaicTestSuites = (chartType: ChartTypes, visParams: PartitionV
 
   it('should return fullfilled padding settings if dimensions are specified', () => {
     const specifiedDimensions = { width: 2000, height: 2000 };
-    const theme = getPartitionTheme(chartType, visParams, chartTheme, specifiedDimensions);
+    const theme = getPartitionTheme(
+      chartType,
+      visParams,
+      chartTheme,
+      specifiedDimensions,
+      undefined,
+      true
+    );
 
     expect(theme).toEqual({
       ...getStaticThemeOptions(chartTheme, visParams),

diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_partition_theme.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_partition_theme.ts
@@ -26,7 +26,8 @@ type GetThemeFn = (
   visParams: PartitionVisParams,
   chartTheme: RecursivePartial<Theme>,
   dimensions?: PieContainerDimensions,
-  rescaleFactor?: number
+  rescaleFactor?: number,
+  hasOpenedOnAggBasedEditor?: boolean
 ) => PartialTheme;
 
 type GetPieDonutWaffleThemeFn = (
@@ -118,12 +119,13 @@ export const getPartitionTheme: GetThemeFn = (
   visParams,
   chartTheme,
   dimensions,
-  rescaleFactor = 1
+  rescaleFactor = 1,
+  hasOpenedOnAggBasedEditor
 ) => {
   // On small multiples we want the labels to only appear inside
   const isSplitChart = Boolean(visParams.dimensions.splitColumn || visParams.dimensions.splitRow);
   const paddingProps: PartialTheme | null =
-    dimensions && !isSplitChart
+    dimensions && !isSplitChart && hasOpenedOnAggBasedEditor
       ? {
           chartPaddings: {
             top: ((1 - Math.min(1, MAX_SIZE / dimensions?.height)) / 2) * dimensions?.height,
-Original file line number
+Diff line change
@@ Expand Up / @@ -83,6 +83,7 @@ describe('PartitionVisComponent', function () { @@
             data: dataPluginMock.createStartContract(),
             fieldFormats: fieldFormatsServiceMock.createStartContract(),
           },
+          hasOpenedOnAggBasedEditor: false,
         };
       });
@@ Expand Down @@