Skip to content

Commit

Permalink
[Rename] Refactored src/plugins/vis_type_metric directory (#101)
Browse files Browse the repository at this point in the history
Signed-off-by: Mihir Soni <[email protected]>
  • Loading branch information
mihirsoni authored and kavilla committed Mar 20, 2021
1 parent 19d40b8 commit 4fd0b46
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion src/plugins/vis_type_metric/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

import { schema, TypeOf } from '@kbn/config-schema';
import { schema, TypeOf } from '@osd/config-schema';

export const configSchema = schema.object({
enabled: schema.boolean({ defaultValue: true }),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"id": "visTypeMetric",
"version": "8.0.0",
"kibanaVersion": "kibana",
"opensearchDashboardsVersion": "opensearchDashboards",
"server": true,
"ui": true,
"requiredPlugins": ["data", "visualizations", "charts", "expressions"],
"requiredBundles": ["kibanaUtils", "visDefaultEditor"]
"requiredBundles": ["opensearchDashboardsUtils", "visDefaultEditor"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { isColorDark } from '@elastic/eui';
import { MetricVisValue } from './metric_vis_value';
import { Input } from '../metric_vis_fn';
import { FieldFormatsContentType, IFieldFormat } from '../../../data/public';
import { KibanaDatatable } from '../../../expressions/public';
import { OpenSearchDashboardsDatatable } from '../../../expressions/public';
import { getHeatmapColors } from '../../../charts/public';
import { VisParams, MetricVisMetric } from '../types';
import { getFormatService } from '../services';
Expand Down Expand Up @@ -109,7 +109,7 @@ class MetricVisComponent extends Component<MetricVisComponentProps> {
return fieldFormatter.convert(value, format);
};

private processTableGroups(table: KibanaDatatable) {
private processTableGroups(table: OpenSearchDashboardsDatatable) {
const config = this.props.visParams.metric;
const dimensions = this.props.visParams.dimensions;
const isPercentageMode = config.percentageMode;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import {
EuiSpacer,
EuiTitle,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@osd/i18n';
import { FormattedMessage } from '@osd/i18n/react';

import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
import {
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/vis_type_metric/public/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
import { PluginInitializerContext } from 'kibana/public';
import { PluginInitializerContext } from 'opensearch-dashboards/public';
import { MetricVisPlugin as Plugin } from './plugin';

export function plugin(initializerContext: PluginInitializerContext) {
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/vis_type_metric/public/metric_vis_fn.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { functionWrapper } from '../../expressions/common/expression_functions/s
describe('interpreter/functions#metric', () => {
const fn = functionWrapper(createMetricVisFn());
const context = {
type: 'kibana_datatable',
type: 'opensearch_dashboards_datatable',
rows: [{ 'col-0-1': 0 }],
columns: [{ id: 'col-0-1', name: 'Count' }],
};
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/vis_type_metric/public/metric_vis_fn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@
* under the License.
*/

import { i18n } from '@kbn/i18n';
import { i18n } from '@osd/i18n';

import {
ExpressionFunctionDefinition,
KibanaDatatable,
OpenSearchDashboardsDatatable,
Range,
Render,
Style,
} from '../../expressions/public';
import { visType, DimensionsVisParam, VisParams } from './types';
import { ColorSchemas, vislibColorMaps, ColorModes } from '../../charts/public';

export type Input = KibanaDatatable;
export type Input = OpenSearchDashboardsDatatable;

interface Arguments {
percentageMode: boolean;
Expand Down Expand Up @@ -63,7 +63,7 @@ export type MetricVisExpressionFunctionDefinition = ExpressionFunctionDefinition
export const createMetricVisFn = (): MetricVisExpressionFunctionDefinition => ({
name: 'metricVis',
type: 'render',
inputTypes: ['kibana_datatable'],
inputTypes: ['opensearch_dashboards_datatable'],
help: i18n.translate('visTypeMetric.function.help', {
defaultMessage: 'Metric visualization',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/vis_type_metric/public/metric_vis_type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

import { i18n } from '@kbn/i18n';
import { i18n } from '@osd/i18n';
import { BaseVisTypeOptions } from 'src/plugins/visualizations/public';
import { MetricVisOptions } from './components/metric_vis_options';
import { ColorSchemas, colorSchemas, ColorModes } from '../../charts/public';
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/vis_type_metric/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'kibana/public';
import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'opensearch-dashboards/public';
import { Plugin as ExpressionsPublicPlugin } from '../../expressions/public';
import { VisualizationsSetup } from '../../visualizations/public';

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/vis_type_metric/public/services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

import { createGetterSetter } from '../../kibana_utils/common';
import { createGetterSetter } from '../../opensearch_dashboards_utils/common';
import { DataPublicPluginStart } from '../../data/public';

export const [getFormatService, setFormatService] = createGetterSetter<
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/vis_type_metric/public/to_ast.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { get } from 'lodash';
import { getVisSchemas, SchemaConfig, Vis } from '../../visualizations/public';
import { buildExpression, buildExpressionFunction } from '../../expressions/public';
import { MetricVisExpressionFunctionDefinition } from './metric_vis_fn';
import { EsaggsExpressionFunctionDefinition } from '../../data/common/search/expressions';
import { OpenSearchaggsExpressionFunctionDefinition } from '../../data/common/search/expressions';

const prepareDimension = (params: SchemaConfig) => {
const visdimension = buildExpressionFunction('visdimension', { accessor: params.accessor });
Expand All @@ -35,8 +35,8 @@ const prepareDimension = (params: SchemaConfig) => {
};

export const toExpressionAst = (vis: Vis, params: any) => {
// soon this becomes: const esaggs = vis.data.aggs!.toExpressionAst();
const esaggs = buildExpressionFunction<EsaggsExpressionFunctionDefinition>('esaggs', {
// soon this becomes: const opensearchaggs = vis.data.aggs!.toExpressionAst();
const opensearchaggs = buildExpressionFunction<OpenSearchaggsExpressionFunctionDefinition>('opensearchaggs', {
index: vis.data.indexPattern!.id!,
metricsAtAllLevels: vis.isHierarchical(),
partialRows: vis.params.showPartialRows || false,
Expand Down Expand Up @@ -97,7 +97,7 @@ export const toExpressionAst = (vis: Vis, params: any) => {
metricVis.addArgument('metric', prepareDimension(metric));
});

const ast = buildExpression([esaggs, metricVis]);
const ast = buildExpression([opensearchaggs, metricVis]);

return ast.toAst();
};
2 changes: 1 addition & 1 deletion src/plugins/vis_type_metric/server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

import { PluginConfigDescriptor } from 'kibana/server';
import { PluginConfigDescriptor } from 'opensearch-dashboards/server';

import { configSchema, ConfigSchema } from '../config';

Expand Down

0 comments on commit 4fd0b46

Please sign in to comment.