[tmp] (testing PR to be closed)

.buildkite/scripts/lifecycle/post_command.sh

@@ -25,6 +25,9 @@ if [[ "$IS_TEST_EXECUTION_STEP" == "true" ]]; then
   buildkite-agent artifact upload 'test/**/screenshots/diff/*.png'
   buildkite-agent artifact upload 'test/**/screenshots/failure/*.png'
   buildkite-agent artifact upload 'test/**/screenshots/session/*.png'
+  buildkite-agent artifact upload 'src/platform/test/**/screenshots/diff/*.png'
+  buildkite-agent artifact upload 'src/platform/test/**/screenshots/failure/*.png'
+  buildkite-agent artifact upload 'src/platform/test/**/screenshots/session/*.png'
   buildkite-agent artifact upload 'src/platform/test/functional/failure_debug/html/*.html'
   buildkite-agent artifact upload 'x-pack/test/**/screenshots/diff/*.png'
   buildkite-agent artifact upload 'x-pack/test/**/screenshots/failure/*.png'

package.json

@@ -120,7 +120,7 @@
     "@elastic/apm-rum": "^5.17.0",
     "@elastic/apm-rum-core": "^5.23.0",
     "@elastic/apm-rum-react": "^2.0.6",
-    "@elastic/charts": "69.2.2",
+    "@elastic/charts": "70.0.1",
     "@elastic/datemath": "5.0.3",
     "@elastic/ebt": "^1.1.1",
     "@elastic/ecs": "^8.11.5",

src/platform/packages/shared/kbn-management/settings/setting_ids/index.ts

@@ -180,7 +180,6 @@ export const TIMELION_TARGET_BUCKETS_ID = 'timelion:target_buckets';
 
 // Visualization settings
 export const VISUALIZATION_HEATMAP_MAX_BUCKETS_ID = 'visualization:heatmap:maxBuckets';
-export const VISUALIZATION_USE_LEGACY_TIME_AXIS_ID = 'visualization:useLegacyTimeAxis';
 export const VISUALIZATION_LEGACY_GAUGE_CHARTS_LIBRARY_ID =
   'visualization:visualize:legacyGaugeChartsLibrary';
 export const VISUALIZATION_LEGACY_HEATMAP_CHARTS_LIBRARY_ID =

src/platform/plugins/private/kibana_usage_collection/server/collectors/management/schema.ts

@@ -62,10 +62,6 @@ export const stackManagementSchema: MakeSchemaFrom<UsageStats> = {
     type: 'long',
     _meta: { description: 'Non-default value of setting.' },
   },
