From 33aed0a6bdba070a37bc3002f4a86a81a0150677 Mon Sep 17 00:00:00 2001
From: Ashwin P Chandran <ashwinpc@amazon.com>
Date: Wed, 19 Oct 2022 15:26:50 -0700
Subject: [PATCH] [Vis Builder] Update vislib params and misc fixes (#2610)

* Updates bar, line, area visbuilder config

Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>

* Misc fixes from functional testing

Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>

* Adds Changelog entry

Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>

Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>
---
 CHANGELOG.md                                  |  1 +
 .../embeddable/disabled_visualization.tsx     |  2 +-
 .../embeddable/vis_builder_embeddable.tsx     |  4 ++++
 .../vis_builder_embeddable_factory.tsx        |  3 ---
 .../vislib/area/area_vis_type.ts              | 22 +++++++++++++++++++
 .../vislib/histogram/histogram_vis_type.ts    | 22 +++++++++++++++++++
 .../vislib/line/line_vis_type.ts              | 22 +++++++++++++++++++
 .../components/visualize_listing.tsx          |  4 +++-
 8 files changed, 75 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90944d0b6438..017d697c4eac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 * [Vis Builder] Fixes auto bounds for timeseries bar chart visualization ([2401](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2401))
 * [Vis Builder] Fixes visualization shift when editing agg ([2401](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2401))
 * [Vis Builder] Renames "Histogram" to "Bar" in vis type picker ([2401](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2401))
+* [Vis Builder] Update vislib params and misc fixes ([2610](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2610))
 * [MD] Add data source param to low-level search call in Discover ([#2431](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2431))
 * [Multi DataSource] Skip data source view in index pattern step when pick default ([#2574](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2574))
 
diff --git a/src/plugins/vis_builder/public/embeddable/disabled_visualization.tsx b/src/plugins/vis_builder/public/embeddable/disabled_visualization.tsx
index 7391589dd01d..be6072c105af 100644
--- a/src/plugins/vis_builder/public/embeddable/disabled_visualization.tsx
+++ b/src/plugins/vis_builder/public/embeddable/disabled_visualization.tsx
@@ -11,7 +11,7 @@ import './disabled_visualization.scss';
 
 export function DisabledVisualization({ title }: { title: string }) {
   return (
-    <div className="vbDisabledVisualization">
+    <div className="vbDisabledVisualization" data-test-subj="disabledVisBuilderVis">
       <EuiIcon type="beaker" size="xl" />
       <div>
         <FormattedMessage
diff --git a/src/plugins/vis_builder/public/embeddable/vis_builder_embeddable.tsx b/src/plugins/vis_builder/public/embeddable/vis_builder_embeddable.tsx
index 1acbd295e43a..706b562ca8b3 100644
--- a/src/plugins/vis_builder/public/embeddable/vis_builder_embeddable.tsx
+++ b/src/plugins/vis_builder/public/embeddable/vis_builder_embeddable.tsx
@@ -29,6 +29,7 @@ import {
 } from '../../../data/public';
 import { validateSchemaState } from '../application/utils/validate_schema_state';
 import { getExpressionLoader, getTypeService } from '../plugin_services';
+import { PersistedState } from '../../../visualizations/public';
 
 // Apparently this needs to match the saved object type for the clone and replace panel actions to work
 export const WIZARD_EMBEDDABLE = WIZARD_SAVED_OBJECT;
@@ -65,6 +66,7 @@ export class WizardEmbeddable extends Embeddable<SavedObjectEmbeddableInput, Wiz
   private node?: HTMLElement;
   private savedWizard?: WizardSavedObjectAttributes;
   private serializedState?: { visualization: string; style: string };
+  private uiState?: PersistedState;
 
   constructor(
     timefilter: TimefilterContract,
@@ -90,6 +92,7 @@ export class WizardEmbeddable extends Embeddable<SavedObjectEmbeddableInput, Wiz
     );
 
     this.savedWizard = savedWizard;
+    this.uiState = new PersistedState();
 
     this.autoRefreshFetchSubscription = timefilter
       .getAutoRefreshFetch$()
@@ -226,6 +229,7 @@ export class WizardEmbeddable extends Embeddable<SavedObjectEmbeddableInput, Wiz
         query: this.input.query,
         filters: this.input.filters,
       },
+      uiState: this.uiState,
     };
     if (this.abortController) {
       this.abortController.abort();
diff --git a/src/plugins/vis_builder/public/embeddable/vis_builder_embeddable_factory.tsx b/src/plugins/vis_builder/public/embeddable/vis_builder_embeddable_factory.tsx
index 66ac196a37a2..c200efee0d2d 100644
--- a/src/plugins/vis_builder/public/embeddable/vis_builder_embeddable_factory.tsx
+++ b/src/plugins/vis_builder/public/embeddable/vis_builder_embeddable_factory.tsx
@@ -71,11 +71,8 @@ export class WizardEmbeddableFactoryDefinition
   ): Promise<WizardEmbeddable | ErrorEmbeddable | DisabledEmbeddable> {
     try {
       const savedWizard = await getSavedWizardLoader().get(savedObjectId);
-
       const editPath = `${EDIT_PATH}/${savedObjectId}`;
-
       const editUrl = getHttp().basePath.prepend(`/app/${PLUGIN_ID}${editPath}`);
-
       const isLabsEnabled = getUISettings().get<boolean>(VISUALIZE_ENABLE_LABS_SETTING);
 
       if (!isLabsEnabled) {
diff --git a/src/plugins/vis_builder/public/visualizations/vislib/area/area_vis_type.ts b/src/plugins/vis_builder/public/visualizations/vislib/area/area_vis_type.ts
index 14b524bf008f..5a42492e862e 100644
--- a/src/plugins/vis_builder/public/visualizations/vislib/area/area_vis_type.ts
+++ b/src/plugins/vis_builder/public/visualizations/vislib/area/area_vis_type.ts
@@ -46,6 +46,28 @@ export const createAreaConfig = (): VisualizationTypeOptions<AreaOptionsDefaults
             min: 0,
             max: 1,
             aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!filters'],
+            defaults: { aggTypes: ['date_histogram', 'terms'] },
+          },
+          {
+            group: AggGroupNames.Buckets,
+            name: 'group',
+            title: i18n.translate('visTypeVislib.area.groupTitle', {
+              defaultMessage: 'Split series',
+            }),
+            min: 0,
+            max: 3,
+            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter'],
+            defaults: { aggTypes: ['terms'] },
+          },
+          {
+            group: AggGroupNames.Buckets,
+            name: 'split',
+            title: i18n.translate('visTypeVislib.area.splitTitle', {
+              defaultMessage: 'Split chart',
+            }),
+            min: 0,
+            max: 1,
+            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter'],
             defaults: { aggTypes: ['terms'] },
           },
         ]),
diff --git a/src/plugins/vis_builder/public/visualizations/vislib/histogram/histogram_vis_type.ts b/src/plugins/vis_builder/public/visualizations/vislib/histogram/histogram_vis_type.ts
index a5b1a7df1356..2524c4c978fa 100644
--- a/src/plugins/vis_builder/public/visualizations/vislib/histogram/histogram_vis_type.ts
+++ b/src/plugins/vis_builder/public/visualizations/vislib/histogram/histogram_vis_type.ts
@@ -46,6 +46,28 @@ export const createHistogramConfig = (): VisualizationTypeOptions<HistogramOptio
             min: 0,
             max: 1,
             aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!filters'],
+            defaults: { aggTypes: ['date_histogram', 'terms'] },
+          },
+          {
+            group: AggGroupNames.Buckets,
+            name: 'group',
+            title: i18n.translate('visTypeVislib.histogram.groupTitle', {
+              defaultMessage: 'Split series',
+            }),
+            min: 0,
+            max: 3,
+            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter'],
+            defaults: { aggTypes: ['terms'] },
+          },
+          {
+            group: AggGroupNames.Buckets,
+            name: 'split',
+            title: i18n.translate('visTypeVislib.histogram.splitTitle', {
+              defaultMessage: 'Split chart',
+            }),
+            min: 0,
+            max: 1,
+            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter'],
             defaults: { aggTypes: ['terms'] },
           },
         ]),
diff --git a/src/plugins/vis_builder/public/visualizations/vislib/line/line_vis_type.ts b/src/plugins/vis_builder/public/visualizations/vislib/line/line_vis_type.ts
index b92019cddd9d..c17c443fd9a7 100644
--- a/src/plugins/vis_builder/public/visualizations/vislib/line/line_vis_type.ts
+++ b/src/plugins/vis_builder/public/visualizations/vislib/line/line_vis_type.ts
@@ -46,6 +46,28 @@ export const createLineConfig = (): VisualizationTypeOptions<LineOptionsDefaults
             min: 0,
             max: 1,
             aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!filters'],
+            defaults: { aggTypes: ['date_histogram', 'terms'] },
+          },
+          {
+            group: AggGroupNames.Buckets,
+            name: 'group',
+            title: i18n.translate('visTypeVislib.line.groupTitle', {
+              defaultMessage: 'Split series',
+            }),
+            min: 0,
+            max: 3,
+            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter'],
+            defaults: { aggTypes: ['terms'] },
+          },
+          {
+            group: AggGroupNames.Buckets,
+            name: 'split',
+            title: i18n.translate('visTypeVislib.line.splitTitle', {
+              defaultMessage: 'Split chart',
+            }),
+            min: 0,
+            max: 1,
+            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter'],
             defaults: { aggTypes: ['terms'] },
           },
           {
diff --git a/src/plugins/visualize/public/application/components/visualize_listing.tsx b/src/plugins/visualize/public/application/components/visualize_listing.tsx
index 767793efa2d8..46db44bb066d 100644
--- a/src/plugins/visualize/public/application/components/visualize_listing.tsx
+++ b/src/plugins/visualize/public/application/components/visualize_listing.tsx
@@ -123,7 +123,9 @@ export const VisualizeListing = () => {
         .then(({ total, hits }: { total: number; hits: object[] }) => ({
           total,
           hits: hits.filter(
-            (result: any) => isLabsEnabled || result.type?.stage !== 'experimental'
+            (result: any) =>
+              isLabsEnabled ||
+              (result.type?.stage !== 'experimental' && result.stage !== 'experimental')
           ),
         }));
     },