Skip to content

Commit

Permalink
fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
alexwizp committed May 17, 2021
1 parent 3d00b8e commit 129f095
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 78 deletions.
16 changes: 8 additions & 8 deletions src/plugins/vis_type_xy/public/expression_functions/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

export { visTypeXyVisFn } from './xy_vis_fn';

export { categoryAxis } from './category_axis';
export { timeMarker } from './time_marker';
export { valueAxis } from './value_axis';
export { seriesParam } from './series_param';
export { thresholdLine } from './threshold_line';
export { label } from './label';
export { visScale } from './vis_scale';
export { xyDimension } from './xy_dimension';
export { categoryAxis, ExpressionValueCategoryAxis } from './category_axis';
export { timeMarker, ExpressionValueTimeMarker } from './time_marker';
export { valueAxis, ExpressionValueValueAxis } from './value_axis';
export { seriesParam, ExpressionValueSeriesParam } from './series_param';
export { thresholdLine, ExpressionValueThresholdLine } from './threshold_line';
export { label, ExpressionValueLabel } from './label';
export { visScale, ExpressionValueScale } from './vis_scale';
export { xyDimension, ExpressionValueXYDimension } from './xy_dimension';
43 changes: 0 additions & 43 deletions src/plugins/vis_type_xy/public/expression_functions_register.ts

This file was deleted.

25 changes: 13 additions & 12 deletions src/plugins/vis_type_xy/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ import {
setPalettesService,
setTrackUiMetric,
} from './services';

import { visTypesDefinitions } from './vis_types';
import { LEGACY_CHARTS_LIBRARY } from '../common';
import { xyVisRenderer } from './vis_renderer';
import { getExpressionFunctionsRegister } from './expression_functions_register';

import * as expressionFunctions from './expression_functions';

// eslint-disable-next-line @typescript-eslint/no-empty-interface
export interface VisTypeXyPluginSetup {}
Expand Down Expand Up @@ -67,18 +69,17 @@ export class VisTypeXyPlugin
setPalettesService(charts.palettes);

expressions.registerRenderer(xyVisRenderer);
expressions.registerFunction(expressionFunctions.visTypeXyVisFn);
expressions.registerFunction(expressionFunctions.categoryAxis);
expressions.registerFunction(expressionFunctions.timeMarker);
expressions.registerFunction(expressionFunctions.valueAxis);
expressions.registerFunction(expressionFunctions.seriesParam);
expressions.registerFunction(expressionFunctions.thresholdLine);
expressions.registerFunction(expressionFunctions.label);
expressions.registerFunction(expressionFunctions.visScale);
expressions.registerFunction(expressionFunctions.xyDimension);

const expressionFunctionsRegister = getExpressionFunctionsRegister(expressions);

visTypesDefinitions.forEach((item) => {
visualizations.createBaseVisualization({
setup: async (vis) => {
await expressionFunctionsRegister();
return vis;
},
...item,
});
});
visTypesDefinitions.forEach(visualizations.createBaseVisualization);
}

setTrackUiMetric(usageCollection?.reportUiCounter.bind(usageCollection, 'vis_type_xy'));
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/vis_type_xy/public/types/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
YDomainRange,
} from '@elastic/charts';

import { Dimension, Scale, ThresholdLine } from './param';
import type { Dimension, Scale, ThresholdLine } from './param';

export interface Column {
id: string | null;
Expand Down
29 changes: 15 additions & 14 deletions src/plugins/vis_type_xy/public/types/param.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,21 @@
* Side Public License, v 1.
*/

import { Fit, Position } from '@elastic/charts';

import { Style, Labels, PaletteOutput } from '../../../charts/public';
import { SchemaConfig } from '../../../visualizations/public';

import { ChartType, XyVisType } from '../../common';
import { ExpressionValueCategoryAxis } from '../expression_functions/category_axis';
import { ExpressionValueSeriesParam } from '../expression_functions/series_param';
import { ExpressionValueValueAxis } from '../expression_functions/value_axis';
import { ExpressionValueLabel } from '../expression_functions/label';
import { ExpressionValueThresholdLine } from '../expression_functions/threshold_line';
import { ExpressionValueTimeMarker } from '../expression_functions/time_marker';
import { ExpressionValueXYDimension } from '../expression_functions/xy_dimension';
import {
import type { Fit, Position } from '@elastic/charts';
import type { Style, Labels, PaletteOutput } from '../../../charts/public';
import type { SchemaConfig } from '../../../visualizations/public';
import type { ChartType, XyVisType } from '../../common';
import type {
ExpressionValueCategoryAxis,
ExpressionValueSeriesParam,
ExpressionValueValueAxis,
ExpressionValueLabel,
ExpressionValueThresholdLine,
ExpressionValueTimeMarker,
ExpressionValueXYDimension,
} from '../expression_functions';

import type {
ChartMode,
AxisMode,
AxisType,
Expand Down

0 comments on commit 129f095

Please sign in to comment.