-  'visualization:useLegacyTimeAxis': {
-    type: 'boolean',
-    _meta: { description: 'Non-default value of setting.' },
-  },
   'visualization:regionmap:showWarnings': {
     type: 'boolean',
     _meta: { description: 'Non-default value of setting.' },

src/platform/plugins/private/kibana_usage_collection/server/collectors/management/types.ts

@@ -51,7 +51,6 @@ export interface UsageStats {
   'observability:aiAssistantSimulatedFunctionCalling': boolean;
   'observability:aiAssistantSearchConnectorIndexPattern': string;
   'visualization:heatmap:maxBuckets': number;
-  'visualization:useLegacyTimeAxis': boolean;
   'visualization:regionmap:showWarnings': boolean;
   'visualization:tileMap:maxPrecision': number;
   'csv:separator': string;

src/platform/plugins/private/vis_types/xy/public/editor/components/options/metrics_axes/category_axis_panel.test.tsx

@@ -31,7 +31,7 @@ describe('CategoryAxisPanel component', () => {
       axis,
       onPositionChanged,
       setCategoryAxis,
-      useMultiLayerAxis: false,
+      disableAxisControls: false,
     };
   });
 
@@ -59,8 +59,8 @@ describe('CategoryAxisPanel component', () => {
     expect(onPositionChanged).toBeCalledWith(value);
   });
 
-  it('should disable label options with multilayer axis', () => {
-    const comp = shallow(<CategoryAxisPanel {...defaultProps} useMultiLayerAxis={true} />);
+  it('should disable label options with disableAxisControls prop', () => {
+    const comp = shallow(<CategoryAxisPanel {...defaultProps} disableAxisControls={true} />);
     const labelOptions = comp.find(LabelOptions).dive();
     const rotateLabelsOption = labelOptions.find({ paramName: 'rotate' });
     const filterLabelOption = labelOptions.find({ paramName: 'filter' });

src/platform/plugins/private/vis_types/xy/public/editor/components/options/metrics_axes/category_axis_panel.tsx

@@ -26,14 +26,14 @@ export interface CategoryAxisPanelProps {
   axis: CategoryAxis;
   onPositionChanged: (position: Position) => void;
   setCategoryAxis: (value: CategoryAxis) => void;
-  useMultiLayerAxis: boolean;
+  disableAxisControls: boolean;
 }
 
 function CategoryAxisPanel({
   axis,
   onPositionChanged,
   setCategoryAxis,
-  useMultiLayerAxis,
+  disableAxisControls,
 }: CategoryAxisPanelProps) {
   const setAxis = useCallback(
     <T extends keyof CategoryAxis>(paramName: T, value: CategoryAxis[T]) => {
@@ -102,7 +102,7 @@ function CategoryAxisPanel({
           axisLabels={axis.labels}
           axisFilterCheckboxName={`xAxisFilterLabelsCheckbox${axis.id}`}
           setAxisLabel={setAxisLabel}
-          disableSingleLayerAxisControls={useMultiLayerAxis}
+          disableAxisControls={disableAxisControls}
         />
       )}
     </EuiPanel>

src/platform/plugins/private/vis_types/xy/public/editor/components/options/metrics_axes/index.tsx

@@ -14,8 +14,6 @@ import { EuiSpacer } from '@elastic/eui';
 import { Position } from '@elastic/charts';
 
 import { BUCKET_TYPES, IAggConfig } from '@kbn/data-plugin/public';
-import { LEGACY_TIME_AXIS } from '@kbn/charts-plugin/common';
-import { getUISettings } from '../../../../services';
 
 import { VisParams, ValueAxis, SeriesParam, CategoryAxis } from '../../../../types';
 import { ValidationVisOptionsProps } from '../../common';
@@ -298,12 +296,10 @@ function MetricsAxisOptions(props: ValidationVisOptionsProps<VisParams>) {
   const xAxisIsHorizontal =
     stateParams.categoryAxes[0].position === Position.Bottom ||
     stateParams.categoryAxes[0].position === Position.Top;
-  const useLegacyTimeAxis = getUISettings().get(LEGACY_TIME_AXIS, false);
   const linearOrStackedBars = stateParams.seriesParams.every(
     ({ mode, type }) => type !== 'histogram' || (type === 'histogram' && mode === 'stacked')
   );
-  const useMultiLayerAxis =
-    xAxisIsHorizontal && isTimeViz && !useLegacyTimeAxis && linearOrStackedBars;
+  const disableAxisControls = xAxisIsHorizontal && isTimeViz && linearOrStackedBars;
 
   return isTabSelected ? (
     <>
@@ -329,7 +325,7 @@ function MetricsAxisOptions(props: ValidationVisOptionsProps<VisParams>) {
         axis={stateParams.categoryAxes[0]}
         onPositionChanged={onCategoryAxisPositionChanged}
         setCategoryAxis={setCategoryAxis}
-        useMultiLayerAxis={useMultiLayerAxis}
+        disableAxisControls={disableAxisControls}
       />
     </>
   ) : null;

src/platform/plugins/private/vis_types/xy/public/editor/components/options/metrics_axes/label_options.tsx

@@ -24,14 +24,14 @@ export interface LabelOptionsProps {
   axisLabels: Labels;
   axisFilterCheckboxName: string;
   setAxisLabel: SetAxisLabel;
-  disableSingleLayerAxisControls?: boolean;
+  disableAxisControls?: boolean;
 }
 
 function LabelOptions({
   axisLabels,
   axisFilterCheckboxName,
   setAxisLabel,
-  disableSingleLayerAxisControls,
+  disableAxisControls,
 }: LabelOptionsProps) {
   const setAxisLabelRotate = useCallback(
     (paramName: 'rotate', value: Labels['rotate']) => {
@@ -42,16 +42,15 @@ function LabelOptions({
   );
 
   const rotateOptions = useMemo(getRotateOptions, []);
-  const multilayerAxisTooltipText = disableSingleLayerAxisControls
+  const axisTooltipText = disableAxisControls
     ? i18n.translate(
         'visTypeXy.controls.pointSeries.categoryAxis.axisLabelsOptionsMultilayer.disabled',
         {
           defaultMessage: 'This option can be configured only with non-time-based axes',
         }
       )
     : undefined;
-  const axisLabelControlDisabled = !axisLabels.show || disableSingleLayerAxisControls;
-
+  const axisLabelControlDisabled = !axisLabels.show || disableAxisControls;
   return (
     <>
       <EuiSpacer size="m" />
@@ -82,14 +81,14 @@ function LabelOptions({
         paramName="filter"
         value={axisLabels.filter}
         setValue={setAxisLabel}
-        tooltip={multilayerAxisTooltipText}
+        tooltip={axisTooltipText}
       />
 
       <EuiSpacer size="m" />
 
       <EuiFlexGroup gutterSize="s">
         <EuiFlexItem>
-          <EuiToolTip content={multilayerAxisTooltipText} delay="long" position="right">
+          <EuiToolTip content={axisTooltipText} delay="long" position="right">
             <SelectOption
               disabled={axisLabelControlDisabled}
               label={i18n.translate('visTypeXy.controls.pointSeries.categoryAxis.alignLabel', {
@@ -104,7 +103,7 @@ function LabelOptions({
           </EuiToolTip>
         </EuiFlexItem>
         <EuiFlexItem>
-          <EuiToolTip content={multilayerAxisTooltipText} delay="long" position="right">
+          <EuiToolTip content={axisTooltipText} delay="long" position="right">
             <TruncateLabelsOption
               disabled={axisLabelControlDisabled}
               value={axisLabels.truncate}

src/platform/plugins/shared/chart_expressions/expression_xy/public/components/xy_chart.test.tsx

@@ -147,7 +147,6 @@ describe('XYChart component', () => {
       syncColors: false,
       syncTooltips: false,
       syncCursor: true,
-      useLegacyTimeAxis: false,
       eventAnnotationService: eventAnnotationServiceMock,
       renderComplete: jest.fn(),
       timeFormat: 'MMM D, YYYY @ HH:mm:ss.SSS',
@@ -324,7 +323,8 @@ describe('XYChart component', () => {
 
         const axisStyle = instance.find(Axis).first().prop('timeAxisLayerCount');
 
-        expect(axisStyle).toBe(0);
+        // This prop is no longer set, since v70 Elastic Charts takes care of this internally.
+        expect(axisStyle).toBe(undefined);
       });
       test('it should enable the new time axis for a line time layer when isHistogram is set to true', () => {
         const timeLayerArgs = createArgsWithLayers([defaultTimeLayer]);
@@ -344,7 +344,8 @@ describe('XYChart component', () => {
 
         const axisStyle = instance.find(Axis).first().prop('timeAxisLayerCount');
 
-        expect(axisStyle).toBe(2);
+        // This prop is no longer set, since v70 Elastic Charts takes care of this internally.
+        expect(axisStyle).toBe(undefined);
       });
       test('it should disable the new time axis for a vertical bar with break down dimension', () => {
         const timeLayer: DataLayerConfig = {
@@ -368,7 +369,8 @@ describe('XYChart component', () => {
 
         const axisStyle = instance.find(Axis).first().prop('timeAxisLayerCount');
 
-        expect(axisStyle).toBe(0);
+        // This prop is no longer set, since v70 Elastic Charts takes care of this internally.
+        expect(axisStyle).toBe(undefined);
       });
 
       test('it should enable the new time axis for a stacked vertical bar with break down dimension', () => {
@@ -394,7 +396,8 @@ describe('XYChart component', () => {
 
         const axisStyle = instance.find(Axis).first().prop('timeAxisLayerCount');
 
-        expect(axisStyle).toBe(2);
+        // This prop is no longer set, since v70 Elastic Charts takes care of this internally.
+        expect(axisStyle).toBe(undefined);
       });
     });
     describe('endzones', () => {