[D&D] Final fixes

config/opensearch_dashboards.yml

@@ -187,4 +187,4 @@
 
 # Set the value of this setting to true to start exploring wizard
 # functionality in Visualization.
-# wizard.enabled: true
+# wizard.enabled: false

src/plugins/saved_objects_management/README.md

@@ -1,4 +1,4 @@
-# Save objects management
+# Saved objects management
 
 Provides a UI (via the `management` plugin) to find and manage all saved objects in one place (you can see the primary page by navigating to `/app/management/opensearch-dashboards/objects`). Not to be confused with the `savedObjects` plugin, which provides all the core capabilities of saved objects.
 

src/plugins/wizard/README.md

@@ -8,7 +8,7 @@ To use this plugin, navigate to:
 
 Visualize -> Create Visualization -> Wizard
 
-## Add a visualization (TODO: Cleanup before merging into mainline)
+## Add a visualization
 
 All new visualizations currently reside in [public/visualizations](./public/visualizations). To add a new one, create a new visualization directory and add the required code (below) to setup and register a new vis type.
 

src/plugins/wizard/common/wizard_saved_object_attributes.ts

@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { integer } from '@opensearch-project/opensearch/api/types';
 import { SavedObjectAttributes } from '../../../core/types';
 
 export const WIZARD_SAVED_OBJECT = 'wizard';
@@ -13,5 +12,5 @@ export interface WizardSavedObjectAttributes extends SavedObjectAttributes {
   description?: string;
   visualizationState?: string;
   styleState?: string;
-  version: integer;
+  version: number;
 }

src/plugins/wizard/config.ts

@@ -6,7 +6,7 @@
 import { schema, TypeOf } from '@osd/config-schema';
 
 export const configSchema = schema.object({
-  enabled: schema.boolean({ defaultValue: true }),
+  enabled: schema.boolean({ defaultValue: false }),
 });
 
 export type ConfigSchema = TypeOf<typeof configSchema>;

src/plugins/wizard/public/application/_util.scss

