Save visualization on save modal, VisBuilder for chart type

Signed-off-by: abbyhu2000 <[email protected]>
opensearch-project · Oct 26, 2022 · 83eeb9f · 83eeb9f
1 parent 227388f
commit 83eeb9f
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 44 deletions.
diff --git a/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.scss b/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.scss
@@ -1,13 +1,3 @@
 .osdSavedObjectSaveModal {
   width: $euiSizeXXL * 10;
 }
-
-.osdSavedObjectSaveModalVisBuilder {
-  color: $euiTextSubduedColor;
-  font-size: $euiFontSizeM;
-}
-
-.osdSavedObjectSaveModalBadge {
-  margin-left: $euiSizeS;
-  vertical-align: text-bottom;
-}
diff --git a/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.tsx b/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.tsx
@@ -45,8 +45,6 @@ import {
   EuiSwitch,
   EuiSwitchEvent,
   EuiTextArea,
-  EuiBadge,
-  EuiBetaBadge,
 } from '@elastic/eui';
 import { FormattedMessage } from '@osd/i18n/react';
 import React from 'react';
@@ -72,7 +70,6 @@ interface Props {
   options?: React.ReactNode | ((state: SaveModalState) => React.ReactNode);
   description?: string;
   showDescription: boolean;
-  isExperimental?: boolean;
 }
 
 export interface SaveModalState {
@@ -114,7 +111,6 @@ export class SavedObjectSaveModal extends React.Component<Props, SaveModalState>
               defaultMessage="Save {objectType}"
               values={{ objectType: this.props.objectType }}
             />
-            {this.renderExperimentalBadge()}
           </EuiModalHeaderTitle>
         </EuiModalHeader>
 
@@ -171,28 +167,6 @@ export class SavedObjectSaveModal extends React.Component<Props, SaveModalState>
     );
   }
 
-  private renderExperimentalBadge = () => {
-    if (!this.props.isExperimental) {
-      return;
-    }
-
-    return (
-      <EuiModalHeaderTitle className="osdSavedObjectSaveModalVisBuilder">
-        <FormattedMessage
-          id="savedObjects.saveModal.saveSubTitle"
-          defaultMessage="Visualization Builder"
-        />
-        <EuiBetaBadge
-          label="Lab"
-          iconType="beaker"
-          color="subdued"
-          size="s"
-          className="osdSavedObjectSaveModalBadge"
-        />
-      </EuiModalHeaderTitle>
-    );
-  };
-
   private renderViewDescription = () => {
     if (!this.props.showDescription) {
       return;

diff --git a/src/plugins/saved_objects/public/save_modal/saved_object_save_modal_origin.tsx b/src/plugins/saved_objects/public/save_modal/saved_object_save_modal_origin.tsx
@@ -50,7 +50,6 @@ interface OriginSaveModalProps {
   objectType: string;
   onClose: () => void;
   onSave: (props: OnSaveProps & { returnToOrigin: boolean }) => void;
-  isExperimental?: boolean;
 }
 
 export function SavedObjectSaveModalOrigin(props: OriginSaveModalProps) {
@@ -126,7 +125,6 @@ export function SavedObjectSaveModalOrigin(props: OriginSaveModalProps) {
       options={getReturnToOriginSwitch}
       description={documentInfo.description}
       showDescription={true}
-      isExperimental={props.isExperimental}
     />
   );
 }
diff --git a/src/plugins/vis_builder/common/index.ts b/src/plugins/vis_builder/common/index.ts
@@ -6,9 +6,9 @@
 export const PLUGIN_ID = 'wizard';
 export const PLUGIN_NAME = 'Wizard';
 export const VISUALIZE_ID = 'visualize';
-export const VIS_BUILDER_TYPE_SHORTHAND = 'VisBuilder';
 export const EDIT_PATH = '/edit';
 export const VIS_BUILDER_STATE = 'experimental';
+export const VIS_BUILDER_CHART_TYPE = 'VisBuilder';
 
 export {
   VisBuilderSavedObjectAttributes,

diff --git a/src/plugins/vis_builder/public/application/utils/get_top_nav_config.tsx b/src/plugins/vis_builder/public/application/utils/get_top_nav_config.tsx
@@ -39,7 +39,7 @@ import {
 import { VisBuilderServices } from '../..';
 import { VisBuilderVisSavedObject } from '../../types';
 import { AppDispatch } from './state_management';
-import { EDIT_PATH, VIS_BUILDER_STATE } from '../../../common';
+import { EDIT_PATH } from '../../../common';
 import { setEditorState } from './state_management/metadata_slice';
 export interface TopNavConfigParams {
   visualizationIdFromUrl: string;
@@ -99,7 +99,6 @@ export const getTopNavConfig = (
             onClose={() => {}}
             originatingApp={originatingApp}
             getAppNameFromId={stateTransfer.getAppNameFromId}
-            isExperimental={VIS_BUILDER_STATE === 'experimental' ? true : false}
           />
         );
 

diff --git a/src/plugins/vis_builder/public/plugin.ts b/src/plugins/vis_builder/public/plugin.ts
@@ -27,7 +27,7 @@ import {
   PLUGIN_ID,
   PLUGIN_NAME,
   VISBUILDER_SAVED_OBJECT,
-  VIS_BUILDER_TYPE_SHORTHAND,
+  VIS_BUILDER_CHART_TYPE,
 } from '../common';
 import { TypeService } from './services/type_service';
 import { getPreloadedStore } from './application/utils/state_management';
@@ -140,7 +140,7 @@ export class VisBuilderPlugin
             savedObjectType: VISBUILDER_SAVED_OBJECT,
             stage: 'experimental',
             title: attributes?.title,
-            typeTitle: VIS_BUILDER_TYPE_SHORTHAND,
+            typeTitle: VIS_BUILDER_CHART_TYPE,
           }),
         },
       },

diff --git a/test/functional/apps/visualize/_chart_types.ts b/test/functional/apps/visualize/_chart_types.ts
@@ -65,7 +65,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         'Timeline',
         'Vega',
         'Vertical Bar',
-        'Visualization Builder',
+        'Wizard', // TODO: Update to final name when ready
       ];
       if (!isOss) {
         expectedChartTypes.push('Maps', 'Lens');