,
- isSecondary = false
-) => {
- const uniqueDict: { [key: string]: boolean } = {};
-
- const [title, ...panelComponents] = items
- .filter((item) => {
- // Ensure unique item ID
- const id = item.type !== ItemTypes.TITLE ? item.id : 'title';
- if (uniqueDict[id]) return false;
-
- uniqueDict[id] = true;
- return true;
- })
- .sort((itemA, itemB) =>
- // Ensure that the title is on top
- itemA.type === ItemTypes.TITLE ? -1 : itemB.type === ItemTypes.TITLE ? 1 : 0
- )
- .map((item, index) => {
- const { type } = item;
-
- switch (type) {
- case ItemTypes.TITLE:
- return ;
-
- case ItemTypes.DROPBOX:
- return ;
-
- case ItemTypes.SELECT:
- case ItemTypes.INPUT:
- return ;
-
- default:
- break;
- }
- });
-
- return (
- <>
- {title}
- {panelComponents}
-
- );
-};
diff --git a/src/plugins/wizard/public/application/contributions/containers/index.ts b/src/plugins/wizard/public/application/contributions/containers/index.ts
deleted file mode 100644
index 74d0a6b8f76e..000000000000
--- a/src/plugins/wizard/public/application/contributions/containers/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-export * from './data_tab';
-export * from './style_tab';
diff --git a/src/plugins/wizard/public/application/contributions/containers/style_tab/index.tsx b/src/plugins/wizard/public/application/contributions/containers/style_tab/index.tsx
deleted file mode 100644
index 6da05f6715e7..000000000000
--- a/src/plugins/wizard/public/application/contributions/containers/style_tab/index.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import React from 'react';
-
-export const STYLE_TAB_ID = 'style_tab';
-
-export const StyleTab = () => {
- return TODO: Layout styles come here.
;
-};
diff --git a/src/plugins/wizard/public/application/contributions/index.ts b/src/plugins/wizard/public/application/contributions/index.ts
deleted file mode 100644
index 6ea0ec832393..000000000000
--- a/src/plugins/wizard/public/application/contributions/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-export * from './containers';
-export * from './constants';
diff --git a/src/plugins/wizard/public/application/utils/async_search/index.ts b/src/plugins/wizard/public/application/utils/async_search/index.ts
deleted file mode 100644
index 9746cde24e4c..000000000000
--- a/src/plugins/wizard/public/application/utils/async_search/index.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { CreateAggConfigParams } from 'src/plugins/data/common';
-import { DataPublicPluginStart, IndexPattern } from 'src/plugins/data/public';
-
-interface IDoAsyncSearch {
- data: DataPublicPluginStart;
- indexPattern: IndexPattern | null;
- aggs?: CreateAggConfigParams[];
-}
-
-export const doAsyncSearch = async ({ data, indexPattern, aggs }: IDoAsyncSearch) => {
- if (!indexPattern || !aggs || !aggs.length) return;
-
- // Constuct the query portion of the search request
- const query = data.query.getOpenSearchQuery(indexPattern);
-
- // Constuct the aggregations portion of the search request by using the `data.search.aggs` service.
- // const aggs = [{ type: 'avg', params: { field: field.name } }];
- // const aggs = [
- // { type: 'terms', params: { field: 'day_of_week' } },
- // { type: 'avg', params: { field: field.name } },
- // { type: 'terms', params: { field: 'customer_gender' } },
- // ];
- const aggConfigs = data.search.aggs.createAggConfigs(indexPattern, aggs);
- const aggsDsl = aggConfigs.toDsl();
-
- const request = {
- params: {
- index: indexPattern.title,
- body: {
- aggs: aggsDsl,
- query,
- },
- },
- };
-
- // Submit the search request using the `data.search` service.
- const { rawResponse } = await data.search.search(request).toPromise();
-
- return {
- rawResponse,
- aggConfigs,
- };
-};
diff --git a/src/plugins/wizard/public/application/utils/state_management/visualization_slice.ts b/src/plugins/wizard/public/application/utils/state_management/visualization_slice.ts
index d18396197a2f..f7d4d3ff6d49 100644
--- a/src/plugins/wizard/public/application/utils/state_management/visualization_slice.ts
+++ b/src/plugins/wizard/public/application/utils/state_management/visualization_slice.ts
@@ -4,7 +4,7 @@
*/
import { createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { CreateAggConfigParams } from 'src/plugins/data/common';
+import { CreateAggConfigParams } from '../../../../../data/common';
import { WizardServices } from '../../../types';
interface VisualizationState {
diff --git a/src/plugins/wizard/public/application/utils/validate_schema_state.ts b/src/plugins/wizard/public/application/utils/validate_schema_state.ts
new file mode 100644
index 000000000000..2db3653e2ce3
--- /dev/null
+++ b/src/plugins/wizard/public/application/utils/validate_schema_state.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { countBy } from 'lodash';
+import { Schemas } from '../../../../vis_default_editor/public';
+import { RootState } from './state_management';
+
+export const validateSchemaState = (schemas: Schemas, state: RootState): [boolean, string?] => {
+ const activeViz = state.visualization.activeVisualization;
+ const vizName = activeViz?.name;
+ const aggs = activeViz?.aggConfigParams;
+
+ // Check if any aggreagations exist
+ if (aggs?.length === 0) {
+ return [false];
+ }
+
+ // Check if each schema's min agg requirement is met
+ const aggSchemaCount = countBy(aggs, (agg) => agg.schema);
+ const invalidsSchemas = schemas.all.filter((schema) => {
+ if (!schema.min) return false;
+ if (!aggSchemaCount[schema.name] || aggSchemaCount[schema.name] < schema.min) return true;
+
+ return false;
+ });
+
+ if (invalidsSchemas.length > 0) {
+ return [
+ false,
+ `The ${vizName} visualization needs at least ${invalidsSchemas[0].min} field(s) in the agg type "${invalidsSchemas[0].name}"`,
+ ];
+ }
+
+ return [true, ''];
+};
diff --git a/src/plugins/wizard/public/services/type_service/type_service.test.ts b/src/plugins/wizard/public/services/type_service/type_service.test.ts
index 7edf38e7e5e0..89e1ecb59154 100644
--- a/src/plugins/wizard/public/services/type_service/type_service.test.ts
+++ b/src/plugins/wizard/public/services/type_service/type_service.test.ts
@@ -6,11 +6,14 @@
import { VisualizationTypeOptions } from './types';
import { TypeService } from './type_service';
-const DEFAULT_VIZ_PROPS = {
+const DEFAULT_VIZ_PROPS: VisualizationTypeOptions = {
name: 'some-name',
icon: 'some-icon',
title: 'Some Title',
- contributions: {},
+ ui: {} as any, // Not required for this test
+ toExpression: async (state) => {
+ return 'test';
+ },
};
describe('TypeService', () => {
@@ -28,7 +31,7 @@ describe('TypeService', () => {
});
describe('#setup', () => {
- test('should throw an error if two visualizzations of the same id are registered', () => {
+ test('should throw an error if two visualizations of the same id are registered', () => {
const { createVisualizationType } = service.setup();
createVisualizationType(createVizType({ name: 'viz-type-1' }));
diff --git a/src/plugins/wizard/public/services/type_service/types.ts b/src/plugins/wizard/public/services/type_service/types.ts
index fae6cdf1c093..b999d66ddf30 100644
--- a/src/plugins/wizard/public/services/type_service/types.ts
+++ b/src/plugins/wizard/public/services/type_service/types.ts
@@ -7,26 +7,6 @@ import { IconType } from '@elastic/eui';
import { RootState } from '../../application/utils/state_management';
import { Schemas } from '../../../../vis_default_editor/public';
-export enum ContributionTypes {
- CONTAINER = 'CONTAINER',
- ITEM = 'ITEM',
-}
-
-export enum ContainerLocations {
- SIDE_PANEL = 'sidePanel',
- TOOLBAR = 'toolbar',
-}
-
-export interface ContainerContribution {
- id: string;
- name: string;
- Component: JSX.Element;
-}
-
-type ContainerSchema = any;
-
-export type ContainerLocationContribution = { [K in ContainerLocations]: ContainerContribution[] };
-
export interface DataTabConfig {
schemas: Schemas;
}
diff --git a/src/plugins/wizard/public/services/type_service/visualization_type.test.tsx b/src/plugins/wizard/public/services/type_service/visualization_type.test.tsx
deleted file mode 100644
index 6d362a229d23..000000000000
--- a/src/plugins/wizard/public/services/type_service/visualization_type.test.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import React from 'react';
-import { VisualizationTypeOptions } from './types';
-import { VisualizationType } from './visualization_type';
-
-// TODO: Update service tests
-describe('VisualizationType', () => {
- const DEFAULT_VIZ_PROPS = {
- name: 'some-name',
- icon: 'some-icon',
- title: 'Some Title',
- contributions: {},
- };
-
- // const createVizType = (props?: Partial): VisualizationTypeOptions => {
- // return {
- // ...DEFAULT_VIZ_PROPS,
- // ...props,
- // };
- // };
-
- // test('should have default container contributions if none are provided', () => {
- // const viz = new VisualizationType(createVizType());
-
- // expect(viz.contributions.containers).toEqual(DEFAULT_CONTAINERS);
- // });
-
- // test('should have replace default container contributions when provided', () => {
- // const defaultContainer = DEFAULT_CONTAINERS.sidePanel[0];
- // const viz = new VisualizationType(
- // createVizType({
- // contributions: {
- // containers: {
- // sidePanel: [
- // {
- // id: defaultContainer.id,
- // name: 'Test',
- // Component: Test
,
- // },
- // ],
- // },
- // },
- // })
- // );
-
- // const container = viz.contributions.containers.sidePanel.find(
- // ({ id }) => id === defaultContainer.id
- // );
- // expect(container).toMatchInlineSnapshot(`
- // Object {
- // "Component":
- // Test
- //
,
- // "id": "data_tab",
- // "name": "Test",
- // }
- // `);
- // });
-
- // test('should register new container if provided', () => {
- // const viz = new VisualizationType(
- // createVizType({
- // contributions: {
- // containers: {
- // sidePanel: [
- // {
- // id: 'test_id',
- // name: 'Test',
- // Component: Test
,
- // },
- // ],
- // },
- // },
- // })
- // );
-
- // const container = viz.contributions.containers.sidePanel.find(({ id }) => id === 'test_id');
- // const containerNames = viz.contributions.containers.sidePanel.map(({ name }) => name);
- // const defaultContainerNames = DEFAULT_CONTAINERS.sidePanel.map(({ name }) => name);
-
- // expect(containerNames).toEqual([...defaultContainerNames, 'Test']);
- // expect(container).toMatchInlineSnapshot(`
- // Object {
- // "Component":
- // Test
- //
,
- // "id": "test_id",
- // "name": "Test",
- // }
- // `);
- // });
-});
diff --git a/src/plugins/wizard/public/services/type_service/visualization_type.tsx b/src/plugins/wizard/public/services/type_service/visualization_type.tsx
index 2ae1d25a4d96..90f30d8f8a95 100644
--- a/src/plugins/wizard/public/services/type_service/visualization_type.tsx
+++ b/src/plugins/wizard/public/services/type_service/visualization_type.tsx
@@ -2,18 +2,20 @@
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/
+import { IconType } from '@elastic/eui';
+import { RootState } from '../../application/utils/state_management';
import { VisualizationTypeOptions } from './types';
type IVisualizationType = VisualizationTypeOptions;
export class VisualizationType implements IVisualizationType {
- public readonly name;
- public readonly title;
- public readonly description;
- public readonly icon;
- public readonly stage;
- public readonly ui;
- public readonly toExpression;
+ public readonly name: string;
+ public readonly title: string;
+ public readonly description: string;
+ public readonly icon: IconType;
+ public readonly stage: 'beta' | 'production';
+ public readonly ui: IVisualizationType['ui'];
+ public readonly toExpression: (state: RootState) => Promise;
constructor(options: VisualizationTypeOptions) {
this.name = options.name;
diff --git a/src/plugins/wizard/public/visualizations/bar_chart/index.ts b/src/plugins/wizard/public/visualizations/bar_chart/index.ts
deleted file mode 100644
index b135edf48ef6..000000000000
--- a/src/plugins/wizard/public/visualizations/bar_chart/index.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { ItemTypes } from '../../application/contributions/constants';
-import {
- DATA_TAB_ID,
- DropboxContribution,
- MainItemContribution as ConfigPanelItem,
-} from '../../application/contributions';
-import { VisualizationTypeOptions } from '../../services/type_service';
-
-export const createBarChartConfig = (): VisualizationTypeOptions => {
- const configPanelItems: ConfigPanelItem[] = [
- {
- type: ItemTypes.TITLE,
- title: 'Bar Chart Configuration',
- },
- createDropboxContribution('x_axis', 'X Axis', {}),
- createDropboxContribution('y_axis', 'Y Axis', { limit: 5 }),
- // {
- // type: ItemTypes.INPUT,
- // id: 'testLabel',
- // label: 'Test Label',
- // },
- ];
-
- return {
- name: 'bar_chart',
- title: 'Bar Chart',
- icon: 'visBarVertical',
- description: 'This is a bar chart',
- contributions: {
- items: {
- [DATA_TAB_ID]: configPanelItems,
- },
- },
- };
-};
-
-const createDropboxContribution = (
- id: string,
- label: string,
- props?: Pick
-): DropboxContribution => ({
- type: ItemTypes.DROPBOX,
- id,
- label,
- items: [
- {
- type: ItemTypes.SELECT,
- id: 'aggregation',
- label: 'Select a Function',
- options: (state, services) => {
- const { config } = state;
- // config.items[]
- const { buckets } = services.data.search.aggs.types.getAll();
- return buckets.map(({ name, title, type }) => ({
- value: name,
- inputDisplay: title,
- }));
- },
- },
- {
- type: ItemTypes.INPUT,
- id: 'label',
- label: 'Name',
- },
- ],
- display: (indexField, dropboxState) => {
- const dropboxField = {
- icon: indexField.type,
- label: indexField.displayName,
- };
-
- if (dropboxState?.label) {
- dropboxField.label = dropboxState.label;
- }
-
- return dropboxField;
- },
- onDrop: (indexField) => {
- return {
- // label: indexField.displayName,
- };
- },
- // isDroppable: (indexField) => {
- // return indexField.displayName === 'geo.srcdest';
- // },
- ...props,
-});
diff --git a/src/plugins/wizard/public/visualizations/index.ts b/src/plugins/wizard/public/visualizations/index.ts
index b9574fd9a771..44ad05739a74 100644
--- a/src/plugins/wizard/public/visualizations/index.ts
+++ b/src/plugins/wizard/public/visualizations/index.ts
@@ -5,8 +5,6 @@
import type { TypeServiceSetup } from '../services/type_service';
import { createMetricConfig } from './metric';
-import { createBarChartConfig } from './bar_chart';
-import { createPieChartConfig } from './pie_chart';
import { WizardPluginStartDependencies } from '../types';
export function registerDefaultTypes(
diff --git a/src/plugins/wizard/public/visualizations/metric/to_expression.ts b/src/plugins/wizard/public/visualizations/metric/to_expression.ts
index f0614801493e..5b787ef5d264 100644
--- a/src/plugins/wizard/public/visualizations/metric/to_expression.ts
+++ b/src/plugins/wizard/public/visualizations/metric/to_expression.ts
@@ -95,8 +95,6 @@ export const toExpression = async ({ style: styleState, visualization }: MetricR
const { activeVisualization, indexPattern: indexId = '' } = visualization;
const { aggConfigParams } = activeVisualization || {};
- if (!aggConfigParams || !aggConfigParams.length) return;
-
const indexPatternsService = getIndexPatterns();
const indexPattern = await indexPatternsService.get(indexId);
const aggConfigs = getAggService().createAggConfigs(indexPattern, cloneDeep(aggConfigParams));
diff --git a/src/plugins/wizard/public/visualizations/pie_chart/index.ts b/src/plugins/wizard/public/visualizations/pie_chart/index.ts
deleted file mode 100644
index e71540852a32..000000000000
--- a/src/plugins/wizard/public/visualizations/pie_chart/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { VisualizationTypeOptions } from '../../services/type_service';
-
-export const createPieChartConfig = (): VisualizationTypeOptions => {
- return {
- name: 'pie_chart',
- title: 'Pie Chart',
- icon: 'visPie',
- contributions: {},
- };
-};