Merge branch 'main' into move-tutorial-assets

Signed-off-by: Miki <miki@amazon.com>

CHANGELOG.md

@@ -69,6 +69,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Migrate from legacy elasticsearch client to opensearch-js client in `osd-opensearch-archiver` package([#4142](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4142))
 - Replace the use of `bluebird` in `saved_objects` plugin ([#4026](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4026))
 - Relocate tutorials imagery into `src/plugins/home/public/assets/tutorials/logos` ([#4382](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4382))
+- [VisBuilder] Use OUI icon ([#4446](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4446))
 - [Vis Colors] Replace color maps with OUI color palettes ([#4293](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4293))
 - [Vis Colors] [Maps] Replace hardcoded color to OUI color in `maps_legacy` plugin ([#4294](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4294))
 - [Vis Colors] [TSVB] Update default color in `vis_type_timeseries` to use `ouiPaletteColorBlind()[0]`([#4363](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4363))

src/plugins/vis_builder/public/embeddable/vis_builder_embeddable_factory.tsx

@@ -26,7 +26,6 @@ import {
  VisBuilderOutput,
  VISBUILDER_EMBEDDABLE,
 } from './vis_builder_embeddable';
-import visBuilderIcon from '../assets/vis_builder_icon.svg';
 import { getStateFromSavedObject } from '../saved_visualizations/transforms';
 import {
  getHttp,
@@ -55,7 +54,7 @@ export class VisBuilderEmbeddableFactory
  name: PLUGIN_NAME,
  includeFields: ['visualizationState'],
  type: VISBUILDER_SAVED_OBJECT,
- getIconForSavedObject: () => visBuilderIcon,
+ getIconForSavedObject: () => 'visBuilder',
  };
 
  // TODO: Would it be better to explicitly declare start service dependencies?

src/plugins/vis_builder/public/plugin.ts

@@ -24,8 +24,6 @@ import {
  VisBuilderStart,
 } from './types';
 import { VisBuilderEmbeddableFactory, VISBUILDER_EMBEDDABLE } from './embeddable';
-import visBuilderIconSecondaryFill from './assets/vis_builder_icon_secondary_fill.svg';
-import visBuilderIcon from './assets/vis_builder_icon.svg';
 import {
  EDIT_PATH,
  PLUGIN_ID,
@@ -189,7 +187,7 @@ export class VisBuilderPlugin
  description: i18n.translate('visBuilder.visPicker.description', {
  defaultMessage: 'Create visualizations using the new VisBuilder',
  }),
- icon: visBuilderIconSecondaryFill,
+ icon: 'visBuilder',
  stage: 'experimental',
  aliasApp: PLUGIN_ID,
  aliasPath: '#/',
@@ -200,7 +198,7 @@ export class VisBuilderPlugin
  description: attributes?.description,
  editApp: PLUGIN_ID,
  editUrl: `${EDIT_PATH}/${encodeURIComponent(id)}`,
- icon: visBuilderIcon,
+ icon: 'visBuilder',
  id,
  savedObjectType: VISBUILDER_SAVED_OBJECT,
  stage: 'experimental',

test/functional/apps/visualize/_area_chart.js

@@ -521,13 +521,15 @@ export default function ({ getService, getPageObjects }) {
 
  it('should show error when calendar interval invalid', async () => {
  await PageObjects.visEditor.setInterval('14d', { type: 'custom' });
- const intervalErrorMessage = await find.byCssSelector(
- '[data-test-subj="visEditorInterval"] + .euiFormErrorText'
- );
+ const intervalErrorMessageSelector =
+ '[data-test-subj="visEditorInterval"] + .euiFormErrorText';
+
+ let intervalErrorMessage = await find.byCssSelector(intervalErrorMessageSelector);
  let errorMessage = await intervalErrorMessage.getVisibleText();
  expect(errorMessage).to.be('Invalid calendar interval: 2w, value must be 1');
 
  await PageObjects.visEditor.setInterval('3w', { type: 'custom' });
+ intervalErrorMessage = await find.byCssSelector(intervalErrorMessageSelector);
  errorMessage = await intervalErrorMessage.getVisibleText();
  expect(errorMessage).to.be('Invalid calendar interval: 3w, value must be 1');
  });