Skip to content

Commit 33aed0a

Browse files
ashwin-pcashwin-pc
authored
[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>
1 parent e3e7605 commit 33aed0a

File tree

8 files changed

+75
-5
lines changed

8 files changed

+75
-5
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
2929
* [Vis Builder] Fixes auto bounds for timeseries bar chart visualization ([2401](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2401))
3030
* [Vis Builder] Fixes visualization shift when editing agg ([2401](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2401))
3131
* [Vis Builder] Renames "Histogram" to "Bar" in vis type picker ([2401](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2401))
32+
* [Vis Builder] Update vislib params and misc fixes ([2610](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2610))
3233
* [MD] Add data source param to low-level search call in Discover ([#2431](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2431))
3334
* [Multi DataSource] Skip data source view in index pattern step when pick default ([#2574](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2574))
3435

‎src/plugins/vis_builder/public/embeddable/disabled_visualization.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import './disabled_visualization.scss';
1111

1212
export function DisabledVisualization({ title }: { title: string }) {
1313
return (
14-
<div className="vbDisabledVisualization">
14+
<div className="vbDisabledVisualization" data-test-subj="disabledVisBuilderVis">
1515
<EuiIcon type="beaker" size="xl" />
1616
<div>
1717
<FormattedMessage

‎src/plugins/vis_builder/public/embeddable/vis_builder_embeddable.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import {
2929
} from '../../../data/public';
3030
import { validateSchemaState } from '../application/utils/validate_schema_state';
3131
import { getExpressionLoader, getTypeService } from '../plugin_services';
32+
import { PersistedState } from '../../../visualizations/public';
3233

3334
// Apparently this needs to match the saved object type for the clone and replace panel actions to work
3435
export const WIZARD_EMBEDDABLE = WIZARD_SAVED_OBJECT;
@@ -65,6 +66,7 @@ export class WizardEmbeddable extends Embeddable<SavedObjectEmbeddableInput, Wiz
6566
private node?: HTMLElement;
6667
private savedWizard?: WizardSavedObjectAttributes;
6768
private serializedState?: { visualization: string; style: string };
69+
private uiState?: PersistedState;
6870

6971
constructor(
7072
timefilter: TimefilterContract,
@@ -90,6 +92,7 @@ export class WizardEmbeddable extends Embeddable<SavedObjectEmbeddableInput, Wiz
9092
);
9193

9294
this.savedWizard = savedWizard;
95+
this.uiState = new PersistedState();
9396

9497
this.autoRefreshFetchSubscription = timefilter
9598
.getAutoRefreshFetch$()
@@ -226,6 +229,7 @@ export class WizardEmbeddable extends Embeddable<SavedObjectEmbeddableInput, Wiz
226229
query: this.input.query,
227230
filters: this.input.filters,
228231
},
232+
uiState: this.uiState,
229233
};
230234
if (this.abortController) {
231235
this.abortController.abort();

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,8 @@ export class WizardEmbeddableFactoryDefinition
7171
): Promise<WizardEmbeddable | ErrorEmbeddable | DisabledEmbeddable> {
7272
try {
7373
const savedWizard = await getSavedWizardLoader().get(savedObjectId);
74-
7574
const editPath = `${EDIT_PATH}/${savedObjectId}`;
76-
7775
const editUrl = getHttp().basePath.prepend(`/app/${PLUGIN_ID}${editPath}`);
78-
7976
const isLabsEnabled = getUISettings().get<boolean>(VISUALIZE_ENABLE_LABS_SETTING);
8077

8178
if (!isLabsEnabled) {

‎src/plugins/vis_builder/public/visualizations/vislib/area/area_vis_type.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,28 @@ export const createAreaConfig = (): VisualizationTypeOptions<AreaOptionsDefaults
4646
min: 0,
4747
max: 1,
4848
aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!filters'],
49+
defaults: { aggTypes: ['date_histogram', 'terms'] },
50+
},
51+
{
52+
group: AggGroupNames.Buckets,
53+
name: 'group',
54+
title: i18n.translate('visTypeVislib.area.groupTitle', {
55+
defaultMessage: 'Split series',
56+
}),
57+
min: 0,
58+
max: 3,
59+
aggFilter: ['!geohash_grid', '!geotile_grid', '!filter'],
60+
defaults: { aggTypes: ['terms'] },
61+
},
62+
{
63+
group: AggGroupNames.Buckets,
64+
name: 'split',
65+
title: i18n.translate('visTypeVislib.area.splitTitle', {
66+
defaultMessage: 'Split chart',
67+
}),
68+
min: 0,
69+
max: 1,
70+
aggFilter: ['!geohash_grid', '!geotile_grid', '!filter'],
4971
defaults: { aggTypes: ['terms'] },
5072
},
5173
]),

‎src/plugins/vis_builder/public/visualizations/vislib/histogram/histogram_vis_type.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,28 @@ export const createHistogramConfig = (): VisualizationTypeOptions<HistogramOptio
4646
min: 0,
4747
max: 1,
4848
aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!filters'],
49+
defaults: { aggTypes: ['date_histogram', 'terms'] },
50+
},
51+
{
52+
group: AggGroupNames.Buckets,
53+
name: 'group',
54+
title: i18n.translate('visTypeVislib.histogram.groupTitle', {
55+
defaultMessage: 'Split series',
56+
}),
57+
min: 0,
58+
max: 3,
59+
aggFilter: ['!geohash_grid', '!geotile_grid', '!filter'],
60+
defaults: { aggTypes: ['terms'] },
61+
},
62+
{
63+
group: AggGroupNames.Buckets,
64+
name: 'split',
65+
title: i18n.translate('visTypeVislib.histogram.splitTitle', {
66+
defaultMessage: 'Split chart',
67+
}),
68+
min: 0,
69+
max: 1,
70+
aggFilter: ['!geohash_grid', '!geotile_grid', '!filter'],
4971
defaults: { aggTypes: ['terms'] },
5072
},
5173
]),

‎src/plugins/vis_builder/public/visualizations/vislib/line/line_vis_type.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,28 @@ export const createLineConfig = (): VisualizationTypeOptions<LineOptionsDefaults
4646
min: 0,
4747
max: 1,
4848
aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!filters'],
49+
defaults: { aggTypes: ['date_histogram', 'terms'] },
50+
},
51+
{
52+
group: AggGroupNames.Buckets,
53+
name: 'group',
54+
title: i18n.translate('visTypeVislib.line.groupTitle', {
55+
defaultMessage: 'Split series',
56+
}),
57+
min: 0,
58+
max: 3,
59+
aggFilter: ['!geohash_grid', '!geotile_grid', '!filter'],
60+
defaults: { aggTypes: ['terms'] },
61+
},
62+
{
63+
group: AggGroupNames.Buckets,
64+
name: 'split',
65+
title: i18n.translate('visTypeVislib.line.splitTitle', {
66+
defaultMessage: 'Split chart',
67+
}),
68+
min: 0,
69+
max: 1,
70+
aggFilter: ['!geohash_grid', '!geotile_grid', '!filter'],
4971
defaults: { aggTypes: ['terms'] },
5072
},
5173
{

‎src/plugins/visualize/public/application/components/visualize_listing.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,9 @@ export const VisualizeListing = () => {
123123
.then(({ total, hits }: { total: number; hits: object[] }) => ({
124124
total,
125125
hits: hits.filter(
126-
(result: any) => isLabsEnabled || result.type?.stage !== 'experimental'
126+
(result: any) =>
127+
isLabsEnabled ||
128+
(result.type?.stage !== 'experimental' && result.stage !== 'experimental')
127129
),
128130
}));
129131
},

0 commit comments

Comments
 (0)
⚡