Skip to content

Commit

Permalink
Rename wizard on save modal and visualization table
Browse files Browse the repository at this point in the history
Change the wizard reference in save modal title, toggle and visualization table

Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>
  • Loading branch information
abbyhu2000 committed Oct 21, 2022
1 parent 74fd39f commit 304dc8c
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 10 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
* [Multi DataSource] Address UX comments on Data source list and create page ([#2625](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2625))
* [Vis Builder] Rename wizard to visBuilder in i18n id and formatted message id ([#2635](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2635))
* [Vis Builder] Rename wizard to visBuilder in class name, type name and function name ([#2639](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2639))
* [Vis Builder] Rename wizard on save modal and visualization table ([#2645](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2645))

### 🐛 Bug Fixes
* [Vis Builder] Fixes auto bounds for timeseries bar chart visualization ([2401](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2401))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import {
EuiSwitch,
EuiSwitchEvent,
EuiTextArea,
EuiBadge,
} from '@elastic/eui';
import { FormattedMessage } from '@osd/i18n/react';
import React from 'react';
Expand Down Expand Up @@ -111,6 +112,11 @@ export class SavedObjectSaveModal extends React.Component<Props, SaveModalState>
defaultMessage="Save {objectType}"
values={{ objectType: this.props.objectType }}
/>
{this.props.objectType === 'Visualization (VisBuilder)' ? (
<EuiBadge color="primary">{'Experimental'}</EuiBadge>
) : (
<></>
)}
</EuiModalHeaderTitle>
</EuiModalHeader>

Expand Down Expand Up @@ -323,11 +329,18 @@ export class SavedObjectSaveModal extends React.Component<Props, SaveModalState>
checked={this.state.copyOnSave}
onChange={this.onCopyOnSaveChange}
label={
<FormattedMessage
id="savedObjects.saveModal.saveAsNewLabel"
defaultMessage="Save as new {objectType}"
values={{ objectType: this.props.objectType }}
/>
<div>
<FormattedMessage
id="savedObjects.saveModal.saveAsNewLabel"
defaultMessage="Save as new {objectType}"
values={{ objectType: this.props.objectType }}
/>
{this.props.objectType === 'Visualization (VisBuilder)' ? (
<EuiBadge color="primary">{'Experimental'}</EuiBadge>
) : (
<></>
)}
</div>
}
/>
<EuiSpacer />
Expand Down
1 change: 1 addition & 0 deletions src/plugins/vis_builder/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

export const PLUGIN_ID = 'wizard';
export const PLUGIN_NAME = 'Wizard';
export const VIS_BUILDER_TYPE = 'Visualization (VisBuilder)';
export const VISUALIZE_ID = 'visualize';
export const EDIT_PATH = '/edit';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import {
import { VisBuilderServices } from '../..';
import { VisBuilderVisSavedObject } from '../../types';
import { AppDispatch } from './state_management';
import { EDIT_PATH } from '../../../common';
import { EDIT_PATH, VIS_BUILDER_TYPE } from '../../../common';
import { setEditorState } from './state_management/metadata_slice';
export interface TopNavConfigParams {
visualizationIdFromUrl: string;
Expand Down Expand Up @@ -95,7 +95,7 @@ export const getTopNavConfig = (
dispatch,
services
)}
objectType={'wizard'}
objectType={VIS_BUILDER_TYPE}
onClose={() => {}}
originatingApp={originatingApp}
getAppNameFromId={stateTransfer.getAppNameFromId}
Expand Down
10 changes: 8 additions & 2 deletions src/plugins/vis_builder/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ import {
import { VisBuilderEmbeddableFactoryDefinition, VISBUILDER_EMBEDDABLE } from './embeddable';
import visBuilderIconSecondaryFill from './assets/wizard_icon_secondary_fill.svg';
import visBuilderIcon from './assets/wizard_icon.svg';
import { EDIT_PATH, PLUGIN_ID, PLUGIN_NAME, VISBUILDER_SAVED_OBJECT } from '../common';
import {
EDIT_PATH,
PLUGIN_ID,
PLUGIN_NAME,
VISBUILDER_SAVED_OBJECT,
VIS_BUILDER_TYPE,
} from '../common';
import { TypeService } from './services/type_service';
import { getPreloadedStore } from './application/utils/state_management';
import {
Expand Down Expand Up @@ -134,7 +140,7 @@ export class VisBuilderPlugin
savedObjectType: VISBUILDER_SAVED_OBJECT,
stage: 'experimental',
title: attributes?.title,
typeTitle: PLUGIN_NAME,
typeTitle: VIS_BUILDER_TYPE,
}),
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,10 @@ const getBadge = (item: VisualizationListItem) => {
return (
<EuiBetaBadge
className="visListingTable__experimentalIcon"
label="E"
label="Lab"
size="s"
color="subdued"
iconType={'beaker'}
title={i18n.translate('visualize.listing.experimentalTitle', {
defaultMessage: 'Experimental',
})}
Expand Down

0 comments on commit 304dc8c

Please sign in to comment.