@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 @mixin scrollNavParent($template-row: none) {
   display: grid;
   min-height: 0;

src/plugins/wizard/public/application/_variables.scss

@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 @import "@elastic/eui/src/global_styling/variables/header";
 @import "@elastic/eui/src/global_styling/variables/form";
 

src/plugins/wizard/public/application/app.scss

@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 @import "variables";
 
 .wizLayout {

src/plugins/wizard/public/application/app.tsx

@@ -6,12 +6,11 @@
 import React from 'react';
 import { I18nProvider } from '@osd/i18n/react';
 import { EuiPage } from '@elastic/eui';
-import { SideNav } from './components/side_nav';
 import { DragDropProvider } from './utils/drag_drop/drag_drop_context';
+import { SideNav } from './components/side_nav';
+import { TopNav } from './components/top_nav';
 import { Workspace } from './components/workspace';
-
 import './app.scss';
-import { TopNav } from './components/top_nav';
 
 export const WizardApp = () => {
   // Render the application DOM.

src/plugins/wizard/public/application/components/data_tab/config_panel.scss

@@ -1,6 +1,13 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 .wizConfig {
+  @include euiYScrollWithShadows;
+
   background: $euiColorLightestShade;
   border-left: $euiBorderThin;
+  border-right: $euiBorderThin;
   position: relative;
   overflow-x: hidden;
 

src/plugins/wizard/public/application/components/data_tab/dropbox.scss

@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 .dropBox {
   margin-top: $euiSize;
   border-bottom: $euiBorderThin;
@@ -49,12 +53,12 @@
     animation: pop-in $euiAnimSpeedFast $euiAnimSlightResistance forwards;
 
     &.validField {
-      background-color: #a8d9e7;
-      border-color: #a8d9e7;
+      background-color: tintOrShade($euiColorPrimary, 80%, 70%);
+      border-color: tintOrShade($euiColorPrimary, 80%, 70%);
 
       &.canDrop {
-        background-color: rgba(0, 161, 201, 30%);
-        border-color: #006bb4;
+        background-color: tintOrShade($euiColorPrimary, 60%, 40%);
+        border-color: tintOrShade($euiColorPrimary, 30%, 20%);
         border-style: dashed;
       }
     }

src/plugins/wizard/public/application/components/data_tab/field_selector.scss

@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 @import "../../util";
 
 .wizFieldSelector {

src/plugins/wizard/public/application/components/data_tab/field_selector_field.scss

@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 .wizFieldSelectorField {
   @include euiBottomShadowSmall;
 

src/plugins/wizard/public/application/components/data_tab/index.scss

@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 @import "../../util";
 
 .wizDataTab {

src/plugins/wizard/public/application/components/data_tab/use/use_dropbox.tsx

@@ -65,7 +65,7 @@ export const useDropbox = (props: UseDropboxProps): DropboxProps => {
   // Event handlers for each dropbox action type
   const onAddField = useCallback(() => {
     if (!aggConfigs || !indexPattern) {
-      throw new Error('Cannot create new field, missing parameters');
+      throw new Error('Cannot create new field, missing aggConfigs or indexPattern');
     }
 
     const aggConfig = aggConfigs.createAggConfig(

src/plugins/wizard/public/application/components/searchable_dropdown.scss

@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 @import "../variables";
 
 .searchableDropdown {

src/plugins/wizard/public/application/components/side_nav.scss

@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 @import "../util";
 @import "../variables";
 

src/plugins/wizard/public/application/components/top_nav.scss

@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 .wizTopNav {
   grid-area: topNav;
   border-bottom: $euiBorderThin;

src/plugins/wizard/public/application/components/workspace.scss

@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 .wizWorkspace {
   display: grid;
   -ms-grid-rows: auto $euiSizeM 1fr;

src/plugins/wizard/public/embeddable/disabled_visualization.scss

@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 .wizDisabledVisualization {
   width: 100%;
   display: grid;

src/plugins/wizard/public/services/type_service/types.ts

@@ -21,7 +21,7 @@ export interface VisualizationTypeOptions<T = any> {
   readonly title: string;
   readonly description?: string;
   readonly icon: IconType;
-  readonly stage?: 'beta' | 'production';
+  readonly stage?: 'experimental' | 'production';
   readonly ui: {
     containerConfig: {
       data: DataTabConfig;

src/plugins/wizard/public/services/type_service/visualization_type.tsx

@@ -13,7 +13,7 @@ export class VisualizationType implements IVisualizationType {
   public readonly title: string;
   public readonly description: string;
   public readonly icon: IconType;
-  public readonly stage: 'beta' | 'production';
+  public readonly stage: 'experimental' | 'production';
   public readonly ui: IVisualizationType['ui'];
   public readonly toExpression: (state: RootState) => Promise<string | undefined>;
 

src/plugins/wizard/server/plugin.ts

@@ -13,7 +13,6 @@ import {
 
 import { WizardPluginSetup, WizardPluginStart } from './types';
 import { capabilitiesProvider } from './capabilities_provider';
-import { defineRoutes } from './routes';
 import { wizardSavedObjectType } from './saved_objects';
 
 export class WizardPlugin implements Plugin<WizardPluginSetup, WizardPluginStart> {
@@ -25,10 +24,6 @@ export class WizardPlugin implements Plugin<WizardPluginSetup, WizardPluginStart
 
   public setup({ capabilities, http, savedObjects }: CoreSetup) {
     this.logger.debug('wizard: Setup');
-    const router = http.createRouter();
-
-    // Register server side APIs
-    defineRoutes(router);
 
     // Register saved object types
     savedObjects.registerType(wizardSavedObjectType);

src/plugins/wizard/server/types.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
 // We need to export plugin server types, even if empty
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface WizardPluginSetup {}
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface WizardPluginStart {}